diff options
| author | adam <adam> | 2011-02-08 13:08:06 +0000 |
|---|---|---|
| committer | adam <adam> | 2011-02-08 13:08:06 +0000 |
| commit | 1d4160d2f16c29aaffc8c118ba13d39735533917 (patch) | |
| tree | 07f4509e9aa839348bbe08ed03d54058af114731 /graphics/plotutils | |
| parent | ae0cdbbc7b8cf45a6a5b075f0fc9d5d94e0b8577 (diff) | |
| download | pkgsrc-1d4160d2f16c29aaffc8c118ba13d39735533917.tar.gz | |
Switch to options.mk and remove plotutils-nox11
Diffstat (limited to 'graphics/plotutils')
| -rw-r--r-- | graphics/plotutils/Makefile | 33 | ||||
| -rw-r--r-- | graphics/plotutils/buildlink3.mk | 8 | ||||
| -rw-r--r-- | graphics/plotutils/options.mk | 17 |
3 files changed, 38 insertions, 20 deletions
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile index 7c51d93c756..73eb291859d 100644 --- a/graphics/plotutils/Makefile +++ b/graphics/plotutils/Makefile @@ -1,34 +1,29 @@ -# $NetBSD: Makefile,v 1.46 2011/01/13 13:36:05 wiz Exp $ -# +# $NetBSD: Makefile,v 1.47 2011/02/08 13:08:06 adam Exp $ -DISTNAME= plotutils-2.6 -PKGREVISION= 2 -CATEGORIES= devel graphics x11 -MASTER_SITES= ${MASTER_SITE_GNU:=plotutils/} +DISTNAME= plotutils-2.6 +PKGREVISION= 3 +CATEGORIES= devel graphics +MASTER_SITES= ${MASTER_SITE_GNU:=plotutils/} -MAINTAINER= dmcmahill@NetBSD.org -HOMEPAGE= http://www.gnu.org/software/plotutils/plotutils.html -COMMENT= Programs and library for plotting scientific data -LICENSE= gnu-gpl-v3 +MAINTAINER= dmcmahill@NetBSD.org +HOMEPAGE= http://www.gnu.org/software/plotutils/plotutils.html +COMMENT= Programs and library for plotting scientific data +LICENSE= gnu-gpl-v3 -CONFLICTS+= plotutils-nox11-[0-9]* +CONFLICTS+= plotutils-nox11-[0-9]* PKG_INSTALLATION_TYPES= overwrite pkgviews PKG_DESTDIR_SUPPORT= user-destdir USE_LANGUAGES= c c++ -USE_TOOLS+= lex yacc - -INFO_FILES= yes USE_LIBTOOL= yes +USE_TOOLS+= lex yacc GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-libplotter MAKE_JOBS_SAFE= no +INFO_FILES= yes + +.include "options.mk" .include "../../graphics/png/buildlink3.mk" -.include "../../x11/libXaw/buildlink3.mk" -.include "../../x11/libXext/buildlink3.mk" -.include "../../x11/libXp/buildlink3.mk" -.include "../../x11/libXt/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/plotutils/buildlink3.mk b/graphics/plotutils/buildlink3.mk index 582e31c39bc..ab8e8d308f5 100644 --- a/graphics/plotutils/buildlink3.mk +++ b/graphics/plotutils/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2011/01/13 13:36:05 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2011/02/08 13:08:06 adam Exp $ BUILDLINK_TREE+= plotutils @@ -9,11 +9,17 @@ BUILDLINK_API_DEPENDS.plotutils+= plotutils>=2.4.1nb2 BUILDLINK_ABI_DEPENDS.plotutils+= plotutils>=2.6nb2 BUILDLINK_PKGSRCDIR.plotutils?= ../../graphics/plotutils +pkgbase := plotutils +.include "../../mk/pkg-build-options.mk" + .include "../../graphics/png/buildlink3.mk" + +.if !empty(PKG_BUILD_OPTIONS.plotutils:Mx11) .include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXp/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" +.endif .endif # PLOTUTILS_BUILDLINK3_MK BUILDLINK_TREE+= -plotutils diff --git a/graphics/plotutils/options.mk b/graphics/plotutils/options.mk new file mode 100644 index 00000000000..ebf2a868744 --- /dev/null +++ b/graphics/plotutils/options.mk @@ -0,0 +1,17 @@ +# $NetBSD: options.mk,v 1.1 2011/02/08 13:08:06 adam Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.plotutils +PKG_SUPPORTED_OPTIONS= x11 +PKG_SUGGESTED_OPTIONS= x11 + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mx11) +.include "../../x11/libXaw/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXp/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" +.else +CONFIGURE_ARGS+= --without-x +.endif |