Date: Tue, 30 May 2017 18:41:40 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r442113 - in head/graphics/xsane: . files Message-ID: <201705301841.v4UIfekL075761@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Tue May 30 18:41:40 2017 New Revision: 442113 URL: https://svnweb.freebsd.org/changeset/ports/442113 Log: Fix help menu which currently tries to open help files from share/sane/xsane/doc instead of share/doc/xsane where they are installed. While here - Add LICENSE_FILE - Pet portlint: regenerate and rename patches - Switch GIMP option to options helpers - Fix pkg-message. The GIMP plugin now shows up in File->Create and not in File->Acquire. PR: 218989 Approved by: lme (mentor), koalative@gmail.com (maintainer timeout, 4 weeks) Differential Revision: https://reviews.freebsd.org/D10752 Added: head/graphics/xsane/files/patch-src_xsane-save.c - copied, changed from r442112, head/graphics/xsane/files/patch-xsane-save.c Deleted: head/graphics/xsane/files/patch-xsane-save.c Modified: head/graphics/xsane/Makefile head/graphics/xsane/files/patch-src_xsane.h head/graphics/xsane/files/pkg-message.in Modified: head/graphics/xsane/Makefile ============================================================================== --- head/graphics/xsane/Makefile Tue May 30 18:33:57 2017 (r442112) +++ head/graphics/xsane/Makefile Tue May 30 18:41:40 2017 (r442113) @@ -3,14 +3,15 @@ PORTNAME= xsane PORTVERSION= 0.999 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://www.xsane.org/download/ MAINTAINER= koalative@gmail.com COMMENT= Gtk-based X11 frontend for SANE (Scanner Access Now Easy) -LICENSE= GPLv2 +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/xsane.COPYING LIB_DEPENDS= libpng.so:graphics/png \ libtiff.so:graphics/tiff \ @@ -19,13 +20,10 @@ LIB_DEPENDS= libpng.so:graphics/png \ BUILD_DEPENDS= scanimage:graphics/sane-backends RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= gmake jpeg pkgconfig +USES= gmake jpeg localbase:ldflags pkgconfig USE_GNOME= gtk20 gdkpixbuf2 GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - PORTDOCS= *.html *.jpg OPTIONS_DEFINE= DOCS GIMP NLS @@ -36,19 +34,16 @@ OPTIONS_SUB= yes GIMP_LIB_DEPENDS= libgimp-2.0.so:graphics/gimp-app GIMP_CONFIGURE_ENABLE= gimp2 gimp +GIMP_SUB_FILES= pkg-message NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext NLS_LIBS= -L${LOCALBASE}/lib -lintl -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MGIMP} -SUB_FILES+= pkg-message -.endif - post-patch: @${REINPLACE_CMD} -e 's| $$(DESTDIR)$$(sbindir)||' \ - -e 's|$$(DESTDIR)$$(xsanedocdir)||' ${WRKSRC}/src/Makefile.in + -e 's|$${datadir}/sane/xsane/doc|${DOCSDIR}|g' \ + -e 's|$$(DESTDIR)$$(xsanedocdir)||' \ + ${WRKSRC}/src/Makefile.in ${WRKSRC}/doc/Makefile.in @${REINPLACE_CMD} -e 's|@POSUB@ doc|@POSUB@|' ${WRKSRC}/Makefile.in post-install: Copied and modified: head/graphics/xsane/files/patch-src_xsane-save.c (from r442112, head/graphics/xsane/files/patch-xsane-save.c) ============================================================================== --- head/graphics/xsane/files/patch-xsane-save.c Tue May 30 18:33:57 2017 (r442112, copy source) +++ head/graphics/xsane/files/patch-src_xsane-save.c Tue May 30 18:41:40 2017 (r442113) @@ -1,6 +1,6 @@ ---- src/xsane-save.c.orig 2010-11-16 22:06:00.000000000 +0100 -+++ src/xsane-save.c 2012-05-04 07:37:59.000000000 +0200 -@@ -4910,7 +4910,7 @@ +--- src/xsane-save.c.orig 2010-11-16 21:06:00 UTC ++++ src/xsane-save.c +@@ -4910,7 +4910,7 @@ int xsane_save_png(FILE *outfile, int co return -1; /* error */ } @@ -9,7 +9,7 @@ { snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG); xsane_back_gtk_error(buf, TRUE); -@@ -5100,7 +5100,7 @@ +@@ -5100,7 +5100,7 @@ int xsane_save_png_16(FILE *outfile, int return -1; /* error */ } Modified: head/graphics/xsane/files/patch-src_xsane.h ============================================================================== --- head/graphics/xsane/files/patch-src_xsane.h Tue May 30 18:33:57 2017 (r442112) +++ head/graphics/xsane/files/patch-src_xsane.h Tue May 30 18:41:40 2017 (r442113) @@ -1,5 +1,5 @@ ---- src/xsane.h.o 2012-10-01 11:12:56.549589382 -0400 -+++ src/xsane.h 2012-10-01 11:12:40.660589178 -0400 +--- src/xsane.h.orig 2013-05-22 21:43:46 UTC ++++ src/xsane.h @@ -251,7 +251,7 @@ # elif defined(HAVE_OS2_H) # define DEFAULT_BROWSER "netscape" Modified: head/graphics/xsane/files/pkg-message.in ============================================================================== --- head/graphics/xsane/files/pkg-message.in Tue May 30 18:33:57 2017 (r442112) +++ head/graphics/xsane/files/pkg-message.in Tue May 30 18:41:40 2017 (r442113) @@ -1,14 +1,6 @@ -=============================================================================== - -XSane has been installed. - To install XSane as a GIMP plug-in, please type: 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. - -Have fun! - -=============================================================================== +"File -> Create" menu.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705301841.v4UIfekL075761>