diff options
| author | Edwin Groothuis <edwin@FreeBSD.org> | 2008-04-17 23:19:49 +0000 |
|---|---|---|
| committer | Edwin Groothuis <edwin@FreeBSD.org> | 2008-04-17 23:19:49 +0000 |
| commit | 1fd359b0402067d2a4b7c51f2b6328d9adb9bc66 (patch) | |
| tree | 8a9843b41d410cdf4f71d2616d73139c082c49d5 /print | |
| parent | - Remove games/teewars (project was renamed) (diff) | |
Incorrect CONFLICTS in multiple ports.
There are incorrect CONFLICTS in multiple ports. E.g.:
contain two CONFLICTS= lines, the second line overrides the first one.
PR: ports/122851
Submitted by: Anatoly Borodin <anatoly.borodin@gmail.com>
Notes
Notes:
svn path=/head/; revision=211480
Diffstat (limited to 'print')
| -rw-r--r-- | print/ghostscript-gnu/Makefile | 5 | ||||
| -rw-r--r-- | print/ghostscript-gpl/Makefile | 5 | ||||
| -rw-r--r-- | print/ghostscript7/Makefile | 5 | ||||
| -rw-r--r-- | print/ghostscript8/Makefile | 5 | ||||
| -rw-r--r-- | print/teTeX-texmf/Makefile | 4 |
5 files changed, 10 insertions, 14 deletions
diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile index 1fa935bb34ed..48235a4ef06e 100644 --- a/print/ghostscript-gnu/Makefile +++ b/print/ghostscript-gnu/Makefile @@ -55,8 +55,6 @@ EXTRACT_ONLY= ${GS_SRCS} MAINTAINER= ports@FreeBSD.org COMMENT= GNU Postscript interpreter -CONFLICTS= gambc-* ghostscript-gpl-* - LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts @@ -64,7 +62,8 @@ RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print # normazile WRKSRC so things like cups-pstoraster may work WRKSRC= ${WRKDIR}/${PORTNAME} -CONFLICTS= ghostscript-gpl* +CONFLICTS= gambc-* ghostscript-gpl-* + USE_BZIP2= yes USE_GMAKE= yes MAKE_ENV= CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \ diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile index d5b5eb6c3a8b..03591cf895e7 100644 --- a/print/ghostscript-gpl/Makefile +++ b/print/ghostscript-gpl/Makefile @@ -25,13 +25,12 @@ EXTRACT_ONLY= ${GS_SRCS} ${IJS_SRCS} MAINTAINER= ports@FreeBSD.org COMMENT= GPL Postscript interpreter -CONFLICTS= gambc-* ghostscript-gnu-* - LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts -CONFLICTS= ghostscript-gnu* +CONFLICTS= gambc-* ghostscript-gnu-* + USE_BZIP2= yes USE_GMAKE= yes WANT_GNOME= yes diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile index 1fa935bb34ed..48235a4ef06e 100644 --- a/print/ghostscript7/Makefile +++ b/print/ghostscript7/Makefile @@ -55,8 +55,6 @@ EXTRACT_ONLY= ${GS_SRCS} MAINTAINER= ports@FreeBSD.org COMMENT= GNU Postscript interpreter -CONFLICTS= gambc-* ghostscript-gpl-* - LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts @@ -64,7 +62,8 @@ RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print # normazile WRKSRC so things like cups-pstoraster may work WRKSRC= ${WRKDIR}/${PORTNAME} -CONFLICTS= ghostscript-gpl* +CONFLICTS= gambc-* ghostscript-gpl-* + USE_BZIP2= yes USE_GMAKE= yes MAKE_ENV= CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \ diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile index d5b5eb6c3a8b..03591cf895e7 100644 --- a/print/ghostscript8/Makefile +++ b/print/ghostscript8/Makefile @@ -25,13 +25,12 @@ EXTRACT_ONLY= ${GS_SRCS} ${IJS_SRCS} MAINTAINER= ports@FreeBSD.org COMMENT= GPL Postscript interpreter -CONFLICTS= gambc-* ghostscript-gnu-* - LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts -CONFLICTS= ghostscript-gnu* +CONFLICTS= gambc-* ghostscript-gnu-* + USE_BZIP2= yes USE_GMAKE= yes WANT_GNOME= yes diff --git a/print/teTeX-texmf/Makefile b/print/teTeX-texmf/Makefile index 73fa1a706894..b061e63c3e5f 100644 --- a/print/teTeX-texmf/Makefile +++ b/print/teTeX-texmf/Makefile @@ -25,7 +25,8 @@ RUN_DEPENDS= ${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \ ${LOCALBASE}/share/fonts/cmpsfont/README:${PORTSDIR}/print/cmpsfont \ ${LOCALBASE}/share/fonts/amspsfont/READ.ME:${PORTSDIR}/print/amspsfnt -CONFLICTS= latex2e-[0-9]* tex-[0-9]* dvips-[0-9]* xdvi-[0-9]* +CONFLICTS= latex2e-[0-9]* tex-[0-9]* dvips-[0-9]* xdvi-[0-9]* \ + ja-ptext-base-[0-9]* .include <bsd.port.pre.mk> @@ -36,7 +37,6 @@ PLIST_SUB= TEXMFDIR=${TEXMFDIR} \ TEXMFCONFIGDIR=${TEXMFCONFIGDIR} \ MKTEXLSR=${MKTEXLSR} \ TEXMF_LSR=${TEXMF_LSR} -CONFLICTS= ja-ptex-base-[0-9]* TETEX_TEXMF_SRC=tetex-texmf-${PORTVERSION}.tar.gz TEXMFDIR= share/texmf |