Date: Fri, 6 Nov 2015 17:11:34 +0000 (UTC) From: Ruslan Makhmatkhanov <rm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r400947 - in head/graphics/djview4: . files Message-ID: <201511061711.tA6HBY3h082437@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rm Date: Fri Nov 6 17:11:34 2015 New Revision: 400947 URL: https://svnweb.freebsd.org/changeset/ports/400947 Log: graphics/djview4: update to 4.10.3 - Remove Qt version from COMMENT and pkg-descr file - Add LICENSE_FILE - Add build dependency from graphics/librsvg2 for icon generation - Add libtiff.so to LIB_DEPENDS as required shared library - Use install-strip for INSTALL_TARGET to strip files - Add "autoreconf", "desktop-file-utils" and "gmake" to USES - Remove QT_NONSTANDARD to use QT configure environment variables - Add additional QT variables to CONFIGURE_ENV - Allow to build with using Qt4 or Qt5 toolkit library through QT4 or QT5 port's options - Adapt (sed) patches for new version - Adapt pkg-plist file - Add upstream patch to simplify "lrelease rule" [1] [1] http://sourceforge.net/p/djvu/djview-git/ci/e664af/tree/src/Makefile.am?diff=975258 PR: 198088 Submitted by: lightside <lightside@gmx.com> Deleted: head/graphics/djview4/files/ Modified: head/graphics/djview4/Makefile head/graphics/djview4/distinfo head/graphics/djview4/pkg-descr head/graphics/djview4/pkg-plist Modified: head/graphics/djview4/Makefile ============================================================================== --- head/graphics/djview4/Makefile Fri Nov 6 17:10:17 2015 (r400946) +++ head/graphics/djview4/Makefile Fri Nov 6 17:11:34 2015 (r400947) @@ -2,55 +2,57 @@ # $FreeBSD$ PORTNAME= djview -PORTVERSION= 4.9 -PORTREVISION= 5 +PORTVERSION= 4.10.3 CATEGORIES= graphics -MASTER_SITES= SF/djvu/DjView/${PORTVERSION} +MASTER_SITES= SF/djvu/DjView/${PORTVERSION:R} MAINTAINER= ports@FreeBSD.org -COMMENT= Standalone Djvu viewer and plugin based on Qt4 toolkit +COMMENT= Standalone Djvu viewer and plugin based on Qt toolkit LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +BUILD_DEPENDS= rsvg-convert:${PORTSDIR}/graphics/librsvg2 LIB_DEPENDS= libdjvulibre.so:${PORTSDIR}/graphics/djvulibre \ libtiff.so:${PORTSDIR}/graphics/tiff +INSTALL_TARGET= install-strip GNU_CONFIGURE= yes -USES= desktop-file-utils libtool pkgconfig webplugin:native -USE_QT4= gui network linguisttools_build moc_build qmake_build rcc_build \ - uic_build +USES= autoreconf desktop-file-utils gmake libtool pkgconfig \ + webplugin:native USE_XORG= sm ice xt -QT_NONSTANDARD= yes CONFIGURE_ARGS= --x-includes="${LOCALBASE}/include" \ - --x-libraries="${LOCALBASE}/lib" --disable-desktopfiles -CONFIGURE_ENV= QMAKE="${QMAKE}" \ - QMAKESPEC="${QMAKESPEC}" + --x-libraries="${LOCALBASE}/lib" +CONFIGURE_ENV= LRELEASE="${LRELEASE}" LUPDATE="${LUPDATE}" + CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib MAKE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" -WRKSRC= ${WRKDIR}/djview4-${PORTVERSION} - WEBPLUGIN_DIR= ${PREFIX}/lib/djview4/plugins WEBPLUGIN_FILES= nsdejavu.so -post-patch: - @${REINPLACE_CMD} -e 's,/netscape/,/djview4/,' \ - ${WRKSRC}/nsdejavu/Makefile.in ${WRKSRC}/nsdejavu/nsdejavu.1.in - @${REINPLACE_CMD} -e 's,@NSDEJAVU_LIBS@,& -lXt -lXext,g' \ - ${WRKSRC}/nsdejavu/Makefile.in +OPTIONS_SINGLE= QT +OPTIONS_SINGLE_QT= QT4 QT5 +OPTIONS_DEFAULT= QT5 + +QT4_USE= QT4=gui,network,opengl,linguisttools_build,moc_build,qmake_build,rcc_build,uic_build +QT5_USE= QT5=gui,network,opengl,printsupport,widgets,buildtools_build,linguisttools_build,qmake_build + +post-patch: .SILENT +# Change plugins directory +# Add GLIB cflags and libs (including -lX*) + ${REINPLACE_CMD} -e '/^pluginsdir/s/mozilla/djview4/ ; \ + /NSDEJAVU_CFLAGS/s|$$| $$\(GLIB_CFLAGS\)| ; \ + /NSDEJAVU_LIBS/s|$$| $$\(GLIB_LIBS\) -lXt -lXext|' \ + ${WRKSRC}/nsdejavu/Makefile.am post-install: -.for f in ${WEBPLUGIN_FILES} - @${STRIP_CMD} ${STAGEDIR}${WEBPLUGIN_DIR}/${f} -.endfor -.for d in 32 64 - @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${d}x${d}/apps - ${INSTALL_DATA} ${WRKSRC}/desktopfiles/hi${d}-djview4.png \ - ${STAGEDIR}${PREFIX}/share/icons/hicolor/${d}x${d}/apps/djvulibre-djview4.png -.endfor - ${INSTALL_DATA} ${WRKSRC}/desktopfiles/djvulibre-djview4.desktop \ - ${STAGEDIR}${PREFIX}/share/applications +# Changing file write permissions needed to strip a file installed as a script + ${CHMOD} +w ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${CHMOD} -w ${STAGEDIR}${PREFIX}/bin/${PORTNAME} +# Create a symbolic link to match desktop file exec name + (cd ${STAGEDIR}${PREFIX}/bin && ${LN} -sf ${PORTNAME} ${PORTNAME}4) .include <bsd.port.mk> Modified: head/graphics/djview4/distinfo ============================================================================== --- head/graphics/djview4/distinfo Fri Nov 6 17:10:17 2015 (r400946) +++ head/graphics/djview4/distinfo Fri Nov 6 17:11:34 2015 (r400947) @@ -1,2 +1,2 @@ -SHA256 (djview-4.9.tar.gz) = d150f557aaa073356d77c1f5e566a6a566281df5f92395b6822139f0e5c90e0c -SIZE (djview-4.9.tar.gz) = 930676 +SHA256 (djview-4.10.3.tar.gz) = 50b80ecddc5aec03c49882c91b3af2f42abfe8454d5ddc01fb313e3481e6ab25 +SIZE (djview-4.10.3.tar.gz) = 1119618 Modified: head/graphics/djview4/pkg-descr ============================================================================== --- head/graphics/djview4/pkg-descr Fri Nov 6 17:10:17 2015 (r400946) +++ head/graphics/djview4/pkg-descr Fri Nov 6 17:11:34 2015 (r400947) @@ -1,4 +1,4 @@ -Standalone Djvu viewer and plugin based on the Qt4 toolkit. Uses djvulibre +Standalone Djvu viewer and plugin based on the Qt toolkit. Uses djvulibre for rendering. WWW: http://djvu.sourceforge.net/ Modified: head/graphics/djview4/pkg-plist ============================================================================== --- head/graphics/djview4/pkg-plist Fri Nov 6 17:10:17 2015 (r400946) +++ head/graphics/djview4/pkg-plist Fri Nov 6 17:11:34 2015 (r400947) @@ -2,15 +2,16 @@ bin/djview bin/djview4 lib/djview4/plugins/nsdejavu.so man/man1/djview.1.gz -man/man1/djview4.1.gz man/man1/nsdejavu.1.gz share/applications/djvulibre-djview4.desktop share/djvu/djview4/djview_cs.qm share/djvu/djview4/djview_de.qm +share/djvu/djview4/djview_es.qm share/djvu/djview4/djview_fr.qm share/djvu/djview4/djview_ru.qm share/djvu/djview4/djview_uk.qm share/djvu/djview4/djview_zh_cn.qm share/djvu/djview4/djview_zh_tw.qm -share/icons/hicolor/32x32/apps/djvulibre-djview4.png -share/icons/hicolor/64x64/apps/djvulibre-djview4.png +share/icons/hicolor/32x32/mimetypes/djvulibre-djview4.png +share/icons/hicolor/64x64/mimetypes/djvulibre-djview4.png +share/icons/hicolor/scalable/mimetypes/djvulibre-djview4.svgz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511061711.tA6HBY3h082437>