diff options
author | Kevin Lo <kevlo@FreeBSD.org> | 2001-12-22 13:59:12 +0000 |
---|---|---|
committer | Kevin Lo <kevlo@FreeBSD.org> | 2001-12-22 13:59:12 +0000 |
commit | 621afdd675778e43f0d6035904b88a82a7b6fd73 (patch) | |
tree | 948a8f778afef7ea736a9c24d35106faa0746633 | |
parent | Avoid making empty directory (diff) |
- Add build option to support Tcl/Tk
- Bump PORTREVISION
PR: 32951
Submitted by: Ports Fury
Notes
Notes:
svn path=/head/; revision=51985
-rw-r--r-- | math/plplot/Makefile | 29 | ||||
-rw-r--r-- | math/plplot/files/patch-aa | 59 | ||||
-rw-r--r-- | math/plplot/pkg-plist | 90 |
3 files changed, 165 insertions, 13 deletions
diff --git a/math/plplot/Makefile b/math/plplot/Makefile index 1d9e31f80865..4efc20225f0c 100644 --- a/math/plplot/Makefile +++ b/math/plplot/Makefile @@ -7,6 +7,7 @@ PORTNAME= plplot PORTVERSION= 5.0.4 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -29,8 +30,32 @@ CONFIGURE_ENV= F77="${FC}" FFLAGS="${FFLAGS}" \ DEMOS_DIR="${PREFIX}/share/examples/plplot" \ INFO_DIR="${PREFIX}/info" \ M4="${LOCALBASE}/bin/gm4" -CONFIGURE_ARGS= --disable-tk --disable-tcl --disable-itcl --disable-python \ - --with-double +CONFIGURE_ARGS= --disable-python --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> diff --git a/math/plplot/files/patch-aa b/math/plplot/files/patch-aa index 17fd33f8a09d..a6c294867942 100644 --- a/math/plplot/files/patch-aa +++ b/math/plplot/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Fri Mar 30 04:55:57 2001 -+++ configure Sat Apr 28 11:41:53 2001 -@@ -1262,7 +1262,9 @@ +--- configure.orig Fri Jun 15 07:53:27 2001 ++++ configure Mon Dec 17 20:14:24 2001 +@@ -1268,7 +1268,9 @@ # Defaults @@ -11,7 +11,7 @@ # Double precision # Note that because there is no standard way to invoke double -@@ -1530,9 +1532,9 @@ +@@ -1536,9 +1538,9 @@ # Optimization if test "$with_opt" = "yes"; then @@ -24,7 +24,50 @@ fi # ---------------------------------------------------------------------------- -@@ -4628,6 +4630,13 @@ +@@ -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 ;; @@ -37,8 +80,8 @@ + ;; * ) echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6 - echo "configure:4634: checking for main in -lXbsd" >&5 -@@ -4909,6 +4918,20 @@ + echo "configure:4727: checking for main in -lXbsd" >&5 +@@ -5002,6 +5029,20 @@ # for Linux.) SHLIB_F77FLAGS=-fPIC ;; @@ -59,7 +102,7 @@ HP-UX-* ) SO=".sl" SHLIB_F77FLAGS="+z" -@@ -6600,6 +6623,7 @@ +@@ -6719,6 +6760,7 @@ s%@LDCXX_FLAGS@%$LDCXX_FLAGS%g s%@F77_FLAGS@%$F77_FLAGS%g s%@LDF_FLAGS@%$LDF_FLAGS%g diff --git a/math/plplot/pkg-plist b/math/plplot/pkg-plist index 55c2e6cc1f6d..7af77c830be6 100644 --- a/math/plplot/pkg-plist +++ b/math/plplot/pkg-plist @@ -2,6 +2,8 @@ bin/plm2gif bin/plplot-config bin/plpr bin/plrender +%%TCLTK%%bin/plserver +%%TCLTK%%bin/pltcl bin/pltek bin/pstex2eps include/plplot/drivers.h @@ -15,11 +17,15 @@ include/plplot/plplot.h include/plplot/plplotP.h include/plplot/plstream.h include/plplot/plstrm.h +%%TCLTK%%include/plplot/pltcl.h +%%TCLTK%%include/plplot/pltk.h include/plplot/plxwd.h +%%TCLTK%%include/plplot/tclMatrix.h lib/libplcxxd.a lib/libplplotd.a lib/libplplotd.so lib/libplplotd.so.5 +%%TCLTK%%lib/libtclmatrixd.a share/doc/plplot/CHANGES share/doc/plplot/COPYING.LIB share/doc/plplot/Copyright @@ -30,8 +36,6 @@ share/doc/plplot/README.local share/doc/plplot/ToDo share/doc/plplot/mklinks share/examples/plplot/Makefile -share/examples/plplot/c++/Makefile -share/examples/plplot/c++/x01cc.cc share/examples/plplot/c/Makefile share/examples/plplot/c/tutor.c share/examples/plplot/c/x01c.c @@ -53,6 +57,8 @@ share/examples/plplot/c/x16c.c share/examples/plplot/c/x17c.c share/examples/plplot/c/x18c.c share/examples/plplot/c/x19c.c +share/examples/plplot/c++/Makefile +share/examples/plplot/c++/x01cc.cc share/examples/plplot/f77/Makefile share/examples/plplot/f77/x01f.f share/examples/plplot/f77/x02f.f @@ -69,23 +75,101 @@ share/examples/plplot/f77/x12f.f share/examples/plplot/f77/x13f.f share/examples/plplot/f77/x16f.f share/examples/plplot/plplot-test.sh +%%TCLTK%%share/examples/plplot/tcl/README.tcldemos +%%TCLTK%%share/examples/plplot/tcl/plgrid.tcl +%%TCLTK%%share/examples/plplot/tcl/plot.dat +%%TCLTK%%share/examples/plplot/tcl/plot.tcl +%%TCLTK%%share/examples/plplot/tcl/r.dat +%%TCLTK%%share/examples/plplot/tcl/stats.log +%%TCLTK%%share/examples/plplot/tcl/tcldemos.tcl +%%TCLTK%%share/examples/plplot/tcl/x01.tcl +%%TCLTK%%share/examples/plplot/tcl/x02.tcl +%%TCLTK%%share/examples/plplot/tcl/x03.tcl +%%TCLTK%%share/examples/plplot/tcl/x04.tcl +%%TCLTK%%share/examples/plplot/tcl/x05.tcl +%%TCLTK%%share/examples/plplot/tcl/x06.tcl +%%TCLTK%%share/examples/plplot/tcl/x07.tcl +%%TCLTK%%share/examples/plplot/tcl/x08.tcl +%%TCLTK%%share/examples/plplot/tcl/x09.tcl +%%TCLTK%%share/examples/plplot/tcl/x10.tcl +%%TCLTK%%share/examples/plplot/tcl/x11.tcl +%%TCLTK%%share/examples/plplot/tcl/x12.tcl +%%TCLTK%%share/examples/plplot/tcl/x13.tcl +%%TCLTK%%share/examples/plplot/tcl/x14.tcl +%%TCLTK%%share/examples/plplot/tcl/x15.tcl +%%TCLTK%%share/examples/plplot/tcl/x16.tcl +%%TCLTK%%share/examples/plplot/tcl/x17.tcl +%%TCLTK%%share/examples/plplot/tcl/x18.tcl share/examples/plplot/test_c.sh share/examples/plplot/test_cxx.sh share/examples/plplot/test_f77.sh share/examples/plplot/test_octave.sh share/examples/plplot/test_python.sh share/examples/plplot/test_tcl.sh +%%TCLTK%%share/examples/plplot/tk/Makefile +%%TCLTK%%share/examples/plplot/tk/README.tkdemos +%%TCLTK%%share/examples/plplot/tk/tk01 +%%TCLTK%%share/examples/plplot/tk/tk02 +%%TCLTK%%share/examples/plplot/tk/tk03 +%%TCLTK%%share/examples/plplot/tk/tk04 +%%TCLTK%%share/examples/plplot/tk/tkdemos.tcl +%%TCLTK%%share/examples/plplot/tk/x01.tcl +%%TCLTK%%share/examples/plplot/tk/x02.tcl +%%TCLTK%%share/examples/plplot/tk/x03.tcl +%%TCLTK%%share/examples/plplot/tk/x04.tcl +%%TCLTK%%share/examples/plplot/tk/x05.tcl +%%TCLTK%%share/examples/plplot/tk/x06.tcl +%%TCLTK%%share/examples/plplot/tk/x07.tcl +%%TCLTK%%share/examples/plplot/tk/x08.tcl +%%TCLTK%%share/examples/plplot/tk/x09.tcl +%%TCLTK%%share/examples/plplot/tk/x10.tcl +%%TCLTK%%share/examples/plplot/tk/x11.tcl +%%TCLTK%%share/examples/plplot/tk/x12.tcl +%%TCLTK%%share/examples/plplot/tk/x13.tcl +%%TCLTK%%share/examples/plplot/tk/x14.tcl +%%TCLTK%%share/examples/plplot/tk/x15.tcl +%%TCLTK%%share/examples/plplot/tk/x16.tcl +%%TCLTK%%share/examples/plplot/tk/x17.tcl +%%TCLTK%%share/examples/plplot/tk/x18.tcl +%%TCLTK%%share/examples/plplot/tk/xtk01.c +%%TCLTK%%share/examples/plplot/tk/xtk02.c +%%TCLTK%%share/examples/plplot/tk/xtk04.c share/plplot/data/cglobe.map share/plplot/data/globe.map share/plplot/data/plstnd5.fnt share/plplot/data/plxtnd5.fnt share/plplot/data/usa.map share/plplot/data/usaglobe.map +%%TCLTK%%share/plplot/tcl/FileSelector.tcl +%%TCLTK%%share/plplot/tcl/PLWin.itk +%%TCLTK%%share/plplot/tcl/PLXWin.itk +%%TCLTK%%share/plplot/tcl/Pltkwin.tcl +%%TCLTK%%share/plplot/tcl/about.tcl +%%TCLTK%%share/plplot/tcl/cmap0a.pal +%%TCLTK%%share/plplot/tcl/cmap1a.pal +%%TCLTK%%share/plplot/tcl/cmap1b.pal +%%TCLTK%%share/plplot/tcl/cmap1c.pal +%%TCLTK%%share/plplot/tcl/cmap1d.pal +%%TCLTK%%share/plplot/tcl/help_gui.tcl +%%TCLTK%%share/plplot/tcl/help_keys.tcl +%%TCLTK%%share/plplot/tcl/help_tcltk.tcl +%%TCLTK%%share/plplot/tcl/plclient.tcl +%%TCLTK%%share/plplot/tcl/plcolor.tcl +%%TCLTK%%share/plplot/tcl/plconfig.tcl +%%TCLTK%%share/plplot/tcl/pldefaults.tcl +%%TCLTK%%share/plplot/tcl/plplot.tcl +%%TCLTK%%share/plplot/tcl/plserver.tcl +%%TCLTK%%share/plplot/tcl/pltools.tcl +%%TCLTK%%share/plplot/tcl/plwidget.tcl +%%TCLTK%%share/plplot/tcl/tclIndex +%%TCLTK%%@dirrm share/plplot/tcl @dirrm share/plplot/data @dirrm share/plplot +%%TCLTK%%@dirrm share/examples/plplot/tk +%%TCLTK%%@dirrm share/examples/plplot/tcl @dirrm share/examples/plplot/f77 -@dirrm share/examples/plplot/c @dirrm share/examples/plplot/c++ +@dirrm share/examples/plplot/c @dirrm share/examples/plplot @dirrm share/doc/plplot @dirrm include/plplot |