svn commit: r442589 - in head: . graphics/cinepaint print print/gimp-gutenprint print/gutenprint print/gutenprint-base print/gutenprint-cups print/gutenprint-foomatic print/gutenprint-ijs print/pho...

Sun Jun 4 21:00:50 UTC 2017

Author: cmt
Date: Sun Jun  4 21:00:48 2017
New Revision: 442589
URL: https://svnweb.freebsd.org/changeset/ports/442589

Log:
  print/gutenprint: update to 5.2.12
  
  https://sourceforge.net/projects/gimp-print/files/gutenprint-5.2/5.2.12/
  
  The -ijs and -foomatic backends have been removed by upstream,
  leaving -cups as the sole choice of backend. Therefore, the -base
  and -cups ports have been merged into the main gutenprint port
  and the obsolete components have been removed.
  
  PR:		217118
  Submitted by:	bsam, tijl
  Reported by:	tijl

Deleted:
  head/print/gutenprint-base/
  head/print/gutenprint-cups/
  head/print/gutenprint-foomatic/
  head/print/gutenprint-ijs/
Modified:
  head/MOVED
  head/graphics/cinepaint/Makefile
  head/print/Makefile
  head/print/gimp-gutenprint/Makefile
  head/print/gimp-gutenprint/pkg-plist
  head/print/gutenprint/Makefile
  head/print/gutenprint/pkg-descr
  head/print/photoprint/Makefile

Modified: head/MOVED
==============================================================================

--- head/MOVED	Sun Jun  4 20:38:26 2017	(r442588)
+++ head/MOVED	Sun Jun  4 21:00:48 2017	(r442589)
@@ -9397,3 +9397,7 @@ net/py-cloudfiles|net/py-python-cloudfiles|2017-05-30|
 irc/konversation-kde4|irc/konversation|2017-05-30|Renamed to irc/konversation
 lang/perl5.20|lang/perl5.24|2017-06-01|Support ends three years after .0 release, please upgrade to a more recent version of Perl
 misc/unicode-ucd|textproc/UCD|2017-06-02|unicode-ucd was a duplicate of textproc/UCD, remove the younger port
+print/gutenprint-base|print/gutenprint|2017-06-04|Folded into gutenprint port
+print/gutenprint-cups|print/gutenprint|2017-06-04|Folded into gutenprint port
+print/gutenprint-foomatic||2017-06-04|Component removed upstream
+print/gutenprint-ijs||2017-06-04|Component removed upstream

Modified: head/graphics/cinepaint/Makefile
==============================================================================
--- head/graphics/cinepaint/Makefile	Sun Jun  4 20:38:26 2017	(r442588)
+++ head/graphics/cinepaint/Makefile	Sun Jun  4 21:00:48 2017	(r442589)
@@ -48,7 +48,7 @@ CONFIGURE_ENV+=	ac_cv_path_OY_CONFIG=no
 .endif
 
 .if ${PORT_OPTIONS:MPRINT}
-LIB_DEPENDS+=	libgutenprint.so:print/gutenprint-base
+LIB_DEPENDS+=	libgutenprint.so:print/gutenprint
 PLIST_SUB+=	PRINT=""
 .else
 CONFIGURE_ARGS+=	--disable-print

Modified: head/print/Makefile
==============================================================================
--- head/print/Makefile	Sun Jun  4 20:38:26 2017	(r442588)
+++ head/print/Makefile	Sun Jun  4 21:00:48 2017	(r442589)
@@ -82,10 +82,6 @@
     SUBDIR += gsview
     SUBDIR += gtklp
     SUBDIR += gutenprint
-    SUBDIR += gutenprint-base
-    SUBDIR += gutenprint-cups
-    SUBDIR += gutenprint-foomatic
-    SUBDIR += gutenprint-ijs
     SUBDIR += gv
     SUBDIR += harfbuzz
     SUBDIR += harfbuzz-icu

Modified: head/print/gimp-gutenprint/Makefile
==============================================================================
--- head/print/gimp-gutenprint/Makefile	Sun Jun  4 20:38:26 2017	(r442588)
+++ head/print/gimp-gutenprint/Makefile	Sun Jun  4 21:00:48 2017	(r442589)
@@ -2,17 +2,13 @@
 # $FreeBSD$
 #    $MCom: ports/print/gimp-gutenprint/Makefile,v 1.5 2007/10/24 21:05:40 ahze Exp $
 
-PORTREVISION=	3
-PORTEPOCH=	0
+PORTREVISION=	0
 PKGNAMEPREFIX=	gimp-
-PKGNAMESUFFIX=	# empty
 
 MAINTAINER=	cmt at burggraben.net
 COMMENT=	Gimp print plug-in
 
-LICENSE=	GPLv2
-
-MASTERDIR=	${.CURDIR}/../../print/gutenprint-base
+MASTERDIR=	${.CURDIR}/../../print/gutenprint
 
 GUT_SLAVE=	gimp
 PLIST=		${.CURDIR}/pkg-plist

Modified: head/print/gimp-gutenprint/pkg-plist
==============================================================================
--- head/print/gimp-gutenprint/pkg-plist	Sun Jun  4 20:38:26 2017	(r442588)
+++ head/print/gimp-gutenprint/pkg-plist	Sun Jun  4 21:00:48 2017	(r442589)
@@ -1 +1,5 @@
+lib/libgutenprintui2.so
+lib/libgutenprintui2.so.1
+lib/libgutenprintui2.so.1.0.0
+libdata/pkgconfig/gutenprintui2.pc
 libexec/gimp/2.2/plug-ins/gutenprint

