Upgrade to 2.2.

4 files changed, 31 insertions, 12 deletions

diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index 2d401243beb9..7162f23cacbf 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	plotutils
-# Version required:	2.1.1
+# Version required:	2.2
 # Date created:		19 June 1998
 # Whom:			Chuck Robey (chuckr)
 #
 # $FreeBSD$
 #
 
-DISTNAME=	plotutils-2.1.1
+DISTNAME=	plotutils-2.2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	plotutils
@@ -14,10 +14,13 @@ MASTER_SITE_SUBDIR=	plotutils
 MAINTAINER=	chuckr@FreeBSD.org
 
 USE_XLIB=	yes
+USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-libplotter
 
 .ifdef HAVE_MOTIF
-CONFIGURE_ARGS=	--with-motif
+CONFIGURE_ARGS+=	--with-motif
+CONFIGURE_ENV=	MOTIFLIB="${MOTIFLIB}"
 # to ensure dependency info is generated properly
 REQUIRES_MOTIF=	yes
 .endif
diff --git a/graphics/plotutils/distinfo b/graphics/plotutils/distinfo
index d87b65d8fafa..617e73cf20ae 100644
--- a/graphics/plotutils/distinfo
+++ b/graphics/plotutils/distinfo
@@ -1 +1 @@
-MD5 (plotutils-2.1.1.tar.gz) = 5454fc866aff4360cab70d0ef831b12d
+MD5 (plotutils-2.2.tar.gz) = e4b2883999ce1300285507727dde54d9
diff --git a/graphics/plotutils/files/patch-ac b/graphics/plotutils/files/patch-ac
new file mode 100644
index 000000000000..df836034e96a
--- /dev/null
+++ b/graphics/plotutils/files/patch-ac
@@ -0,0 +1,11 @@
+--- configure.orig	Fri Sep 10 14:44:14 1999
++++ configure	Fri Sep 10 14:43:09 1999
+@@ -4189,7 +4189,7 @@
+ # Check whether --with-motif or --without-motif was given.
+ if test "${with_motif+set}" = set; then
+   withval="$with_motif"
+-  X_TOOLKIT_LIBS="-lXm $X_TOOLKIT_LIBS"; echo $ac_n "checking for XpQueryExtension in -lXp""... $ac_c" 1>&6
++  X_TOOLKIT_LIBS="${MOTIFLIB} $X_TOOLKIT_LIBS"; echo $ac_n "checking for XpQueryExtension in -lXp""... $ac_c" 1>&6
+ echo "configure:4194: checking for XpQueryExtension in -lXp" >&5
+ ac_lib_var=`echo Xp'_'XpQueryExtension | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
diff --git a/graphics/plotutils/pkg-plist b/graphics/plotutils/pkg-plist
index 19b4fa89695c..438b67cd7528 100644
--- a/graphics/plotutils/pkg-plist
+++ b/graphics/plotutils/pkg-plist
@@ -1,9 +1,11 @@
-bin/spline
 bin/double
+bin/graph
 bin/ode
+bin/pic2plot
 bin/plot
+bin/plotfont
+bin/spline
 bin/tek2plot
-bin/graph
 share/ode/README
 share/ode/atwoods.ode
 share/ode/bead.ode
@@ -24,11 +26,10 @@ share/ode/viscous.ode
 share/libplot/README
 share/libplot/colors.txt
 share/libplot/demo-page
-share/libplot/hershey-demo.c
-share/libplot/hershey-fonts
-share/libplot/hershey-number
+share/libplot/h-demo.c
+share/libplot/h-fonts.doc
+share/libplot/h-glyphs.doc
 share/libplot/hershey.bib
-share/libplot/hershey.doc
 share/libplot/kana.doc
 share/libplot/kanji.doc
 share/tek2plot/README
@@ -42,12 +43,16 @@ share/tek2plot/scale.tek
 share/tek2plot/skymap.tek
 share/tek2plot/usmap.tek
 lib/libplot.so
-lib/libplot.so.1
+lib/libplot.so.2
 lib/libplot.a
-lib/libplot.la
+lib/libplotter.so
+lib/libplotter.so.2
+lib/libplotter.a
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 include/plot.h
+include/plotcompat.h
+include/plotter.h
 @unexec install-info --delete --info-dir=/usr/local/info /usr/local/info/plotutils.info
 info/plotutils.info
 @exec install-info --info-dir=/usr/local/info /usr/local/info/plotutils.info