From owner-svn-ports-head@freebsd.org Sun Sep 27 21:01:40 2015 Return-Path: Delivered-To: svn-ports-head@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 03381A0B02E; Sun, 27 Sep 2015 21:01:40 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 D8E75A2E; Sun, 27 Sep 2015 21:01:39 +0000 (UTC) (envelope-from rm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8RL1d74080082; Sun, 27 Sep 2015 21:01:39 GMT (envelope-from rm@FreeBSD.org) Received: (from rm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8RL1dQD080080; Sun, 27 Sep 2015 21:01:39 GMT (envelope-from rm@FreeBSD.org) Message-Id: <201509272101.t8RL1dQD080080@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rm set sender to rm@FreeBSD.org using -f From: Ruslan Makhmatkhanov Date: Sun, 27 Sep 2015 21:01:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398050 - head/graphics/djview4 X-SVN-Group: ports-head 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.20 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: Sun, 27 Sep 2015 21:01:40 -0000 Author: rm Date: Sun Sep 27 21:01:38 2015 New Revision: 398050 URL: https://svnweb.freebsd.org/changeset/ports/398050 Log: graphics/djview4: port improvements There are some improvements for graphics/djview4 port to make it usable on desktop. For example, while there is a need to use register-djview-menu shell script (on post-install stage, which is not available currently) to setup the djview4 menu entries and icons, it is possible to install them manually, as described in ${WRKSRC}/desktopfiles/README file. Also this application is translated to different languages. - add LICENSE_FILE - add libtiff.so to LIB_DEPENDS as required shared library - add desktop-file-utils to USES and sort it - add linguist to USE_QT4, because there are available messages to translate - add --disable-desktopfiles option to CONFIGURE_ARGS, which do not install scripts to register icons and menus - replace CFLAGS and CXXFLAGS with CPPFLAGS for include directory - improve sed patch by using & for replacement part - strip web-plugin library, install icons and desktop files on post-install stage - remove unneeded files after --disable-desktopfiles option from pkg-plist - add translated files, icons and desktop files to pkg-plist PR: 196409 Submitted by: lightside Modified: head/graphics/djview4/Makefile head/graphics/djview4/pkg-plist Modified: head/graphics/djview4/Makefile ============================================================================== --- head/graphics/djview4/Makefile Sun Sep 27 20:39:37 2015 (r398049) +++ head/graphics/djview4/Makefile Sun Sep 27 21:01:38 2015 (r398050) @@ -3,7 +3,7 @@ PORTNAME= djview PORTVERSION= 4.9 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= SF/djvu/DjView/${PORTVERSION} @@ -11,21 +11,23 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Standalone Djvu viewer and plugin based on Qt4 toolkit LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libdjvulibre.so:${PORTSDIR}/graphics/djvulibre +LIB_DEPENDS= libdjvulibre.so:${PORTSDIR}/graphics/djvulibre \ + libtiff.so:${PORTSDIR}/graphics/tiff GNU_CONFIGURE= yes -USES= pkgconfig webplugin:native libtool -USE_QT4= gui network rcc_build uic_build moc_build qmake_build +USES= desktop-file-utils libtool pkgconfig webplugin:native +USE_QT4= gui network linguisttools_build moc_build qmake_build rcc_build \ + uic_build USE_XORG= sm ice xt QT_NONSTANDARD= yes CONFIGURE_ARGS= --x-includes="${LOCALBASE}/include" \ - --x-libraries="${LOCALBASE}/lib" + --x-libraries="${LOCALBASE}/lib" --disable-desktopfiles CONFIGURE_ENV= QMAKE="${QMAKE}" \ QMAKESPEC="${QMAKESPEC}" +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CFLAGS+= -I${LOCALBASE}/include -CXXFLAGS+= -I${LOCALBASE}/include MAKE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" WRKSRC= ${WRKDIR}/djview4-${PORTVERSION} @@ -36,10 +38,20 @@ 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@,@NSDEJAVU_LIBS@ -lXt -lXext,g' \ + @${REINPLACE_CMD} -e 's,@NSDEJAVU_LIBS@,& -lXt -lXext,g' \ ${WRKSRC}/nsdejavu/Makefile.in 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 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/djview4/plugins/nsdejavu.so .include Modified: head/graphics/djview4/pkg-plist ============================================================================== --- head/graphics/djview4/pkg-plist Sun Sep 27 20:39:37 2015 (r398049) +++ head/graphics/djview4/pkg-plist Sun Sep 27 21:01:38 2015 (r398050) @@ -4,10 +4,13 @@ lib/djview4/plugins/nsdejavu.so man/man1/djview.1.gz man/man1/djview4.1.gz man/man1/nsdejavu.1.gz -share/djvu/djview4/desktop/djvulibre-djview4.desktop -share/djvu/djview4/desktop/hi-djview4.svgz -share/djvu/djview4/desktop/hi32-djview4.png -share/djvu/djview4/desktop/hi64-djview4.png -share/djvu/djview4/desktop/prebuilt-hi32-djview4.png -share/djvu/djview4/desktop/prebuilt-hi64-djview4.png -share/djvu/djview4/desktop/register-djview-menu +share/applications/djvulibre-djview4.desktop +share/djvu/djview4/djview_cs.qm +share/djvu/djview4/djview_de.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