summaryrefslogtreecommitdiff
path: root/graphics/gnuplot
diff options
context:
space:
mode:
authorjschauma <jschauma@pkgsrc.org>2003-06-07 17:39:23 +0000
committerjschauma <jschauma@pkgsrc.org>2003-06-07 17:39:23 +0000
commitb0356598729946d38a179641463d999756587128 (patch)
treea635c2ef0e606a3a7cfaf5533744972927127086 /graphics/gnuplot
parenta556be5da738209110f8898285c5aaf3c92359cb (diff)
downloadpkgsrc-b0356598729946d38a179641463d999756587128.tar.gz
Split plotutils and gnuplot into '<pkgname>' and '<pkgname>-nox11' each
(alternatively, we could have renamed one to '<pkgname>-x11', but for the element of least surprise, the default remains x11 enabled). This will work much better than the previous attempt to build two packages from one Makefile, which wasn't all thought out wrt to dependencies, buildlinks etc. Bump PKGREVISION on plotutils and gnuplot for this.
Diffstat (limited to 'graphics/gnuplot')
-rw-r--r--graphics/gnuplot/Makefile38
-rw-r--r--graphics/gnuplot/PLIST4
2 files changed, 17 insertions, 25 deletions
diff --git a/graphics/gnuplot/Makefile b/graphics/gnuplot/Makefile
index f230f1b2b5a..fa78f9fd846 100644
--- a/graphics/gnuplot/Makefile
+++ b/graphics/gnuplot/Makefile
@@ -1,38 +1,30 @@
-# $NetBSD: Makefile,v 1.20 2003/06/06 14:41:29 jschauma Exp $
+# $NetBSD: Makefile,v 1.21 2003/06/07 17:39:25 jschauma Exp $
#
-DISTNAME= gnuplot-3.7.3
-SVR4_PKGNAME= gplot
-CATEGORIES= graphics x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnuplot/} \
- ftp://ftp.ucc.ie/pub/gnuplot/ \
- ftp://ftp.cc.monash.edu.au/pub/gnuplot/
+DISTNAME= gnuplot-3.7.3
+SVR4_PKGNAME= gplot
+PKGREVISION= 1
+CATEGORIES= graphics x11
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnuplot/} \
+ ftp://ftp.ucc.ie/pub/gnuplot/ \
+ ftp://ftp.cc.monash.edu.au/pub/gnuplot/
-MAINTAINER= root@garbled.net
-HOMEPAGE= http://sourceforge.net/projects/gnuplot/
-COMMENT= gnuplot is a nice plotting utility
+MAINTAINER= root@garbled.net
+HOMEPAGE= http://sourceforge.net/projects/gnuplot/
+COMMENT= gnuplot is a nice plotting utility
+CONFLICTS+= ${DISTNAME:C/-[0-9].*//}
+
+GNU_CONFIGURE= YES
USE_BUILDLINK2= YES
# because of missing rl_complete_with_tilde_expansion and rl_terminal_name
USE_GNU_READLINE= YES
-GNU_CONFIGURE= YES
+USE_X11= YES
CONFIGURE_ARGS+= --with-pdf
CONFIGURE_ARGS+= --with-plot=${LOCALBASE}
CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline}
-.include "../../mk/bsd.prefs.mk"
-
-.if exists(${X11BASE})
-PKGNAME= ${DISTNAME:C/-/-x11-/}
-CONFLICTS+= ${DISTNAME:C/-[0-9].*//}
-USE_X11= YES
-PLIST_SUBST+= XCOMM=""
-.else
-CONFLICTS+= ${DISTNAME:C/-[0-9].*/-x11/}
-PLIST_SUBST+= XCOMM="@comment "
-.endif
-
.include "../../devel/readline/buildlink2.mk"
.include "../../graphics/plotutils/buildlink2.mk"
.include "../../graphics/png/buildlink2.mk"
diff --git a/graphics/gnuplot/PLIST b/graphics/gnuplot/PLIST
index 5329e29f97f..f01575710d7 100644
--- a/graphics/gnuplot/PLIST
+++ b/graphics/gnuplot/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2003/06/04 21:34:08 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/06/07 17:39:25 jschauma Exp $
bin/gnuplot
-${XCOMM}bin/gnuplot_x11
+bin/gnuplot_x11
@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gnuplot.info
info/gnuplot.info
@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gnuplot.info