diff options
| author | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-03-31 02:22:45 +0800 |
|---|---|---|
| committer | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-03-31 02:22:45 +0800 |
| commit | 75217400b7d0cb4f15302b1c69acab41a7296d0f (patch) | |
| tree | b0e75ee1283ce9dfcea1def1f7fb3672c2960a27 /graphics | |
| parent | 8245c7faf7c4d0c37ab9d53ccb84afed224ffc55 (diff) | |
| download | marcuscom-ports-75217400b7d0cb4f15302b1c69acab41a7296d0f.tar.gz marcuscom-ports-75217400b7d0cb4f15302b1c69acab41a7296d0f.tar.zst marcuscom-ports-75217400b7d0cb4f15302b1c69acab41a7296d0f.zip | |
Update CONFLICTS
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8586 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/gimp-app-devel/Makefile | 4 | ||||
| -rw-r--r-- | graphics/gimp-app/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile index 8031edfe7..7d57a76d2 100644 --- a/graphics/gimp-app-devel/Makefile +++ b/graphics/gimp-app-devel/Makefile @@ -3,7 +3,7 @@ # Whom: erich@FreeBSD.org # # $FreeBSD$ -# $MCom: ports/graphics/gimp-app-devel/Makefile,v 1.9 2007/02/24 21:00:45 mezz Exp $ +# $MCom: ports/graphics/gimp-app-devel/Makefile,v 1.10 2007/03/30 17:05:26 ahze Exp $ # PORTNAME= gimp @@ -73,7 +73,7 @@ LIB_DEPENDS+= gimp-2.0.0:${PORTSDIR}/graphics/gimp-app .else -CONFLICTS= gimp-1.* +CONFLICTS= gimp-1.* gimp-app-[0-9]* MAN1+= gimp-2.3.1 gimp-remote-2.3.1 gimptool-2.0.1 MAN5+= gimprc-2.3.5 diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index ed4090e91..7ec640b1c 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -3,7 +3,7 @@ # Whom: erich@FreeBSD.org # # $FreeBSD$ -# $MCom: ports/graphics/gimp-app/Makefile,v 1.10 2007/03/30 18:18:12 ahze Exp $ +# $MCom: ports/graphics/gimp-app/Makefile,v 1.11 2007/03/30 18:20:44 ahze Exp $ PORTNAME= gimp PORTVERSION= 2.2.13 @@ -30,7 +30,7 @@ LIB_DEPENDS= wmf.2:${PORTSDIR}/graphics/libwmf \ jpeg.9:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff -CONFLICTS= gimp-1.* gimpshop-[0-9]* +CONFLICTS= gimp-1.* gimpshop-[0-9]* gimp-app-devel-[0-9]* SHLIBVER?= 200 |