Attachment 161014 Details for Bug 202324 – fix and modernize gutenprint ports

[patch] fix and modernize gutenprint ports

gutenprint.diff (text/plain), 4.06 KB, created by Christoph Moench-Tegeder on 2015-09-13 20:40:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christoph Moench-Tegeder

Created: 2015-09-13 20:40:44 UTC

Size: 4.06 KB

patch

obsolete

>Index: print/gutenprint-base/Makefile
>===================================================================
>--- print/gutenprint-base/Makefile	(revision 396853)
>+++ print/gutenprint-base/Makefile	(working copy)
>@@ -15,33 +15,41 @@
> 
> CONFLICTS=	gimp-print-[0-9]*
> 
>+.if !defined(GUT_SLAVE)
>+OPTIONS_DEFINE=	GTK2
>+OPTIONS_DEFAULT=GTK2
>+OPTIONS_SUB=	yes
>+.endif
>+
>+GTK2_CONFIGURE_ENABLE=	libgutenprintui2
>+GTK2_LIB_DEPENDS=	libgtk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
>+
>+.include <bsd.port.options.mk>
>+
> USES=		gettext gmake libtool pathfix pkgconfig tar:bzip2
>-USE_GNOME=	gtk20
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=--with-gimp=no --with-gimp2=no
>+CONFIGURE_ARGS+=--without-gimp --without-gimp2
> USE_LDCONFIG=	yes
> 
> CPPFLAGS+=	-I${LOCALBASE}/include -I${PREFIX}/include
> LDFLAGS+=	-L${LOCALBASE}/lib -L${PREFIX}/lib
>+INSTALL_TARGET=	install-strip
> 
> .include <bsd.port.pre.mk>
> 
> .if ${SLAVE_PORT}=="yes"
>-LIB_DEPENDS+=	libgutenprintui2.so:${PORTSDIR}/print/gutenprint-base
>+LIB_DEPENDS+=	libgutenprint.so:${PORTSDIR}/print/gutenprint-base
> PKG_CONFIG?=	${LOCALBASE}/bin/pkg-config
>-GUTENPRINTUI2_LIBS=`${PKG_CONFIG} --libs gutenprintui2`
>+GUTENPRINTUI2_LIBS=`${PKG_CONFIG} --libs gutenprint`
> .else
> MAN1+=		escputil.1
> .endif
> 
> .if defined(GUT_SLAVE) && ${GUT_SLAVE}=="gimp"
>-LIB_DEPENDS+=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app \
>-		libgutenprint.so:${PORTSDIR}/print/gutenprint-base
>-CONFIGURE_ARGS=--with-gimp2=yes # Override CONFIGURE_ARGS
>+LIB_DEPENDS+=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app
>+CONFIGURE_ARGS+=--with-gimp2=yes # Override CONFIGURE_ARGS
> BUILD_WRKSRC=	${WRKSRC}/src/gimp2
> INSTALL_WRKSRC=	${WRKSRC}/src/gimp2
>-.else
>-CONFIGURE_ARGS+=--without-gimp2
> .endif
> 
> .if defined(GUT_SLAVE) && ${GUT_SLAVE}=="cups"
>@@ -97,6 +105,11 @@
> 	@${REINPLACE_CMD} -e 's|= $$(pkglibdir)|= ${PREFIX}/libexec/cups|' \
> 		${WRKSRC}/src/cups/Makefile.in
> 
>+pre-configure:
>+.if defined(GUT_SLAVE) && (${GUT_SLAVE}=="gimp")
>+	@test -f ${LOCALBASE}/lib/libgutenprintui2.so || (printf "\nprint/gutenprint-base must be rebuilt with GTK2 support\n\n" && exit 1)
>+.endif
>+
> pre-build:
> .if defined(GUT_SLAVE) && (${GUT_SLAVE}=="foomatic" || ${GUT_SLAVE}=="cups")
> 	@(cd ${WRKSRC}/src/xml && ${MAKE})
>@@ -103,10 +116,8 @@
> .endif
> 
> pre-install:
>-	@${MKDIR} ${STAGEDIR}${LOCALBASE}/lib/gutenprint/5.2/modules
>-.if defined(GUT_SLAVE) && ${GUT_SLAVE}=="cups"
>-	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${LOCALBASE}/bin/perl|' \
>-		${WRKSRC}/src/cups/cups-genppdupdate
>+.if !defined(GUT_SLAVE)
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gutenprint/5.2/modules
> .endif
> 
> post-install:
>Index: print/gutenprint-base/pkg-plist
>===================================================================
>--- print/gutenprint-base/pkg-plist	(revision 396853)
>+++ print/gutenprint-base/pkg-plist	(working copy)
>@@ -23,20 +23,20 @@
> include/gutenprint/vars.h
> include/gutenprint/weave.h
> include/gutenprint/xml.h
>-include/gutenprintui2/curve.h
>-include/gutenprintui2/gammacurve.h
>-include/gutenprintui2/gutenprintui.h
>-include/gutenprintui2/typebuiltins.h
>+%%GTK2%%include/gutenprintui2/curve.h
>+%%GTK2%%include/gutenprintui2/gammacurve.h
>+%%GTK2%%include/gutenprintui2/gutenprintui.h
>+%%GTK2%%include/gutenprintui2/typebuiltins.h
> lib/libgutenprint.so.2
> lib/libgutenprint.so.2.3.0
>-lib/libgutenprintui2.so.1.0.0
>+%%GTK2%%lib/libgutenprintui2.so.1.0.0
> lib/libgutenprint.a
> lib/libgutenprint.so
>-lib/libgutenprintui2.a
>-lib/libgutenprintui2.so
>-lib/libgutenprintui2.so.1
>+%%GTK2%%lib/libgutenprintui2.a
>+%%GTK2%%lib/libgutenprintui2.so
>+%%GTK2%%lib/libgutenprintui2.so.1
> libdata/pkgconfig/gutenprint.pc
>-libdata/pkgconfig/gutenprintui2.pc
>+%%GTK2%%libdata/pkgconfig/gutenprintui2.pc
> man/man1/escputil.1.gz
> %%DATADIR%%/5.2/xml/dither-matrix-1x1.xml
> %%DATADIR%%/5.2/xml/dither-matrix-2x1.xml
>Index: print/gutenprint-cups/pkg-plist
>===================================================================
>--- print/gutenprint-cups/pkg-plist	(revision 396853)
>+++ print/gutenprint-cups/pkg-plist	(working copy)
>@@ -2378,4 +2378,3 @@
> share/locale/vi/gutenprint_vi.po
> share/locale/zh_CN/gutenprint_zh_CN.po
> share/locale/zh_TW/gutenprint_zh_TW.po
>-@dir lib/gutenprint/5.2/modules

Actions: View | Diff

Attachments on bug 202324: 161014 | 161015 | 161016 | 161074