Attachment #18302 for bug #32951

View | Details | Raw Unified | Return to bug 32951
Collapse All | Expand All




		DEMOS_DIR="${PREFIX}/share/examples/plplot" \
		INFO_DIR="${PREFIX}/info" \
		M4="${LOCALBASE}/bin/gm4"
CONFIGURE_ARGS=	--disable-python --with-double
		--with-double
INSTALLS_SHLIB=	yes

.if defined(WITH_TCLTK)
LIB_DEPENDS+=	itk32.1:${PORTSDIR}/x11-toolkits/itk
CONFIGURE_ENV+=	ITCLINCDIR="${LOCALBASE}/include/itcl3.2" \
		ITCLLIBDIR="${LOCALBASE}/lib" \
		ITCLLIBSTR="-litcl32" \
		ITKINCDIR="${LOCALBASE}/include/itk3.2" \
		ITKLIBDIR="${LOCALBASE}/lib" \
		ITKLIBSTR="-litk32" \
		TCLINCDIR="${LOCALBASE}/include/tcl8.3" \
		TCLLIBDIR="${LOCALBASE}/lib" \
		TCLLIBSTR="-ltcl83" \
		TKINCDIR="${LOCALBASE}/include/tk8.3" \
		TKLIBDIR="${LOCALBASE}/lib" \
		TKLIBSTR="-ltk83"
PLIST_SUB+=	TCLTK=""
.else
CONFIGURE_ARGS+=	--disable-itcl --disable-tcl --disable-tk
PLIST_SUB+=	TCLTK="@comment "
.endif

post-patch:
.for file in scripts/mktclIndex
	@${PERL} -pi -e 's|tclsh|${LOCALBASE}/bin/tclsh8.3|g' ${WRKSRC}/${file}
.endfor

.include <bsd.port.mk>




--- configure.orig	Fri Jun 15 07:53:27 2001
+++ configure	Mon Dec 17 20:14:24 2001
@@ -1268,7 +1268,9 @@
 
 # Defaults
 

 
 # Double precision
 # Note that because there is no standard way to invoke double
@@ -1536,9 +1538,9 @@
 # Optimization
 
 if test "$with_opt" = "yes"; then

 fi
 
 # ----------------------------------------------------------------------------
@@ -2012,15 +2014,33 @@
 # Default linker library commands.  These may need version numbers
 # appended to them though.
 
-ITKLIBSTR=-litk
-TKLIBSTR=-ltk
-ITCLLIBSTR=-litcl
-TCLLIBSTR=-ltcl
-XLIBSTR=-lX11
-GDLIBSTR=-lgd
-PNGLIBSTR=-lpng
-JPEGLIBSTR=-ljpeg
-ZLIBLIBSTR=-lz
+if test -z "$ITKLIBSTR"; then
+    ITKLIBSTR=-litk
+fi
+if test -z "$TKLIBSTR"; then
+    TKLIBSTR=-ltk
+fi
+if test -z "$ITCLLIBSTR"; then
+    ITCLLIBSTR=-litcl
+fi
+if test -z "$TCLLIBSTR"; then
+    TCLLIBSTR=-ltcl
+fi
+if test -z "$XLIBSTR"; then
+    XLIBSTR=-lX11
+fi
+if test -z "$GDLIBSTR"; then
+    GDLIBSTR=-lgd
+fi
+if test -z "$PNGLIBSTR"; then
+    PNGLIBSTR=-lpng
+fi
+if test -z "$JPEGLIBSTR"; then
+    JPEGLIBSTR=-ljpeg
+fi
+if test -z "$ITKLIBSTR"; then
+    ZLIBLIBSTR=-lz
+fi
 
 # Add the current directory to the include path.  This must occur
 # first in the list, before we add the directories for any auxilliary
@@ -4721,6 +4741,13 @@
 		EXTRA_LIBS="-ldl -lm"
 	    fi
 	;;

+	;;
 	* ) 	
 	    echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
 echo "configure:4727: checking for main in -lXbsd" >&5
@@ -5002,6 +5029,20 @@
             # for Linux.)
 	    SHLIB_F77FLAGS=-fPIC
 	;;

 	HP-UX-* )
 	    SO=".sl"
 	    SHLIB_F77FLAGS="+z"
@@ -6719,6 +6760,7 @@
 s%@LDCXX_FLAGS@%$LDCXX_FLAGS%g
 s%@F77_FLAGS@%$F77_FLAGS%g
 s%@LDF_FLAGS@%$LDF_FLAGS%g

