aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorahze <ahze@FreeBSD.org>2007-04-06 21:22:21 +0800
committerahze <ahze@FreeBSD.org>2007-04-06 21:22:21 +0800
commit266e40da6177f21abae52b6368a95b4ae2841a10 (patch)
tree27194918af812da175cfc2b0f5708706a2f4809d
parenta1791d10a50d80225810451e77e0fd70ab9ddb14 (diff)
downloadfreebsd-ports-gnome-266e40da6177f21abae52b6368a95b4ae2841a10.tar.gz
freebsd-ports-gnome-266e40da6177f21abae52b6368a95b4ae2841a10.tar.zst
freebsd-ports-gnome-266e40da6177f21abae52b6368a95b4ae2841a10.zip
- Don't use graphics/gimp[-devel] OPTIONS file
PR: 111277 Reported by: Bartosz Fabianowski
-rw-r--r--graphics/gimp-app-devel/Makefile6
-rw-r--r--graphics/gimp-app/Makefile6
-rw-r--r--graphics/py-gimp/Makefile5
3 files changed, 7 insertions, 10 deletions
diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index abae102224cb..e6f701aa59ed 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -6,7 +6,7 @@
# $MCom: ports/graphics/gimp-app-devel/Makefile,v 1.12 2007/04/03 17:41:42 ahze Exp $
#
-PORTNAME= gimp
+PORTNAME= gimp-app
PORTVERSION= 2.3.15
PORTEPOCH?= 1
CATEGORIES?= graphics gnome
@@ -18,7 +18,7 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
http://www.mirrorservice.org/sites/ftp.gimp.org/pub/%SUBDIR%/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/%SUBDIR%,}
MASTER_SITE_SUBDIR= gimp/v${PORTVERSION:R}
-PKGNAMESUFFIX?= -app-devel
+DISTNAME= gimp-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= A GNU Image Manipulation Program development version
@@ -55,7 +55,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
GIMP_THREAD_LIBS=${PTHREAD_LIBS}
.if !defined(GIMP_SLAVE)
-OPTIONS= DEBUG "debugging" off \
+OPTIONS?= DEBUG "debugging" off \
MP "multiple processor support" off \
RSVG "SVG format support" on
.endif
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 2d86275016ed..3ef75d2ff72c 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
# $MCom: ports/graphics/gimp-app/Makefile,v 1.12 2007/03/30 18:22:45 ahze Exp $
-PORTNAME= gimp
+PORTNAME= gimp-app
PORTVERSION= 2.2.13
PORTREVISION= 2
PORTEPOCH= 1
@@ -18,6 +18,7 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
http://www.mirrorservice.org/sites/ftp.gimp.org/pub/%SUBDIR%/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/%SUBDIR%,}
MASTER_SITE_SUBDIR= gimp/v${PORTVERSION:R}
+DISTNAME= gimp-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= A GNU Image Manipulation Program
@@ -52,8 +53,6 @@ CONFIGURE_ARGS= --disable-perl \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-GIMP_DISTFILE= ${DISTDIR}/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
-
MAN1= gimp.1 gimp-2.2.1 gimp-remote.1 gimp-remote-2.2.1 gimptool-2.0.1
MAN5= gimprc.5 gimprc-2.2.5
@@ -98,7 +97,6 @@ CONFIGURE_ARGS+= --enable-mp
USE_GNOME+= gnomepanel desktopfileutils
CONFIGURE_ARGS+= --with-desktop-dir=${LOCALBASE}/share/gnome
CONFIGURE_ENV+= GIMP_THREAD_LIBS=${PTHREAD_LIBS}
-PKGNAMESUFFIX:= -gnome
PLIST_SUB+= GNOMEPANEL:=""
GNOME_ENABLED= yes
.else
diff --git a/graphics/py-gimp/Makefile b/graphics/py-gimp/Makefile
index bde5aa98d23e..337d0c00a94c 100644
--- a/graphics/py-gimp/Makefile
+++ b/graphics/py-gimp/Makefile
@@ -5,10 +5,9 @@
# $FreeBSD$
# $MCom: ports/graphics/py-gimp/Makefile,v 1.2 2007/01/01 22:40:46 ahze Exp $
-PORTREVISION= 0
+PORTREVISION= 1
PORTEPOCH= 0
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-PKGNAMESUFFIX= # empty
MAINTAINER= gnome@FreeBSD.org
COMMENT= GIMP python plugin
@@ -24,6 +23,6 @@ PLIST= ${.CURDIR}/pkg-plist
BUILD_WRKSRC= ${WRKSRC}/plug-ins/pygimp
INSTALL_WRKSRC= ${WRKSRC}/plug-ins/pygimp
-MASTERDIR= ${.CURDIR}/../../graphics/gimp-app
+MASTERDIR= ${.CURDIR}/../../graphics/gimp-app-devel
.include "${MASTERDIR}/Makefile"