svn commit: r422407 - in head/archivers: quazip quazip-qt5 quazip-qt5/files quazip/files

Sun Sep 18 20:21:03 UTC 2016

Author: tcberner
Date: Sun Sep 18 20:21:01 2016
New Revision: 422407
URL: https://svnweb.freebsd.org/changeset/ports/422407

Log:
  Convert archivers/quazip-qt5 into a slave port, and switch to cmake for archivers/quazip.
  
  * Convert to slaveport, as they are very similar
  * Switch to cmake in archviers/quazip
  
  Reviewed by:	rakuco
  Approved by:	rakuco (mentor)
  Differential Revision:	https://reviews.freebsd.org/D7909

Added:
  head/archivers/quazip/files/patch-quazip_CMakeLists.txt
     - copied unchanged from r422406, head/archivers/quazip-qt5/files/patch-quazip_CMakeLists.txt
Deleted:
  head/archivers/quazip-qt5/distinfo
  head/archivers/quazip-qt5/files/
  head/archivers/quazip-qt5/pkg-descr
  head/archivers/quazip-qt5/pkg-plist
  head/archivers/quazip/files/patch-qztest_qztest.pro
Modified:
  head/archivers/quazip-qt5/Makefile
  head/archivers/quazip/Makefile
  head/archivers/quazip/pkg-plist

Modified: head/archivers/quazip-qt5/Makefile
==============================================================================

--- head/archivers/quazip-qt5/Makefile	Sun Sep 18 20:10:54 2016	(r422406)
+++ head/archivers/quazip-qt5/Makefile	Sun Sep 18 20:21:01 2016	(r422407)
@@ -1,21 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	quazip
-PORTVERSION=	0.7.2
-CATEGORIES=	archivers
-MASTER_SITES=	SF
+PORTREVISION=	0
 PKGNAMESUFFIX=	-qt5
 
-MAINTAINER=	kde at FreeBSD.org
-COMMENT=	Qt/C++ wrapper for ZIP/UNZIP package
+MASTERDIR=	${.CURDIR:H}/quazip
 
-LICENSE=	LGPL21
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-USES=		cmake:outsource
-USE_LDCONFIG=	yes
-USE_QT5=	core buildtools_build qmake_build
-
-CMAKE_ARGS=	-DBUILD_WITH_QT4:BOOL=FALSE
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"

Modified: head/archivers/quazip/Makefile
==============================================================================
--- head/archivers/quazip/Makefile	Sun Sep 18 20:10:54 2016	(r422406)
+++ head/archivers/quazip/Makefile	Sun Sep 18 20:21:01 2016	(r422407)
@@ -3,6 +3,7 @@
 
 PORTNAME=	quazip
 PORTVERSION=	0.7.2
+PORTREVISION?=	1
 CATEGORIES=	archivers
 MASTER_SITES=	SF
 
@@ -11,8 +12,18 @@ COMMENT=	Qt/C++ wrapper for ZIP/UNZIP pa
 
 LICENSE=	LGPL21
 
-USES=		qmake
+USES=		cmake:outsource
 USE_LDCONFIG=	yes
-USE_QT4=	corelib moc_build network_build qtestlib_build
+
+.  if empty(PKGNAMESUFFIX)
+USE_QT4=	corelib moc_build network_build qmake_build rcc_build uic_build
+CMAKE_ARGS=	-DBUILD_WITH_QT4:BOOL=TRUE
+.  else
+USE_QT5=	core buildtools_build qmake_build
+CMAKE_ARGS=	-DBUILD_WITH_QT4:BOOL=FALSE
+QTVER_SUFFIX=	5
+.  endif
+
+PLIST_SUB=	QTVER_SUFFIX="${QTVER_SUFFIX}"
 
 .include <bsd.port.mk>