Lines 2-7 Link Here

(-)math/plplot/pkg-plist (-3 / +87 lines)
2	bin/plplot-config	2	bin/plplot-config
3	bin/plpr	3	bin/plpr
4	bin/plrender	4	bin/plrender
		5	%%TCLTK%%bin/plserver
		6	%%TCLTK%%bin/pltcl
5	bin/pltek	7	bin/pltek
6	bin/pstex2eps	8	bin/pstex2eps
7	include/plplot/drivers.h	9	include/plplot/drivers.h
Lines 15-25 Link Here
15	include/plplot/plplotP.h	17	include/plplot/plplotP.h
16	include/plplot/plstream.h	18	include/plplot/plstream.h
17	include/plplot/plstrm.h	19	include/plplot/plstrm.h
		20	%%TCLTK%%include/plplot/pltcl.h
		21	%%TCLTK%%include/plplot/pltk.h
18	include/plplot/plxwd.h	22	include/plplot/plxwd.h
		23	%%TCLTK%%include/plplot/tclMatrix.h
19	lib/libplcxxd.a	24	lib/libplcxxd.a
20	lib/libplplotd.a	25	lib/libplplotd.a
21	lib/libplplotd.so	26	lib/libplplotd.so
22	lib/libplplotd.so.5	27	lib/libplplotd.so.5
		28	%%TCLTK%%lib/libtclmatrixd.a
23	share/doc/plplot/CHANGES	29	share/doc/plplot/CHANGES
24	share/doc/plplot/COPYING.LIB	30	share/doc/plplot/COPYING.LIB
25	share/doc/plplot/Copyright	31	share/doc/plplot/Copyright
Lines 30-37 Link Here
30	share/doc/plplot/ToDo	36	share/doc/plplot/ToDo
31	share/doc/plplot/mklinks	37	share/doc/plplot/mklinks
32	share/examples/plplot/Makefile	38	share/examples/plplot/Makefile
33	share/examples/plplot/c++/Makefile
34	share/examples/plplot/c++/x01cc.cc
35	share/examples/plplot/c/Makefile	39	share/examples/plplot/c/Makefile
36	share/examples/plplot/c/tutor.c	40	share/examples/plplot/c/tutor.c
37	share/examples/plplot/c/x01c.c	41	share/examples/plplot/c/x01c.c
Lines 53-58 Link Here
53	share/examples/plplot/c/x17c.c	57	share/examples/plplot/c/x17c.c
54	share/examples/plplot/c/x18c.c	58	share/examples/plplot/c/x18c.c
55	share/examples/plplot/c/x19c.c	59	share/examples/plplot/c/x19c.c
		60	share/examples/plplot/c++/Makefile
		61	share/examples/plplot/c++/x01cc.cc
56	share/examples/plplot/f77/Makefile	62	share/examples/plplot/f77/Makefile
57	share/examples/plplot/f77/x01f.f	63	share/examples/plplot/f77/x01f.f
58	share/examples/plplot/f77/x02f.f	64	share/examples/plplot/f77/x02f.f
Lines 69-91 Link Here
69	share/examples/plplot/f77/x13f.f	75	share/examples/plplot/f77/x13f.f
70	share/examples/plplot/f77/x16f.f	76	share/examples/plplot/f77/x16f.f
71	share/examples/plplot/plplot-test.sh	77	share/examples/plplot/plplot-test.sh
		78	%%TCLTK%%share/examples/plplot/tcl/README.tcldemos
		79	%%TCLTK%%share/examples/plplot/tcl/plgrid.tcl
		80	%%TCLTK%%share/examples/plplot/tcl/plot.dat
		81	%%TCLTK%%share/examples/plplot/tcl/plot.tcl
		82	%%TCLTK%%share/examples/plplot/tcl/r.dat
		83	%%TCLTK%%share/examples/plplot/tcl/stats.log
		84	%%TCLTK%%share/examples/plplot/tcl/tcldemos.tcl
		85	%%TCLTK%%share/examples/plplot/tcl/x01.tcl
		86	%%TCLTK%%share/examples/plplot/tcl/x02.tcl
		87	%%TCLTK%%share/examples/plplot/tcl/x03.tcl
		88	%%TCLTK%%share/examples/plplot/tcl/x04.tcl
		89	%%TCLTK%%share/examples/plplot/tcl/x05.tcl
		90	%%TCLTK%%share/examples/plplot/tcl/x06.tcl
		91	%%TCLTK%%share/examples/plplot/tcl/x07.tcl
		92	%%TCLTK%%share/examples/plplot/tcl/x08.tcl
		93	%%TCLTK%%share/examples/plplot/tcl/x09.tcl
		94	%%TCLTK%%share/examples/plplot/tcl/x10.tcl
		95	%%TCLTK%%share/examples/plplot/tcl/x11.tcl
		96	%%TCLTK%%share/examples/plplot/tcl/x12.tcl
		97	%%TCLTK%%share/examples/plplot/tcl/x13.tcl
		98	%%TCLTK%%share/examples/plplot/tcl/x14.tcl
		99	%%TCLTK%%share/examples/plplot/tcl/x15.tcl
		100	%%TCLTK%%share/examples/plplot/tcl/x16.tcl
		101	%%TCLTK%%share/examples/plplot/tcl/x17.tcl
		102	%%TCLTK%%share/examples/plplot/tcl/x18.tcl
