Bug 177733

Summary: [maintainer update] graphics/nomacs update to version 1.0.2
Product: Ports & Packages Reporter: Jens K. Loewe <bsd>
Component: Individual Port(s)Assignee: Alex Kozlov <ak>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff
none
patch2.txt none

Description Jens K. Loewe 2013-04-09 15:30:00 UTC 
There is a new version of nomacs available. Existing port is 1.0.0, new one is 1.0.2. This version is (internally) called 1.0.2.1, marking a repackaging of 1.0.2 due to a charset issue.

Fix: Update attached.

Patch attached with submission follows:
How-To-Repeat: -
Comment 1 Jens K. Loewe 2013-04-09 15:32:16 UTC 
Uhm, sorry, forgot a dependency.

Fixed patch:

-----------------------------------------------------

diff -ruN alt/Makefile neu/Makefile
--- alt/Makefile        2013-03-01 21:11:05.000000000 +0100
+++ neu/Makefile        2013-04-09 16:27:04.000000000 +0200
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=      nomacs
-PORTVERSION=   1.0.0
+PORTVERSION=   1.0.2
 CATEGORIES=    graphics
 MASTER_SITES=  SF/nomacs/nomacs-${PORTVERSION}/
-DISTNAME=      ${PORTNAME}-${PORTVERSION}
+DISTNAME=      ${PORTNAME}-${PORTVERSION}.1
 
 MAINTAINER=    bsd@tuxproject.de
 COMMENT=       Small, fast and free image viewer
@@ -12,7 +12,8 @@
 LICENSE=       GPLv3
 
 LIB_DEPENDS=   exiv2:${PORTSDIR}/graphics/exiv2 \
-               sysinfo:${PORTSDIR}/devel/libsysinfo
+               sysinfo:${PORTSDIR}/devel/libsysinfo \
+               raw:${PORTSDIR}/graphics/libraw
 
 USE_BZIP2=     yes
 USE_CMAKE=     yes
@@ -20,8 +21,7 @@
                qmake_build rcc_build uic_build
 LDFLAGS+=      -lsysinfo -lkvm
 WRKTOP=                ${WRKDIR}
-WRKSUBDIR=     ${PORTNAME}-${PORTVERSION}
+WRKSUBDIR=     ${DISTNAME}
 WRKSRC=                ${WRKTOP}/${WRKSUBDIR}
-CMAKE_ARGS+=    -DENABLE_RAW=0
 
 .include <bsd.port.mk>
diff -ruN alt/distinfo neu/distinfo
--- alt/distinfo        2013-03-01 20:10:21.000000000 +0100
+++ neu/distinfo        2013-04-09 16:12:21.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (nomacs-1.0.0.tar.bz2) = bf2a0a9ecb35551dc8ed25c0db95c1183b3771a2ce9e2a41d7e1d230bac2c5f2
-SIZE (nomacs-1.0.0.tar.bz2) = 803404
+SHA256 (nomacs-1.0.2.1.tar.bz2) = 25617b2cab8ed6fe75b4ff5ec0b39c3128d55ec68d4f7fe7eace2fdbad874755
+SIZE (nomacs-1.0.2.1.tar.bz2) = 808068
Comment 2 Pawel Pekala freebsd_committer freebsd_triage 2013-05-02 13:11:42 UTC 
State Changed
From-To: open->feedback

