Date: Thu, 19 Apr 2007 17:47:45 -0500 (CDT) From: Sean Farley <sean-freebsd@farley.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: domi@saargate.de Subject: ports/111924: [PATCH] graphics/xsane: dependency changes Message-ID: <200704192247.l3JMljMb036872@thor.farley.org> Resent-Message-ID: <200704192250.l3JMo2KK049249@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 111924 >Category: ports >Synopsis: [PATCH] graphics/xsane: dependency changes >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Apr 19 22:50:01 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Sean Farley >Release: FreeBSD 6.2-STABLE i386 >Organization: >Environment: System: FreeBSD thor.farley.org 6.2-STABLE FreeBSD 6.2-STABLE #0: Fri Feb 16 16:30:29 CST 2007 >Description: Added option to toggle NLS support. Changed gimp dependency from gimp (meta-port) to gimp-app. Port maintainer (domi@saargate.de) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- xsane-0.991_1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/graphics/xsane.orig/Makefile /usr/ports/graphics/xsane/Makefile --- /usr/ports/graphics/xsane.orig/Makefile Sun Jun 11 16:40:50 2006 +++ /usr/ports/graphics/xsane/Makefile Sat Apr 14 12:43:16 2007 @@ -25,19 +25,28 @@ USE_X_PREFIX= yes GNU_CONFIGURE= yes WANT_GNOME= yes -USE_GETTEXT= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib -lintl" + LDFLAGS="-L${LOCALBASE}/lib" MAN1= xsane.1 #SUB_FILES+= pkg-message OPTIONS= GTK2 "Enable GTK2 support (use GTK1 if turned off)" on \ - GIMP "Enable GIMP plugin support" off + GIMP "Enable GIMP plugin support" off \ + NLS "Enable Native Language Support" on .include <bsd.port.pre.mk> +.if defined(WITHOUT_NLS) +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " +.else +USE_GETTEXT= yes +PLIST_SUB+= NLS="" +CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib -lintl" +.endif + .if defined(WITHOUT_GTK2) USE_GNOME= gtk12 CONFIGURE_ARGS+= --disable-gtk2 @@ -51,7 +60,7 @@ LIB_DEPENDS+= gimp:${PORTSDIR}/graphics/gimp1 CONFIGURE_ARGS+= --disable-gimp2 .else -LIB_DEPENDS+= gimp:${PORTSDIR}/graphics/gimp +LIB_DEPENDS+= gimp:${PORTSDIR}/graphics/gimp-app .endif # WITHOUT_GTK2 .else CONFIGURE_ARGS+= --disable-gimp @@ -63,7 +72,7 @@ pre-patch: @${FIND} ${WRKSRC} -name 'Makefile.in' | ${XARGS} ${REINPLACE_CMD} \ - -i "" -e 's|\$$(sbindir)||g' + -i "" -e 's|\$${sbindir}||g' post-install: .if defined(WITH_GIMP) diff -ruN --exclude=CVS /usr/ports/graphics/xsane.orig/pkg-plist /usr/ports/graphics/xsane/pkg-plist --- /usr/ports/graphics/xsane.orig/pkg-plist Mon Jan 23 15:37:47 2006 +++ /usr/ports/graphics/xsane/pkg-plist Sat Apr 14 12:43:16 2007 @@ -1,25 +1,25 @@ bin/xsane -share/locale/cs/LC_MESSAGES/xsane.mo -share/locale/da/LC_MESSAGES/xsane.mo -share/locale/de/LC_MESSAGES/xsane.mo -share/locale/es/LC_MESSAGES/xsane.mo -share/locale/fr/LC_MESSAGES/xsane.mo -share/locale/hu/LC_MESSAGES/xsane.mo -share/locale/it/LC_MESSAGES/xsane.mo -share/locale/ja/LC_MESSAGES/xsane.mo -share/locale/nl/LC_MESSAGES/xsane.mo -share/locale/pl/LC_MESSAGES/xsane.mo -share/locale/pt/LC_MESSAGES/xsane.mo -share/locale/pt_BR/LC_MESSAGES/xsane.mo -share/locale/ro/LC_MESSAGES/xsane.mo -share/locale/ru/LC_MESSAGES/xsane.mo -share/locale/sk/LC_MESSAGES/xsane.mo -share/locale/sl/LC_MESSAGES/xsane.mo -share/locale/sr/LC_MESSAGES/xsane.mo -share/locale/sv/LC_MESSAGES/xsane.mo -share/locale/tr/LC_MESSAGES/xsane.mo -share/locale/vi/LC_MESSAGES/xsane.mo -share/locale/zh/LC_MESSAGES/xsane.mo +%%NLS%%share/locale/cs/LC_MESSAGES/xsane.mo +%%NLS%%share/locale/da/LC_MESSAGES/xsane.mo +%%NLS%%share/locale/de/LC_MESSAGES/xsane.mo +%%NLS%%share/locale/es/LC_MESSAGES/xsane.mo +%%NLS%%share/locale/fr/LC_MESSAGES/xsane.mo +%%NLS%%share/locale/hu/LC_MESSAGES/xsane.mo +%%NLS%%share/locale/it/LC_MESSAGES/xsane.mo +%%NLS%%share/locale/ja/LC_MESSAGES/xsane.mo +%%NLS%%share/locale/nl/LC_MESSAGES/xsane.mo +%%NLS%%share/locale/pl/LC_MESSAGES/xsane.mo +%%NLS%%share/locale/pt/LC_MESSAGES/xsane.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/xsane.mo +%%NLS%%share/locale/ro/LC_MESSAGES/xsane.mo +%%NLS%%share/locale/ru/LC_MESSAGES/xsane.mo +%%NLS%%share/locale/sk/LC_MESSAGES/xsane.mo +%%NLS%%share/locale/sl/LC_MESSAGES/xsane.mo +%%NLS%%share/locale/sr/LC_MESSAGES/xsane.mo +%%NLS%%share/locale/sv/LC_MESSAGES/xsane.mo +%%NLS%%share/locale/tr/LC_MESSAGES/xsane.mo +%%NLS%%share/locale/vi/LC_MESSAGES/xsane.mo +%%NLS%%share/locale/zh/LC_MESSAGES/xsane.mo share/sane/xsane/Mustek-logo.xpm share/sane/xsane/Plustek-logo.xpm share/sane/xsane/UMAX-logo.xpm --- xsane-0.991_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200704192247.l3JMljMb036872>