72	share/examples/plplot/test_c.sh	103	share/examples/plplot/test_c.sh
73	share/examples/plplot/test_cxx.sh	104	share/examples/plplot/test_cxx.sh
74	share/examples/plplot/test_f77.sh	105	share/examples/plplot/test_f77.sh
75	share/examples/plplot/test_octave.sh	106	share/examples/plplot/test_octave.sh
76	share/examples/plplot/test_python.sh	107	share/examples/plplot/test_python.sh
77	share/examples/plplot/test_tcl.sh	108	share/examples/plplot/test_tcl.sh
		109	%%TCLTK%%share/examples/plplot/tk/Makefile
		110	%%TCLTK%%share/examples/plplot/tk/README.tkdemos
		111	%%TCLTK%%share/examples/plplot/tk/tk01
		112	%%TCLTK%%share/examples/plplot/tk/tk02
		113	%%TCLTK%%share/examples/plplot/tk/tk03
		114	%%TCLTK%%share/examples/plplot/tk/tk04
		115	%%TCLTK%%share/examples/plplot/tk/tkdemos.tcl
		116	%%TCLTK%%share/examples/plplot/tk/x01.tcl
		117	%%TCLTK%%share/examples/plplot/tk/x02.tcl
		118	%%TCLTK%%share/examples/plplot/tk/x03.tcl
		119	%%TCLTK%%share/examples/plplot/tk/x04.tcl
		120	%%TCLTK%%share/examples/plplot/tk/x05.tcl
		121	%%TCLTK%%share/examples/plplot/tk/x06.tcl
		122	%%TCLTK%%share/examples/plplot/tk/x07.tcl
		123	%%TCLTK%%share/examples/plplot/tk/x08.tcl
		124	%%TCLTK%%share/examples/plplot/tk/x09.tcl
		125	%%TCLTK%%share/examples/plplot/tk/x10.tcl
		126	%%TCLTK%%share/examples/plplot/tk/x11.tcl
		127	%%TCLTK%%share/examples/plplot/tk/x12.tcl
		128	%%TCLTK%%share/examples/plplot/tk/x13.tcl
		129	%%TCLTK%%share/examples/plplot/tk/x14.tcl
		130	%%TCLTK%%share/examples/plplot/tk/x15.tcl
		131	%%TCLTK%%share/examples/plplot/tk/x16.tcl
		132	%%TCLTK%%share/examples/plplot/tk/x17.tcl
		133	%%TCLTK%%share/examples/plplot/tk/x18.tcl
		134	%%TCLTK%%share/examples/plplot/tk/xtk01.c
		135	%%TCLTK%%share/examples/plplot/tk/xtk02.c
		136	%%TCLTK%%share/examples/plplot/tk/xtk04.c
