Consolidate more common stuff between ghostscript and ghostscript-nox11

in Makefile.common, and note conflict with the ghostscript-gnu* packages.
This commit is contained in:
jlam 2002-09-13 05:16:45 +00:00
parent 73dad376e9
commit df38081629
3 changed files with 15 additions and 27 deletions

View file

@ -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"

View file

@ -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

View file

@ -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"