- Add support for guttenprint plugin, on by default

  the gutenprint plugin source came from gutenprinten 0.5.0-rc3
  and gnu-autotools Makefile.am from me.


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

4 files changed, 41 insertions, 28 deletions

diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index 9407d76c8..982831c75 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -3,7 +3,7 @@
 # Whom:                 erich@FreeBSD.org
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/gimp-devel/Makefile,v 1.15 2006/04/11 20:23:06 ahze Exp $
+#   $MCom: ports/graphics/gimp-devel/Makefile,v 1.16 2006/06/09 21:36:08 ahze Exp $
 #
 
 PORTNAME=	gimp
@@ -16,8 +16,11 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.fh-heilbronn.de/mirrors/ftp.gimp.org/%SUBDIR%/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/%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}
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/%SUBDIR%,} \
+		${MASTER_SITE_LOCAL}:gut
+MASTER_SITE_SUBDIR=	gimp/v${PORTVERSION:R} \
+			ahze:gut
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${EXTRA_DISTFILES}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNU Image Manipulation Program development version
@@ -63,8 +66,8 @@ MAN5=	gimprc-2.3.5
 
 OPTIONS=	DEBUG "debugging" off \
 		PYTHON "Python-Fu support" off \
+		PRINT "Gutenprint plugin" on \
 		GNOMEPRINT "GNOME printing plugin" on \
-		HTML_HELP_BROWSER "GIMP help browser" on \
 		MP "multiple processor support" off
 
 .include <bsd.port.pre.mk>
@@ -92,12 +95,26 @@ CONFIGURE_ARGS+=	--disable-python
 PLIST_SUB+=		PYTHON:="@comment "
 .endif
 
-.if defined(WITHOUT_GNOMEPRINT)
-CONFIGURE_ARGS+=	--without-gnomeprint
-PLIST_SUB+=		PRINT="@comment "
+.if !defined(WITHOUT_PRINT)
+LIB_DEPENDS+=	gutenprintui2.1:${PORTSDIR}/print/gutenprint
+EXTRA_DISTFILES+=	gimp2-gutenprint-2${EXTRACT_SUFX}:gut
+GUT_WRKSRC=	${WRKDIR}/gimp2-gutenprint
+PKGCONFIG?=		${LOCALBASE}/bin/pkg-config
+GUTENPRINT_CFLAGS=	`${PKGCONFIG} --cflags gutenprintui2`
+GUTENPRINT_LIBS=	`${PKGCONFIG} --libs gutenprintui2`
+GUT_MAKE_ENV=	GUTENPRINT_CFLAGS="${GUTENPRINT_CFLAGS}" \
+		GUTENPRINT_LIBS="${GUTENPRINT_LIBS}"
+PLIST_SUB+=	GPRINT=""
 .else
+PLIST_SUB+=	GPRINT="@comment "
+.endif
+
+.if !defined(WITHOUT_GNOMEPRINT)
 USE_GNOME+=		libgnomeprintui
 PLIST_SUB+=		PRINT=""
+.else
+CONFIGURE_ARGS+=	--without-gnomeprint
+PLIST_SUB+=		PRINT="@comment "
 .endif
 
 .if defined(WITH_MP)
@@ -116,11 +133,11 @@ PLIST_SUB+=		GTK=""
 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-extract:
