- Merge gimp-devel changes to gimp

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8584 df743ca5-7f9a-e211-a948-0013205c9059

1 files changed, 68 insertions, 64 deletions

diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 4a3fd4ffb..6b125f923 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -3,14 +3,13 @@
 # Whom:                 erich@FreeBSD.org
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/gimp-app/Makefile,v 1.8 2007/02/16 18:14:25 mezz Exp $
-#
+#    $MCom: ports/graphics/gimp/Makefile,v 1.2 2006/08/25 18:14:57 pav Exp $
 
 PORTNAME=	gimp
-PORTVERSION=	2.3.13
-PORTREVISION=	1
-PORTEPOCH?=	1
-CATEGORIES?=	graphics gnome
+PORTVERSION=	2.2.13
+PORTREVISION=	2
+PORTEPOCH=	1
+CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		http://gimp.mirrors.hoobly.com/%SUBDIR%/ \
 		http://ftp.gwdg.de/pub/misc/grafik/gimp/%SUBDIR%/ \
@@ -19,64 +18,68 @@ 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
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A GNU Image Manipulation Program development version
+COMMENT=	A GNU Image Manipulation Program
 
-LIB_DEPENDS=	exif.12:${PORTSDIR}/graphics/libexif \
-		wmf.2:${PORTSDIR}/graphics/libwmf \
-		poppler-glib.1:${PORTSDIR}/graphics/poppler-gtk \
+LIB_DEPENDS=	wmf.2:${PORTSDIR}/graphics/libwmf \
 		aa.1:${PORTSDIR}/graphics/aalib \
+		exif.12:${PORTSDIR}/graphics/libexif \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		lcms.1:${PORTSDIR}/graphics/lcms
+		tiff.4:${PORTSDIR}/graphics/tiff
+
+CONFLICTS=	gimp-1.* gimpshop-[0-9]*
+
+SHLIBVER?=	200
 
 USE_BZIP2=	yes
-USE_GETTEXT=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
-USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2 ltverhack desktopfileutils
+GNU_CONFIGURE=	yes
+USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2
 WANT_GNOME=	yes
-USE_GCC=	3.4+
+USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
-INSTALLS_ICONS=	yes
-LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
-CONFIGURE_ARGS?=--disable-perl \
+PLIST_SUB=	SHLIBVER="${SHLIBVER}"
+CONFIGURE_ARGS=	--disable-perl \
 		--with-html-dir=${DOCSDIR} \
 		--disable-gtk-doc \
-		--without-print \
-		--disable-python \
-		--with-desktop-dir=${PREFIX}/share
+		--enable-static \
+		--mandir=${PREFIX}/man
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
-		GIMP_THREAD_LIBS=${PTHREAD_LIBS}
+		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
 
-.if !defined(GIMP_SLAVE)
 OPTIONS=	DEBUG "debugging" off \
-		MP "multiple processor support" off \
-		RSVG "SVG format support" on
-.endif
+		PYTHON "Python-Fu support" off \
+		RSVG "SVG format support" on \
+		HTML_HELP_BROWSER "GIMP help browser" on \
+		MP "multiple processor support" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(GIMP_SLAVE)
-PKG_CONFIG?=	${LOCALBASE}/bin/pkg-config
-GIMP_LIBS=	`${PKG_CONFIG} --libs gimp-2.0`
-GIMP_THUMB_LIBS=`${PKG_CONFIG} --libs gimpthumb-2.0`
-GIMP_UI_LIBS=	`${PKG_CONFIG} --libs gimpui-2.0`
-
-LIB_DEPENDS+=	gimp-2.0.0:${PORTSDIR}/graphics/gimp-app
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--enable-debug
+.endif
 
+.if defined(WITH_PYTHON)
+USE_PYTHON=		yes
+# we need to manually include this, because USE_PYTHON is defined
+# after including bsd.port.pre.mk
+.include "${PORTSDIR}/Mk/bsd.python.mk"
+USE_GNOME+=		pygtk2
+CONFIGURE_ARGS+=	--enable-python
+PLIST_SUB+=		PYTHON:=""
 .else
-
-CONFLICTS=	gimp-1.*
-
-MAN1+=	gimp-2.3.1 gimp-remote-2.3.1 gimptool-2.0.1
-MAN5+=	gimprc-2.3.5
+CONFIGURE_ARGS+=	--disable-python
+PLIST_SUB+=		PYTHON:="@comment "
+.endif
 
 .if defined(WITHOUT_RSVG)
 CONFIGURE_ARGS+=	--without-librsvg
@@ -86,41 +89,42 @@ USE_GNOME+=		librsvg2
 PLIST_SUB+=		SVG=""
 .endif
 
-.if defined(WITH_DEBUG)
-CONFIGURE_ARGS+=	--enable-debug
+.if defined(WITHOUT_PRINT)
+CONFIGURE_ARGS+=	--disable-print
+PLIST_SUB+=		PRINT="@comment "
+.else
+LIB_DEPENDS+=		gimpprint.2:${PORTSDIR}/print/gimp-print
+PLIST_SUB+=		PRINT=""
 .endif
 
 .if defined(WITH_MP)
 CONFIGURE_ARGS+=	--enable-mp
-.else
-CONFIGURE_ARGS+=	--disable-mp
 .endif
 
-.if ${HAVE_GNOME:Mgnomehier}!="" || defined(WITH_GNOME)
-USE_GNOME+=		desktopfileutils gnomehier
-PLIST_SUB+=		GNOME=""
+.if ${HAVE_GNOME:Mgnomepanel}!=""
+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
-PLIST_SUB+=		GNOME="@comment "
-.endif
-
+PLIST_SUB+=		GNOMEPANEL:="@comment "
+CONFIGURE_ENV+=		GIMP_THREAD_LIBS=${PTHREAD_LIBS}
 .endif
 
+.if defined(WITH_HTML_HELP_BROWSER)
+USE_GNOME+=		libgtkhtml
+PLIST_SUB+=		HELPBROWSER:=""
+.else
+PLIST_SUB+=		HELPBROWSER:="@comment "
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%GIMP_LIBS%%|${GIMP_LIBS}|; \
-		s|%%GIMP_THUMB_LIBS%%|${GIMP_THUMB_LIBS}|; \
-		s|%%GIMP_UI_LIBS%%|${GIMP_UI_LIBS}|' \
-			${WRKSRC}/plug-ins/pygimp/Makefile.in
-	@${REINPLACE_CMD} -e 's|"libpng"|"libpng12"|' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|@mandir@|${PREFIX}/man|' \
-		${WRKSRC}/docs/Makefile.in
+	@${REINPLACE_CMD} -e 's|\(have_gtkhtml2=\)yes|\1no|' ${WRKSRC}/configure
+.endif
 
+.if defined(GNOME_ENABLED)
 post-install:
-.if ${HAVE_GNOME:Mgnomehier}!="" || defined(WITH_GNOME)
-	${MKDIR} ${PREFIX}/share/gnome/mime-info ${PREFIX}/share/gnome/application-registry
-	${INSTALL_DATA} ${WRKSRC}/desktop/gimp.applications ${PREFIX}/share/gnome/application-registry
-	${INSTALL_DATA} ${WRKSRC}/desktop/gimp.keys ${PREFIX}/share/gnome/mime-info
-.endif
 	@-update-desktop-database
+.endif
 
 .include <bsd.port.post.mk>