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 -0000 1.3
> > > +++ Makefile 11 Sep 2016 19:55:34 -0000
> > > @@ -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
--- Makefile 27 Jun 2016 05:25:40 -0000 1.3
+++ Makefile 12 Sep 2016 18:42:26 -0000
@@ -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 <raf...@sizeofvoid.org>
-MASTER_SITES = https://github.com/nomacs/nomacs/releases/download/${V}/
-
-EXTRACT_SUFX = .tar.bz2
-
-SHARED_LIBS += nomacsCore 0.0 # 3.2
-SHARED_LIBS += nomacsGui 0.0 # 3.2
-SHARED_LIBS += nomacsLoader 0.0 # 3.2
+SHARED_LIBS += nomacsCore 0.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
--- distinfo 27 Jun 2016 05:25:40 -0000 1.2
+++ distinfo 12 Sep 2016 18:42:26 -0000
@@ -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 -0000
1.2
+++ patches/patch-cmake_UnixBuildTarget_cmake 12 Sep 2016 18:42:26 -0000
@@ -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 -0000 1.2
+++ pkg/PLIST 12 Sep 2016 18:42:26 -0000
@@ -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
