4 files changed, 61 insertions, 36 deletions

diff --git a/archivers/quazip/Makefile b/archivers/quazip/Makefile
index 257a63f1f4f5..e71360995c90 100644
--- a/archivers/quazip/Makefile
+++ b/archivers/quazip/Makefile
@@ -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 package
 
 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>
diff --git a/archivers/quazip/files/patch-quazip_CMakeLists.txt b/archivers/quazip/files/patch-quazip_CMakeLists.txt
new file mode 100644
index 000000000000..91ba3552806c
--- /dev/null
+++ b/archivers/quazip/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})
diff --git a/archivers/quazip/files/patch-qztest_qztest.pro b/archivers/quazip/files/patch-qztest_qztest.pro
deleted file mode 100644
index 8bc5b7bf0f83..000000000000
--- a/archivers/quazip/files/patch-qztest_qztest.pro
+++ /dev/null
@@ -1,14 +0,0 @@
---- qztest/qztest.pro.orig	2016-03-01 15:20:57 UTC
-+++ qztest/qztest.pro
-@@ -43,7 +43,10 @@ MOC_DIR = .moc
- win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../quazip/release/ -lquazip
- else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../quazip/debug/ -lquazipd
- else:mac:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../quazip/debug/ -lquazip_debug
--else:unix: LIBS += -L$$OUT_PWD/../quazip/ -lquazip
-+else:unix: LIBS += -L$$OUT_PWD/../quazip/ -lquazip $$join(QMAKE_LIBDIR, " -L", -L) -L$$QMAKE_LIBDIR_QT
-+
-+QMAKE_LIBDIR=
-+QMAKE_LIBDIR_QT=
- 
- INCLUDEPATH += $$PWD/..
- DEPENDPATH += $$PWD/../quazip
diff --git a/archivers/quazip/pkg-plist b/archivers/quazip/pkg-plist
index 3427d7a0232b..7c0aac474187 100644
--- a/archivers/quazip/pkg-plist
+++ b/archivers/quazip/pkg-plist
@@ -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