Followup patch seems to be missing, can you resend as a attachment 
please?
Comment 3 Jens K. Loewe 2013-05-02 19:30:19 UTC 
Updated patch with newly added "RAW" option:



    diff -ruN alt/Makefile neu-with-options/Makefile
    --- alt/Makefile        2013-03-01 21:11:05.000000000 +0100
    +++ neu-with-options/Makefile   2013-05-02 20:27:25.000000000 +0200
    @@ -1,10 +1,10 @@
     # $FreeBSD$
     
     PORTNAME=      nomacs
    -PORTVERSION=   1.0.0
    +PORTVERSION=   1.0.2
     CATEGORIES=    graphics
     MASTER_SITES=  SF/nomacs/nomacs-${PORTVERSION}/
    -DISTNAME=      ${PORTNAME}-${PORTVERSION}
    +DISTNAME=      ${PORTNAME}-${PORTVERSION}.1
     
     MAINTAINER=    bsd@tuxproject.de
     COMMENT=       Small, fast and free image viewer
    @@ -14,14 +14,25 @@
     LIB_DEPENDS=   exiv2:${PORTSDIR}/graphics/exiv2 \
                    sysinfo:${PORTSDIR}/devel/libsysinfo
     
    +OPTIONS_DEFINE= RAW
    +OPTIONS_DEFAULT= ${OPTIONS_DEFINE}
    +RAW_DESC=       Enable RAW support
    +
     USE_BZIP2=     yes
     USE_CMAKE=     yes
     USE_QT4=       gui network linguist_build moc_build \
                    qmake_build rcc_build uic_build
     LDFLAGS+=      -lsysinfo -lkvm
     WRKTOP=                ${WRKDIR}
    -WRKSUBDIR=     ${PORTNAME}-${PORTVERSION}
    +WRKSUBDIR=     ${DISTNAME}
     WRKSRC=                ${WRKTOP}/${WRKSUBDIR}
    -CMAKE_ARGS+=    -DENABLE_RAW=0
    +
    +.include <bsd.port.options.mk>
    +
    +.if ${PORT_OPTIONS:MRAW}
    +LIB_DEPENDS+=raw:${PORTSDIR}/graphics/libraw
    +.else
    +CMAKE_ARGS+=-DENABLE_RAW=0
    +.endif
     
     .include <bsd.port.mk>
    diff -ruN alt/distinfo neu-with-options/distinfo
    --- alt/distinfo        2013-03-01 20:10:21.000000000 +0100
    +++ neu-with-options/distinfo   2013-05-02 20:10:18.000000000 +0200
    @@ -1,2 +1,2 @@
    -SHA256 (nomacs-1.0.0.tar.bz2) = bf2a0a9ecb35551dc8ed25c0db95c1183b3771a2ce9e2a41d7e1d230bac2c5f2
    -SIZE (nomacs-1.0.0.tar.bz2) = 803404
    +SHA256 (nomacs-1.0.2.1.tar.bz2) = 25617b2cab8ed6fe75b4ff5ec0b39c3128d55ec68d4f7fe7eace2fdbad874755
    +SIZE (nomacs-1.0.2.1.tar.bz2) = 808068
Comment 4 Alex Kozlov 2013-06-27 02:47:44 UTC 
Hi, Jens

The RAW option also requires graphics/opencv dependency:

-- checking for module 'opencv>=2.1.0'
--   package 'opencv>=2.1.0' not found
CMake Error at CMakeLists.txt:169 (find_package):
  By not providing "FindOpenCV.cmake" in CMAKE_MODULE_PATH this project has
  asked CMake to find a package configuration file provided by "OpenCV", but
  CMake did not find one.


-- 
Alex
Comment 5 Jens K. Loewe 2013-06-27 23:57:19 UTC 
Well, yes, you're right.
(Also, meanwhile they updated to nomacs 1.2.0.)

Not sure whether to submit a new PR or not. Well, I just updated the
port and tried building it with and without RAW support.

