From owner-svn-ports-head@freebsd.org Fri Mar 27 12:10:59 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B99B7273EBE; Fri, 27 Mar 2020 12:10:59 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48pgg734Scz42pB; Fri, 27 Mar 2020 12:10:59 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 685D9209EA; Fri, 27 Mar 2020 12:10:29 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02RCATMM080589; Fri, 27 Mar 2020 12:10:29 GMT (envelope-from makc@FreeBSD.org) Received: (from makc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02RCASrn080515; Fri, 27 Mar 2020 12:10:28 GMT (envelope-from makc@FreeBSD.org) Message-Id: <202003271210.02RCASrn080515@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: makc set sender to makc@FreeBSD.org using -f From: Max Brazhnikov Date: Fri, 27 Mar 2020 12:10:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529241 - in head/deskutils/shutter: . files X-SVN-Group: ports-head X-SVN-Commit-Author: makc X-SVN-Commit-Paths: in head/deskutils/shutter: . files X-SVN-Commit-Revision: 529241 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Mar 2020 12:10:59 -0000 Author: makc Date: Fri Mar 27 12:10:28 2020 New Revision: 529241 URL: https://svnweb.freebsd.org/changeset/ports/529241 Log: deskutils/shutter: - Unbreak by updating to 0.94.3 - CVE-2015-0854 was fixed upstream, so remove stale patch - while here, arrange Makefile: utilize options helpers, sort variables, etc PR: 243072 Submitted by: ktullavik@gmail.com Approved by: maintainer timeout (3 months) Deleted: head/deskutils/shutter/files/ Modified: head/deskutils/shutter/Makefile head/deskutils/shutter/distinfo (contents, props changed) head/deskutils/shutter/pkg-plist (contents, props changed) Modified: head/deskutils/shutter/Makefile ============================================================================== --- head/deskutils/shutter/Makefile Fri Mar 27 11:23:42 2020 (r529240) +++ head/deskutils/shutter/Makefile Fri Mar 27 12:10:28 2020 (r529241) @@ -2,16 +2,13 @@ # $FreeBSD$ PORTNAME= shutter -PORTVERSION= 0.93.1 -PORTREVISION= 5 +PORTVERSION= 0.94.3 CATEGORIES= deskutils -MASTER_SITES= http://shutter-project.org/wp-content/uploads/releases/tars/ +MASTER_SITES= https://launchpadlibrarian.net/427931700/ MAINTAINER= nivit@FreeBSD.org COMMENT= Screenshot tool -BROKEN= unfetchable - LICENSE= GPLv3 GPLv2 # the latter for some shipped cursors LICENSE_COMB= multi @@ -28,7 +25,7 @@ RUN_DEPENDS= ImageMagick6>=6.9.3.1,1:graphics/ImageMag p5-Gtk2-ImageView>=0.05:x11-toolkits/p5-Gtk2-ImageView \ p5-Gtk2-Unique>=0.05:x11-toolkits/p5-Gtk2-Unique \ p5-Gtk2>=1.2491:x11-toolkits/p5-Gtk2 \ - p5-JSON-XS>=3.01:converters/p5-JSON-XS \ + p5-JSON-MaybeXS>=1.0:converters/p5-JSON-MaybeXS \ p5-JSON>=2.90:converters/p5-JSON \ p5-Locale-gettext>=1.05:devel/p5-Locale-gettext \ p5-Net-DBus>=1.0.0:devel/p5-Net-DBus \ @@ -43,23 +40,20 @@ RUN_DEPENDS= ImageMagick6>=6.9.3.1,1:graphics/ImageMag p5-XML-Simple>=2.20:textproc/p5-XML-Simple \ xdg-utils>=1.0.2.20130919:devel/xdg-utils -INSTALLS_ICONS= yes +USES= desktop-file-utils gettext-runtime gnome perl5 shebangfix -METADATA_DESC= Enable Shutter to write Metadata -METADATA_RUN_DEPENDS= p5-Image-ExifTool>=9.76:graphics/p5-Image-ExifTool - +USE_PERL5= run +INSTALLS_ICONS= yes NO_BUILD= yes -OPTIONS_DEFINE= METADATA NLS -OPTIONS_SUB= yes - SHEBANG_FILES= bin/shutter share/shutter/resources/system/upload_plugins/*.pm SHUTTER_DESKTOP= share/applications/shutter.desktop -USE_PERL5= run -USES= desktop-file-utils gettext-runtime gnome perl5 shebangfix +OPTIONS_DEFINE= METADATA NLS +OPTIONS_SUB= yes -.include +METADATA_DESC= Enable Shutter to write Metadata +METADATA_RUN_DEPENDS= p5-Image-ExifTool>=9.76:graphics/p5-Image-ExifTool post-patch: ${REINPLACE_CMD} -e '/OnlyShowIn/d' ${WRKSRC}/${SHUTTER_DESKTOP} @@ -71,11 +65,11 @@ do-install: ${INSTALL_MAN} share/man/man1/shutter.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/) @(cd ${WRKSRC}/share && \ ${COPYTREE_SHARE} "icons pixmaps" ${STAGEDIR}${LOCALBASE}/share) -.if ${PORT_OPTIONS:MNLS} - @(cd ${WRKSRC}/share/locale && \ - ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/locale) -.endif @(cd ${WRKSRC}/share/shutter && \ ${COPYTREE_SHARE} resources ${STAGEDIR}${DATADIR}) + +do-install-NLS-on: + @(cd ${WRKSRC}/share/locale && \ + ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/locale) .include Modified: head/deskutils/shutter/distinfo ============================================================================== --- head/deskutils/shutter/distinfo Fri Mar 27 11:23:42 2020 (r529240) +++ head/deskutils/shutter/distinfo Fri Mar 27 12:10:28 2020 (r529241) @@ -1,2 +1,3 @@ -SHA256 (shutter-0.93.1.tar.gz) = 536d1f7bc69fff518bf5a6a040d6a2d65beb2eecd5429967c71c25cf991e9625 -SIZE (shutter-0.93.1.tar.gz) = 3432204 +TIMESTAMP = 1578014940 +SHA256 (shutter-0.94.3.tar.gz) = 85befa3e79042e33b1908635f7b922d3dd2e6fbb3418a275160a3bfccd2c9b07 +SIZE (shutter-0.94.3.tar.gz) = 3375447 Modified: head/deskutils/shutter/pkg-plist ============================================================================== --- head/deskutils/shutter/pkg-plist Fri Mar 27 11:23:42 2020 (r529240) +++ head/deskutils/shutter/pkg-plist Fri Mar 27 12:10:28 2020 (r529241) @@ -766,10 +766,8 @@ share/pixmaps/shutter.png %%DATADIR%%/resources/system/plugins/shell/sptrim/sptrim %%DATADIR%%/resources/system/upload_plugins/Template.pm %%DATADIR%%/resources/system/upload_plugins/upload/Dropbox.pm -%%DATADIR%%/resources/system/upload_plugins/upload/ITmages.pm +%%DATADIR%%/resources/system/upload_plugins/upload/Gyazo.pm %%DATADIR%%/resources/system/upload_plugins/upload/Imgur.pm -%%DATADIR%%/resources/system/upload_plugins/upload/Minus.pm %%DATADIR%%/resources/system/upload_plugins/upload/ToileLibre.pm -%%DATADIR%%/resources/system/upload_plugins/upload/TwitPic.pm %%DATADIR%%/resources/system/upload_plugins/upload/vgyme.pm @mode