svn commit: r449919 - in head/graphics/nomacs: . files

Adriaan de Groot adridg at FreeBSD.org
Fri Sep 15 18:31:24 UTC 2017 

Author: adridg
Date: Fri Sep 15 18:31:22 2017
New Revision: 449919
URL: https://svnweb.freebsd.org/changeset/ports/449919

Log:
  Update nomacs to 3.6.1.
  
   - previous version 2.2.0 from 2014, used Qt4, did not build with CMake 3.9
   - current released version from 2017, Qt5
  
  Maintainer timeout (16 days)
  
  PR:		221918
  Approved by:	rakuco (mentor)
  Submitted by:	tcberner

Deleted:
  head/graphics/nomacs/files/patch-cmake_Unix.cmake
Modified:
  head/graphics/nomacs/Makefile
  head/graphics/nomacs/distinfo
  head/graphics/nomacs/files/patch-cmake_UnixBuildTarget.cmake
  head/graphics/nomacs/pkg-plist

Modified: head/graphics/nomacs/Makefile
==============================================================================
--- head/graphics/nomacs/Makefile	Fri Sep 15 18:28:31 2017	(r449918)
+++ head/graphics/nomacs/Makefile	Fri Sep 15 18:31:22 2017	(r449919)
@@ -1,42 +1,37 @@
 # $FreeBSD$
 
 PORTNAME=	nomacs
-PORTVERSION=	2.2.0
-PORTREVISION=	8
+PORTVERSION=	3.6.1
 CATEGORIES=	graphics
-MASTER_SITES=	SF/nomacs/nomacs-${PORTVERSION}/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
 MAINTAINER=	bsd at tuxproject.de
 COMMENT=	Small, fast, and free image viewer
 
 LICENSE=	GPLv3
 
-BROKEN=		Does not build with CMake 3.9, needs update
-
 LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
 		libsysinfo.so:devel/libsysinfo \
-		libopencv_core.so:graphics/opencv-core
+		libopencv_highgui.so:graphics/opencv \
+		libopencv_core.so:graphics/opencv-core \
+		liblcms2.so:graphics/lcms2 \
+		libtbb.so:devel/tbb
+
 USES=		cmake desktop-file-utils dos2unix pkgconfig tar:bzip2
-USE_QT4=	gui network linguist_build moc_build \
-		qmake_build rcc_build uic_build
+USE_QT5=        concurrent core gui network printsupport svg widgets \
+		buildtools_build linguisttools_build qmake_build
+
 DOS2UNIX_REGEX=	.*\.(cpp|h|txt)
 
-WRKTOP=		${WRKDIR}
-WRKSUBDIR=	${DISTNAME:S,-source,,}
-WRKSRC=		${WRKTOP}/${WRKSUBDIR}
-
 OPTIONS_DEFINE=	RAW TIFF
 OPTIONS_DEFAULT=	RAW TIFF
 
 RAW_LIB_DEPENDS=	libraw.so:graphics/libraw
-RAW_CMAKE_OFF=		-DENABLE_RAW=0
+RAW_CMAKE_BOOL=		ENABLE_RAW
 
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
-TIFF_CMAKE_OFF=		-DENABLE_TIFF=0
+TIFF_CMAKE_BOOL=		ENABLE_TIFF
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|share/man/man1|man/man1|' \
-		${WRKSRC}/CMakeLists.txt
+USE_GITHUB=	yes
+WRKSRC_SUBDIR=	ImageLounge
 
 .include <bsd.port.mk>

Modified: head/graphics/nomacs/distinfo
==============================================================================
--- head/graphics/nomacs/distinfo	Fri Sep 15 18:28:31 2017	(r449918)
+++ head/graphics/nomacs/distinfo	Fri Sep 15 18:31:22 2017	(r449919)
@@ -1,2 +1,3 @@
-SHA256 (nomacs-2.2.0-source.tar.bz2) = 10825140bd856334aa3ba3a59c93f7205ec9218321d5ded20a70a43af424a884
-SIZE (nomacs-2.2.0-source.tar.bz2) = 1392489
+TIMESTAMP = 1503992141
+SHA256 (nomacs-nomacs-3.6.1_GH0.tar.gz) = 09b289cac51a5fdccc02aa4a60405bbbd4b5bfdb6b2a52ca5b0cb3b0f7a87068
+SIZE (nomacs-nomacs-3.6.1_GH0.tar.gz) = 28604636

