diff options
| author | jschauma <jschauma@pkgsrc.org> | 2003-06-07 17:39:23 +0000 |
|---|---|---|
| committer | jschauma <jschauma@pkgsrc.org> | 2003-06-07 17:39:23 +0000 |
| commit | b0356598729946d38a179641463d999756587128 (patch) | |
| tree | a635c2ef0e606a3a7cfaf5533744972927127086 /graphics/plotutils | |
| parent | a556be5da738209110f8898285c5aaf3c92359cb (diff) | |
| download | pkgsrc-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/plotutils')
| -rw-r--r-- | graphics/plotutils/Makefile | 27 | ||||
| -rw-r--r-- | graphics/plotutils/buildlink2.mk | 4 |
2 files changed, 11 insertions, 20 deletions
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile index 858232d2aa9..c8ad4f828fe 100644 --- a/graphics/plotutils/Makefile +++ b/graphics/plotutils/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.24 2003/06/06 14:39:06 jschauma Exp $ +# $NetBSD: Makefile,v 1.25 2003/06/07 17:39:24 jschauma Exp $ # DISTNAME= plotutils-2.4.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel graphics x11 MASTER_SITES= ${MASTER_SITE_GNU:=plotutils/} @@ -10,27 +10,18 @@ MAINTAINER= dmcmahill@netbsd.org HOMEPAGE= http://www.gnu.org/software/plotutils/plotutils.html COMMENT= Programs and library for plotting scientific data -USE_BUILDLINK2= yes -USE_GCC_SHLIB= yes +CONFLICTS+= ${DISTNAME:C/-[0-9].*/-nox11/} -GNU_CONFIGURE= yes +USE_BUILDLINK2= YES +USE_GCC_SHLIB= YES +USE_X11= YES + +GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-libplotter -USE_LIBTOOL= yes +USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig ${WRKSRC}/libxmi/ltconfig -.include "../../mk/bsd.prefs.mk" - -# this package works with and without X11, but if X11 is present, we need the -# necessary compile and ld flags -.if exists(${X11BASE}) -PKGNAME= ${DISTNAME:C/-/-x11-/} -CONFLICTS+= ${DISTNAME:C/-[0-9].*//} -USE_X11= YES -.else -CONFLICTS+= ${DISTNAME:C/-[0-9].*/-x11/} -.endif - .include "../../graphics/png/buildlink2.mk" .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/plotutils/buildlink2.mk b/graphics/plotutils/buildlink2.mk index a9dad08f3ae..3cf6e12ff97 100644 --- a/graphics/plotutils/buildlink2.mk +++ b/graphics/plotutils/buildlink2.mk @@ -1,10 +1,10 @@ -# $NetBSD: buildlink2.mk,v 1.1 2003/01/25 12:06:27 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.2 2003/06/07 17:39:24 jschauma Exp $ .if !defined(PLOTUTILS_BUILDLINK2_MK) PLOTUTILS_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= plotutils -BUILDLINK_DEPENDS.plotutils?= plotutils>=2.4.1nb1 +BUILDLINK_DEPENDS.plotutils?= plotutils>=2.4.1nb2 BUILDLINK_PKGSRCDIR.plotutils?= ../../graphics/plotutils EVAL_PREFIX+= BUILDLINK_PREFIX.plotutils=plotutils |