78	share/plplot/data/cglobe.map	137	share/plplot/data/cglobe.map
79	share/plplot/data/globe.map	138	share/plplot/data/globe.map
80	share/plplot/data/plstnd5.fnt	139	share/plplot/data/plstnd5.fnt
81	share/plplot/data/plxtnd5.fnt	140	share/plplot/data/plxtnd5.fnt
82	share/plplot/data/usa.map	141	share/plplot/data/usa.map
83	share/plplot/data/usaglobe.map	142	share/plplot/data/usaglobe.map
		143	%%TCLTK%%share/plplot/tcl/FileSelector.tcl
		144	%%TCLTK%%share/plplot/tcl/PLWin.itk
		145	%%TCLTK%%share/plplot/tcl/PLXWin.itk
		146	%%TCLTK%%share/plplot/tcl/Pltkwin.tcl
		147	%%TCLTK%%share/plplot/tcl/about.tcl
		148	%%TCLTK%%share/plplot/tcl/cmap0a.pal
		149	%%TCLTK%%share/plplot/tcl/cmap1a.pal
		150	%%TCLTK%%share/plplot/tcl/cmap1b.pal
		151	%%TCLTK%%share/plplot/tcl/cmap1c.pal
		152	%%TCLTK%%share/plplot/tcl/cmap1d.pal
		153	%%TCLTK%%share/plplot/tcl/help_gui.tcl
		154	%%TCLTK%%share/plplot/tcl/help_keys.tcl
		155	%%TCLTK%%share/plplot/tcl/help_tcltk.tcl
		156	%%TCLTK%%share/plplot/tcl/plclient.tcl
		157	%%TCLTK%%share/plplot/tcl/plcolor.tcl
		158	%%TCLTK%%share/plplot/tcl/plconfig.tcl
		159	%%TCLTK%%share/plplot/tcl/pldefaults.tcl
		160	%%TCLTK%%share/plplot/tcl/plplot.tcl
		161	%%TCLTK%%share/plplot/tcl/plserver.tcl
		162	%%TCLTK%%share/plplot/tcl/pltools.tcl
		163	%%TCLTK%%share/plplot/tcl/plwidget.tcl
		164	%%TCLTK%%share/plplot/tcl/tclIndex
		165	%%TCLTK%%@dirrm share/plplot/tcl
84	@dirrm share/plplot/data	166	@dirrm share/plplot/data
85	@dirrm share/plplot	167	@dirrm share/plplot
		168	%%TCLTK%%@dirrm share/examples/plplot/tk
		169	%%TCLTK%%@dirrm share/examples/plplot/tcl
86	@dirrm share/examples/plplot/f77	170	@dirrm share/examples/plplot/f77
87	@dirrm share/examples/plplot/c
88	@dirrm share/examples/plplot/c++	171	@dirrm share/examples/plplot/c++
		172	@dirrm share/examples/plplot/c
89	@dirrm share/examples/plplot	173	@dirrm share/examples/plplot
90	@dirrm share/doc/plplot	174	@dirrm share/doc/plplot
91	@dirrm include/plplot	175	@dirrm include/plplot

Return to bug 32951

Lines 29-36 Link Here

(-)math/plplot/Makefile (-2 / +26 lines)
29	DEMOS_DIR="${PREFIX}/share/examples/plplot" \	29	DEMOS_DIR="${PREFIX}/share/examples/plplot" \
30	INFO_DIR="${PREFIX}/info" \	30	INFO_DIR="${PREFIX}/info" \
31	M4="${LOCALBASE}/bin/gm4"	31	M4="${LOCALBASE}/bin/gm4"
32	CONFIGURE_ARGS= --disable-tk --disable-tcl --disable-itcl --disable-python \	32	CONFIGURE_ARGS= --disable-python --with-double
33	--with-double
34	INSTALLS_SHLIB= yes	33	INSTALLS_SHLIB= yes
		34
		35	.if defined(WITH_TCLTK)
		36	LIB_DEPENDS+= itk32.1:${PORTSDIR}/x11-toolkits/itk
		37	CONFIGURE_ENV+= ITCLINCDIR="${LOCALBASE}/include/itcl3.2" \
		38	ITCLLIBDIR="${LOCALBASE}/lib" \
		39	ITCLLIBSTR="-litcl32" \
		40	ITKINCDIR="${LOCALBASE}/include/itk3.2" \
		41	ITKLIBDIR="${LOCALBASE}/lib" \
		42	ITKLIBSTR="-litk32" \
		43	TCLINCDIR="${LOCALBASE}/include/tcl8.3" \
		44	TCLLIBDIR="${LOCALBASE}/lib" \
		45	TCLLIBSTR="-ltcl83" \
		46	TKINCDIR="${LOCALBASE}/include/tk8.3" \
		47	TKLIBDIR="${LOCALBASE}/lib" \
		48	TKLIBSTR="-ltk83"
		49	PLIST_SUB+= TCLTK=""
		50	.else
		51	CONFIGURE_ARGS+= --disable-itcl --disable-tcl --disable-tk
		52	PLIST_SUB+= TCLTK="@comment "
		53	.endif
		54
		55	post-patch:
		56	.for file in scripts/mktclIndex
		57	@${PERL} -pi -e 's\|tclsh\|${LOCALBASE}/bin/tclsh8.3\|g' ${WRKSRC}/${file}
		58	.endfor
35		59
36	.include <bsd.port.mk>	60	.include <bsd.port.mk>