Modified: head/graphics/nomacs/files/patch-cmake_UnixBuildTarget.cmake
==============================================================================
--- head/graphics/nomacs/files/patch-cmake_UnixBuildTarget.cmake	Fri Sep 15 18:28:31 2017	(r449918)
+++ head/graphics/nomacs/files/patch-cmake_UnixBuildTarget.cmake	Fri Sep 15 18:31:22 2017	(r449919)
@@ -1,29 +1,11 @@
---- cmake/UnixBuildTarget.cmake
+--- cmake/UnixBuildTarget.cmake.orig	2017-08-29 07:50:23 UTC
 +++ cmake/UnixBuildTarget.cmake
-@@ -3,7 +3,7 @@
-   set(BINARY_NAME ${CMAKE_PROJECT_NAME})
-   link_directories(${LIBRAW_LIBRARY_DIRS} ${OpenCV_LIBRARY_DIRS} ${EXIV2_LIBRARY_DIRS})
-   add_executable(${BINARY_NAME} WIN32 MACOSX_BUNDLE ${NOMACS_SOURCES} ${NOMACS_UI} ${NOMACS_MOC_SRC} ${NOMACS_RCC} ${NOMACS_HEADERS} ${NOMACS_RC} ${NOMACS_QM} ${NOMACS_TRANSLATIONS} ${LIBQPSD_SOURCES} ${LIBQPSD_HEADERS} ${LIBQPSD_MOC_SRC} ${WEBP_SOURCE} ${QUAZIP_SOURCES} ${QUAZIP_MOC_SRC})
--  target_link_libraries(${BINARY_NAME} ${QT_LIBRARIES} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBRARIES} ${VERSION_LIB} ${TIFF_LIBRARY} ${ZLIB_LIBRARY})
-+  target_link_libraries(${BINARY_NAME} ${QT_LIBRARIES} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OPENCV_CORE_LIBRARY} ${OPENCV_IMGPROC_LIBRARY} ${SYSINFO_LIBRARY} ${VERSION_LIB} ${TIFF_LIBRARY} ${ZLIB_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
+@@ -80,7 +80,7 @@ install(FILES ${NOMACS_QM} DESTINATION share/nomacs/tr
+ #  manpage
+ install(FILES Readme/nomacs.1 DESTINATION share/man/man1)
+ #  appdata
+-install(FILES nomacs.appdata.xml DESTINATION /usr/share/appdata/)
++install(FILES nomacs.appdata.xml DESTINATION share/appdata/)
  
-   if(CMAKE_SYSTEM_NAME MATCHES "Linux")
- 	  SET_TARGET_PROPERTIES(${BINARY_NAME} PROPERTIES LINK_FLAGS -fopenmp)
-@@ -49,7 +49,7 @@
-   set(DLL_NAME lib${CMAKE_PROJECT_NAME})
-   #set(LIB_NAME optimized ${DLL_NAME}.lib debug ${DLL_NAME}d.lib)
-   LIST(REMOVE_ITEM NOMACS_SOURCES ${CMAKE_SOURCE_DIR}/src/main.cpp)
--  link_directories(${LIBRAW_LIBRARY_DIRS} ${OpenCV_LIBRARY_DIRS} ${EXIV2_LIBRARY_DIRS} ${CMAKE_BINARY_DIR})
-+  link_directories(${LIBRAW_LIBRARY_DIRS} ${SYSINFO_LIBRARY_DIRS}  ${OPENCV_CORE_LIBRARY_DIRS} ${EXIV2_LIBRARY_DIRS} ${CMAKE_BINARY_DIR})
-   add_executable(${BINARY_NAME} WIN32  MACOSX_BUNDLE src/main.cpp ${NOMACS_MOC_SRC_SU} ${NOMACS_QM} ${NOMACS_TRANSLATIONS} ${NOMACS_RC})
-   target_link_libraries(${BINARY_NAME} ${QT_LIBRARIES} ${VERSION_LIB} ${DLL_NAME})
- 
-@@ -57,7 +57,7 @@
-   set_target_properties(${BINARY_NAME} PROPERTIES IMPORTED_IMPLIB "")
- 		  
-   add_library(${DLL_NAME} SHARED ${NOMACS_SOURCES} ${NOMACS_UI} ${NOMACS_MOC_SRC} ${NOMACS_RCC} ${NOMACS_HEADERS} ${NOMACS_RC} ${LIBQPSD_SOURCES} ${LIBQPSD_HEADERS} ${LIBQPSD_MOC_SRC} ${WEBP_SOURCE}  ${QUAZIP_SOURCES} ${QUAZIP_MOC_SRC})
--  target_link_libraries(${DLL_NAME} ${QT_LIBRARIES} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBRARIES} ${VERSION_LIB} ${TIFF_LIBRARIES} ${HUPNP_LIBS} ${HUPNPAV_LIBS})
-+  target_link_libraries(${DLL_NAME} ${QT_LIBRARIES} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OPENCV_CORE_LIBRARY} ${OPENCV_IMGPROC_LIBRARY} ${SYSINFO_LIBRARY} ${VERSION_LIB} ${TIFF_LIBRARIES} ${HUPNP_LIBS} ${HUPNPAV_LIBS})
-   add_dependencies(${BINARY_NAME} ${DLL_NAME})
- 
-   if (ENABLE_QT5)
+ # "make dist" target
+ string(TOLOWER ${PROJECT_NAME} CPACK_PACKAGE_NAME)

