Date: Thu, 28 Feb 2002 09:23:31 -0800 (PST) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/35414: Update port: math/plplot to 5.1.0 Message-ID: <200202281723.g1SHNVs76497@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 35414
>Category: ports
>Synopsis: Update port: math/plplot to 5.1.0
>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: Thu Feb 28 09:30:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 5.1.0
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/math/plplot/Makefile math/plplot/Makefile
--- /usr/ports/math/plplot/Makefile Sun Dec 23 00:15:39 2001
+++ math/plplot/Makefile Thu Feb 28 07:09:30 2002
@@ -6,8 +6,7 @@
#
PORTNAME= plplot
-PORTVERSION= 5.0.4
-PORTREVISION= 1
+PORTVERSION= 5.1.0
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -26,11 +25,11 @@
GDLIBDIR="${LOCALBASE}/lib" \
XINCDIR="${X11BASE}/include" \
XLIBDIR="${X11BASE}/lib" \
- PLPLOT_PREFIX="${PREFIX}/share/plplot" \
- DEMOS_DIR="${PREFIX}/share/examples/plplot" \
+ PLPLOT_PREFIX="${DATADIR}" \
+ DEMOS_DIR="${EXAMPLESDIR}" \
INFO_DIR="${PREFIX}/info" \
M4="${LOCALBASE}/bin/gm4"
-CONFIGURE_ARGS= --disable-python --with-double
+CONFIGURE_ARGS= --disable-python --disable-octave --with-double
INSTALLS_SHLIB= yes
.if defined(WITH_TCLTK)
diff -urN /usr/ports/math/plplot/distinfo math/plplot/distinfo
--- /usr/ports/math/plplot/distinfo Thu Aug 9 01:27:11 2001
+++ math/plplot/distinfo Sat Feb 2 07:20:10 2002
@@ -1 +1 @@
-MD5 (plplot-5.0.4.tar.gz) = 98eb53a99f7b78cbd2a388f32a11599f
+MD5 (plplot-5.1.0.tar.gz) = e0b6608db15102b0fd57670923adfe0a
diff -urN /usr/ports/math/plplot/files/patch-aa math/plplot/files/patch-aa
--- /usr/ports/math/plplot/files/patch-aa Sun Dec 23 00:15:40 2001
+++ math/plplot/files/patch-aa Thu Feb 28 04:08:50 2002
@@ -1,6 +1,6 @@
---- configure.orig Fri Jun 15 07:53:27 2001
-+++ configure Mon Dec 17 20:14:24 2001
-@@ -1268,7 +1268,9 @@
+--- configure.orig Thu Jan 31 07:23:55 2002
++++ configure Thu Feb 28 04:05:01 2002
+@@ -1435,7 +1435,9 @@
# Defaults
@@ -11,7 +11,7 @@
# Double precision
# Note that because there is no standard way to invoke double
-@@ -1536,9 +1538,9 @@
+@@ -1667,9 +1669,9 @@
# Optimization
if test "$with_opt" = "yes"; then
@@ -24,7 +24,7 @@
fi
# ----------------------------------------------------------------------------
-@@ -2012,15 +2014,33 @@
+@@ -2143,16 +2145,36 @@
# Default linker library commands. These may need version numbers
# appended to them though.
@@ -34,6 +34,7 @@
-TCLLIBSTR=-ltcl
-XLIBSTR=-lX11
-GDLIBSTR=-lgd
+-CDLIBSTR=-lcd
-PNGLIBSTR=-lpng
-JPEGLIBSTR=-ljpeg
-ZLIBLIBSTR=-lz
@@ -55,19 +56,132 @@
+if test -z "$GDLIBSTR"; then
+ GDLIBSTR=-lgd
+fi
++if test -z "$CDLIBSTR"; then
++ CDLIBSTR=-lcd
++fi
+if test -z "$PNGLIBSTR"; then
+ PNGLIBSTR=-lpng
+fi
+if test -z "$JPEGLIBSTR"; then
+ JPEGLIBSTR=-ljpeg
+fi
-+if test -z "$ITKLIBSTR"; then
++if test -z "$ZLIBSTR"; 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 @@
+@@ -2646,8 +2668,7 @@
+ rm -rf conftest*
+
+ incdirs="\
+- /usr/include \
+- /usr/local/include"
++ /usr/include"
+
+ for dir in $incdirs; do
+ if test -r "$dir/gd.h"; then
+@@ -2705,8 +2726,7 @@
+ echo "$ac_t""no" 1>&6
+
+ libdirs="\
+- /usr/lib \
+- /usr/local/lib"
++ /usr/lib"
+
+ for dir in $libdirs; do
+ if test -r "$dir/libgd.so" -o -r "$dir/libgd.a"; then
+@@ -2767,8 +2787,7 @@
+ echo "$ac_t""no" 1>&6
+
+ libdirs="\
+- /usr/lib \
+- /usr/local/lib"
++ /usr/lib"
+
+ for dir in $libdirs; do
+ if test -r "$dir/libpng.so" -o -r "$dir/libpng.a"; then
+@@ -2829,8 +2848,7 @@
+ echo "$ac_t""no" 1>&6
+
+ libdirs="\
+- /usr/lib \
+- /usr/local/lib"
++ /usr/lib"
+
+ for dir in $libdirs; do
+ if test -r "$dir/libjpeg.so" -o -r "$dir/libjpeg.a"; then
+@@ -2891,8 +2909,7 @@
+ echo "$ac_t""no" 1>&6
+
+ libdirs="\
+- /usr/lib \
+- /usr/local/lib"
++ /usr/lib"
+
+ for dir in $libdirs; do
+ if test -r "$dir/libz.so" -o -r "$dir/libz.a"; then
+@@ -2915,6 +2932,7 @@
+ fi
+ fi
+
++if /usr/bin/false ; then
+ GDLIBS=""
+ GDINCS=""
+ if test "$enable_png" = "yes" -o "$enable_jpeg" = "yes"; then
+@@ -3037,6 +3055,7 @@
+
+ fi
+ fi
++fi
+
+ #next test requires C language
+
+@@ -3161,8 +3180,7 @@
+ rm -rf conftest*
+
+ incdirs="\
+- /usr/include \
+- /usr/local/include"
++ /usr/include"
+
+ for dir in $incdirs; do
+ if test -r "$dir/cd.h"; then
+@@ -3219,8 +3237,7 @@
+ echo "$ac_t""no" 1>&6
+
+ libdirs="\
+- /usr/lib \
+- /usr/local/lib"
++ /usr/lib"
+
+ for dir in $libdirs; do
+ if test -r "$dir/libcd.so" -o -r "$dir/libcd.a"; then
+@@ -3322,7 +3339,6 @@
+ $prefix/include \
+ $HOME/local/include \
+ $HOME/include \
+-/usr/local/include \
+ /usr/include/tcl \
+ /usr/include"
+
+@@ -3333,7 +3349,6 @@
+ $prefix/lib \
+ $HOME/local/lib \
+ $HOME/lib \
+-/usr/local/lib \
+ /usr/lib"
+
+ incdirs=$incdirs_default
+@@ -5072,7 +5087,6 @@
+ $HOME/local/lib \
+ $HOME/dbmalloc/lib \
+ $HOME/lib \
+- /usr/local/lib \
+ /usr/local/dbmalloc/lib \
+ /usr/lib"
+
+@@ -5512,6 +5526,13 @@
EXTRA_LIBS="-ldl -lm"
fi
;;
@@ -80,8 +194,8 @@
+ ;;
* )
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 @@
+ echo "configure:5518: checking for main in -lXbsd" >&5
+@@ -5793,6 +5814,20 @@
# for Linux.)
SHLIB_F77FLAGS=-fPIC
;;
@@ -102,11 +216,11 @@
HP-UX-* )
SO=".sl"
SHLIB_F77FLAGS="+z"
-@@ -6719,6 +6760,7 @@
+@@ -9672,6 +9707,7 @@
s%@LDCXX_FLAGS@%$LDCXX_FLAGS%g
s%@F77_FLAGS@%$F77_FLAGS%g
s%@LDF_FLAGS@%$LDF_FLAGS%g
+s%@M4@%$M4%g
s%@M4_FLAGS@%$M4_FLAGS%g
s%@CPP@%$CPP%g
- s%@STUPIDTK_OBJ@%$STUPIDTK_OBJ%g
+ s%@GTK_CONFIG@%$GTK_CONFIG%g
diff -urN /usr/ports/math/plplot/files/patch-ag math/plplot/files/patch-ag
--- /usr/ports/math/plplot/files/patch-ag Thu Aug 9 01:27:12 2001
+++ math/plplot/files/patch-ag Tue Feb 26 04:29:47 2002
@@ -1,5 +1,5 @@
---- cf/inst_lib.in.orig Sat Apr 21 10:49:12 2001
-+++ cf/inst_lib.in Fri Aug 3 07:26:36 2001
+--- cf/inst_lib.in.orig Thu Aug 23 08:03:43 2001
++++ cf/inst_lib.in Tue Feb 26 04:13:31 2002
@@ -16,30 +16,33 @@
if test ! -d $(INFO_DIR); then mkdir -p $(INFO_DIR); fi
@@ -38,6 +38,6 @@
cd $(top_srcdir)/include; \
- $(CP) plplotP.h plplot.h plxwd.h plevent.h plstrm.h pdf.h \
+ ${BSD_INSTALL_DATA} plplotP.h plplot.h plxwd.h plevent.h plstrm.h pdf.h \
- pldebug.h drivers.h $(INCLUDE_DIR)
+ pldebug.h drivers.h disptab.h $(INCLUDE_DIR)
install_lib: install_dirs install_fonts install_libbase \
diff -urN /usr/ports/math/plplot/pkg-plist math/plplot/pkg-plist
--- /usr/ports/math/plplot/pkg-plist Sun Dec 23 00:15:40 2001
+++ math/plplot/pkg-plist Tue Feb 26 06:10:04 2002
@@ -6,6 +6,7 @@
%%TCLTK%%bin/pltcl
bin/pltek
bin/pstex2eps
+include/plplot/disptab.h
include/plplot/drivers.h
include/plplot/pdf.h
include/plplot/plConfig.h
@@ -57,6 +58,7 @@
share/examples/plplot/c/x17c.c
share/examples/plplot/c/x18c.c
share/examples/plplot/c/x19c.c
+share/examples/plplot/c/x20c.c
share/examples/plplot/c++/Makefile
share/examples/plplot/c++/x01cc.cc
share/examples/plplot/f77/Makefile
@@ -147,6 +149,7 @@
%%TCLTK%%share/plplot/tcl/about.tcl
%%TCLTK%%share/plplot/tcl/cmap0a.pal
%%TCLTK%%share/plplot/tcl/cmap1a.pal
+%%TCLTK%%share/plplot/tcl/cmap1a1.pal
%%TCLTK%%share/plplot/tcl/cmap1b.pal
%%TCLTK%%share/plplot/tcl/cmap1c.pal
%%TCLTK%%share/plplot/tcl/cmap1d.pal
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200202281723.g1SHNVs76497>