4 files changed, 36 insertions, 41 deletions

diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index c99905c50759..6993f073d4be 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -6,22 +6,27 @@
 #
 
 PORTNAME=	plotutils
-PORTVERSION=	2.3
+PORTVERSION=	2.4.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	plotutils
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	chuckr@FreeBSD.org
 
-USE_XLIB=	yes
+LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png
+
+USE_NEWGCC=	yes
+USE_MOTIF=	yes
 USE_LIBTOOL=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		MOTIFLIB="${MOTIFLIB}" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--enable-libplotter --enable-libxmi --with-motif
 INSTALLS_SHLIB=	yes
-USE_NEWGCC=	yes
-CONFIGURE_ARGS=	--enable-libplotter --enable-libxmi
-MAN1=		ode.1 plot.1 spline.1 tek2plot.1
 
-USE_MOTIF=	yes
-CONFIGURE_ARGS+=	--with-motif
-CONFIGURE_ENV=	MOTIFLIB="${MOTIFLIB}"
+MAN1=		ode.1 plot.1 plotfont.1 spline.1 tek2plot.1
+
+pre-patch:
+	@${PERL} -pi -e 's|-lXm |\$$\{MOTIFLIB\} |g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/graphics/plotutils/distinfo b/graphics/plotutils/distinfo
index acf206eca2d9..2e4ba155a267 100644
--- a/graphics/plotutils/distinfo
+++ b/graphics/plotutils/distinfo
@@ -1 +1 @@
-MD5 (plotutils-2.3.tar.gz) = 12a2708a92ae668a54cc4c00ea4804dd
+MD5 (plotutils-2.4.1.tar.gz) = 8da2cc2ed5a837cad0753c7843ef18ee
diff --git a/graphics/plotutils/files/patch-ac b/graphics/plotutils/files/patch-ac
deleted file mode 100644
index a7cf621d3390..000000000000
--- a/graphics/plotutils/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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} -lXpm $X_TOOLKIT_LIBS"; echo $ac_n "checking for XpQueryExtension in -lXp""... $ac_c" 1>&6
- 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 1fc0ab3b2796..2f995a2e5d5f 100644
--- a/graphics/plotutils/pkg-plist
+++ b/graphics/plotutils/pkg-plist
@@ -6,6 +6,25 @@ bin/plot
 bin/plotfont
 bin/spline
 bin/tek2plot
+include/plot.h
+include/plotcompat.h
+include/plotter.h
+include/xmi.h
+@unexec install-info --delete %D/info/libxmi.info %D/info/dir
+info/libxmi.info
+@exec install-info %D/info/libxmi.info %D/info/dir
+@unexec install-info --delete %D/info/plotutils.info %D/info/dir
+info/plotutils.info
+@exec install-info %D/info/plotutils.info %D/info/dir
+lib/libplot.a
+lib/libplot.so
+lib/libplot.so.4
+lib/libplotter.a
+lib/libplotter.so
+lib/libplotter.so.4
+lib/libxmi.a
+lib/libxmi.so
+lib/libxmi.so.1
 share/libplot/README
 share/libplot/colors.txt
 share/libplot/demo-page
@@ -46,27 +65,9 @@ share/tek2plot/karney.tek
 share/tek2plot/ocpred.tek
 share/tek2plot/scale.tek
 share/tek2plot/skymap.tek
+share/tek2plot/skymap2.tek
 share/tek2plot/usmap.tek
-lib/libplot.so
-lib/libplot.so.3
-lib/libplot.a
-lib/libplotter.so
-lib/libplotter.so.3
-lib/libplotter.a
-lib/libxmi.so
-lib/libxmi.so.1
-lib/libxmi.a
-include/plot.h
-include/plotcompat.h
-include/plotter.h
-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=%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
+@dirrm share/libplot