diff options
author | jlam <jlam> | 2002-09-13 05:16:45 +0000 |
---|---|---|
committer | jlam <jlam> | 2002-09-13 05:16:45 +0000 |
commit | de67c8846f5a6343ffef73955afebf08b5ed9975 (patch) | |
tree | bb452ac2d92586058252587cbbfbea852b874c4d | |
parent | 5acfda251ccbcd50f2a52487c0f329e796041d4f (diff) | |
download | pkgsrc-de67c8846f5a6343ffef73955afebf08b5ed9975.tar.gz |
Consolidate more common stuff between ghostscript and ghostscript-nox11
in Makefile.common, and note conflict with the ghostscript-gnu* packages.
-rw-r--r-- | print/ghostscript-nox11/Makefile | 14 | ||||
-rw-r--r-- | print/ghostscript-nox11/Makefile.common | 11 | ||||
-rw-r--r-- | print/ghostscript/Makefile | 17 |
3 files changed, 15 insertions, 27 deletions
diff --git a/print/ghostscript-nox11/Makefile b/print/ghostscript-nox11/Makefile index 5b6a03b1e84..2bd2b810d6e 100644 --- a/print/ghostscript-nox11/Makefile +++ b/print/ghostscript-nox11/Makefile @@ -1,17 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2002/08/25 21:50:29 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2002/09/13 05:16:45 jlam Exp $ PKGNAME= ghostscript-nox11-${GS_VERS} PKGREVISION= 4 COMMENT= Aladdin Postscript interpreter without X11 drivers -CONFLICTS= ghostscript{,-x11}-[0-9]* - -USE_BUILDLINK2= YES - -.include "../../print/ghostscript-nox11/Makefile.common" -.include "../../mk/bsd.pkg.mk" - -# arm32 compiler has an optimizer problem -.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "arm32" -CFLAGS+= -O0 -.endif +.include "Makefile.common" diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common index b6cc8854a9d..66b2345bf2d 100644 --- a/print/ghostscript-nox11/Makefile.common +++ b/print/ghostscript-nox11/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.35 2002/09/11 00:08:32 jlam Exp $ +# $NetBSD: Makefile.common,v 1.36 2002/09/13 05:16:46 jlam Exp $ DISTNAME= ghostscript-${GS_VERS} GS_VERS= 6.01 @@ -10,11 +10,14 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= jlam@netbsd.org HOMEPAGE= http://www.cs.wisc.edu/~ghost/index.html +CONFLICTS+= ghostscript{,-nox11}-[0-9]* +CONFLICTS+= ghostscript-gnu{,-nox11}-[0-9]* CONFLICTS+= hpijs-[0-9]* DEPENDS+= ghostscript-fonts-6.0:../../fonts/ghostscript-fonts DEPENDS+= watanabe-vfont-19930318:../../fonts/watanabe_vfont +USE_BUILDLINK2= yes USE_GMAKE= yes GNU_CONFIGURE= yes @@ -289,3 +292,9 @@ post-install: .include "../../graphics/png/buildlink2.mk" .include "../../print/ja-vflib-lib/buildlink2.mk" +.include "../../mk/bsd.pkg.mk" + +# arm32 compiler has an optimizer problem +.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "arm32" +CFLAGS+= -O0 +.endif diff --git a/print/ghostscript/Makefile b/print/ghostscript/Makefile index 1947d221362..d748451bcb1 100644 --- a/print/ghostscript/Makefile +++ b/print/ghostscript/Makefile @@ -1,23 +1,12 @@ -# $NetBSD: Makefile,v 1.10 2002/08/25 21:50:28 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2002/09/13 05:16:45 jlam Exp $ PKGNAME= ghostscript-${GS_VERS} PKGREVISION= 4 COMMENT= Aladdin Postscript interpreter -CONFLICTS= ghostscript{,-x11,-nox11}-[0-9]* - -USE_BUILDLINK2= YES -USE_X11= YES - -.include "../../print/ghostscript-nox11/Makefile.common" - +USE_X11= YES MAKEFRAGS+= ${FILESDIR}/devs.x11 GS_DISPLAY_DEVICE= x11.dev XLIBS= Xt SM ICE Xext X11 -.include "../../mk/bsd.pkg.mk" - -# arm32 compiler has an optimizer problem -.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "arm32" -CFLAGS+= -O0 -.endif +.include "../ghostscript-nox11/Makefile.common" |