Date: Tue, 22 Sep 2015 23:59:06 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397598 - in head/print: gimp-gutenprint gutenprint-base gutenprint-cups Message-ID: <201509222359.t8MNx6LX012024@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Tue Sep 22 23:59:05 2015 New Revision: 397598 URL: https://svnweb.freebsd.org/changeset/ports/397598 Log: - Make GTK2 support optional - Fix module directory handling - Strip libraries - Minor fixes PR: 196321, 200017, 202324 Submitted by: mazhe@alkumuna.eu, yuri@rawbw.com, amdmi3@FreeBSD.org, cmt@burggraben.net (maintainer) Approved by: cmt@burggraben.net (maintainer) Modified: head/print/gimp-gutenprint/Makefile head/print/gutenprint-base/Makefile head/print/gutenprint-base/pkg-plist head/print/gutenprint-cups/pkg-plist Modified: head/print/gimp-gutenprint/Makefile ============================================================================== --- head/print/gimp-gutenprint/Makefile Tue Sep 22 23:43:54 2015 (r397597) +++ head/print/gimp-gutenprint/Makefile Tue Sep 22 23:59:05 2015 (r397598) @@ -2,7 +2,7 @@ # $FreeBSD$ # $MCom: ports/print/gimp-gutenprint/Makefile,v 1.5 2007/10/24 21:05:40 ahze Exp $ -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 0 PKGNAMEPREFIX= gimp- PKGNAMESUFFIX= # empty @@ -15,6 +15,6 @@ LICENSE= GPLv2 MASTERDIR= ${.CURDIR}/../../print/gutenprint-base GUT_SLAVE= gimp -PLIST= ${.CURDIR}/pkg-plist +PLIST= ${.CURDIR}/pkg-plist .include "${MASTERDIR}/Makefile" Modified: head/print/gutenprint-base/Makefile ============================================================================== --- head/print/gutenprint-base/Makefile Tue Sep 22 23:43:54 2015 (r397597) +++ head/print/gutenprint-base/Makefile Tue Sep 22 23:59:05 2015 (r397598) @@ -4,6 +4,7 @@ PORTNAME?= gutenprint PORTVERSION= 5.2.10 +PORTREVISION= 1 CATEGORIES= print MASTER_SITES= SF/gimp-print/gutenprint-5.2/${PORTVERSION} PKGNAMESUFFIX?= -base @@ -15,33 +16,39 @@ LICENSE= GPLv2 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` -.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,16 +104,19 @@ post-patch: @${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}) .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: Modified: head/print/gutenprint-base/pkg-plist ============================================================================== --- head/print/gutenprint-base/pkg-plist Tue Sep 22 23:43:54 2015 (r397597) +++ head/print/gutenprint-base/pkg-plist Tue Sep 22 23:59:05 2015 (r397598) @@ -23,20 +23,20 @@ include/gutenprint/util.h 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 Modified: head/print/gutenprint-cups/pkg-plist ============================================================================== --- head/print/gutenprint-cups/pkg-plist Tue Sep 22 23:43:54 2015 (r397597) +++ head/print/gutenprint-cups/pkg-plist Tue Sep 22 23:59:05 2015 (r397598) @@ -2378,4 +2378,3 @@ share/locale/uk/gutenprint_uk.po 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509222359.t8MNx6LX012024>