Date: Mon, 4 Feb 2013 02:58:12 +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: r311563 - in head/graphics/xsane: . files Message-ID: <201302040258.r142wCAG051293@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Mon Feb 4 02:58:12 2013 New Revision: 311563 URL: http://svnweb.freebsd.org/changeset/ports/311563 Log: - Cleanups - Fix NLS option logic - Pass maintaindership to submitter - While here, substitude LOCALBASE in pkg-message PR: 175007 Submitted by: nemysis <nemysis@gmx.ch> Modified: head/graphics/xsane/Makefile head/graphics/xsane/files/pkg-message.in Modified: head/graphics/xsane/Makefile ============================================================================== --- head/graphics/xsane/Makefile Mon Feb 4 02:47:35 2013 (r311562) +++ head/graphics/xsane/Makefile Mon Feb 4 02:58:12 2013 (r311563) @@ -3,50 +3,49 @@ PORTNAME= xsane PORTVERSION= 0.998 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://www.xsane.org/download/ \ http://gd.tuwien.ac.at/hci/sane/xsane/ \ ftp://ftp.mostang.com/pub/sane/xsane/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= nemysis@gmx.ch COMMENT= Gtk-based X11 frontend for SANE (Scanner Access Now Easy) LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ png15:${PORTSDIR}/graphics/png \ - tiff:${PORTSDIR}/graphics/tiff \ - sane:${PORTSDIR}/graphics/sane-backends + tiff:${PORTSDIR}/graphics/tiff +BUILD_DEPENDS= scanimage:${PORTSDIR}/graphics/sane-backends +RUN_DEPENDS:= ${BUILD_DEPENDS} USE_GMAKE= yes GNU_CONFIGURE= yes -WANT_GNOME= yes USE_GNOME= gtk20 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib MAN1= xsane.1 -#SUB_FILES+= pkg-message - OPTIONS_DEFINE= GIMP NLS GIMP_DESC= GIMP plugin support .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNLS} -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.else USE_GETTEXT= yes -PLIST_SUB+= NLS="" CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib -lintl" +PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " .endif .if ${PORT_OPTIONS:MGIMP} SUB_FILES+= pkg-message LIB_DEPENDS+= gimp:${PORTSDIR}/graphics/gimp-app +CONFIGURE_ARGS+=--enable-gimp2 .else -CONFIGURE_ARGS+= --disable-gimp +CONFIGURE_ARGS+=--disable-gimp .endif pre-patch: @@ -55,7 +54,9 @@ pre-patch: post-install: .if ${PORT_OPTIONS:MGIMP} + @${ECHO_CMD} @${CAT} ${PKGMESSAGE} + @${ECHO_CMD} .endif .include <bsd.port.mk> Modified: head/graphics/xsane/files/pkg-message.in ============================================================================== --- head/graphics/xsane/files/pkg-message.in Mon Feb 4 02:47:35 2013 (r311562) +++ head/graphics/xsane/files/pkg-message.in Mon Feb 4 02:58:12 2013 (r311563) @@ -1,10 +1,14 @@ -Congratulations, XSane is now installed. +=============================================================================== + +XSane has been installed. To install XSane as a GIMP plug-in, please type: -ln -sf ${LOCALBASE}/bin/xsane ~/.gimp-n.n/plug-ins/xsane + ln -sf %%LOCALBASE%%/bin/xsane ~/.gimp-*/plug-ins/xsane Then run the GIMP, and a new "XSane" menu item should appear in the -"File->Acquire" menu. Use this to access your scanner. +"File->Acquire" menu. Use this to access your scanner. Have fun! + +===============================================================================
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302040258.r142wCAG051293>