That said, here's the updated patch, hope I got it right this time:

    diff -ruN alt/Makefile neu-with-options/Makefile
    --- alt/Makefile        2013-03-01 21:11:05.000000000 +0100
    +++ neu-with-options/Makefile   2013-06-28 00:49:24.000000000 +0200
    @@ -1,10 +1,10 @@
     # $FreeBSD$
     
     PORTNAME=      nomacs
    -PORTVERSION=   1.0.0
    +PORTVERSION=   1.2.0
     CATEGORIES=    graphics
     MASTER_SITES=  SF/nomacs/nomacs-${PORTVERSION}/
    -DISTNAME=      ${PORTNAME}-${PORTVERSION}
    +DISTNAME=      ${PORTNAME}-${PORTVERSION}-source
     
     MAINTAINER=    bsd@tuxproject.de
     COMMENT=       Small, fast and free image viewer
    @@ -14,6 +14,10 @@
     LIB_DEPENDS=   exiv2:${PORTSDIR}/graphics/exiv2 \
                    sysinfo:${PORTSDIR}/devel/libsysinfo
     
    +OPTIONS_DEFINE= RAW
    +OPTIONS_DEFAULT= ${OPTIONS_DEFINE}
    +RAW_DESC=       Enable RAW support
    +
     USE_BZIP2=     yes
     USE_CMAKE=     yes
     USE_QT4=       gui network linguist_build moc_build \
    @@ -22,6 +26,14 @@
     WRKTOP=                ${WRKDIR}
     WRKSUBDIR=     ${PORTNAME}-${PORTVERSION}
     WRKSRC=                ${WRKTOP}/${WRKSUBDIR}
    -CMAKE_ARGS+=    -DENABLE_RAW=0
    +
    +.include <bsd.port.options.mk>
    +
    +.if ${PORT_OPTIONS:MRAW}
    +LIB_DEPENDS+=raw:${PORTSDIR}/graphics/libraw \
    +             opencv:${PORTSDIR}/graphics/opencv
    +.else
    +CMAKE_ARGS+=-DENABLE_RAW=0
    +.endif
     
     .include <bsd.port.mk>
    diff -ruN alt/distinfo neu-with-options/distinfo
    --- alt/distinfo        2013-03-01 20:10:21.000000000 +0100
    +++ neu-with-options/distinfo   2013-06-28 00:48:23.000000000 +0200
    @@ -1,2 +1,2 @@
    -SHA256 (nomacs-1.0.0.tar.bz2) = bf2a0a9ecb35551dc8ed25c0db95c1183b3771a2ce9e2a41d7e1d230bac2c5f2
    -SIZE (nomacs-1.0.0.tar.bz2) = 803404
    +SHA256 (nomacs-1.2.0-source.tar.bz2) = 0c60e5d17a7f3d17f33344b59440dad2bac0358fd1fae85b48574f2c61674259
    +SIZE (nomacs-1.2.0-source.tar.bz2) = 859335
Comment 6 Alex Kozlov 2013-06-28 14:12:56 UTC 
Hi, Jens

Can you please test the attached patch?


-- 
Alex
Comment 7 dfilter service freebsd_committer freebsd_triage 2013-06-30 15:50:08 UTC 
Author: ak
Date: Sun Jun 30 14:49:55 2013
New Revision: 322088
URL: http://svnweb.freebsd.org/changeset/ports/322088

Log:
  - Update to 1.2.0
  - Add RAW option
  - Convert to USES=desktop-file-utils
  
  PR:	ports/177733 (based on)
  Submitted by:	Jens K. Loewe <bsd@tuxproject.de> (maintainer)

Modified:
  head/graphics/nomacs/Makefile
  head/graphics/nomacs/distinfo
  head/graphics/nomacs/pkg-plist

Modified: head/graphics/nomacs/Makefile
==============================================================================
--- head/graphics/nomacs/Makefile	Sun Jun 30 14:43:56 2013	(r322087)
+++ head/graphics/nomacs/Makefile	Sun Jun 30 14:49:55 2013	(r322088)
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	nomacs
-PORTVERSION=	1.0.0
+PORTVERSION=	1.2.0
 CATEGORIES=	graphics
 MASTER_SITES=	SF/nomacs/nomacs-${PORTVERSION}/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
+DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
 MAINTAINER=	bsd@tuxproject.de
 COMMENT=	Small, fast and free image viewer
