diff options
| -rw-r--r-- | print/ghostscript-nox11/Makefile.common | 4 | ||||
| -rw-r--r-- | print/hpijs/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common index 4c7547c3c3a..b6cc8854a9d 100644 --- a/print/ghostscript-nox11/Makefile.common +++ b/print/ghostscript-nox11/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.34 2002/08/25 21:50:29 jlam Exp $ +# $NetBSD: Makefile.common,v 1.35 2002/09/11 00:08:32 jlam Exp $ DISTNAME= ghostscript-${GS_VERS} GS_VERS= 6.01 @@ -10,6 +10,8 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= jlam@netbsd.org HOMEPAGE= http://www.cs.wisc.edu/~ghost/index.html +CONFLICTS+= hpijs-[0-9]* + DEPENDS+= ghostscript-fonts-6.0:../../fonts/ghostscript-fonts DEPENDS+= watanabe-vfont-19930318:../../fonts/watanabe_vfont diff --git a/print/hpijs/Makefile b/print/hpijs/Makefile index dcc65cb2c33..920d4f34bb5 100644 --- a/print/hpijs/Makefile +++ b/print/hpijs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/09/11 00:01:28 jlam Exp $ +# $NetBSD: Makefile,v 1.2 2002/09/11 00:08:32 jlam Exp $ DISTNAME= hpijs-1.2.2 CATEGORIES= print @@ -8,6 +8,8 @@ MAINTAINER= jlam@netbsd.org COMMENT= HP inkjet printer driver server HOMEPAGE= http://hpinkjet.sourceforge.net/ +CONFLICTS= ghostscript<=6.0.1nb4 ghostscript-nox11<=6.0.1nb4 + USE_BUILDLINK2= # defined GNU_CONFIGURE= # defined |