+.if !defined(WITHOUT_PRINT)
+	${RM} -rf ${WRKSRC}/plug-ins/print
+	${MKDIR} ${WRKSRC}/plug-ins/print
+	${CP} -f ${GUT_WRKSRC}/* ${WRKSRC}/plug-ins/print
 .endif
 
 post-patch:
@@ -128,12 +145,17 @@ post-patch:
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|@mandir@|${PREFIX}/man|' \
 		${WRKSRC}/docs/Makefile.in
-.if defined(WITH_HTML_HELP_BROWSER)
-	@${REINPLACE_CMD} -e 's|\(have_gtkhtml2=\)yes|\1no|' ${WRKSRC}/configure
+
+post-build:
+.if !defined(WITHOUT_PRINT)
+	@(cd ${WRKSRC}/plug-ins/print; ${SETENV} ${GUT_MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
 .endif
 
-.if defined(GNOME_ENABLED)
 post-install:
+.if !defined(WITHOUT_PRINT)
+	@(cd ${WRKSRC}/plug-ins/print; ${SETENV} ${GUT_MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+.endif
+.if defined(GNOME_ENABLED)
 	@-update-desktop-database
 .endif
 
diff --git a/graphics/gimp-devel/distinfo b/graphics/gimp-devel/distinfo
index fea82af35..3487f9fb3 100644
--- a/graphics/gimp-devel/distinfo
+++ b/graphics/gimp-devel/distinfo
@@ -1,3 +1,6 @@
 MD5 (gimp-2.3.9.tar.bz2) = 4299e81e1824e08a90b50dc8beb46151
 SHA256 (gimp-2.3.9.tar.bz2) = 64c334f99cc4e5204a1925299b7a1da3d027f0b1c6900e6309f5b8da40aa9f10
 SIZE (gimp-2.3.9.tar.bz2) = 15183977
+MD5 (gimp2-gutenprint-2.tar.bz2) = d24f0e7bd1f2e62984395293b5f1a43d
+SHA256 (gimp2-gutenprint-2.tar.bz2) = 3226cf58210fd796e5748817256d29de425e21b093fb84997b787df050344164
+SIZE (gimp2-gutenprint-2.tar.bz2) = 15155
diff --git a/graphics/gimp-devel/files/patch-plug-ins_print_print.c b/graphics/gimp-devel/files/patch-plug-ins_print_print.c
deleted file mode 100644
index 36f4bf714..000000000
--- a/graphics/gimp-devel/files/patch-plug-ins_print_print.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- plug-ins/print/print.c.orig	Tue Dec 26 07:43:54 2000
-+++ plug-ins/print/print.c	Tue Dec 26 07:44:07 2000
-@@ -1417,7 +1417,7 @@
- 
-     if (i < (sizeof(lpcs) / sizeof(lpcs[0])))
-     {
--      strcat(command, " status < /dev/null");
-+      strcat(command, " status all < /dev/null");
-       type = PRINTERS_LPC;
-     }
-     else
diff --git a/graphics/gimp-devel/pkg-plist b/graphics/gimp-devel/pkg-plist
index ff01c448b..e47279f84 100644
--- a/graphics/gimp-devel/pkg-plist
+++ b/graphics/gimp-devel/pkg-plist
@@ -352,7 +352,6 @@ libexec/gimp/2.2/plug-ins/gtm
 libexec/gimp/2.2/plug-ins/guillotine
 libexec/gimp/2.2/plug-ins/header
 libexec/gimp/2.2/plug-ins/help
-%%HELPBROWSER:%%libexec/gimp/2.2/plug-ins/helpbrowser
 libexec/gimp/2.2/plug-ins/hot
 libexec/gimp/2.2/plug-ins/ifscompose
 libexec/gimp/2.2/plug-ins/illusion
@@ -392,6 +391,7 @@ libexec/gimp/2.2/plug-ins/pnm
 libexec/gimp/2.2/plug-ins/polar
 libexec/gimp/2.2/plug-ins/poppler
 libexec/gimp/2.2/plug-ins/postscript
+%%GPRINT%%libexec/gimp/2.2/plug-ins/print
 libexec/gimp/2.2/plug-ins/procedure-browser
 libexec/gimp/2.2/plug-ins/psd
 libexec/gimp/2.2/plug-ins/psd_save
@@ -1882,7 +1882,6 @@ share/aclocal/gimp-2.0.m4
 %%DATADIR%%/tips/gimp-tips.xml
 share/gnome/application-registry/gimp.applications
 share/gnome/applications/gimp.desktop
-share/gnome/applications/mimeinfo.cache
 share/gnome/icons/hicolor/16x16/apps/gimp.png
 share/gnome/icons/hicolor/22x22/apps/gimp.png
 share/gnome/icons/hicolor/24x24/apps/gimp.png