From owner-svn-ports-all@freebsd.org Tue Jun 14 17:41:07 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 50DBDB723D8; Tue, 14 Jun 2016 17:41:07 +0000 (UTC) (envelope-from pi@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 mx1.freebsd.org (Postfix) with ESMTPS id 2C46B2B06; Tue, 14 Jun 2016 17:41:07 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5EHf6u6039230; Tue, 14 Jun 2016 17:41:06 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5EHf6m2039081; Tue, 14 Jun 2016 17:41:06 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201606141741.u5EHf6m2039081@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Tue, 14 Jun 2016 17:41:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416902 - head/graphics/djvulibre X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jun 2016 17:41:07 -0000 Author: pi Date: Tue Jun 14 17:41:06 2016 New Revision: 416902 URL: https://svnweb.freebsd.org/changeset/ports/416902 Log: graphics/djvulibre: some fixes for the icons - Remove graphics/librsvg2 from build dependency - Add DESKTOPFILES option for installation of icons and mime types - Use prebuilt icons instead of conversion tool to generate them - Adapt pkg-plist PR: 198087 Submitted by: lightside@gmx.com Modified: head/graphics/djvulibre/Makefile head/graphics/djvulibre/pkg-plist Modified: head/graphics/djvulibre/Makefile ============================================================================== --- head/graphics/djvulibre/Makefile Tue Jun 14 17:36:22 2016 (r416901) +++ head/graphics/djvulibre/Makefile Tue Jun 14 17:41:06 2016 (r416902) @@ -3,6 +3,7 @@ PORTNAME= djvulibre PORTVERSION= 3.5.27 +PORTREVISION= 1 CATEGORIES= graphics www MASTER_SITES= SF/djvu/DjVuLibre/${PORTVERSION} @@ -12,7 +13,6 @@ COMMENT= DjVu base libraries and utiliti LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= rsvg-convert:graphics/librsvg2 LIB_DEPENDS= libtiff.so:graphics/tiff INSTALL_TARGET= install-strip @@ -23,19 +23,23 @@ CONFIGURE_ENV= JPEG_CFLAGS="-I${LOCALBAS TIFF_CFLAGS="-I${LOCALBASE}/include" \ TIFF_LIBS="-L${LOCALBASE}/lib -ltiff" LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} -USES= cpe gmake iconv jpeg libtool shared-mime-info +USES= cpe gmake iconv jpeg libtool CPE_VENDOR= djvulibre_project USE_LDCONFIG= yes -INSTALLS_ICONS= yes CONFLICTS= djvulibre-nox11-3* PORTDOCS= *.djvu *.pdf *.txt -OPTIONS_DEFINE= DOCS ANY2DJVU +OPTIONS_DEFINE= DESKTOPFILES DOCS ANY2DJVU +OPTIONS_DEFAULT= DESKTOPFILES OPTIONS_SUB= yes ANY2DJVU_DESC= Install any2djvu script (requires curl) ANY2DJVU_RUN_DEPENDS= curl:ftp/curl +DESKTOPFILES_DESC= Install icons and mime types +DESKTOPFILES_CONFIGURE_ENABLE= desktopfiles +DESKTOPFILES_USES= shared-mime-info +DESKTOPFILES_VARS= INSTALLS_ICONS=yes post-patch: # Remove custom optimization compiler flags @@ -52,6 +56,11 @@ post-patch-ANY2DJVU-off: @${REINPLACE_CMD} -e 's/any2djvu // ; s/any2djvu\.1 //' \ ${WRKSRC}/tools/Makefile.in +post-patch-DESKTOPFILES-on: +# Use prebuilt icons, without using conversion tool + @${SED} -i.c.bak -e 's/conversion_tool=[[:alpha:]]*/conversion_tool=no/' \ + ${WRKSRC}/configure + post-install-DOCS-on: (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) Modified: head/graphics/djvulibre/pkg-plist ============================================================================== --- head/graphics/djvulibre/pkg-plist Tue Jun 14 17:36:22 2016 (r416901) +++ head/graphics/djvulibre/pkg-plist Tue Jun 14 17:41:06 2016 (r416902) @@ -60,16 +60,16 @@ share/djvu/osi/zh/messages.xml share/djvu/pubtext/DjVuMessages.dtd share/djvu/pubtext/DjVuOCR.dtd share/djvu/pubtext/DjVuXML-s.dtd -share/icons/hicolor/16x16/mimetypes/djvu.png -share/icons/hicolor/20x20/mimetypes/djvu.png -share/icons/hicolor/22x22/mimetypes/djvu.png -share/icons/hicolor/24x24/mimetypes/djvu.png -share/icons/hicolor/32x32/mimetypes/djvu.png -share/icons/hicolor/48x48/mimetypes/djvu.png -share/icons/hicolor/64x64/mimetypes/djvu.png -share/icons/hicolor/72x72/mimetypes/djvu.png -share/icons/hicolor/96x96/mimetypes/djvu.png -share/icons/hicolor/128x128/mimetypes/djvu.png -share/icons/hicolor/256x256/mimetypes/djvu.png -share/icons/hicolor/scalable/mimetypes/djvu.svgz -share/mime/packages/djvulibre-mime.xml +%%DESKTOPFILES%%share/icons/hicolor/16x16/mimetypes/djvu.png +%%DESKTOPFILES%%share/icons/hicolor/20x20/mimetypes/djvu.png +%%DESKTOPFILES%%share/icons/hicolor/22x22/mimetypes/djvu.png +%%DESKTOPFILES%%share/icons/hicolor/24x24/mimetypes/djvu.png +%%DESKTOPFILES%%share/icons/hicolor/32x32/mimetypes/djvu.png +%%DESKTOPFILES%%share/icons/hicolor/48x48/mimetypes/djvu.png +%%DESKTOPFILES%%share/icons/hicolor/64x64/mimetypes/djvu.png +%%DESKTOPFILES%%share/icons/hicolor/72x72/mimetypes/djvu.png +%%DESKTOPFILES%%share/icons/hicolor/96x96/mimetypes/djvu.png +%%DESKTOPFILES%%share/icons/hicolor/128x128/mimetypes/djvu.png +%%DESKTOPFILES%%share/icons/hicolor/256x256/mimetypes/djvu.png +%%DESKTOPFILES%%share/icons/hicolor/scalable/mimetypes/djvu.svgz +%%DESKTOPFILES%%share/mime/packages/djvulibre-mime.xml