Modified: head/graphics/nomacs/pkg-plist
==============================================================================
--- head/graphics/nomacs/pkg-plist	Fri Sep 15 18:28:31 2017	(r449918)
+++ head/graphics/nomacs/pkg-plist	Fri Sep 15 18:31:22 2017	(r449919)
@@ -1,20 +1,33 @@
 bin/nomacs
+lib/libnomacsCore.so
+lib/libnomacsCore.so.3
+lib/libnomacsCore.so.3.6.0
+share/appdata/nomacs.appdata.xml
 share/applications/nomacs.desktop
 share/man/man1/nomacs.1
 %%DATADIR%%/translations/nomacs_als.qm
+%%DATADIR%%/translations/nomacs_ar.qm
 %%DATADIR%%/translations/nomacs_az.qm
+%%DATADIR%%/translations/nomacs_bg.qm
+%%DATADIR%%/translations/nomacs_bs.qm
 %%DATADIR%%/translations/nomacs_cs.qm
 %%DATADIR%%/translations/nomacs_de.qm
 %%DATADIR%%/translations/nomacs_en.qm
 %%DATADIR%%/translations/nomacs_es.qm
 %%DATADIR%%/translations/nomacs_fr.qm
+%%DATADIR%%/translations/nomacs_hr.qm
 %%DATADIR%%/translations/nomacs_it.qm
 %%DATADIR%%/translations/nomacs_ja.qm
+%%DATADIR%%/translations/nomacs_ko.qm
+%%DATADIR%%/translations/nomacs_nl.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_sl.qm
 %%DATADIR%%/translations/nomacs_sr.qm
+%%DATADIR%%/translations/nomacs_sv.qm
+%%DATADIR%%/translations/nomacs_tr.qm
+%%DATADIR%%/translations/nomacs_uk.qm
 %%DATADIR%%/translations/nomacs_zh.qm
-share/pixmaps/nomacs.png
+share/pixmaps/nomacs.svg

More information about the svn-ports-all mailing list