From owner-freebsd-ports Wed Jan 5 10:30:22 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 33724154A1 for ; Wed, 5 Jan 2000 10:30:02 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id KAA18403; Wed, 5 Jan 2000 10:30:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id EDC4B15473; Wed, 5 Jan 2000 10:20:25 -0800 (PST) Message-Id: <20000105182025.EDC4B15473@hub.freebsd.org> Date: Wed, 5 Jan 2000 10:20:25 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@freebsd.org X-Send-Pr-Version: www-1.0 Subject: ports/15918: Update port: math/plplot Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 15918 >Category: ports >Synopsis: Update port: math/plplot >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Jan 5 10:30:01 PST 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 3.4-RELEASE i386 >Organization: >Environment: >Description: - 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 New file: patches/patch-ad patches/patch-ae patches/patch-af >How-To-Repeat: >Fix: diff -urN /usr/ports/math/plplot/Makefile math/plplot/Makefile --- /usr/ports/math/plplot/Makefile Tue Nov 9 08:24:58 1999 +++ math/plplot/Makefile Tue Jan 4 23:43:40 2000 @@ -23,8 +23,7 @@ .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 @@ .else ${LN} -sf libplplotdX.so.4.99 ${PREFIX}/lib/libplplotdX.so .endif + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .include diff -urN /usr/ports/math/plplot/patches/patch-aa math/plplot/patches/patch-aa --- /usr/ports/math/plplot/patches/patch-aa Mon Sep 28 07:39:16 1998 +++ math/plplot/patches/patch-aa Wed Jan 5 00:15:27 2000 @@ -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 -urN /usr/ports/math/plplot/pkg/DESCR math/plplot/pkg/DESCR --- /usr/ports/math/plplot/pkg/DESCR Mon Oct 6 17:18:49 1997 +++ math/plplot/pkg/DESCR Tue Jan 4 23:38:58 2000 @@ -11,3 +11,5 @@ 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 -urN /usr/ports/math/plplot/pkg/PLIST math/plplot/pkg/PLIST --- /usr/ports/math/plplot/pkg/PLIST Mon Sep 28 07:39:16 1998 +++ math/plplot/pkg/PLIST Tue Jan 4 23:40:01 2000 @@ -5,114 +5,112 @@ 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/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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message