diff options
| author | Hiroki Sato <hrs@FreeBSD.org> | 2011-06-20 18:57:14 +0000 |
|---|---|---|
| committer | Hiroki Sato <hrs@FreeBSD.org> | 2011-06-20 18:57:14 +0000 |
| commit | 15c088992b2febdba1d18ee1e99463775334fbaf (patch) | |
| tree | abd84e987b636e4aa5655e470f2fca2fa09bf07a /print/ghostscript7 | |
| parent | 9020c49ddd345e8889953659bf6ff27012f05d37 (diff) | |
| download | ports-15c088992b2febdba1d18ee1e99463775334fbaf.tar.gz ports-15c088992b2febdba1d18ee1e99463775334fbaf.zip | |
Update CONFLICTS lines.
PR: ports/158028
Notes
Notes:
svn path=/head/; revision=275918
Diffstat (limited to 'print/ghostscript7')
| -rw-r--r-- | print/ghostscript7/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile index fd37aed91beb..21e6074409cc 100644 --- a/print/ghostscript7/Makefile +++ b/print/ghostscript7/Makefile @@ -7,7 +7,7 @@ PORTNAME= ghostscript7 PORTVERSION= 7.07 -PORTREVISION= 23 +PORTREVISION= 24 CATEGORIES= print MASTER_SITES= SF/ghostscript/gnu-gs/${PORTVERSION}:gs_srcs \ ${MASTER_SITE_PORTS_JP:S/$/:ports_jp,ports_jp_gs/} \ @@ -30,7 +30,8 @@ RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print WRKSRC= ${WRKDIR}/${PORTNAME:S,7$,,} DATADIR= ${PREFIX}/share/${PORTNAME:S,7$,,} -CONFLICTS= gambc-* ghostscript8-* +CONFLICTS_INSTALL= gambc-[0-9]* ghostscript[89]-[0-9]* \ + ghostscript[89]-*-[0-9]* USE_BZIP2= yes USE_GMAKE= yes @@ -127,11 +128,11 @@ USE_XORG= xt xext CONFIGURE_ARGS+=--with-x \ --x-includes=${X11BASE}/include \ --x-libraries=${X11BASE}/lib -CONFLICTS+= ghostscript7-nox11-[0-9]* +CONFLICTS_INSTALL+= ghostscript7-nox11-[0-9]* .else PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-nox11 CONFIGURE_ARGS+=--without-x -CONFLICTS+= ghostscript7-[0-9]* +CONFLICTS_INSTALL+= ghostscript7-[0-9]* .endif .if defined(WITH_SHLIB) |