Lines 1-6 Link Here

(-)math/plplot/files/patch-aa (-8 / +51 lines)
1	--- configure.orig Fri Mar 30 04:55:57 2001	1	--- configure.orig Fri Jun 15 07:53:27 2001
2	+++ configure Sat Apr 28 11:41:53 2001	2	+++ configure Mon Dec 17 20:14:24 2001
3	@@ -1262,7 +1262,9 @@	3	@@ -1268,7 +1268,9 @@
4		4
5	# Defaults	5	# Defaults
6		6
Lines 11-17 Link Here
11		11
12	# Double precision	12	# Double precision
13	# Note that because there is no standard way to invoke double	13	# Note that because there is no standard way to invoke double
14	@@ -1530,9 +1532,9 @@	14	@@ -1536,9 +1538,9 @@
15	# Optimization	15	# Optimization
16		16
17	if test "$with_opt" = "yes"; then	17	if test "$with_opt" = "yes"; then
Lines 24-30 Link Here
24	fi	24	fi
25		25
26	# ----------------------------------------------------------------------------	26	# ----------------------------------------------------------------------------
27	@@ -4628,6 +4630,13 @@	27	@@ -2012,15 +2014,33 @@
		28	# Default linker library commands. These may need version numbers
		29	# appended to them though.
		30
		31	-ITKLIBSTR=-litk
		32	-TKLIBSTR=-ltk
		33	-ITCLLIBSTR=-litcl
		34	-TCLLIBSTR=-ltcl
		35	-XLIBSTR=-lX11
		36	-GDLIBSTR=-lgd
		37	-PNGLIBSTR=-lpng
		38	-JPEGLIBSTR=-ljpeg
		39	-ZLIBLIBSTR=-lz
		40	+if test -z "$ITKLIBSTR"; then
		41	+ ITKLIBSTR=-litk
		42	+fi
		43	+if test -z "$TKLIBSTR"; then
		44	+ TKLIBSTR=-ltk
		45	+fi
		46	+if test -z "$ITCLLIBSTR"; then
		47	+ ITCLLIBSTR=-litcl
		48	+fi
		49	+if test -z "$TCLLIBSTR"; then
		50	+ TCLLIBSTR=-ltcl
		51	+fi
		52	+if test -z "$XLIBSTR"; then
		53	+ XLIBSTR=-lX11
		54	+fi
		55	+if test -z "$GDLIBSTR"; then
		56	+ GDLIBSTR=-lgd
		57	+fi
		58	+if test -z "$PNGLIBSTR"; then
		59	+ PNGLIBSTR=-lpng
		60	+fi
		61	+if test -z "$JPEGLIBSTR"; then
		62	+ JPEGLIBSTR=-ljpeg
		63	+fi
		64	+if test -z "$ITKLIBSTR"; then
		65	+ ZLIBLIBSTR=-lz
		66	+fi
		67
		68	# Add the current directory to the include path. This must occur
		69	# first in the list, before we add the directories for any auxilliary
		70	@@ -4721,6 +4741,13 @@
28	EXTRA_LIBS="-ldl -lm"	71	EXTRA_LIBS="-ldl -lm"
29	fi	72	fi
30	;;	73	;;
Lines 37-44 Link Here
37	+ ;;	80	+ ;;
38	* )	81	* )
39	echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6	82	echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
40	echo "configure:4634: checking for main in -lXbsd" >&5	83	echo "configure:4727: checking for main in -lXbsd" >&5
41	@@ -4909,6 +4918,20 @@	84	@@ -5002,6 +5029,20 @@
42	# for Linux.)	85	# for Linux.)
43	SHLIB_F77FLAGS=-fPIC	86	SHLIB_F77FLAGS=-fPIC
44	;;	87	;;
Lines 59-65 Link Here
59	HP-UX-* )	102	HP-UX-* )
60	SO=".sl"	103	SO=".sl"
61	SHLIB_F77FLAGS="+z"	104	SHLIB_F77FLAGS="+z"
62	@@ -6600,6 +6623,7 @@	105	@@ -6719,6 +6760,7 @@
63	s%@LDCXX_FLAGS@%$LDCXX_FLAGS%g	106	s%@LDCXX_FLAGS@%$LDCXX_FLAGS%g
64	s%@F77_FLAGS@%$F77_FLAGS%g	107	s%@F77_FLAGS@%$F77_FLAGS%g
65	s%@LDF_FLAGS@%$LDF_FLAGS%g	108	s%@LDF_FLAGS@%$LDF_FLAGS%g