Modified: head/print/gutenprint/Makefile
==============================================================================
--- head/print/gutenprint/Makefile	Sun Jun  4 20:38:26 2017	(r442588)
+++ head/print/gutenprint/Makefile	Sun Jun  4 21:00:48 2017	(r442589)
@@ -1,27 +1,54 @@
 # Created by: dgilbert at velocet.ca
 # $FreeBSD$
-#    $MCom: ports/print/gutenprint/Makefile,v 1.8 2007/04/03 17:42:21 ahze Exp $
+#    $MCom: ports/print/gutenprint-base/Makefile,v 1.8 2007/03/30 16:45:02 ahze Exp $
 
 PORTNAME=	gutenprint
-PORTVERSION=	5.2.10
+PORTVERSION=	5.2.12
+PORTREVISION?=	0	# also print/gimp-gutenprint
 CATEGORIES=	print
+MASTER_SITES=	SF/gimp-print/gutenprint-5.2/${PORTVERSION}
 
 MAINTAINER=	cmt at burggraben.net
-COMMENT=	The "meta-port" for GutenPrint
+COMMENT=	Gutenprint Printer Drivers
 
-RUN_DEPENDS=	gutenprint-base>0:print/gutenprint-base
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		metaport
+CONFLICTS=	gimp-print-[0-9]*
 
-OPTIONS_DEFINE=		CUPS GIMP IJS FOOMATIC
-OPTIONS_DEFAULT=	IJS
-CUPS_DESC=		GutenPrint (gimp-print) Cups Drivers
-GIMP_DESC=		GIMP Gutenprint printing plugin
-IJS_DESC=		IJS GhostScript Drivers
-FOOMATIC_DESC=		Foomatic data files
-CUPS_RUN_DEPENDS=	gutenprint-cups>0:print/gutenprint-cups
-GIMP_RUN_DEPENDS=	gimp-gutenprint>0:print/gimp-gutenprint
-IJS_RUN_DEPENDS=	gutenprint-ijs>0:print/gutenprint-ijs
-FOOMATIC_RUN_DEPENDS+=	gutenprint-foomatic>0:print/gutenprint-foomatic
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-static --enable-simplified-cups-ppds DLOPEN_LIBS=" "
+INSTALL_TARGET=	install-strip
+USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
+
+.if !defined(GUT_SLAVE)
+LIB_DEPENDS+=	libcupsimage.so:print/cups
+RUN_DEPENDS+=	${LOCALBASE}/libexec/cups/filter/gstoraster:print/cups-filters
+CONFIGURE_ARGS+=--disable-libgutenprintui2 --without-gimp2
+USES+=		iconv
+USE_LDCONFIG=	yes
+.else
+LIB_DEPENDS+=	libgutenprint.so:print/gutenprint
+MAKE_ARGS+=	GUTENPRINT_LIBS='`$$(PKG_CONFIG) --libs gutenprint`'
+.if ${GUT_SLAVE} == "gimp"
+LIB_DEPENDS+=	libgimp-2.0.so:graphics/gimp-app
+CONFIGURE_ARGS+=--enable-libgutenprintui2 --with-gimp2
+BUILD_WRKSRC=	${WRKSRC}/src/gimp2
+INSTALL_WRKSRC=	${WRKSRC}/src/gimp2
+USE_GNOME+=	gtk20
+.endif
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/bin/lpstat|${LOCALBASE}/bin/lpstat|' \
+		${WRKSRC}/src/gutenprintui2/plist.c
+	@${REINPLACE_CMD} -e '/DEPENDENCIES/s/$$(GUTENPRINT_LIBS)//' \
+		${WRKSRC}/src/gimp2/Makefile.in
+
+post-install:
+.if defined(GUT_SLAVE) && ${GUT_SLAVE} == "gimp"
+	@(cd ${WRKSRC}/src/gutenprintui2 && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
+		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+.endif
 
 .include <bsd.port.mk>

Modified: head/print/gutenprint/pkg-descr
==============================================================================
--- head/print/gutenprint/pkg-descr	Sun Jun  4 20:38:26 2017	(r442588)
+++ head/print/gutenprint/pkg-descr	Sun Jun  4 21:00:48 2017	(r442589)
@@ -1,6 +1,4 @@
-The "meta-port" for GutenPrint
-
-High quality drivers for Canon, Epson, Lexmark, and PCL printers
-for use with Ghostscript, CUPS, Foomatic, and the Gimp
+High quality drivers for Canon, Epson, Lexmark, Sony, Olympus, and PCL
+printers for use with CUPS and GIMP.
 
 WWW: http://gimp-print.sourceforge.net/

Modified: head/print/photoprint/Makefile
==============================================================================
--- head/print/photoprint/Makefile	Sun Jun  4 20:38:26 2017	(r442588)
+++ head/print/photoprint/Makefile	Sun Jun  4 21:00:48 2017	(r442589)
@@ -12,7 +12,7 @@ COMMENT=	Utility to print multiple images per sheet
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libcups.so:print/cups \
-		libgutenprint.so:print/gutenprint-base \
+		libgutenprint.so:print/gutenprint \
 		liblcms.so:graphics/lcms \
 		libnetpbm.so:graphics/netpbm \
 		libpng.so:graphics/png \
