UPDATE: graphics/nomacs (archivers/quazip 1.3)
Update diff to use QuaZip 1.3. Comments, ok? Index: Makefile === RCS file: /cvs/ports/graphics/nomacs/Makefile,v retrieving revision 1.31 diff -u -p -u -p -r1.31 Makefile --- Makefile11 Mar 2022 19:22:54 - 1.31 +++ Makefile27 Aug 2022 04:57:56 - @@ -3,6 +3,7 @@ COMMENT = small and fast Qt image viewer GH_ACCOUNT = nomacs GH_PROJECT = nomacs GH_TAGNAME = 3.17.2206 +REVISION = 0 CATEGORIES = graphics @@ -17,7 +18,7 @@ PERMIT_PACKAGE = Yes WANTLIB += ${COMPILER_LIBCXX} Qt5Concurrent Qt5Core Qt5Gui Qt5Network WANTLIB += Qt5PrintSupport Qt5Svg Qt5Widgets c exiv2 lcms2 m opencv_core -WANTLIB += opencv_imgproc quazip5 raw tiff +WANTLIB += opencv_imgproc quazip1-qt5 raw tiff z MODULES = devel/cmake \ x11/qt5 \ @@ -26,7 +27,7 @@ RUN_DEPENDS = devel/desktop-file-utils x11/gtk+3,-guic \ x11/qt5/qtimageformats -LIB_DEPENDS = archivers/quazip \ +LIB_DEPENDS = archivers/quazip>=1.3 \ graphics/exiv2 \ graphics/lcms2 \ graphics/libraw \ @@ -42,8 +43,10 @@ WRKDIST =${WRKDIR}/${PKGNAME}/ImageLou NO_TEST = Yes +CXXFLAGS +=-I${LOCALBASE}/include/QuaZip-Qt5/ + pre-configure: find ${WRKSRC} -type f -name "*.cpp" -exec sed -i \ - 's,,,' {} \; + 's,,,' {} \; .include Index: patches/patch-cmake_Unix_cmake === RCS file: patches/patch-cmake_Unix_cmake diff -N patches/patch-cmake_Unix_cmake --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-cmake_Unix_cmake 27 Aug 2022 04:57:56 - @@ -0,0 +1,26 @@ +Index: cmake/Unix.cmake +--- cmake/Unix.cmake.orig cmake/Unix.cmake +@@ -94,7 +94,6 @@ unset(QUAZIP_LIBS CACHE) + unset(QUAZIP_BUILD_DIRECTORY CACHE) + unset(QUAZIP_DEPENDENCY CACHE) + unset(QUAZIP_FOUND CACHE) +-unset(QUAZIP_LIBRARIES CACHE) + + unset(QUAZIP_HEADERS CACHE) + unset(QUAZIP_SOURCES CACHE) +@@ -104,11 +103,12 @@ if(ENABLE_QUAZIP) + if(USE_SYSTEM_QUAZIP) + SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) + +-find_package(QuaZip5 QUIET) +-if(NOT QUAZIP_FOUND) ++find_package(QuaZip-Qt5 QUIET) ++if(NOT QuaZip-Qt5_FOUND) + message(FATAL_ERROR "QUAZIP not found. It's mandatory when used with ENABLE_QUAZIP enabled, you can also disable USE_SYSTEM_QUAZIP") + else() + add_definitions(-DWITH_QUAZIP) ++ set(QUAZIP_LIBRARIES "QuaZip::QuaZip") + endif() + else() + find_package(ZLIB REQUIRED)
Re: UPDATE: graphics/nomacs
On Sat Nov 11, 2017 at 11:33:03AM +0100, Rafael Sadowski wrote: > Hi All, > > please find below a simple diff to update nomacs to the latest stable > version. Tested on amd64. > > Ok? Comments? > > Rafael Sadowski > New diff below, ok? Don't be shy. Index: Makefile === RCS file: /cvs/ports/graphics/nomacs/Makefile,v retrieving revision 1.12 diff -u -p -u -p -r1.12 Makefile --- Makefile16 Nov 2017 23:20:39 - 1.12 +++ Makefile25 Nov 2017 11:50:19 - @@ -1,19 +1,18 @@ # $OpenBSD: Makefile,v 1.12 2017/11/16 23:20:39 naddy Exp $ -COMMENT = small and fast Qt image viewer +COMMENT = small and fast Qt image viewer GH_ACCOUNT = nomacs GH_PROJECT = nomacs -GH_TAGNAME = 3.6.1 -REVISION = 0 +GH_TAGNAME = 3.8.0 -CATEGORIES = graphics +CATEGORIES = graphics -HOMEPAGE = http://www.nomacs.org +HOMEPAGE = https://nomacs.org -MAINTAINER = Rafael Sadowski+MAINTAINER = Rafael Sadowski -SHARED_LIBS += nomacsCore2.0 # 3.3 +SHARED_LIBS += nomacsCore3.0 # 3.3 # GPLv3 PERMIT_PACKAGE_CDROM = Yes @@ -26,8 +25,6 @@ WANTLIB += ${COMPILER_LIBCXX} MODULES = devel/cmake \ x11/qt5 \ -COMPILER = base-clang ports-gcc - RUN_DEPENDS = devel/desktop-file-utils LIB_DEPENDS = archivers/quazip \ @@ -39,7 +36,8 @@ LIB_DEPENDS = archivers/quazip \ x11/qt5/qtsvg CONFIGURE_ARGS = -DUSE_SYSTEM_QUAZIP:Bool=ON \ - -DDISABLE_QT_DEBUG:Bool=ON + -DDISABLE_QT_DEBUG:Bool=ON \ + -DENABLE_TRANSLATIONS:Bool=ON WRKDIST = ${WRKDIR}/${PKGNAME}/ImageLounge Index: distinfo === RCS file: /cvs/ports/graphics/nomacs/distinfo,v retrieving revision 1.5 diff -u -p -u -p -r1.5 distinfo --- distinfo18 Apr 2017 12:02:25 - 1.5 +++ distinfo25 Nov 2017 11:50:19 - @@ -1,2 +1,2 @@ -SHA256 (nomacs-3.6.1.tar.gz) = CbKJysUaX9zMAqpKYEBbu9S1v9trKlLKWwyzsPeocGg= -SIZE (nomacs-3.6.1.tar.gz) = 28604636 +SHA256 (nomacs-3.8.0.tar.gz) = 9DrRUH8okNsvuqDLEQ3jrF7+dUzy56BT6qv+1NXgaEU= +SIZE (nomacs-3.8.0.tar.gz) = 32240476 Index: pkg/PLIST === RCS file: /cvs/ports/graphics/nomacs/pkg/PLIST,v retrieving revision 1.4 diff -u -p -u -p -r1.4 PLIST --- pkg/PLIST 25 Mar 2017 08:39:51 - 1.4 +++ pkg/PLIST 25 Nov 2017 11:50:19 - @@ -3,12 +3,15 @@ @lib lib/libnomacsCore.so.${LIBnomacsCore_VERSION} @man man/man1/nomacs.1 share/applications/nomacs.desktop +share/metainfo/ +share/metainfo/nomacs.appdata.xml share/nomacs/ share/nomacs/translations/ share/nomacs/translations/nomacs_als.qm share/nomacs/translations/nomacs_ar.qm share/nomacs/translations/nomacs_az.qm share/nomacs/translations/nomacs_bg.qm +share/nomacs/translations/nomacs_br_pt.qm share/nomacs/translations/nomacs_bs.qm share/nomacs/translations/nomacs_cs.qm share/nomacs/translations/nomacs_de.qm
UPDATE: graphics/nomacs
Hi All, please find below a simple diff to update nomacs to the latest stable version. Tested on amd64. Ok? Comments? Rafael Sadowski Index: Makefile === RCS file: /cvs/ports/graphics/nomacs/Makefile,v retrieving revision 1.11 diff -u -p -u -p -r1.11 Makefile --- Makefile27 Jul 2017 09:55:45 - 1.11 +++ Makefile11 Nov 2017 10:30:27 - @@ -4,16 +4,15 @@ COMMENT = small and fast Qt image viewe GH_ACCOUNT = nomacs GH_PROJECT = nomacs -GH_TAGNAME = 3.6.1 -REVISION = 0 +GH_TAGNAME = 3.8.0 CATEGORIES = graphics HOMEPAGE = http://www.nomacs.org -MAINTAINER = Rafael Sadowski+MAINTAINER = Rafael Sadowski -SHARED_LIBS += nomacsCore2.0 # 3.3 +SHARED_LIBS += nomacsCore3.0 # 3.3 # GPLv3 PERMIT_PACKAGE_CDROM = Yes @@ -26,8 +25,6 @@ WANTLIB += ${COMPILER_LIBCXX} MODULES = devel/cmake \ x11/qt5 \ -COMPILER = gcc - RUN_DEPENDS = devel/desktop-file-utils LIB_DEPENDS = archivers/quazip \ @@ -39,7 +36,8 @@ LIB_DEPENDS = archivers/quazip \ x11/qt5/qtsvg CONFIGURE_ARGS = -DUSE_SYSTEM_QUAZIP:Bool=ON \ - -DDISABLE_QT_DEBUG:Bool=ON + -DDISABLE_QT_DEBUG:Bool=ON \ + -DENABLE_TRANSLATIONS:Bool=ON WRKDIST = ${WRKDIR}/${PKGNAME}/ImageLounge Index: distinfo === RCS file: /cvs/ports/graphics/nomacs/distinfo,v retrieving revision 1.5 diff -u -p -u -p -r1.5 distinfo --- distinfo18 Apr 2017 12:02:25 - 1.5 +++ distinfo11 Nov 2017 10:30:27 - @@ -1,2 +1,2 @@ -SHA256 (nomacs-3.6.1.tar.gz) = CbKJysUaX9zMAqpKYEBbu9S1v9trKlLKWwyzsPeocGg= -SIZE (nomacs-3.6.1.tar.gz) = 28604636 +SHA256 (nomacs-3.8.0.tar.gz) = 9DrRUH8okNsvuqDLEQ3jrF7+dUzy56BT6qv+1NXgaEU= +SIZE (nomacs-3.8.0.tar.gz) = 32240476 Index: pkg/PLIST === RCS file: /cvs/ports/graphics/nomacs/pkg/PLIST,v retrieving revision 1.4 diff -u -p -u -p -r1.4 PLIST --- pkg/PLIST 25 Mar 2017 08:39:51 - 1.4 +++ pkg/PLIST 11 Nov 2017 10:30:27 - @@ -3,12 +3,15 @@ @lib lib/libnomacsCore.so.${LIBnomacsCore_VERSION} @man man/man1/nomacs.1 share/applications/nomacs.desktop +share/metainfo/ +share/metainfo/nomacs.appdata.xml share/nomacs/ share/nomacs/translations/ share/nomacs/translations/nomacs_als.qm share/nomacs/translations/nomacs_ar.qm share/nomacs/translations/nomacs_az.qm share/nomacs/translations/nomacs_bg.qm +share/nomacs/translations/nomacs_br_pt.qm share/nomacs/translations/nomacs_bs.qm share/nomacs/translations/nomacs_cs.qm share/nomacs/translations/nomacs_de.qm
Re: UPDATE: graphics/nomacs
On 2017/04/18 12:41, Rafael Sadowski wrote: > Hi All, > > here is an update for nomacs. Tested @amd64. Shared lib major needs a bump. Otherwise OK. Funny looking at the first line of pkg/DESCR and the SIZE line in distinfo though!
UPDATE: graphics/nomacs
Hi All, here is an update for nomacs. Tested @amd64. Best regards, Rafael Sadowski Index: Makefile === RCS file: /cvs/ports/graphics/nomacs/Makefile,v retrieving revision 1.6 diff -u -p -u -p -r1.6 Makefile --- Makefile25 Mar 2017 08:39:51 - 1.6 +++ Makefile18 Apr 2017 10:38:59 - @@ -4,13 +4,13 @@ COMMENT = small and fast Qt image viewe GH_ACCOUNT = nomacs GH_PROJECT = nomacs -GH_TAGNAME = 3.6.0 +GH_TAGNAME = 3.6.1 CATEGORIES = graphics HOMEPAGE = http://www.nomacs.org -MAINTAINER = Rafael Sadowski+MAINTAINER = Rafael Sadowski SHARED_LIBS += nomacsCore1.0 # 3.3 Index: distinfo === RCS file: /cvs/ports/graphics/nomacs/distinfo,v retrieving revision 1.4 diff -u -p -u -p -r1.4 distinfo --- distinfo25 Mar 2017 08:39:51 - 1.4 +++ distinfo18 Apr 2017 10:38:59 - @@ -1,2 +1,2 @@ -SHA256 (nomacs-3.6.0.tar.gz) = bViYtR1iDA3keQ6bB4vSxSfGIBLRAMqEmjfOdO+ivVQ= -SIZE (nomacs-3.6.0.tar.gz) = 29493578 +SHA256 (nomacs-3.6.1.tar.gz) = CbKJysUaX9zMAqpKYEBbu9S1v9trKlLKWwyzsPeocGg= +SIZE (nomacs-3.6.1.tar.gz) = 28604636
UPDATE: graphics/nomacs
Hi All, here is an update for nomacs. Tested @amd64. Regards, Rafael Sadowski Index: Makefile === RCS file: /cvs/ports/graphics/nomacs/Makefile,v retrieving revision 1.5 diff -u -p -u -p -r1.5 Makefile --- Makefile25 Dec 2016 14:34:39 - 1.5 +++ Makefile24 Mar 2017 19:34:06 - @@ -4,8 +4,7 @@ COMMENT = small and fast Qt image viewe GH_ACCOUNT = nomacs GH_PROJECT = nomacs -GH_TAGNAME = 3.4 -REVISION = 0 +GH_TAGNAME = 3.6.0 CATEGORIES = graphics @@ -13,9 +12,7 @@ HOMEPAGE =http://www.nomacs.org MAINTAINER = Rafael Sadowski-SHARED_LIBS += nomacsCore0.0 # 3.3 -SHARED_LIBS += nomacsGui 0.0 # 3.3 -SHARED_LIBS += nomacsLoader 0.0 # 3.3 +SHARED_LIBS += nomacsCore1.0 # 3.3 # GPLv3 PERMIT_PACKAGE_CDROM = Yes Index: distinfo === RCS file: /cvs/ports/graphics/nomacs/distinfo,v retrieving revision 1.3 diff -u -p -u -p -r1.3 distinfo --- distinfo13 Sep 2016 08:21:36 - 1.3 +++ distinfo24 Mar 2017 19:34:06 - @@ -1,2 +1,2 @@ -SHA256 (nomacs-3.4.tar.gz) = VS7aiK7epIgxzjVAleOq1HiStLUCn0JBcb7baCccKi8= -SIZE (nomacs-3.4.tar.gz) = 30026261 +SHA256 (nomacs-3.6.0.tar.gz) = bViYtR1iDA3keQ6bB4vSxSfGIBLRAMqEmjfOdO+ivVQ= +SIZE (nomacs-3.6.0.tar.gz) = 29493578 Index: patches/patch-cmake_UnixBuildTarget_cmake === RCS file: /cvs/ports/graphics/nomacs/patches/patch-cmake_UnixBuildTarget_cmake,v retrieving revision 1.3 diff -u -p -u -p -r1.3 patch-cmake_UnixBuildTarget_cmake --- patches/patch-cmake_UnixBuildTarget_cmake 13 Sep 2016 08:21:36 - 1.3 +++ patches/patch-cmake_UnixBuildTarget_cmake 24 Mar 2017 19:34:06 - @@ -1,7 +1,7 @@ $OpenBSD: patch-cmake_UnixBuildTarget_cmake,v 1.3 2016/09/13 08:21:36 kirby Exp $ cmake/UnixBuildTarget.cmake.orig Fri Jul 22 13:43:37 2016 -+++ cmake/UnixBuildTarget.cmakeMon Jul 25 17:55:33 2016 -@@ -83,7 +83,11 @@ install(FILES src/img/nomacs.svg DESTINATION share/pix +--- cmake/UnixBuildTarget.cmake.orig Thu Mar 23 16:18:04 2017 cmake/UnixBuildTarget.cmakeFri Mar 24 07:19:31 2017 +@@ -78,7 +78,11 @@ install(FILES src/img/nomacs.svg DESTINATION share/pix # translations install(FILES ${NOMACS_QM} DESTINATION share/nomacs/translations) # manpage Index: patches/patch-cmake_Unix_cmake === RCS file: /cvs/ports/graphics/nomacs/patches/patch-cmake_Unix_cmake,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-cmake_Unix_cmake --- patches/patch-cmake_Unix_cmake 27 Jun 2016 05:25:40 - 1.2 +++ patches/patch-cmake_Unix_cmake 24 Mar 2017 19:34:06 - @@ -2,9 +2,9 @@ $OpenBSD: patch-cmake_Unix_cmake,v 1.2 2 - Avoid forced linkage with libstdc++. cmake/Unix.cmake.orig Mon May 2 22:16:21 2016 -+++ cmake/Unix.cmake Mon May 2 22:18:57 2016 -@@ -70,6 +70,7 @@ if(ENABLE_RAW) +--- cmake/Unix.cmake.orig Thu Mar 23 16:18:04 2017 cmake/Unix.cmake Fri Mar 24 07:19:31 2017 +@@ -66,6 +66,7 @@ if(ENABLE_RAW) if(NOT LIBRAW_FOUND) message(FATAL_ERROR "libraw not found. It's mandatory when used with ENABLE_RAW enabled") else() Index: pkg/PLIST === RCS file: /cvs/ports/graphics/nomacs/pkg/PLIST,v retrieving revision 1.3 diff -u -p -u -p -r1.3 PLIST --- pkg/PLIST 13 Sep 2016 08:21:36 - 1.3 +++ pkg/PLIST 24 Mar 2017 19:34:06 - @@ -1,8 +1,6 @@ @comment $OpenBSD: PLIST,v 1.3 2016/09/13 08:21:36 kirby Exp $ @bin bin/nomacs @lib lib/libnomacsCore.so.${LIBnomacsCore_VERSION} -@lib lib/libnomacsGui.so.${LIBnomacsGui_VERSION} -@lib lib/libnomacsLoader.so.${LIBnomacsLoader_VERSION} @man man/man1/nomacs.1 share/applications/nomacs.desktop share/nomacs/ @@ -28,6 +26,8 @@ share/nomacs/translations/nomacs_ru.qm share/nomacs/translations/nomacs_sk.qm share/nomacs/translations/nomacs_sl.qm share/nomacs/translations/nomacs_sr.qm +share/nomacs/translations/nomacs_sv.qm +share/nomacs/translations/nomacs_tr.qm share/nomacs/translations/nomacs_uk.qm share/nomacs/translations/nomacs_zh.qm share/pixmaps/
Re: UPDATE: graphics/nomacs
On Mon, September 12, 2016 17:30, Antoine Jacoutot wrote: > On Mon, Sep 12, 2016 at 04:34:07PM +0300, Kirill Bychkov wrote: >> On Sun, September 11, 2016 23:04, Rafael Sadowski wrote: >> > On Thu Aug 18, 2016 at 10:36:08AM +0100, Stuart Henderson wrote: >> >> On 2016/08/17 21:55, Rafael Sadowski wrote: >> >> > > -V = 3.2.0 >> >> > > -DISTNAME = nomacs-${V}-source >> >> > > -PKGNAME =${DISTNAME:S/-source//} >> >> > > +V = 3.4 >> >> > > +DISTNAME = nomacs-${V} >> >> >> >> No need to set DISTNAME here. >> >> >> >> > > + >> >> > > +GH_ACCOUNT = nomacs >> >> > > +GH_PROJECT = nomacs >> >> > > +GH_TAGNAME = ${V} >> >> >> >> Might as well just set GH_TAGNAME = 3.4 rather than use indirection via >> >> ${V}. >> > >> > >> > Updateded diff with Stuart's improvements. >> > >> > OK now? Tested @amd64 with current (today) ports tree and kernel/userland. >> > >> > Kind regards, >> > >> > Rafael >> > >> > >> > Index: Makefile >> > === >> > RCS file: /cvs/ports/graphics/nomacs/Makefile,v >> > retrieving revision 1.3 >> > diff -u -p -u -p -r1.3 Makefile >> > --- Makefile 27 Jun 2016 05:25:40 - 1.3 >> > +++ Makefile 11 Sep 2016 19:55:34 - >> > @@ -2,9 +2,11 @@ >> > >> > COMMENT = small and fast Qt image viewer >> > >> > -V = 3.2.0 >> > -DISTNAME =nomacs-${V}-source >> > -PKGNAME = ${DISTNAME:S/-source//} >> > +PKGNAME = nomacs-3.4 >> >> Hi! >> PKGNAME is not needed. It is the same as DISTNAME. Other than this it looks >> good to me. Any objections? > > Is DISTNAME even needed since we're using GH_* vars? It was removed after sthen@'s comments, but PKGNAME was still there. > > >> >> > + >> > +GH_ACCOUNT = nomacs >> > +GH_PROJECT = nomacs >> > +GH_TAGNAME = 3.4 >> > >> > CATEGORIES = graphics >> > >> > @@ -12,13 +14,9 @@ HOMEPAGE = http://www.nomacs.org >> > >> > MAINTAINER = Rafael Sadowski>> > >> > -MASTER_SITES = >> > https://github.com/nomacs/nomacs/releases/download/${V}/ >> > - >> > -EXTRACT_SUFX =.tar.bz2 >> > - >> > -SHARED_LIBS += nomacsCore0.0 # 3.2 >> > -SHARED_LIBS += nomacsGui 0.0 # 3.2 >> > -SHARED_LIBS += nomacsLoader 0.0 # 3.2 >> > +SHARED_LIBS += nomacsCore0.0 # 3.3 >> > +SHARED_LIBS += nomacsGui 0.0 # 3.3 >> > +SHARED_LIBS += nomacsLoader 0.0 # 3.3 >> > >> > # GPLv3 >> > PERMIT_PACKAGE_CDROM =Yes >> > @@ -46,7 +44,7 @@ LIB_DEPENDS =archivers/quazip \ >> > CONFIGURE_ARGS = -DUSE_SYSTEM_QUAZIP:Bool=ON \ >> >-DDISABLE_QT_DEBUG:Bool=ON >> > >> > -WRKDIST = ${WRKDIR}/${PKGNAME} >> > +WRKDIST = ${WRKDIR}/${PKGNAME}/ImageLounge >> > >> > NO_TEST = Yes >> > >> > Index: distinfo >> > === >> > RCS file: /cvs/ports/graphics/nomacs/distinfo,v >> > retrieving revision 1.2 >> > diff -u -p -u -p -r1.2 distinfo >> > --- distinfo 27 Jun 2016 05:25:40 - 1.2 >> > +++ distinfo 11 Sep 2016 19:55:34 - >> > @@ -1,2 +1,2 @@ >> > -SHA256 (nomacs-3.2.0-source.tar.bz2) = >> > gkYvNmWbCwnvQWnZJ9CGEkTs+DeQugMYWiREQCeMSa0= >> > -SIZE (nomacs-3.2.0-source.tar.bz2) = 1090076 >> > +SHA256 (nomacs-3.4.tar.gz) = VS7aiK7epIgxzjVAleOq1HiStLUCn0JBcb7baCccKi8= >> > +SIZE (nomacs-3.4.tar.gz) = 30026261 >> > Index: patches/patch-cmake_UnixBuildTarget_cmake >> > === >> > RCS file: >> > /cvs/ports/graphics/nomacs/patches/patch-cmake_UnixBuildTarget_cmake,v >> > retrieving revision 1.2 >> > diff -u -p -u -p -r1.2 patch-cmake_UnixBuildTarget_cmake >> > --- patches/patch-cmake_UnixBuildTarget_cmake 27 Jun 2016 05:25:40 >> -1.2 >> > +++ patches/patch-cmake_UnixBuildTarget_cmake 11 Sep 2016 19:55:34 >> > - >> > @@ -1,7 +1,7 @@ >> > $OpenBSD: patch-cmake_UnixBuildTarget_cmake,v 1.2 2016/06/27 05:25:40 >> landry >> > Exp $ >> > cmake/UnixBuildTarget.cmake.orig Mon May 2 22:13:12 2016 >> > -+++ cmake/UnixBuildTarget.cmake Mon May 2 22:15:52 2016 >> > -@@ -93,7 +93,11 @@ install(FILES src/img/nomacs.svg DESTINATION share/pix >> > +--- cmake/UnixBuildTarget.cmake.orig Fri Jul 22 13:43:37 2016 >> > cmake/UnixBuildTarget.cmake Mon Jul 25 17:55:33 2016 >> > +@@ -83,7 +83,11 @@ install(FILES src/img/nomacs.svg DESTINATION share/pix >> > # translations >> > install(FILES ${NOMACS_QM} DESTINATION share/nomacs/translations) >> > # manpage >> > Index: pkg/PLIST >> > === >> > RCS file: /cvs/ports/graphics/nomacs/pkg/PLIST,v >> > retrieving revision 1.2 >> > diff -u -p -u -p -r1.2 PLIST >> > --- pkg/PLIST
Re: UPDATE: graphics/nomacs
On Mon Sep 12, 2016 at 04:30:45PM +0200, Antoine Jacoutot wrote: > On Mon, Sep 12, 2016 at 04:34:07PM +0300, Kirill Bychkov wrote: > > On Sun, September 11, 2016 23:04, Rafael Sadowski wrote: > > > On Thu Aug 18, 2016 at 10:36:08AM +0100, Stuart Henderson wrote: > > >> On 2016/08/17 21:55, Rafael Sadowski wrote: > > >> > > -V = 3.2.0 > > >> > > -DISTNAME = nomacs-${V}-source > > >> > > -PKGNAME = ${DISTNAME:S/-source//} > > >> > > +V = 3.4 > > >> > > +DISTNAME = nomacs-${V} > > >> > > >> No need to set DISTNAME here. > > >> > > >> > > + > > >> > > +GH_ACCOUNT =nomacs > > >> > > +GH_PROJECT =nomacs > > >> > > +GH_TAGNAME =${V} > > >> > > >> Might as well just set GH_TAGNAME = 3.4 rather than use indirection via > > >> ${V}. > > > > > > > > > Updateded diff with Stuart's improvements. > > > > > > OK now? Tested @amd64 with current (today) ports tree and kernel/userland. > > > > > > Kind regards, > > > > > > Rafael > > > > > > > > > Index: Makefile > > > === > > > RCS file: /cvs/ports/graphics/nomacs/Makefile,v > > > retrieving revision 1.3 > > > diff -u -p -u -p -r1.3 Makefile > > > --- Makefile 27 Jun 2016 05:25:40 - 1.3 > > > +++ Makefile 11 Sep 2016 19:55:34 - > > > @@ -2,9 +2,11 @@ > > > > > > COMMENT =small and fast Qt image viewer > > > > > > -V = 3.2.0 > > > -DISTNAME = nomacs-${V}-source > > > -PKGNAME =${DISTNAME:S/-source//} > > > +PKGNAME =nomacs-3.4 > > > > Hi! > > PKGNAME is not needed. It is the same as DISTNAME. Other than this it looks > > good to me. Any objections? > > Is DISTNAME even needed since we're using GH_* vars? > That's new for me. With diff below (without PKGNAME and DISTNAME): $ make show=DISTNAME nomacs-3.4 Index: Makefile === RCS file: /cvs/ports/graphics/nomacs/Makefile,v retrieving revision 1.3 diff -u -p -u -p -r1.3 Makefile --- Makefile27 Jun 2016 05:25:40 - 1.3 +++ Makefile12 Sep 2016 18:42:26 - @@ -2,9 +2,9 @@ COMMENT = small and fast Qt image viewer -V =3.2.0 -DISTNAME = nomacs-${V}-source -PKGNAME = ${DISTNAME:S/-source//} +GH_ACCOUNT = nomacs +GH_PROJECT = nomacs +GH_TAGNAME = 3.4 CATEGORIES = graphics @@ -12,13 +12,9 @@ HOMEPAGE = http://www.nomacs.org MAINTAINER = Rafael Sadowski-MASTER_SITES = https://github.com/nomacs/nomacs/releases/download/${V}/ - -EXTRACT_SUFX = .tar.bz2 - -SHARED_LIBS += nomacsCore0.0 # 3.2 -SHARED_LIBS += nomacsGui 0.0 # 3.2 -SHARED_LIBS += nomacsLoader 0.0 # 3.2 +SHARED_LIBS += nomacsCore0.0 # 3.3 +SHARED_LIBS += nomacsGui 0.0 # 3.3 +SHARED_LIBS += nomacsLoader 0.0 # 3.3 # GPLv3 PERMIT_PACKAGE_CDROM = Yes @@ -46,7 +42,7 @@ LIB_DEPENDS = archivers/quazip \ CONFIGURE_ARGS = -DUSE_SYSTEM_QUAZIP:Bool=ON \ -DDISABLE_QT_DEBUG:Bool=ON -WRKDIST = ${WRKDIR}/${PKGNAME} +WRKDIST = ${WRKDIR}/${PKGNAME}/ImageLounge NO_TEST = Yes Index: distinfo === RCS file: /cvs/ports/graphics/nomacs/distinfo,v retrieving revision 1.2 diff -u -p -u -p -r1.2 distinfo --- distinfo27 Jun 2016 05:25:40 - 1.2 +++ distinfo12 Sep 2016 18:42:26 - @@ -1,2 +1,2 @@ -SHA256 (nomacs-3.2.0-source.tar.bz2) = gkYvNmWbCwnvQWnZJ9CGEkTs+DeQugMYWiREQCeMSa0= -SIZE (nomacs-3.2.0-source.tar.bz2) = 1090076 +SHA256 (nomacs-3.4.tar.gz) = VS7aiK7epIgxzjVAleOq1HiStLUCn0JBcb7baCccKi8= +SIZE (nomacs-3.4.tar.gz) = 30026261 Index: patches/patch-cmake_UnixBuildTarget_cmake === RCS file: /cvs/ports/graphics/nomacs/patches/patch-cmake_UnixBuildTarget_cmake,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-cmake_UnixBuildTarget_cmake --- patches/patch-cmake_UnixBuildTarget_cmake 27 Jun 2016 05:25:40 - 1.2 +++ patches/patch-cmake_UnixBuildTarget_cmake 12 Sep 2016 18:42:26 - @@ -1,7 +1,7 @@ $OpenBSD: patch-cmake_UnixBuildTarget_cmake,v 1.2 2016/06/27 05:25:40 landry Exp $ cmake/UnixBuildTarget.cmake.orig Mon May 2 22:13:12 2016 -+++ cmake/UnixBuildTarget.cmakeMon May 2 22:15:52 2016 -@@ -93,7 +93,11 @@ install(FILES src/img/nomacs.svg DESTINATION share/pix +--- cmake/UnixBuildTarget.cmake.orig Fri Jul 22 13:43:37 2016 cmake/UnixBuildTarget.cmakeMon Jul 25 17:55:33 2016 +@@ -83,7 +83,11 @@ install(FILES src/img/nomacs.svg DESTINATION share/pix # translations install(FILES ${NOMACS_QM} DESTINATION
Re: UPDATE: graphics/nomacs
On Mon, Sep 12, 2016 at 04:34:07PM +0300, Kirill Bychkov wrote: > On Sun, September 11, 2016 23:04, Rafael Sadowski wrote: > > On Thu Aug 18, 2016 at 10:36:08AM +0100, Stuart Henderson wrote: > >> On 2016/08/17 21:55, Rafael Sadowski wrote: > >> > > -V = 3.2.0 > >> > > -DISTNAME =nomacs-${V}-source > >> > > -PKGNAME = ${DISTNAME:S/-source//} > >> > > +V = 3.4 > >> > > +DISTNAME =nomacs-${V} > >> > >> No need to set DISTNAME here. > >> > >> > > + > >> > > +GH_ACCOUNT = nomacs > >> > > +GH_PROJECT = nomacs > >> > > +GH_TAGNAME = ${V} > >> > >> Might as well just set GH_TAGNAME = 3.4 rather than use indirection via > >> ${V}. > > > > > > Updateded diff with Stuart's improvements. > > > > OK now? Tested @amd64 with current (today) ports tree and kernel/userland. > > > > Kind regards, > > > > Rafael > > > > > > Index: Makefile > > === > > RCS file: /cvs/ports/graphics/nomacs/Makefile,v > > retrieving revision 1.3 > > diff -u -p -u -p -r1.3 Makefile > > --- Makefile27 Jun 2016 05:25:40 - 1.3 > > +++ Makefile11 Sep 2016 19:55:34 - > > @@ -2,9 +2,11 @@ > > > > COMMENT = small and fast Qt image viewer > > > > -V =3.2.0 > > -DISTNAME = nomacs-${V}-source > > -PKGNAME = ${DISTNAME:S/-source//} > > +PKGNAME = nomacs-3.4 > > Hi! > PKGNAME is not needed. It is the same as DISTNAME. Other than this it looks > good to me. Any objections? Is DISTNAME even needed since we're using GH_* vars? > > > + > > +GH_ACCOUNT = nomacs > > +GH_PROJECT = nomacs > > +GH_TAGNAME = 3.4 > > > > CATEGORIES = graphics > > > > @@ -12,13 +14,9 @@ HOMEPAGE = http://www.nomacs.org > > > > MAINTAINER = Rafael Sadowski> > > > -MASTER_SITES = > > https://github.com/nomacs/nomacs/releases/download/${V}/ > > - > > -EXTRACT_SUFX = .tar.bz2 > > - > > -SHARED_LIBS += nomacsCore0.0 # 3.2 > > -SHARED_LIBS += nomacsGui 0.0 # 3.2 > > -SHARED_LIBS += nomacsLoader 0.0 # 3.2 > > +SHARED_LIBS += nomacsCore0.0 # 3.3 > > +SHARED_LIBS += nomacsGui 0.0 # 3.3 > > +SHARED_LIBS += nomacsLoader 0.0 # 3.3 > > > > # GPLv3 > > PERMIT_PACKAGE_CDROM = Yes > > @@ -46,7 +44,7 @@ LIB_DEPENDS = archivers/quazip \ > > CONFIGURE_ARGS = -DUSE_SYSTEM_QUAZIP:Bool=ON \ > > -DDISABLE_QT_DEBUG:Bool=ON > > > > -WRKDIST = ${WRKDIR}/${PKGNAME} > > +WRKDIST = ${WRKDIR}/${PKGNAME}/ImageLounge > > > > NO_TEST = Yes > > > > Index: distinfo > > === > > RCS file: /cvs/ports/graphics/nomacs/distinfo,v > > retrieving revision 1.2 > > diff -u -p -u -p -r1.2 distinfo > > --- distinfo27 Jun 2016 05:25:40 - 1.2 > > +++ distinfo11 Sep 2016 19:55:34 - > > @@ -1,2 +1,2 @@ > > -SHA256 (nomacs-3.2.0-source.tar.bz2) = > > gkYvNmWbCwnvQWnZJ9CGEkTs+DeQugMYWiREQCeMSa0= > > -SIZE (nomacs-3.2.0-source.tar.bz2) = 1090076 > > +SHA256 (nomacs-3.4.tar.gz) = VS7aiK7epIgxzjVAleOq1HiStLUCn0JBcb7baCccKi8= > > +SIZE (nomacs-3.4.tar.gz) = 30026261 > > Index: patches/patch-cmake_UnixBuildTarget_cmake > > === > > RCS file: > > /cvs/ports/graphics/nomacs/patches/patch-cmake_UnixBuildTarget_cmake,v > > retrieving revision 1.2 > > diff -u -p -u -p -r1.2 patch-cmake_UnixBuildTarget_cmake > > --- patches/patch-cmake_UnixBuildTarget_cmake 27 Jun 2016 05:25:40 > > - 1.2 > > +++ patches/patch-cmake_UnixBuildTarget_cmake 11 Sep 2016 19:55:34 > > - > > @@ -1,7 +1,7 @@ > > $OpenBSD: patch-cmake_UnixBuildTarget_cmake,v 1.2 2016/06/27 05:25:40 > > landry > > Exp $ > > cmake/UnixBuildTarget.cmake.orig Mon May 2 22:13:12 2016 > > -+++ cmake/UnixBuildTarget.cmakeMon May 2 22:15:52 2016 > > -@@ -93,7 +93,11 @@ install(FILES src/img/nomacs.svg DESTINATION share/pix > > +--- cmake/UnixBuildTarget.cmake.orig Fri Jul 22 13:43:37 2016 > > cmake/UnixBuildTarget.cmakeMon Jul 25 17:55:33 2016 > > +@@ -83,7 +83,11 @@ install(FILES src/img/nomacs.svg DESTINATION share/pix > > # translations > > install(FILES ${NOMACS_QM} DESTINATION share/nomacs/translations) > > # manpage > > Index: pkg/PLIST > > === > > RCS file: /cvs/ports/graphics/nomacs/pkg/PLIST,v > > retrieving revision 1.2 > > diff -u -p -u -p -r1.2 PLIST > > --- pkg/PLIST 27 Jun 2016 05:25:40 - 1.2 > > +++ pkg/PLIST 11 Sep 2016 19:55:34 - > > @@ -20,6 +20,7 @@ share/nomacs/translations/nomacs_fr.qm > > share/nomacs/translations/nomacs_hr.qm > >
Re: UPDATE: graphics/nomacs
On Sun, September 11, 2016 23:04, Rafael Sadowski wrote: > On Thu Aug 18, 2016 at 10:36:08AM +0100, Stuart Henderson wrote: >> On 2016/08/17 21:55, Rafael Sadowski wrote: >> > > -V = 3.2.0 >> > > -DISTNAME = nomacs-${V}-source >> > > -PKGNAME = ${DISTNAME:S/-source//} >> > > +V = 3.4 >> > > +DISTNAME = nomacs-${V} >> >> No need to set DISTNAME here. >> >> > > + >> > > +GH_ACCOUNT =nomacs >> > > +GH_PROJECT =nomacs >> > > +GH_TAGNAME =${V} >> >> Might as well just set GH_TAGNAME = 3.4 rather than use indirection via >> ${V}. > > > Updateded diff with Stuart's improvements. > > OK now? Tested @amd64 with current (today) ports tree and kernel/userland. > > Kind regards, > > Rafael > > > Index: Makefile > === > RCS file: /cvs/ports/graphics/nomacs/Makefile,v > retrieving revision 1.3 > diff -u -p -u -p -r1.3 Makefile > --- Makefile 27 Jun 2016 05:25:40 - 1.3 > +++ Makefile 11 Sep 2016 19:55:34 - > @@ -2,9 +2,11 @@ > > COMMENT =small and fast Qt image viewer > > -V = 3.2.0 > -DISTNAME = nomacs-${V}-source > -PKGNAME =${DISTNAME:S/-source//} > +PKGNAME =nomacs-3.4 Hi! PKGNAME is not needed. It is the same as DISTNAME. Other than this it looks good to me. Any objections? > + > +GH_ACCOUNT = nomacs > +GH_PROJECT = nomacs > +GH_TAGNAME = 3.4 > > CATEGORIES = graphics > > @@ -12,13 +14,9 @@ HOMEPAGE = http://www.nomacs.org > > MAINTAINER = Rafael Sadowski> > -MASTER_SITES = > https://github.com/nomacs/nomacs/releases/download/${V}/ > - > -EXTRACT_SUFX = .tar.bz2 > - > -SHARED_LIBS += nomacsCore0.0 # 3.2 > -SHARED_LIBS += nomacsGui 0.0 # 3.2 > -SHARED_LIBS += nomacsLoader 0.0 # 3.2 > +SHARED_LIBS += nomacsCore0.0 # 3.3 > +SHARED_LIBS += nomacsGui 0.0 # 3.3 > +SHARED_LIBS += nomacsLoader 0.0 # 3.3 > > # GPLv3 > PERMIT_PACKAGE_CDROM = Yes > @@ -46,7 +44,7 @@ LIB_DEPENDS = archivers/quazip \ > CONFIGURE_ARGS = -DUSE_SYSTEM_QUAZIP:Bool=ON \ > -DDISABLE_QT_DEBUG:Bool=ON > > -WRKDIST =${WRKDIR}/${PKGNAME} > +WRKDIST =${WRKDIR}/${PKGNAME}/ImageLounge > > NO_TEST =Yes > > Index: distinfo > === > RCS file: /cvs/ports/graphics/nomacs/distinfo,v > retrieving revision 1.2 > diff -u -p -u -p -r1.2 distinfo > --- distinfo 27 Jun 2016 05:25:40 - 1.2 > +++ distinfo 11 Sep 2016 19:55:34 - > @@ -1,2 +1,2 @@ > -SHA256 (nomacs-3.2.0-source.tar.bz2) = > gkYvNmWbCwnvQWnZJ9CGEkTs+DeQugMYWiREQCeMSa0= > -SIZE (nomacs-3.2.0-source.tar.bz2) = 1090076 > +SHA256 (nomacs-3.4.tar.gz) = VS7aiK7epIgxzjVAleOq1HiStLUCn0JBcb7baCccKi8= > +SIZE (nomacs-3.4.tar.gz) = 30026261 > Index: patches/patch-cmake_UnixBuildTarget_cmake > === > RCS file: > /cvs/ports/graphics/nomacs/patches/patch-cmake_UnixBuildTarget_cmake,v > retrieving revision 1.2 > diff -u -p -u -p -r1.2 patch-cmake_UnixBuildTarget_cmake > --- patches/patch-cmake_UnixBuildTarget_cmake 27 Jun 2016 05:25:40 - > 1.2 > +++ patches/patch-cmake_UnixBuildTarget_cmake 11 Sep 2016 19:55:34 - > @@ -1,7 +1,7 @@ > $OpenBSD: patch-cmake_UnixBuildTarget_cmake,v 1.2 2016/06/27 05:25:40 landry > Exp $ > cmake/UnixBuildTarget.cmake.orig Mon May 2 22:13:12 2016 > -+++ cmake/UnixBuildTarget.cmake Mon May 2 22:15:52 2016 > -@@ -93,7 +93,11 @@ install(FILES src/img/nomacs.svg DESTINATION share/pix > +--- cmake/UnixBuildTarget.cmake.orig Fri Jul 22 13:43:37 2016 > cmake/UnixBuildTarget.cmake Mon Jul 25 17:55:33 2016 > +@@ -83,7 +83,11 @@ install(FILES src/img/nomacs.svg DESTINATION share/pix > # translations > install(FILES ${NOMACS_QM} DESTINATION share/nomacs/translations) > # manpage > Index: pkg/PLIST > === > RCS file: /cvs/ports/graphics/nomacs/pkg/PLIST,v > retrieving revision 1.2 > diff -u -p -u -p -r1.2 PLIST > --- pkg/PLIST 27 Jun 2016 05:25:40 - 1.2 > +++ pkg/PLIST 11 Sep 2016 19:55:34 - > @@ -20,6 +20,7 @@ share/nomacs/translations/nomacs_fr.qm > share/nomacs/translations/nomacs_hr.qm > share/nomacs/translations/nomacs_it.qm > share/nomacs/translations/nomacs_ja.qm > +share/nomacs/translations/nomacs_ko.qm > share/nomacs/translations/nomacs_nl.qm > share/nomacs/translations/nomacs_pl.qm > share/nomacs/translations/nomacs_pt.qm > >
Re: UPDATE: graphics/nomacs
On Thu Aug 18, 2016 at 10:36:08AM +0100, Stuart Henderson wrote: > On 2016/08/17 21:55, Rafael Sadowski wrote: > > > -V = 3.2.0 > > > -DISTNAME = nomacs-${V}-source > > > -PKGNAME =${DISTNAME:S/-source//} > > > +V = 3.4 > > > +DISTNAME = nomacs-${V} > > No need to set DISTNAME here. > > > > + > > > +GH_ACCOUNT = nomacs > > > +GH_PROJECT = nomacs > > > +GH_TAGNAME = ${V} > > Might as well just set GH_TAGNAME = 3.4 rather than use indirection via ${V}. Updateded diff with Stuart's improvements. OK now? Tested @amd64 with current (today) ports tree and kernel/userland. Kind regards, Rafael Index: Makefile === RCS file: /cvs/ports/graphics/nomacs/Makefile,v retrieving revision 1.3 diff -u -p -u -p -r1.3 Makefile --- Makefile27 Jun 2016 05:25:40 - 1.3 +++ Makefile11 Sep 2016 19:55:34 - @@ -2,9 +2,11 @@ COMMENT = small and fast Qt image viewer -V =3.2.0 -DISTNAME = nomacs-${V}-source -PKGNAME = ${DISTNAME:S/-source//} +PKGNAME = nomacs-3.4 + +GH_ACCOUNT = nomacs +GH_PROJECT = nomacs +GH_TAGNAME = 3.4 CATEGORIES = graphics @@ -12,13 +14,9 @@ HOMEPAGE = http://www.nomacs.org MAINTAINER = Rafael Sadowski-MASTER_SITES = https://github.com/nomacs/nomacs/releases/download/${V}/ - -EXTRACT_SUFX = .tar.bz2 - -SHARED_LIBS += nomacsCore0.0 # 3.2 -SHARED_LIBS += nomacsGui 0.0 # 3.2 -SHARED_LIBS += nomacsLoader 0.0 # 3.2 +SHARED_LIBS += nomacsCore0.0 # 3.3 +SHARED_LIBS += nomacsGui 0.0 # 3.3 +SHARED_LIBS += nomacsLoader 0.0 # 3.3 # GPLv3 PERMIT_PACKAGE_CDROM = Yes @@ -46,7 +44,7 @@ LIB_DEPENDS = archivers/quazip \ CONFIGURE_ARGS = -DUSE_SYSTEM_QUAZIP:Bool=ON \ -DDISABLE_QT_DEBUG:Bool=ON -WRKDIST = ${WRKDIR}/${PKGNAME} +WRKDIST = ${WRKDIR}/${PKGNAME}/ImageLounge NO_TEST = Yes Index: distinfo === RCS file: /cvs/ports/graphics/nomacs/distinfo,v retrieving revision 1.2 diff -u -p -u -p -r1.2 distinfo --- distinfo27 Jun 2016 05:25:40 - 1.2 +++ distinfo11 Sep 2016 19:55:34 - @@ -1,2 +1,2 @@ -SHA256 (nomacs-3.2.0-source.tar.bz2) = gkYvNmWbCwnvQWnZJ9CGEkTs+DeQugMYWiREQCeMSa0= -SIZE (nomacs-3.2.0-source.tar.bz2) = 1090076 +SHA256 (nomacs-3.4.tar.gz) = VS7aiK7epIgxzjVAleOq1HiStLUCn0JBcb7baCccKi8= +SIZE (nomacs-3.4.tar.gz) = 30026261 Index: patches/patch-cmake_UnixBuildTarget_cmake === RCS file: /cvs/ports/graphics/nomacs/patches/patch-cmake_UnixBuildTarget_cmake,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-cmake_UnixBuildTarget_cmake --- patches/patch-cmake_UnixBuildTarget_cmake 27 Jun 2016 05:25:40 - 1.2 +++ patches/patch-cmake_UnixBuildTarget_cmake 11 Sep 2016 19:55:34 - @@ -1,7 +1,7 @@ $OpenBSD: patch-cmake_UnixBuildTarget_cmake,v 1.2 2016/06/27 05:25:40 landry Exp $ cmake/UnixBuildTarget.cmake.orig Mon May 2 22:13:12 2016 -+++ cmake/UnixBuildTarget.cmakeMon May 2 22:15:52 2016 -@@ -93,7 +93,11 @@ install(FILES src/img/nomacs.svg DESTINATION share/pix +--- cmake/UnixBuildTarget.cmake.orig Fri Jul 22 13:43:37 2016 cmake/UnixBuildTarget.cmakeMon Jul 25 17:55:33 2016 +@@ -83,7 +83,11 @@ install(FILES src/img/nomacs.svg DESTINATION share/pix # translations install(FILES ${NOMACS_QM} DESTINATION share/nomacs/translations) # manpage Index: pkg/PLIST === RCS file: /cvs/ports/graphics/nomacs/pkg/PLIST,v retrieving revision 1.2 diff -u -p -u -p -r1.2 PLIST --- pkg/PLIST 27 Jun 2016 05:25:40 - 1.2 +++ pkg/PLIST 11 Sep 2016 19:55:34 - @@ -20,6 +20,7 @@ share/nomacs/translations/nomacs_fr.qm share/nomacs/translations/nomacs_hr.qm share/nomacs/translations/nomacs_it.qm share/nomacs/translations/nomacs_ja.qm +share/nomacs/translations/nomacs_ko.qm share/nomacs/translations/nomacs_nl.qm share/nomacs/translations/nomacs_pl.qm share/nomacs/translations/nomacs_pt.qm
Re: UPDATE: graphics/nomacs
On 2016/08/17 21:55, Rafael Sadowski wrote: > > -V =3.2.0 > > -DISTNAME = nomacs-${V}-source > > -PKGNAME = ${DISTNAME:S/-source//} > > +V =3.4 > > +DISTNAME = nomacs-${V} No need to set DISTNAME here. > > + > > +GH_ACCOUNT = nomacs > > +GH_PROJECT = nomacs > > +GH_TAGNAME = ${V} Might as well just set GH_TAGNAME = 3.4 rather than use indirection via ${V}.
Re: UPDATE: graphics/nomacs
Anyone? On Sat Jul 30, 2016 at 04:33:38PM +0200, Rafael Sadowski wrote: > Hi @ports, > > looks like ports are unlock. Here is an update for nomacs. Tested @amd64 > > OK, Comments!? > > Kind regards, > > Rafael > > Index: Makefile > === > RCS file: /cvs/ports/graphics/nomacs/Makefile,v > retrieving revision 1.3 > diff -u -p -u -p -r1.3 Makefile > --- Makefile 27 Jun 2016 05:25:40 - 1.3 > +++ Makefile 30 Jul 2016 14:30:45 - > @@ -2,9 +2,12 @@ > > COMMENT =small and fast Qt image viewer > > -V = 3.2.0 > -DISTNAME = nomacs-${V}-source > -PKGNAME =${DISTNAME:S/-source//} > +V = 3.4 > +DISTNAME = nomacs-${V} > + > +GH_ACCOUNT = nomacs > +GH_PROJECT = nomacs > +GH_TAGNAME = ${V} > > CATEGORIES = graphics > > @@ -12,13 +15,9 @@ HOMEPAGE = http://www.nomacs.org > > MAINTAINER = Rafael Sadowski> > -MASTER_SITES = > https://github.com/nomacs/nomacs/releases/download/${V}/ > - > -EXTRACT_SUFX = .tar.bz2 > - > -SHARED_LIBS += nomacsCore0.0 # 3.2 > -SHARED_LIBS += nomacsGui 0.0 # 3.2 > -SHARED_LIBS += nomacsLoader 0.0 # 3.2 > +SHARED_LIBS += nomacsCore0.0 # 3.3 > +SHARED_LIBS += nomacsGui 0.0 # 3.3 > +SHARED_LIBS += nomacsLoader 0.0 # 3.3 > > # GPLv3 > PERMIT_PACKAGE_CDROM = Yes > @@ -46,7 +45,7 @@ LIB_DEPENDS = archivers/quazip \ > CONFIGURE_ARGS = -DUSE_SYSTEM_QUAZIP:Bool=ON \ > -DDISABLE_QT_DEBUG:Bool=ON > > -WRKDIST =${WRKDIR}/${PKGNAME} > +WRKDIST =${WRKDIR}/${PKGNAME}/ImageLounge > > NO_TEST =Yes > > Index: distinfo > === > RCS file: /cvs/ports/graphics/nomacs/distinfo,v > retrieving revision 1.2 > diff -u -p -u -p -r1.2 distinfo > --- distinfo 27 Jun 2016 05:25:40 - 1.2 > +++ distinfo 30 Jul 2016 14:30:45 - > @@ -1,2 +1,2 @@ > -SHA256 (nomacs-3.2.0-source.tar.bz2) = > gkYvNmWbCwnvQWnZJ9CGEkTs+DeQugMYWiREQCeMSa0= > -SIZE (nomacs-3.2.0-source.tar.bz2) = 1090076 > +SHA256 (nomacs-3.4.tar.gz) = VS7aiK7epIgxzjVAleOq1HiStLUCn0JBcb7baCccKi8= > +SIZE (nomacs-3.4.tar.gz) = 30026261 > Index: patches/patch-cmake_UnixBuildTarget_cmake > === > RCS file: > /cvs/ports/graphics/nomacs/patches/patch-cmake_UnixBuildTarget_cmake,v > retrieving revision 1.2 > diff -u -p -u -p -r1.2 patch-cmake_UnixBuildTarget_cmake > --- patches/patch-cmake_UnixBuildTarget_cmake 27 Jun 2016 05:25:40 - > 1.2 > +++ patches/patch-cmake_UnixBuildTarget_cmake 30 Jul 2016 14:30:45 - > @@ -1,7 +1,7 @@ > $OpenBSD: patch-cmake_UnixBuildTarget_cmake,v 1.2 2016/06/27 05:25:40 landry > Exp $ > cmake/UnixBuildTarget.cmake.orig Mon May 2 22:13:12 2016 > -+++ cmake/UnixBuildTarget.cmake Mon May 2 22:15:52 2016 > -@@ -93,7 +93,11 @@ install(FILES src/img/nomacs.svg DESTINATION share/pix > +--- cmake/UnixBuildTarget.cmake.orig Fri Jul 22 13:43:37 2016 > cmake/UnixBuildTarget.cmake Mon Jul 25 17:55:33 2016 > +@@ -83,7 +83,11 @@ install(FILES src/img/nomacs.svg DESTINATION share/pix > # translations > install(FILES ${NOMACS_QM} DESTINATION share/nomacs/translations) > # manpage > Index: pkg/PLIST > === > RCS file: /cvs/ports/graphics/nomacs/pkg/PLIST,v > retrieving revision 1.2 > diff -u -p -u -p -r1.2 PLIST > --- pkg/PLIST 27 Jun 2016 05:25:40 - 1.2 > +++ pkg/PLIST 30 Jul 2016 14:30:45 - > @@ -20,6 +20,7 @@ share/nomacs/translations/nomacs_fr.qm > share/nomacs/translations/nomacs_hr.qm > share/nomacs/translations/nomacs_it.qm > share/nomacs/translations/nomacs_ja.qm > +share/nomacs/translations/nomacs_ko.qm > share/nomacs/translations/nomacs_nl.qm > share/nomacs/translations/nomacs_pl.qm > share/nomacs/translations/nomacs_pt.qm
UPDATE: graphics/nomacs
Hi @ports, looks like ports are unlock. Here is an update for nomacs. Tested @amd64 OK, Comments!? Kind regards, Rafael Index: Makefile === RCS file: /cvs/ports/graphics/nomacs/Makefile,v retrieving revision 1.3 diff -u -p -u -p -r1.3 Makefile --- Makefile27 Jun 2016 05:25:40 - 1.3 +++ Makefile30 Jul 2016 14:30:45 - @@ -2,9 +2,12 @@ COMMENT = small and fast Qt image viewer -V =3.2.0 -DISTNAME = nomacs-${V}-source -PKGNAME = ${DISTNAME:S/-source//} +V =3.4 +DISTNAME = nomacs-${V} + +GH_ACCOUNT = nomacs +GH_PROJECT = nomacs +GH_TAGNAME = ${V} CATEGORIES = graphics @@ -12,13 +15,9 @@ HOMEPAGE = http://www.nomacs.org MAINTAINER = Rafael Sadowski-MASTER_SITES = https://github.com/nomacs/nomacs/releases/download/${V}/ - -EXTRACT_SUFX = .tar.bz2 - -SHARED_LIBS += nomacsCore0.0 # 3.2 -SHARED_LIBS += nomacsGui 0.0 # 3.2 -SHARED_LIBS += nomacsLoader 0.0 # 3.2 +SHARED_LIBS += nomacsCore0.0 # 3.3 +SHARED_LIBS += nomacsGui 0.0 # 3.3 +SHARED_LIBS += nomacsLoader 0.0 # 3.3 # GPLv3 PERMIT_PACKAGE_CDROM = Yes @@ -46,7 +45,7 @@ LIB_DEPENDS = archivers/quazip \ CONFIGURE_ARGS = -DUSE_SYSTEM_QUAZIP:Bool=ON \ -DDISABLE_QT_DEBUG:Bool=ON -WRKDIST = ${WRKDIR}/${PKGNAME} +WRKDIST = ${WRKDIR}/${PKGNAME}/ImageLounge NO_TEST = Yes Index: distinfo === RCS file: /cvs/ports/graphics/nomacs/distinfo,v retrieving revision 1.2 diff -u -p -u -p -r1.2 distinfo --- distinfo27 Jun 2016 05:25:40 - 1.2 +++ distinfo30 Jul 2016 14:30:45 - @@ -1,2 +1,2 @@ -SHA256 (nomacs-3.2.0-source.tar.bz2) = gkYvNmWbCwnvQWnZJ9CGEkTs+DeQugMYWiREQCeMSa0= -SIZE (nomacs-3.2.0-source.tar.bz2) = 1090076 +SHA256 (nomacs-3.4.tar.gz) = VS7aiK7epIgxzjVAleOq1HiStLUCn0JBcb7baCccKi8= +SIZE (nomacs-3.4.tar.gz) = 30026261 Index: patches/patch-cmake_UnixBuildTarget_cmake === RCS file: /cvs/ports/graphics/nomacs/patches/patch-cmake_UnixBuildTarget_cmake,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-cmake_UnixBuildTarget_cmake --- patches/patch-cmake_UnixBuildTarget_cmake 27 Jun 2016 05:25:40 - 1.2 +++ patches/patch-cmake_UnixBuildTarget_cmake 30 Jul 2016 14:30:45 - @@ -1,7 +1,7 @@ $OpenBSD: patch-cmake_UnixBuildTarget_cmake,v 1.2 2016/06/27 05:25:40 landry Exp $ cmake/UnixBuildTarget.cmake.orig Mon May 2 22:13:12 2016 -+++ cmake/UnixBuildTarget.cmakeMon May 2 22:15:52 2016 -@@ -93,7 +93,11 @@ install(FILES src/img/nomacs.svg DESTINATION share/pix +--- cmake/UnixBuildTarget.cmake.orig Fri Jul 22 13:43:37 2016 cmake/UnixBuildTarget.cmakeMon Jul 25 17:55:33 2016 +@@ -83,7 +83,11 @@ install(FILES src/img/nomacs.svg DESTINATION share/pix # translations install(FILES ${NOMACS_QM} DESTINATION share/nomacs/translations) # manpage Index: pkg/PLIST === RCS file: /cvs/ports/graphics/nomacs/pkg/PLIST,v retrieving revision 1.2 diff -u -p -u -p -r1.2 PLIST --- pkg/PLIST 27 Jun 2016 05:25:40 - 1.2 +++ pkg/PLIST 30 Jul 2016 14:30:45 - @@ -20,6 +20,7 @@ share/nomacs/translations/nomacs_fr.qm share/nomacs/translations/nomacs_hr.qm share/nomacs/translations/nomacs_it.qm share/nomacs/translations/nomacs_ja.qm +share/nomacs/translations/nomacs_ko.qm share/nomacs/translations/nomacs_nl.qm share/nomacs/translations/nomacs_pl.qm share/nomacs/translations/nomacs_pt.qm
UPDATE: graphics/nomacs
Hi ports@, here's an update to nomacs 3.2.0. Tested on amd64 over weeks without problems. Comments ? OK ? Best regards, Rafael Index: Makefile === RCS file: /cvs/ports/graphics/nomacs/Makefile,v retrieving revision 1.2 diff -u -p -u -p -r1.2 Makefile --- Makefile18 Mar 2016 23:12:17 - 1.2 +++ Makefile26 Jun 2016 11:47:43 - @@ -2,8 +2,9 @@ COMMENT = small and fast Qt image viewer -V =3.0.0 -DISTNAME = nomacs-${V} +V =3.2.0 +DISTNAME = nomacs-${V}-source +PKGNAME = ${DISTNAME:S/-source//} CATEGORIES = graphics @@ -11,16 +12,20 @@ HOMEPAGE = http://www.nomacs.org MAINTAINER = Rafael Sadowski-GH_ACCOUNT = nomacs -GH_PROJECT = nomacs -GH_COMMIT =5821af531ea267822791b69eb18196dcbcf9cc2e +MASTER_SITES = https://github.com/nomacs/nomacs/releases/download/${V}/ + +EXTRACT_SUFX = .tar.bz2 + +SHARED_LIBS += nomacsCore0.0 # 3.2 +SHARED_LIBS += nomacsGui 0.0 # 3.2 +SHARED_LIBS += nomacsLoader 0.0 # 3.2 # GPLv3 PERMIT_PACKAGE_CDROM = Yes WANTLIB += Qt5Concurrent Qt5Core Qt5Gui Qt5Network Qt5PrintSupport WANTLIB += Qt5Svg Qt5Widgets c exiv2 lcms2 m opencv_core opencv_imgproc -WANTLIB += pthread raw tiff webp quazip +WANTLIB += pthread raw tiff quazip MODULES = devel/cmake \ x11/qt5 \ @@ -38,11 +43,10 @@ LIB_DEPENDS = archivers/quazip \ graphics/opencv \ graphics/tiff -CONFIGURE_ARGS = -DUSE_SYSTEM_WEBP:Bool=ON \ - -DUSE_SYSTEM_QUAZIP:Bool=ON \ +CONFIGURE_ARGS = -DUSE_SYSTEM_QUAZIP:Bool=ON \ -DDISABLE_QT_DEBUG:Bool=ON -WRKDIST = ${WRKDIR}/nomacs-${GH_COMMIT}/ImageLounge +WRKDIST = ${WRKDIR}/${PKGNAME} NO_TEST = Yes Index: distinfo === RCS file: /cvs/ports/graphics/nomacs/distinfo,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 distinfo --- distinfo24 Jan 2016 10:06:15 - 1.1.1.1 +++ distinfo26 Jun 2016 11:47:43 - @@ -1,2 +1,2 @@ -SHA256 (nomacs-3.0.0.tar.gz) = VKL0xouTAF38eK8AxSrrD+RChe7UPHwfmAp7Ury/ofs= -SIZE (nomacs-3.0.0.tar.gz) = 30355245 +SHA256 (nomacs-3.2.0-source.tar.bz2) = gkYvNmWbCwnvQWnZJ9CGEkTs+DeQugMYWiREQCeMSa0= +SIZE (nomacs-3.2.0-source.tar.bz2) = 1090076 Index: patches/patch-cmake_UnixBuildTarget_cmake === RCS file: /cvs/ports/graphics/nomacs/patches/patch-cmake_UnixBuildTarget_cmake,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-cmake_UnixBuildTarget_cmake --- patches/patch-cmake_UnixBuildTarget_cmake 24 Jan 2016 10:06:15 - 1.1.1.1 +++ patches/patch-cmake_UnixBuildTarget_cmake 26 Jun 2016 11:47:43 - @@ -1,25 +1,16 @@ $OpenBSD: patch-cmake_UnixBuildTarget_cmake,v 1.1.1.1 2016/01/24 10:06:15 landry Exp $ cmake/UnixBuildTarget.cmake.orig Thu Dec 17 10:57:09 2015 -+++ cmake/UnixBuildTarget.cmakeTue Jan 19 20:29:11 2016 -@@ -93,7 +93,7 @@ else() - - add_library(${DLL_NAME} SHARED ${NOMACS_SOURCES} ${NOMACS_UI} ${NOMACS_HEADERS} ${NOMACS_RC} ${LIBQPSD_SOURCES} ${LIBQPSD_HEADERS} ${WEBP_SOURCE} ${QUAZIP_SOURCES} ${NOMACS_RESOURCES} ${NOMACS_RCC}) - target_include_directories(${DLL_NAME} PRIVATE ${OpenCV_INCLUDE_DIRS}) -- target_link_libraries(${DLL_NAME} ${QT_LIBRARIES} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBRARIES} ${VERSION_LIB} ${TIFF_LIBRARIES} ${HUPNP_LIBS} ${HUPNPAV_LIBS} ${WEBP_LIBRARIES} ${WEBP_STATIC_LIBRARIES}) -+ target_link_libraries(${DLL_NAME} ${QT_LIBRARIES} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBRARIES} ${VERSION_LIB} ${TIFF_LIBRARIES} ${HUPNP_LIBS} ${HUPNPAV_LIBS} ${QUAZIP_LIBRARIES} ${WEBP_LIBRARIES} ${WEBP_STATIC_LIBRARIES}) - add_dependencies(${BINARY_NAME} ${DLL_NAME}) - set_target_properties(${DLL_NAME} PROPERTIES PREFIX "") - -@@ -118,7 +118,11 @@ else() - # translations - install(FILES ${NOMACS_QM} DESTINATION share/nomacs/translations) - # manpage -- install(FILES Readme/nomacs.1 DESTINATION share/man/man1) -+ if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") -+ install(FILES Readme/nomacs.1 DESTINATION man/man1) -+ else() -+ install(FILES Readme/nomacs.1 DESTINATION share/man/man1) -+ endif() - # appdata - install(FILES nomacs.appdata.xml DESTINATION /usr/share/appdata/) +--- cmake/UnixBuildTarget.cmake.orig Mon May 2 22:13:12 2016 cmake/UnixBuildTarget.cmakeMon May 2 22:15:52 2016 +@@ -93,7 +93,11 @@ install(FILES src/img/nomacs.svg DESTINATION share/pix + # translations + install(FILES ${NOMACS_QM} DESTINATION