Date: Mon, 13 Jun 2016 19:19:04 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416860 - in head/graphics/djvulibre: . files Message-ID: <201606131919.u5DJJ4Dv045051@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Mon Jun 13 19:19:04 2016 New Revision: 416860 URL: https://svnweb.freebsd.org/changeset/ports/416860 Log: graphics/djvulibre: 3.5.25.3 -> 3.5.27 - simplified configuration scripts - deadlock fixes - Thread safe miniexp - Now using the standard autotools approach (thanks to Vincent Torri). - New windows installer (thanks to Konstantin Kravtsov). - General speedup thanks to lock-free smart pointers. - ddjvu can produce one file per page. - djvused can now set the default page orientation. - Bug fixes all around. PR: 198087 Submitted by: lightside@gmx.com Approved by: bf (maintainer timeout) Deleted: head/graphics/djvulibre/files/ Modified: head/graphics/djvulibre/Makefile head/graphics/djvulibre/distinfo head/graphics/djvulibre/pkg-plist Modified: head/graphics/djvulibre/Makefile ============================================================================== --- head/graphics/djvulibre/Makefile Mon Jun 13 19:12:50 2016 (r416859) +++ head/graphics/djvulibre/Makefile Mon Jun 13 19:19:04 2016 (r416860) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= djvulibre -PORTVERSION= 3.5.25.3 -PORTREVISION= 3 +PORTVERSION= 3.5.27 CATEGORIES= graphics www -MASTER_SITES= SF/djvu/DjVuLibre/${PORTVERSION:R} +MASTER_SITES= SF/djvu/DjVuLibre/${PORTVERSION} MAINTAINER= bf@FreeBSD.org COMMENT= DjVu base libraries and utilities @@ -13,21 +12,24 @@ 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 GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-pkgconfigdir="${PREFIX}/libdata/pkgconfig" CONFIGURE_ENV= JPEG_CFLAGS="-I${LOCALBASE}/include" \ JPEG_LIBS="-L${LOCALBASE}/lib -ljpeg" \ TIFF_CFLAGS="-I${LOCALBASE}/include" \ TIFF_LIBS="-L${LOCALBASE}/lib -ltiff" LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} -USES= cpe iconv jpeg libtool pathfix +USES= cpe gmake iconv jpeg libtool shared-mime-info CPE_VENDOR= djvulibre_project USE_LDCONFIG= yes +INSTALLS_ICONS= yes CONFLICTS= djvulibre-nox11-3* -WRKSRC= ${WRKDIR}/${DISTNAME:R} -PORTDOCS= djvu2spec.djvu djvu3spec.djvu djvuchanges.txt lizard2002.djvu lizard2007.djvu +PORTDOCS= *.djvu *.pdf *.txt OPTIONS_DEFINE= DOCS ANY2DJVU OPTIONS_SUB= yes @@ -35,27 +37,22 @@ OPTIONS_SUB= yes ANY2DJVU_DESC= Install any2djvu script (requires curl) ANY2DJVU_RUN_DEPENDS= curl:ftp/curl -.include <bsd.port.options.mk> - post-patch: - @${REINPLACE_CMD} -e \ - '/-[Og]\*)/d ; \ - s|$$OPTS -O[[:digit:]]*|$$OPTS|g ; \ - s|$$OPTS $$opt|$$OPTS|g' \ +# Remove custom optimization compiler flags + @${REINPLACE_CMD} -e '/-[Og]\*)/d ; \ + /^ opt=/s|-O[[:digit:]]*||g' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e \ - 's|$${FLAGS}|| ; \ - s|@CPPFLAGS@|$${FLAGS} &|' \ - ${WRKSRC}/tools/jb2cmp/Makefile.in - @${REINPLACE_CMD} -e \ - 's|_PROGRAM} -m 0755|_SCRIPT}|' \ +# Convert bash to sh script, which uses fetch instead of wget + @${REINPLACE_CMD} -e '/^#!/s|bash -f|sh| ; \ + s|^function || ; s| == | = |g ; \ + s|wget $$wgetopts -O|${FETCH_BINARY} $$wgetopts -o|' \ + ${WRKSRC}/tools/any2djvu + +post-patch-ANY2DJVU-off: + @${REINPLACE_CMD} -e 's/any2djvu // ; s/any2djvu\.1 //' \ ${WRKSRC}/tools/Makefile.in -.if empty(PORT_OPTIONS:MANY2DJVU) - @${REINPLACE_CMD} -e 's,any2djvu,,' ${WRKSRC}/tools/Makefile.in -.endif - -post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR} + +post-install-DOCS-on: + (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) .include <bsd.port.mk> Modified: head/graphics/djvulibre/distinfo ============================================================================== --- head/graphics/djvulibre/distinfo Mon Jun 13 19:12:50 2016 (r416859) +++ head/graphics/djvulibre/distinfo Mon Jun 13 19:19:04 2016 (r416860) @@ -1,2 +1,2 @@ -SHA256 (djvulibre-3.5.25.3.tar.gz) = 898d7ed6dd2fa311a521baa95407a91b20a872d80c45e8245442d64f142cb1e0 -SIZE (djvulibre-3.5.25.3.tar.gz) = 2543949 +SHA256 (djvulibre-3.5.27.tar.gz) = e69668252565603875fb88500cde02bf93d12d48a3884e472696c896e81f505f +SIZE (djvulibre-3.5.27.tar.gz) = 3648522 Modified: head/graphics/djvulibre/pkg-plist ============================================================================== --- head/graphics/djvulibre/pkg-plist Mon Jun 13 19:12:50 2016 (r416859) +++ head/graphics/djvulibre/pkg-plist Mon Jun 13 19:19:04 2016 (r416860) @@ -21,7 +21,7 @@ include/libdjvu/ddjvuapi.h include/libdjvu/miniexp.h lib/libdjvulibre.so lib/libdjvulibre.so.21 -lib/libdjvulibre.so.21.4.0 +lib/libdjvulibre.so.21.6.0 libdata/pkgconfig/ddjvuapi.pc %%ANY2DJVU%%man/man1/any2djvu.1.gz man/man1/bzz.1.gz @@ -47,17 +47,6 @@ man/man1/djvuxmlparser.1.gz share/djvu/osi/cs/messages.xml share/djvu/osi/de/libdjvu++.xml share/djvu/osi/de/messages.xml -share/djvu/osi/desktop/djvulibre-mime.xml -share/djvu/osi/desktop/hi-djvu.svgz -share/djvu/osi/desktop/hi22-djvu.png -share/djvu/osi/desktop/hi32-djvu.png -share/djvu/osi/desktop/hi48-djvu.png -share/djvu/osi/desktop/hi64-djvu.png -share/djvu/osi/desktop/prebuilt-hi22-djvu.png -share/djvu/osi/desktop/prebuilt-hi32-djvu.png -share/djvu/osi/desktop/prebuilt-hi48-djvu.png -share/djvu/osi/desktop/prebuilt-hi64-djvu.png -share/djvu/osi/desktop/register-djvu-mime share/djvu/osi/en/djvutools-reference.xml share/djvu/osi/en/libdjvu++.xml share/djvu/osi/en/messages.xml @@ -71,3 +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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606131919.u5DJJ4Dv045051>