Copied: head/archivers/quazip/files/patch-quazip_CMakeLists.txt (from r422406, head/archivers/quazip-qt5/files/patch-quazip_CMakeLists.txt)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/archivers/quazip/files/patch-quazip_CMakeLists.txt	Sun Sep 18 20:21:01 2016	(r422407, copy of r422406, head/archivers/quazip-qt5/files/patch-quazip_CMakeLists.txt)
@@ -0,0 +1,27 @@
+Properly link quazip_static against its dependencies
+
+From the looks of r256, it appears that the target_link_libraries() call in
+quazip/CMakeLists.txt was modified with the intention of linking both
+${QUAZIP_LIB_TARGET_NAME} and quazip_static against all required libraries.
+However, target_link_libraries()'s syntax is such that the first argument is
+the library that all other arguments will be linked against. In other words,
+libquazip(5).so will link against quazip_static, which is not what is desired.
+
+Creator: Raphael Kubo da Costa
+
+https://sourceforge.net/p/quazip/patches/28/
+
+Index: quazip/CMakeLists.txt
+===================================================================
+--- quazip/CMakeLists.txt.orig	2016-01-03 06:01:40 UTC
++++ quazip/CMakeLists.txt
+@@ -25,7 +25,8 @@ endif ()
+ 
+ set_target_properties(${QUAZIP_LIB_TARGET_NAME} quazip_static PROPERTIES VERSION 1.0.0 SOVERSION 1 DEBUG_POSTFIX d)
+ # Link against ZLIB_LIBRARIES if needed (on Windows this variable is empty)
+-target_link_libraries(${QUAZIP_LIB_TARGET_NAME} quazip_static ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES})
++target_link_libraries(quazip_static ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES})
++target_link_libraries(${QUAZIP_LIB_TARGET_NAME} ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES})
+ 
+ install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip${QUAZIP_LIB_VERSION_SUFFIX})
+ install(TARGETS ${QUAZIP_LIB_TARGET_NAME} quazip_static LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION})

Modified: head/archivers/quazip/pkg-plist
==============================================================================
--- head/archivers/quazip/pkg-plist	Sun Sep 18 20:10:54 2016	(r422406)
+++ head/archivers/quazip/pkg-plist	Sun Sep 18 20:21:01 2016	(r422407)
@@ -1,20 +1,21 @@
-include/quazip/JlCompress.h
-include/quazip/crypt.h
-include/quazip/ioapi.h
-include/quazip/quaadler32.h
-include/quazip/quachecksum32.h
-include/quazip/quacrc32.h
-include/quazip/quagzipfile.h
-include/quazip/quaziodevice.h
-include/quazip/quazip.h
-include/quazip/quazip_global.h
-include/quazip/quazipdir.h
-include/quazip/quazipfile.h
-include/quazip/quazipfileinfo.h
-include/quazip/quazipnewinfo.h
-include/quazip/unzip.h
-include/quazip/zip.h
-lib/libquazip.so
-lib/libquazip.so.1
-lib/libquazip.so.1.0
-lib/libquazip.so.1.0.0
+include/quazip%%QTVER_SUFFIX%%/JlCompress.h
+include/quazip%%QTVER_SUFFIX%%/crypt.h
+include/quazip%%QTVER_SUFFIX%%/ioapi.h
+include/quazip%%QTVER_SUFFIX%%/quaadler32.h
+include/quazip%%QTVER_SUFFIX%%/quachecksum32.h
+include/quazip%%QTVER_SUFFIX%%/quacrc32.h
+include/quazip%%QTVER_SUFFIX%%/quagzipfile.h
+include/quazip%%QTVER_SUFFIX%%/quaziodevice.h
+include/quazip%%QTVER_SUFFIX%%/quazip.h
+include/quazip%%QTVER_SUFFIX%%/quazip_global.h
+include/quazip%%QTVER_SUFFIX%%/quazipdir.h
+include/quazip%%QTVER_SUFFIX%%/quazipfile.h
+include/quazip%%QTVER_SUFFIX%%/quazipfileinfo.h
+include/quazip%%QTVER_SUFFIX%%/quazipnewinfo.h
+include/quazip%%QTVER_SUFFIX%%/unzip.h
+include/quazip%%QTVER_SUFFIX%%/zip.h
+lib/libquazip%%QTVER_SUFFIX%%.a
+lib/libquazip%%QTVER_SUFFIX%%.so
+lib/libquazip%%QTVER_SUFFIX%%.so.1
+lib/libquazip%%QTVER_SUFFIX%%.so.1.0.0
+share/cmake/Modules/FindQuaZip%%QTVER_SUFFIX%%.cmake
