Upgrade to version 2.3.

Submitted by:	Thomas Gellekum <tg@melaten.rwth-aachen.de>

4 files changed, 35 insertions, 21 deletions

diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index 7162f23cacbf..0e2cdb206305 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-DISTNAME=	plotutils-2.2
+DISTNAME=	plotutils-2.3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	plotutils
@@ -15,8 +15,9 @@ MAINTAINER=	chuckr@FreeBSD.org
 
 USE_XLIB=	yes
 USE_LIBTOOL=	yes
+USE_NEWGCC=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-libplotter
+CONFIGURE_ARGS=	--enable-libplotter --enable-libxmi
 
 .ifdef HAVE_MOTIF
 CONFIGURE_ARGS+=	--with-motif
diff --git a/graphics/plotutils/distinfo b/graphics/plotutils/distinfo
index 617e73cf20ae..acf206eca2d9 100644
--- a/graphics/plotutils/distinfo
+++ b/graphics/plotutils/distinfo
@@ -1 +1 @@
-MD5 (plotutils-2.2.tar.gz) = e4b2883999ce1300285507727dde54d9
+MD5 (plotutils-2.3.tar.gz) = 12a2708a92ae668a54cc4c00ea4804dd
diff --git a/graphics/plotutils/files/patch-ac b/graphics/plotutils/files/patch-ac
index df836034e96a..3f4d98099f17 100644
--- a/graphics/plotutils/files/patch-ac
+++ b/graphics/plotutils/files/patch-ac
@@ -1,11 +1,11 @@
---- configure.orig	Fri Sep 10 14:44:14 1999
-+++ configure	Fri Sep 10 14:43:09 1999
-@@ -4189,7 +4189,7 @@
++--- configure.orig     Mon Oct  4 18:11:17 1999
+++++ configure  Thu Feb 24 16:02:34 2000
++@@ -4041,7 +4041,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
 +  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
+ echo "configure:4046: 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 438b67cd7528..6a735aed59e8 100644
--- a/graphics/plotutils/pkg-plist
+++ b/graphics/plotutils/pkg-plist
@@ -6,6 +6,15 @@ bin/plot
 bin/plotfont
 bin/spline
 bin/tek2plot
+share/libplot/README
+share/libplot/colors.txt
+share/libplot/demo-page
+share/libplot/h-demo.c
+share/libplot/h-fonts.doc
+share/libplot/h-glyphs.doc
+share/libplot/hershey.bib
+share/libplot/kana.doc
+share/libplot/kanji.doc
 share/ode/README
 share/ode/atwoods.ode
 share/ode/bead.ode
@@ -23,15 +32,11 @@ share/ode/qcd.ode
 share/ode/rumor.ode
 share/ode/soliton.ode
 share/ode/viscous.ode
-share/libplot/README
-share/libplot/colors.txt
-share/libplot/demo-page
-share/libplot/h-demo.c
-share/libplot/h-fonts.doc
-share/libplot/h-glyphs.doc
-share/libplot/hershey.bib
-share/libplot/kana.doc
-share/libplot/kanji.doc
+share/pic2plot/README
+share/pic2plot/macros.pic
+share/pic2plot/pic0.ps
+share/pic2plot/pic1.ps
+share/pic2plot/picmacros.ps
 share/tek2plot/README
 share/tek2plot/aitest.tek
 share/tek2plot/dmerc.tek
@@ -43,19 +48,27 @@ share/tek2plot/scale.tek
 share/tek2plot/skymap.tek
 share/tek2plot/usmap.tek
 lib/libplot.so
-lib/libplot.so.2
+lib/libplot.so.3
 lib/libplot.a
 lib/libplotter.so
-lib/libplotter.so.2
+lib/libplotter.so.3
 lib/libplotter.a
+lib/libxmi.so
+lib/libxmi.so.1
+lib/libxmi.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
+include/xmi.h
+@unexec install-info --delete --info-dir=%D/info %D/info/libxmi.info
+@unexec install-info --delete --info-dir=%D/info %D/info/plotutils.info
+info/libxmi.info
 info/plotutils.info
-@exec install-info --info-dir=/usr/local/info /usr/local/info/plotutils.info
+@exec install-info --info-dir=%D/info %D/info/libxmi.info
+@exec install-info --info-dir=%D/info %D/info/plotutils.info
 @dirrm share/tek2plot
+@dirrm share/pic2plot
 @dirrm share/libplot
 @dirrm share/ode