@@ -15,19 +15,29 @@ LIB_DEPENDS=	exiv2:${PORTSDIR}/graphics/
 		sysinfo:${PORTSDIR}/devel/libsysinfo
 
 USE_BZIP2=	yes
-USES=		cmake
+USES=		cmake desktop-file-utils
 USE_QT4=	gui network linguist_build moc_build \
 		qmake_build rcc_build uic_build
 LDFLAGS+=	-lsysinfo -lkvm
 WRKTOP=		${WRKDIR}
-WRKSUBDIR=	${PORTNAME}-${PORTVERSION}
+WRKSUBDIR=	${DISTNAME:S,-source,,}
 WRKSRC=		${WRKTOP}/${WRKSUBDIR}
-CMAKE_ARGS+=	-DENABLE_RAW=0
 MAN1=		nomacs.1
 
+OPTIONS_DEFINE=	RAW
+OPTIONS_DEFAULT=	RAW
+RAW_DESC=	RAW images support
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MRAW}
+LIB_DEPENDS+=	raw:${PORTSDIR}/graphics/libraw \
+	opencv_legacy:${PORTSDIR}/graphics/opencv
+.else
+CMAKE_ARGS+=	-DENABLE_RAW=0
+.endif
+
 post-extract:
-	@cd ${WRKSRC}/ &&\
-	${REINPLACE_CMD} -e 's|share/man/man1|man/man1|' \
-		CMakeLists.txt
+	@${REINPLACE_CMD} -e 's|share/man/man1|man/man1|' ${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>

Modified: head/graphics/nomacs/distinfo
==============================================================================
--- head/graphics/nomacs/distinfo	Sun Jun 30 14:43:56 2013	(r322087)
+++ head/graphics/nomacs/distinfo	Sun Jun 30 14:49:55 2013	(r322088)
@@ -1,2 +1,2 @@
-SHA256 (nomacs-1.0.0.tar.bz2) = bf2a0a9ecb35551dc8ed25c0db95c1183b3771a2ce9e2a41d7e1d230bac2c5f2
-SIZE (nomacs-1.0.0.tar.bz2) = 803404
+SHA256 (nomacs-1.2.0-source.tar.bz2) = 0c60e5d17a7f3d17f33344b59440dad2bac0358fd1fae85b48574f2c61674259
+SIZE (nomacs-1.2.0-source.tar.bz2) = 859335

Modified: head/graphics/nomacs/pkg-plist
==============================================================================
--- head/graphics/nomacs/pkg-plist	Sun Jun 30 14:43:56 2013	(r322087)
+++ head/graphics/nomacs/pkg-plist	Sun Jun 30 14:49:55 2013	(r322088)
@@ -2,16 +2,19 @@ bin/nomacs
 share/applications/nomacs.desktop
 %%DATADIR%%/translations/nomacs_als.qm
 %%DATADIR%%/translations/nomacs_az.qm
+%%DATADIR%%/translations/nomacs_cs.qm
 %%DATADIR%%/translations/nomacs_de.qm
 %%DATADIR%%/translations/nomacs_en.qm
 %%DATADIR%%/translations/nomacs_es.qm
+%%DATADIR%%/translations/nomacs_it.qm
 %%DATADIR%%/translations/nomacs_pl.qm
+%%DATADIR%%/translations/nomacs_pt.qm
 %%DATADIR%%/translations/nomacs_ru.qm
+%%DATADIR%%/translations/nomacs_sl.qm
 %%DATADIR%%/translations/nomacs_sk.qm
+%%DATADIR%%/translations/nomacs_sr.qm
 %%DATADIR%%/translations/nomacs_zh.qm
 share/pixmaps/nomacs.png
 @dirrm %%DATADIR%%/translations
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 8 Alex Kozlov freebsd_committer freebsd_triage 2013-06-30 15:51:08 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->ak

I'll take it.
Comment 9 Alex Kozlov freebsd_committer freebsd_triage 2013-06-30 15:51:20 UTC 
State Changed
From-To: feedback->closed

Committed. Thanks!