From db4b9a98cda40488253f6e74b9fdf47a6cbc5bab Mon Sep 17 00:00:00 2001 From: imura Date: Fri, 14 Jan 2000 17:35:24 +0000 Subject: - Support CC/CFLAGS/CXXFLAGS properly - Support install macros - perl -> ${PERL} - Move install path of data files from lib/ to libdata/ - Add WWW: line into pkg/DESCR - Fix pkg/PLIST PR: 15918 Submitted by: KATO Tsuguru --- math/plplot/Makefile | 4 +- math/plplot/files/patch-aa | 48 +++++++++++-- math/plplot/files/patch-ab | 62 +++++++++++++---- math/plplot/files/patch-ad | 7 ++ math/plplot/files/patch-ae | 49 +++++++++++++ math/plplot/files/patch-af | 11 +++ math/plplot/pkg-descr | 2 + math/plplot/pkg-plist | 170 ++++++++++++++++++++++----------------------- 8 files changed, 247 insertions(+), 106 deletions(-) create mode 100644 math/plplot/files/patch-ad create mode 100644 math/plplot/files/patch-ae create mode 100644 math/plplot/files/patch-af (limited to 'math') diff --git a/math/plplot/Makefile b/math/plplot/Makefile index e4d7b175a033..5f27b8a2d48c 100644 --- a/math/plplot/Makefile +++ b/math/plplot/Makefile @@ -23,8 +23,7 @@ CONFIGURE_ARGS= --with-gcc=yes --with-double=yes .include post-patch: - @perl -pi.bak -e "s|/usr/local/plplot/lib|${PREFIX}/lib/plplot|g;" \ - ${WRKSRC}/src/plctrl.c + @${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/*.c post-install: .if ${PORTOBJFORMAT} == "elf" @@ -32,5 +31,6 @@ post-install: .else ${LN} -sf libplplotdX.so.4.99 ${PREFIX}/lib/libplplotdX.so .endif + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .include diff --git a/math/plplot/files/patch-aa b/math/plplot/files/patch-aa index 341419dd1e15..ff13bb319a2f 100644 --- a/math/plplot/files/patch-aa +++ b/math/plplot/files/patch-aa @@ -1,19 +1,34 @@ ---- configure.orig Tue Jun 6 14:58:50 1995 -+++ configure Sat Sep 26 23:34:48 1998 +--- configure.orig Wed Jun 7 04:58:50 1995 ++++ configure Wed Jan 5 00:15:16 2000 +@@ -1175,10 +1175,10 @@ + # ---------------------------------------------------------------------------- + + if test "$with_gcc" = "yes"; then +- CC=gcc +- CXX=gcc +- OCC="gcc -traditional" +- CPP="gcc -E" ++ CC=$CC ++ CXX=$CXX ++ OCC="$CC -traditional" ++ CPP="$CC -E" + + if test "$with_warn" = "yes"; then + SYS_FLAGS_C=-Wall @@ -1472,13 +1472,13 @@ # ---------------------------------------------------------------------------- CC_FLAGS=\ -"-c $DBL_FLAG_C $DEBUG_FLAG_C $SYS_FLAGS_C $PROF_FLAG_C $OPT_FLAG_C" -+"-c $CFLAGS $DBL_FLAG_C $DEBUG_FLAG_C $SYS_FLAGS_C $PROF_FLAG_C $OPT_FLAG_C" ++"-c $DBL_FLAG_C $DEBUG_FLAG_C $SYS_FLAGS_C $PROF_FLAG_C $CFLAGS" CXX_FLAGS=\ -"-c $DBL_FLAG_CXX $DEBUG_FLAG_CXX $SYS_FLAGS_CXX $PROF_FLAG_CXX $OPT_FLAG_CXX" -+"-c $CFLAGS $DBL_FLAG_CXX $DEBUG_FLAG_CXX $SYS_FLAGS_CXX $PROF_FLAG_CXX $OPT_FLAG_CXX" ++"-c $DBL_FLAG_CXX $DEBUG_FLAG_CXX $SYS_FLAGS_CXX $PROF_FLAG_CXX $CXXFLAGS" F77_FLAGS=\ -"-c $DBL_FLAG_F $DEBUG_FLAG_F $SYS_FLAGS_F $PROF_FLAG_F $OPT_FLAG_F" -+"-c $FFLAGS $DBL_FLAG_F $DEBUG_FLAG_F $SYS_FLAGS_F $PROF_FLAG_F $OPT_FLAG_F" ++"-c $DBL_FLAG_F $DEBUG_FLAG_F $SYS_FLAGS_F $PROF_FLAG_F $FFLAGS" LDC_FLAGS=\ "$PROF_FLAG_LC $SYS_FLAGS_LC $DEBUG_FLAG_LC" @@ -38,7 +53,7 @@ HP-UX-* ) SO=".sl" SHLIB_F77FLAGS="+z" -@@ -4192,16 +4206,16 @@ +@@ -4192,16 +4206,19 @@ fi fi if test -z "$DOC_DIR"; then @@ -55,6 +70,27 @@ if test -z "$DEMOS_DIR"; then - DEMOS_DIR=$prefix/examples + DEMOS_DIR=$prefix/share/examples/plplot ++fi ++if test -z "$DATA_DIR"; then ++ DATA_DIR=$prefix/libdata/plplot fi cat >> confdefs.h <> confdefs.h < ", ipage, npage); + +- gets(ibuf); ++ fgets(ibuf, sizeof(ibuf), stdin); + c = ibuf[0]; + + /* User input a page number or a return */ diff --git a/math/plplot/pkg-descr b/math/plplot/pkg-descr index 894b1fad6833..a1909083eddc 100644 --- a/math/plplot/pkg-descr +++ b/math/plplot/pkg-descr @@ -11,3 +11,5 @@ a host of mathematical, musical, and other symbols. The fonts can be scaled to any desired size. A variety of output devices are supported and new devices can be easily added by writing a small number of device dependent routines. + +WWW: http://emma.la.asu.edu/plplot/ diff --git a/math/plplot/pkg-plist b/math/plplot/pkg-plist index 9917717261de..24004b99a441 100644 --- a/math/plplot/pkg-plist +++ b/math/plplot/pkg-plist @@ -5,114 +5,112 @@ bin/pltek include/plplot/pdf.h include/plplot/plstrm.h include/plplot/plevent.h -include/plplot/plxwd.h include/plplot/plplot.h include/plplot/plplotP.h include/plplot/plstream.h +include/plplot/plxwd.h lib/libplplotdX.a lib/libplplotdX.so -lib/libplplotdX.so.4.99 +lib/libplplotdX.so.4 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R -lib/plplot/usaglobe.map -lib/plplot/usa.map -lib/plplot/globe.map -lib/plplot/cglobe.map -lib/plplot/plxtnd5.fnt -lib/plplot/plstnd5.fnt -share/doc/plplot/README -share/doc/plplot/ToDo -share/doc/plplot/FAQ +libdata/plplot/cglobe.map +libdata/plplot/globe.map +libdata/plplot/plstnd5.fnt +libdata/plplot/plxtnd5.fnt +libdata/plplot/usa.map +libdata/plplot/usaglobe.map share/doc/plplot/CHANGES +share/doc/plplot/FAQ share/doc/plplot/NEWS -share/doc/plplot/mklinks +share/doc/plplot/README 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/plcdemos.h -share/examples/plplot/c/x18c.c -share/examples/plplot/c/x17c.c -share/examples/plplot/c/x16c.c -share/examples/plplot/c/x15c.c -share/examples/plplot/c/x14c.c -share/examples/plplot/c/x13c.c -share/examples/plplot/c/x12c.c -share/examples/plplot/c/x11c.c -share/examples/plplot/c/x10c.c -share/examples/plplot/c/x09c.c -share/examples/plplot/c/x08c.c -share/examples/plplot/c/x07c.c -share/examples/plplot/c/x06c.c -share/examples/plplot/c/x05c.c -share/examples/plplot/c/x04c.c -share/examples/plplot/c/x03c.c -share/examples/plplot/c/x02c.c -share/examples/plplot/c/x01c.c share/examples/plplot/c/tutor.c +share/examples/plplot/c/x01c.c +share/examples/plplot/c/x02c.c +share/examples/plplot/c/x03c.c +share/examples/plplot/c/x04c.c +share/examples/plplot/c/x05c.c +share/examples/plplot/c/x06c.c +share/examples/plplot/c/x07c.c +share/examples/plplot/c/x08c.c +share/examples/plplot/c/x09c.c +share/examples/plplot/c/x10c.c +share/examples/plplot/c/x11c.c +share/examples/plplot/c/x12c.c +share/examples/plplot/c/x13c.c +share/examples/plplot/c/x14c.c +share/examples/plplot/c/x15c.c +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/f77/Makefile share/examples/plplot/f77/x01f.f -share/examples/plplot/f77/x13f.f -share/examples/plplot/f77/x12f.f -share/examples/plplot/f77/x11f.f -share/examples/plplot/f77/x10f.f -share/examples/plplot/f77/x09f.f -share/examples/plplot/f77/x08f.f -share/examples/plplot/f77/x07f.f -share/examples/plplot/f77/x06f.f -share/examples/plplot/f77/x05f.f -share/examples/plplot/f77/x04f.f -share/examples/plplot/f77/x03f.f share/examples/plplot/f77/x02f.f +share/examples/plplot/f77/x03f.f +share/examples/plplot/f77/x04f.f +share/examples/plplot/f77/x05f.f +share/examples/plplot/f77/x06f.f +share/examples/plplot/f77/x07f.f +share/examples/plplot/f77/x08f.f +share/examples/plplot/f77/x09f.f +share/examples/plplot/f77/x10f.f +share/examples/plplot/f77/x11f.f +share/examples/plplot/f77/x12f.f +share/examples/plplot/f77/x13f.f share/examples/plplot/f77/x16f.f share/examples/plplot/python/tutorpy -share/examples/plplot/python/x18py -share/examples/plplot/python/x17py -share/examples/plplot/python/x16py -share/examples/plplot/python/x15py -share/examples/plplot/python/x14py -share/examples/plplot/python/x13py -share/examples/plplot/python/x12py -share/examples/plplot/python/x11py -share/examples/plplot/python/x10py -share/examples/plplot/python/x09py -share/examples/plplot/python/x08py -share/examples/plplot/python/x07py -share/examples/plplot/python/x06py -share/examples/plplot/python/x05py -share/examples/plplot/python/x04py -share/examples/plplot/python/x03py -share/examples/plplot/python/x02py share/examples/plplot/python/x01py +share/examples/plplot/python/x02py +share/examples/plplot/python/x03py +share/examples/plplot/python/x04py +share/examples/plplot/python/x05py +share/examples/plplot/python/x06py +share/examples/plplot/python/x07py +share/examples/plplot/python/x08py +share/examples/plplot/python/x09py +share/examples/plplot/python/x10py +share/examples/plplot/python/x11py +share/examples/plplot/python/x12py +share/examples/plplot/python/x13py +share/examples/plplot/python/x14py +share/examples/plplot/python/x15py +share/examples/plplot/python/x16py +share/examples/plplot/python/x17py +share/examples/plplot/python/x18py share/examples/plplot/python/x19py share/examples/plplot/tcl/plgrid.tcl -share/examples/plplot/tcl/x15.tcl -share/examples/plplot/tcl/x14.tcl -share/examples/plplot/tcl/x13.tcl -share/examples/plplot/tcl/x12.tcl -share/examples/plplot/tcl/x11.tcl -share/examples/plplot/tcl/x10.tcl -share/examples/plplot/tcl/x09.tcl -share/examples/plplot/tcl/x08.tcl -share/examples/plplot/tcl/x07.tcl -share/examples/plplot/tcl/x06.tcl -share/examples/plplot/tcl/x05.tcl -share/examples/plplot/tcl/x04.tcl -share/examples/plplot/tcl/x03.tcl -share/examples/plplot/tcl/x02.tcl -share/examples/plplot/tcl/x01.tcl -share/examples/plplot/tcl/tcldemos.tcl -share/examples/plplot/tcl/plot.tcl share/examples/plplot/tcl/plot.dat +share/examples/plplot/tcl/plot.tcl +share/examples/plplot/tcl/tcldemos.tcl +share/examples/plplot/tcl/x01.tcl +share/examples/plplot/tcl/x02.tcl +share/examples/plplot/tcl/x03.tcl +share/examples/plplot/tcl/x04.tcl +share/examples/plplot/tcl/x05.tcl +share/examples/plplot/tcl/x06.tcl +share/examples/plplot/tcl/x07.tcl +share/examples/plplot/tcl/x08.tcl +share/examples/plplot/tcl/x09.tcl +share/examples/plplot/tcl/x10.tcl +share/examples/plplot/tcl/x11.tcl +share/examples/plplot/tcl/x12.tcl +share/examples/plplot/tcl/x13.tcl +share/examples/plplot/tcl/x14.tcl +share/examples/plplot/tcl/x15.tcl share/examples/plplot/tcl/x16.tcl share/examples/plplot/tk/Makefile share/examples/plplot/tk/tk01 -share/examples/plplot/tk/xtk02.c -share/examples/plplot/tk/xtk01.c -share/examples/plplot/tk/tkdemos.tcl -share/examples/plplot/tk/tk04 -share/examples/plplot/tk/tk03 share/examples/plplot/tk/tk02 -share/examples/plplot/tk/xtk04.c +share/examples/plplot/tk/tk03 +share/examples/plplot/tk/tk04 +share/examples/plplot/tk/tkdemos.tcl share/examples/plplot/tk/x01.tcl share/examples/plplot/tk/x02.tcl share/examples/plplot/tk/x03.tcl @@ -129,13 +127,15 @@ share/examples/plplot/tk/x13.tcl share/examples/plplot/tk/x14.tcl share/examples/plplot/tk/x15.tcl share/examples/plplot/tk/x16.tcl -share/examples/plplot/Makefile -@dirrm include/plplot -@dirrm lib/plplot -@dirrm share/doc/plplot +share/examples/plplot/tk/xtk01.c +share/examples/plplot/tk/xtk02.c +share/examples/plplot/tk/xtk04.c @dirrm share/examples/plplot/tk @dirrm share/examples/plplot/tcl @dirrm share/examples/plplot/python @dirrm share/examples/plplot/f77 @dirrm share/examples/plplot/c @dirrm share/examples/plplot +@dirrm share/doc/plplot +@dirrm libdata/plplot +@dirrm include/plplot -- cgit