7 files changed, 22 insertions, 341 deletions

diff --git a/math/plplot/files/patch-aa b/math/plplot/files/patch-aa
deleted file mode 100644
index b0600fe398f2..000000000000
--- a/math/plplot/files/patch-aa
+++ /dev/null
@@ -1,226 +0,0 @@
---- configure.orig	Thu Jan 31 07:23:55 2002
-+++ configure	Thu Feb 28 04:05:01 2002
-@@ -1435,7 +1435,9 @@
- 
- # Defaults
- 
--M4=m4
-+if test -z "$M4"; then
-+    M4=m4
-+fi
- 
- # Double precision
- # Note that because there is no standard way to invoke double
-@@ -1667,9 +1669,9 @@
- # Optimization
- 
- if test "$with_opt" = "yes"; then
--    OPT_FLAG_C=-O
--    OPT_FLAG_CXX=-O
--    OPT_FLAG_F=-O
-+    OPT_FLAG_C="$CFLAGS"
-+    OPT_FLAG_CXX="$CXXFLAGS"
-+    OPT_FLAG_F="$FFLAGS"
- fi
- 
- # ----------------------------------------------------------------------------
-@@ -2143,16 +2145,36 @@
- # 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
--CDLIBSTR=-lcd
--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 "$CDLIBSTR"; then
-+    CDLIBSTR=-lcd
-+fi
-+if test -z "$PNGLIBSTR"; then
-+    PNGLIBSTR=-lpng
-+fi
-+if test -z "$JPEGLIBSTR"; then
-+    JPEGLIBSTR=-ljpeg
-+fi
-+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
-@@ -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
- 	;;
-+	FreeBSD* )
-+	    if test "$enable_f77" = "yes"; then
-+		EXTRA_LIBS="$EXTRA_LIBS -lm -lg2c"
-+	    else
-+		EXTRA_LIBS="$EXTRA_LIBS -lm"
-+	    fi
-+	;;
- 	* ) 	
- 	    echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
- echo "configure:5518: checking for main in -lXbsd" >&5
-@@ -5793,6 +5814,20 @@
-             # for Linux.)
- 	    SHLIB_F77FLAGS=-fPIC
- 	;;
-+	FreeBSD* )
-+	    SHLIB_CCFLAGS="-fpic -DPIC"
-+	    SHLIB_CXXFLAGS="-fpic -DPIC"
-+	    echo "$ac_t""okay" 1>&6
-+	    if [ "${PORTOBJFORMAT}" = "elf" ]; then
-+		SO='.so.$(MAJOR_VERSION)'
-+		SHLIB_BUILD="$CC -shared -Wl,-soname -Wl,\$@ -o"
-+		SOVERSION='$(MAJOR_VERSION)'
-+	    else
-+		SO='.so.$(MAJOR_VERSION).$(MINOR_VERSION)'
-+		SHLIB_BUILD="ld -Bshareable -o"
-+		SOVERSION='$(MAJOR_VERSION).$(MINOR_VERSION)'
-+	    fi
-+	;;
- 	HP-UX-* )
- 	    SO=".sl"
- 	    SHLIB_F77FLAGS="+z"
-@@ -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%@GTK_CONFIG@%$GTK_CONFIG%g
diff --git a/math/plplot/files/patch-ab b/math/plplot/files/patch-ab
deleted file mode 100644
index 7c3fbc245887..000000000000
--- a/math/plplot/files/patch-ab
+++ /dev/null
@@ -1,38 +0,0 @@
---- cf/install.in.orig	Tue Mar 27 10:01:46 2001
-+++ cf/install.in	Sat Apr 28 07:55:00 2001
-@@ -32,28 +32,26 @@
- install_demos:
- 	@-if test ! -d $(DEMOS_DIR); then mkdir -p $(DEMOS_DIR); fi; \
- 	  if test ! -d $(DEMOS_DIR)/c; then mkdir -p $(DEMOS_DIR)/c; fi; \
--	  $(CP) Makedemo $(DEMOS_DIR)/Makefile; \
--	  $(CP) ../test/test_*.sh plplot-test.sh $(DEMOS_DIR); \
-+	  ${BSD_INSTALL_DATA} Makedemo $(DEMOS_DIR)/Makefile; \
-+	  ${BSD_INSTALL_DATA} ../test/test_*.sh plplot-test.sh $(DEMOS_DIR); \
- 	  chmod a+x $(DEMOS_DIR)/plplot-test.sh; \
- 	  $(LN) ../Makefile $(DEMOS_DIR)/c; \
- 	  cd $(top_srcdir)/examples/c; \
--	  $(CP) *.c $(DEMOS_DIR)/c; \
--	  $(CP) *.h $(INCLUDE_DIR)
-+	  ${BSD_INSTALL_DATA} *.c $(DEMOS_DIR)/c; \
-+	  ${BSD_INSTALL_DATA} *.h $(INCLUDE_DIR)
- 
- install_plrender:
- 	@-if test $(SHARED) = 1; then \
- 	  $(LDC) $(LDC_FLAGS) plrender$O $(LIB_INSTALL) \
- 		-o plrender$E $(LDC_LIBS) $(INSTALL_RPATH); \
- 	  fi; \
--	  strip plrender$E; \
--	  $(CP) plrender$E $(BIN_DIR)
-+	  ${BSD_INSTALL_PROGRAM} plrender$E $(BIN_DIR)
- 
- install_pltek:
--	@-strip pltek$E; $(CP) pltek$E $(BIN_DIR)
-+	@${BSD_INSTALL_PROGRAM} pltek$E $(BIN_DIR)
- 
- install_plplot_config:
--	 @$(CP) plplot-config $(BIN_DIR); \
--	 chmod a+x $(BIN_DIR)/plplot-config
-+	 @${BSD_INSTALL_SCRIPT} plplot-config $(BIN_DIR)
- 
- install_utils: install_plrender install_pltek install_plplot_config
- 
diff --git a/math/plplot/files/patch-ad b/math/plplot/files/patch-ad
deleted file mode 100644
index dceffcd32498..000000000000
--- a/math/plplot/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- cf/init.in.orig	Mon Mar 26 17:10:40 2001
-+++ cf/init.in	Sat Apr 28 01:19:12 2001
-@@ -21,7 +21,7 @@
- OCC		= @OCC@
- F77		= @F77@
- LDF		= @LDF@
--M4		= m4
-+M4		= @M4@
- 
- # Force everything.  If unsure, test for existence first.
- # Redefine these as needed in system-specific setup.
diff --git a/math/plplot/files/patch-ag b/math/plplot/files/patch-ag
deleted file mode 100644
index a70fccb154f0..000000000000
--- a/math/plplot/files/patch-ag
+++ /dev/null
@@ -1,43 +0,0 @@
---- 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
- 
- install_fonts:
--	@-cd $(top_srcdir)/lib; $(CP) *.fnt *.map $(DATA_DIR)
-+	@-cd $(top_srcdir)/lib; ${BSD_INSTALL_DATA} *.fnt *.map $(DATA_DIR)
- 
- install_libbase:
- 	@-( cd $(LIB_DIR); $(RM) $(PLLINKS) ) ; \
--	  $(CP) $(PLLIB_BASE)* $(LIB_DIR); \
-+	  ${BSD_INSTALL_DATA} $(PLLIB_BASE)* $(LIB_DIR); \
- 	  if test -r $(PLLIB_BASE)$(LIB_TAG)$A; then \
- 	     $(RANLIB) $(LIB_DIR)/$(PLLIB_BASE)$(LIB_TAG)$A; \
-+	  fi; \
-+	  if test -f $(LIB_DIR)/$(PLLIB_SO); then \
-+	     $(LN) $(PLLIB_SO) $(LIB_DIR)/$(PLLIB_BASE)$(LIB_TAG).so ; \
- 	  fi
- 
- install_textfiles:
- 	@-cd $(top_srcdir); \
--	  $(CP) README NEWS CHANGES Copyright COPYING.LIB FAQ ToDo mklinks \
-+	  ${BSD_INSTALL_DATA} README NEWS CHANGES Copyright COPYING.LIB FAQ ToDo mklinks \
- 		$(DOC_DIR); \
- 	  if test ! -f $(DOC_DIR)/README.local; then \
--	      $(CP) $(top_srcdir)/doc/README.local $(DOC_DIR); \
-+	      ${BSD_INSTALL_DATA} $(top_srcdir)/doc/README.local $(DOC_DIR); \
- 	  fi
- 
- install_scriptfiles:
--	@-cd $(top_srcdir)/scripts; $(CP) pl* pstex2eps $(BIN_DIR)
-+	@-cd $(top_srcdir)/scripts; ${BSD_INSTALL_SCRIPT} pl* pstex2eps $(BIN_DIR)
- 
- install_includes:
--	@-$(CP) plConfig.h plDevs.h $(INCLUDE_DIR); \
-+	@-${BSD_INSTALL_DATA} plConfig.h plDevs.h $(INCLUDE_DIR); \
- 	  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 disptab.h $(INCLUDE_DIR)
- 
- install_lib: install_dirs install_fonts install_libbase \
diff --git a/math/plplot/files/patch-ah b/math/plplot/files/patch-ah
deleted file mode 100644
index e04d6d400a85..000000000000
--- a/math/plplot/files/patch-ah
+++ /dev/null
@@ -1,23 +0,0 @@
---- cf/pkg_cxx.in.orig	Sat Feb  3 09:36:16 2001
-+++ cf/pkg_cxx.in	Sat Apr 28 07:11:10 2001
-@@ -32,17 +32,17 @@
- # Targets
- 
- install_cxx_includes:
--	@-cd $(top_srcdir)/bindings/c++; $(CP) plstream.h $(INCLUDE_DIR)
-+	@-cd $(top_srcdir)/bindings/c++; ${BSD_INSTALL_DATA} plstream.h $(INCLUDE_DIR)
- 
- install_cxx_demos:
- 	@-if test ! -d $(DEMOS_DIR)/c++; then mkdir -p $(DEMOS_DIR)/c++; fi; \
- 	  $(LN) ../Makefile $(DEMOS_DIR)/c++; \
--	  cd $(top_srcdir)/examples/c++; $(CP) *.cc $(DEMOS_DIR)/c++
-+	  cd $(top_srcdir)/examples/c++; ${BSD_INSTALL_DATA} *.cc $(DEMOS_DIR)/c++
- 
- install_cxx: install_cxx_includes install_cxx_demos
- 
- install_cxxlib:
--	@-$(CP) $(CXXLIB_BASE)* $(LIB_DIR); \
-+	@-${BSD_INSTALL_DATA} $(CXXLIB_BASE)* $(LIB_DIR); \
- 	  if test -r $(CXXLIB_BASE)$(LIB_TAG)$A; then \
- 	      $(RANLIB) $(LIB_DIR)/$(CXXLIB_BASE)$(LIB_TAG)$A; \
- 	  fi
diff --git a/math/plplot/files/patch-bindings::tcl::Makefile.in b/math/plplot/files/patch-bindings::tcl::Makefile.in
new file mode 100644
index 000000000000..ae326bf8045f
--- /dev/null
+++ b/math/plplot/files/patch-bindings::tcl::Makefile.in
@@ -0,0 +1,11 @@
+--- bindings/tcl/Makefile.in.orig	Mon Apr 21 21:36:35 2003
++++ bindings/tcl/Makefile.in	Wed Apr 23 18:39:49 2003
+@@ -341,7 +341,7 @@
+ with_rpath_FALSE = @with_rpath_FALSE@
+ with_rpath_TRUE = @with_rpath_TRUE@
+ 
+-tcldir = ${prefix}/$(DATA_DIR)/../tcl
++@enable_tcl_TRUE@tcldir = ${prefix}/$(DATA_DIR)/../tcl
+ 
+ libplplot = ../../src/libplplot$(LIB_TAG).la
+ libmatrix = libtclmatrix$(LIB_TAG).la
diff --git a/math/plplot/files/patch-bindings::tk::Makefile.in b/math/plplot/files/patch-bindings::tk::Makefile.in
new file mode 100644
index 000000000000..abfbf353ba17
--- /dev/null
+++ b/math/plplot/files/patch-bindings::tk::Makefile.in
@@ -0,0 +1,11 @@
+--- bindings/tk/Makefile.in.orig	Mon Apr 21 21:36:35 2003
++++ bindings/tk/Makefile.in	Wed Apr 23 18:28:32 2003
+@@ -341,7 +341,7 @@
+ with_rpath_FALSE = @with_rpath_FALSE@
+ with_rpath_TRUE = @with_rpath_TRUE@
+ 
+-tcldir = ${prefix}/$(DATA_DIR)/../tcl
++@enable_tk_TRUE@tcldir = ${prefix}/$(DATA_DIR)/../tcl
+ 
+ libplplottcltk = ../tcl/libplplottcltk$(LIB_TAG).la
+