Page MenuHomeFreeBSD
Files F131699291

D7909.diff
No OneTemporary
Actions

D7909.diff
View Options

Index: head/archivers/quazip-qt5/Makefile
===================================================================
--- head/archivers/quazip-qt5/Makefile
+++ head/archivers/quazip-qt5/Makefile
@@ -1,21 +1,9 @@
# $FreeBSD$
PORTNAME= quazip
-PORTVERSION= 0.7.2
-CATEGORIES= archivers
-MASTER_SITES= SF
+PORTREVISION= 0
PKGNAMESUFFIX= -qt5
-MAINTAINER= kde@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"
Index: head/archivers/quazip-qt5/distinfo
===================================================================
--- head/archivers/quazip-qt5/distinfo
+++ head/archivers/quazip-qt5/distinfo
@@ -1,3 +0,0 @@
-TIMESTAMP = 1472674423
-SHA256 (quazip-0.7.2.tar.gz) = 91d827fbcafd099ae814cc18a8dd3bb709da6b8a27c918ee1c6c03b3f29440f4
-SIZE (quazip-0.7.2.tar.gz) = 466915
Index: head/archivers/quazip-qt5/files/patch-quazip_CMakeLists.txt
===================================================================
--- head/archivers/quazip-qt5/files/patch-quazip_CMakeLists.txt
+++ head/archivers/quazip-qt5/files/patch-quazip_CMakeLists.txt
@@ -1,27 +0,0 @@
-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})
Index: head/archivers/quazip-qt5/pkg-descr
===================================================================
--- head/archivers/quazip-qt5/pkg-descr
+++ head/archivers/quazip-qt5/pkg-descr
@@ -1,4 +0,0 @@
-QuaZIP is a simple C++ wrapper over Gilles Vollant's ZIP/UNZIP package that
-can be used to access ZIP archives. It uses the Qt toolkit.
-
-WWW: http://quazip.sourceforge.net/
Index: head/archivers/quazip-qt5/pkg-plist
===================================================================
--- head/archivers/quazip-qt5/pkg-plist
+++ head/archivers/quazip-qt5/pkg-plist
@@ -1,21 +0,0 @@
-include/quazip5/JlCompress.h
-include/quazip5/crypt.h
-include/quazip5/ioapi.h
-include/quazip5/quaadler32.h
-include/quazip5/quachecksum32.h
-include/quazip5/quacrc32.h
-include/quazip5/quagzipfile.h
-include/quazip5/quaziodevice.h
-include/quazip5/quazip.h
-include/quazip5/quazip_global.h
-include/quazip5/quazipdir.h
-include/quazip5/quazipfile.h
-include/quazip5/quazipfileinfo.h
-include/quazip5/quazipnewinfo.h
-include/quazip5/unzip.h
-include/quazip5/zip.h
-lib/libquazip5.a
-lib/libquazip5.so
-lib/libquazip5.so.1
-lib/libquazip5.so.1.0.0
-share/cmake/Modules/FindQuaZip5.cmake
Index: head/archivers/quazip/Makefile
===================================================================
--- head/archivers/quazip/Makefile
+++ head/archivers/quazip/Makefile
@@ -3,6 +3,7 @@
PORTNAME= quazip
PORTVERSION= 0.7.2
+PORTREVISION?= 1
CATEGORIES= archivers
MASTER_SITES= SF
@@ -11,8 +12,18 @@
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>
Index: head/archivers/quazip/files/patch-quazip_CMakeLists.txt
===================================================================
--- head/archivers/quazip/files/patch-quazip_CMakeLists.txt
+++ head/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})
Index: head/archivers/quazip/files/patch-qztest_qztest.pro
===================================================================
--- head/archivers/quazip/files/patch-qztest_qztest.pro
+++ head/archivers/quazip/files/patch-qztest_qztest.pro
@@ -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
Index: head/archivers/quazip/pkg-plist
===================================================================
--- head/archivers/quazip/pkg-plist
+++ head/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

File Metadata

Mime Type
text/plain
Expires
Sat, Oct 11, 11:03 AM (18 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23562954
Default Alt Text
D7909.diff (9 KB)

Event Timeline