Index: head/archivers/Makefile =================================================================== --- head/archivers/Makefile (revision 404685) +++ head/archivers/Makefile (revision 404686) @@ -1,232 +1,233 @@ # $FreeBSD$ # COMMENT = Archivers SUBDIR += 9e SUBDIR += advancecomp SUBDIR += amigadepacker SUBDIR += arc SUBDIR += arj SUBDIR += ark SUBDIR += atool SUBDIR += bicom SUBDIR += brotli SUBDIR += bzip SUBDIR += bzip2 SUBDIR += cabextract SUBDIR += dact SUBDIR += deb2targz SUBDIR += deco SUBDIR += deutex SUBDIR += dpkg SUBDIR += dzip SUBDIR += ecm SUBDIR += engrampa SUBDIR += epkg SUBDIR += fastjar SUBDIR += file-roller SUBDIR += fpc-bzip2 SUBDIR += fpc-unzip SUBDIR += freetar SUBDIR += freeze SUBDIR += gcab SUBDIR += gcpio SUBDIR += gnome-autoar SUBDIR += grzip SUBDIR += gtar SUBDIR += gzip SUBDIR += gzrecover SUBDIR += ha SUBDIR += hffzip SUBDIR += hlextract SUBDIR += hpack.non-usa.only SUBDIR += hs-tar SUBDIR += hs-zip-archive SUBDIR += hs-zlib SUBDIR += hs-zlib-bindings SUBDIR += hs-zlib-enum SUBDIR += innoextract SUBDIR += javatar SUBDIR += jzip.org SUBDIR += jzlib SUBDIR += kzip SUBDIR += laszip SUBDIR += lbrate SUBDIR += lbzip2 SUBDIR += lcab SUBDIR += lha SUBDIR += lha-ac SUBDIR += libarc SUBDIR += libarchive SUBDIR += libcabinet SUBDIR += libcomprex SUBDIR += libdynamite SUBDIR += liblz4 SUBDIR += liblzxcomp SUBDIR += libmspack SUBDIR += liborange SUBDIR += libpar2 SUBDIR += librtfcomp SUBDIR += libunrar SUBDIR += libunrar4 SUBDIR += libzip SUBDIR += linux-f10-ucl SUBDIR += linux-f10-upx SUBDIR += lrzip SUBDIR += lzip SUBDIR += lzlib SUBDIR += lzma SUBDIR += lzmalib SUBDIR += lzo2 SUBDIR += lzop SUBDIR += macutils SUBDIR += makeself SUBDIR += mar SUBDIR += minizip SUBDIR += mscompress SUBDIR += mtf SUBDIR += nomarch SUBDIR += nulib SUBDIR += nwreckdum SUBDIR += ocaml-bz2 SUBDIR += ocaml-zip SUBDIR += p5-Archive-Any SUBDIR += p5-Archive-Any-Lite SUBDIR += p5-Archive-Any-Plugin-Rar SUBDIR += p5-Archive-Extract SUBDIR += p5-Archive-Extract-Libarchive SUBDIR += p5-Archive-Peek SUBDIR += p5-Archive-Rar SUBDIR += p5-Archive-SimpleExtractor SUBDIR += p5-Archive-Tar SUBDIR += p5-Archive-Zip SUBDIR += p5-Compress-Bzip2 SUBDIR += p5-Compress-LZ4 SUBDIR += p5-Compress-LZF SUBDIR += p5-Compress-LZO SUBDIR += p5-Compress-LZW SUBDIR += p5-Compress-Raw-Bzip2 SUBDIR += p5-Compress-Raw-Lzma SUBDIR += p5-Compress-Raw-Zlib SUBDIR += p5-Compress-Snappy SUBDIR += p5-IO-Compress SUBDIR += p5-IO-Compress-Lzf SUBDIR += p5-IO-Compress-Lzma SUBDIR += p5-IO-Compress-Lzop SUBDIR += p5-IO-Zlib SUBDIR += p5-Mac-Macbinary SUBDIR += p5-POE-Filter-Bzip2 SUBDIR += p5-POE-Filter-LZF SUBDIR += p5-POE-Filter-LZO SUBDIR += p5-POE-Filter-LZW SUBDIR += p5-POE-Filter-Zlib SUBDIR += p5-PerlIO-gzip SUBDIR += p5-PerlIO-via-Bzip2 SUBDIR += p7zip SUBDIR += p7zip-codec-rar SUBDIR += packddir SUBDIR += paq SUBDIR += par SUBDIR += par2cmdline SUBDIR += par2cmdline-tbb SUBDIR += parchive SUBDIR += pbzip2 SUBDIR += pear-File_Archive SUBDIR += pear-Horde_Compress SUBDIR += pear-Horde_Compress_Fast SUBDIR += pear-Horde_Pack SUBDIR += pear-PHP_Archive SUBDIR += peazip SUBDIR += pecl-lzf SUBDIR += pecl-phk SUBDIR += pecl-rar SUBDIR += php-horde_lz4 SUBDIR += php5-bz2 SUBDIR += php5-phar SUBDIR += php5-snappy SUBDIR += php5-zip SUBDIR += php5-zlib SUBDIR += php55-bz2 SUBDIR += php55-phar SUBDIR += php55-zip SUBDIR += php55-zlib SUBDIR += php56-bz2 SUBDIR += php56-phar SUBDIR += php56-zip SUBDIR += php56-zlib SUBDIR += pigz SUBDIR += pixz SUBDIR += plzip SUBDIR += ppmd SUBDIR += ppmd-7z SUBDIR += ppunpack SUBDIR += pxz SUBDIR += py-attic SUBDIR += py-librtfcomp SUBDIR += py-lz4 SUBDIR += py-lzma SUBDIR += py-pyliblzma SUBDIR += py-python-snappy SUBDIR += qpress SUBDIR += quazip + SUBDIR += quazip-qt5 SUBDIR += rar SUBDIR += rox-archive SUBDIR += rpm2cpio SUBDIR += rpm4 SUBDIR += ruby-lha SUBDIR += ruby-zip SUBDIR += rubygem-archive-tar-minitar SUBDIR += rubygem-archive-zip SUBDIR += rubygem-bzip2-ruby SUBDIR += rubygem-libarchive SUBDIR += rubygem-minitar SUBDIR += rubygem-rubyzip SUBDIR += rubygem-rubyzip2 SUBDIR += rvm SUBDIR += rzip SUBDIR += sectar SUBDIR += sharutils SUBDIR += snappy SUBDIR += snappy-java SUBDIR += snzip SUBDIR += squeeze SUBDIR += squsq SUBDIR += stuffit SUBDIR += szip SUBDIR += tardy SUBDIR += tclmkziplib SUBDIR += thunar-archive-plugin SUBDIR += torrentzip SUBDIR += ucl SUBDIR += unace SUBDIR += unadf SUBDIR += unalz SUBDIR += unarj SUBDIR += undms SUBDIR += unfoo SUBDIR += unlzx SUBDIR += unmakeself SUBDIR += unmass SUBDIR += unrar SUBDIR += unrar-iconv SUBDIR += unshield SUBDIR += untar SUBDIR += unzip SUBDIR += unzoo SUBDIR += upx SUBDIR += xar SUBDIR += xarchive SUBDIR += xarchiver SUBDIR += xdms SUBDIR += xmill SUBDIR += xpk SUBDIR += zip SUBDIR += zip-ada SUBDIR += zipmix SUBDIR += zipper SUBDIR += zoo SUBDIR += zopfli SUBDIR += zutils .include Index: head/archivers/quazip-qt5/Makefile =================================================================== --- head/archivers/quazip-qt5/Makefile (nonexistent) +++ head/archivers/quazip-qt5/Makefile (revision 404686) @@ -0,0 +1,21 @@ +# $FreeBSD$ + +PORTNAME= quazip +PORTVERSION= 0.7.1 +CATEGORIES= archivers +MASTER_SITES= SF +PKGNAMESUFFIX= -qt5 + +MAINTAINER= kde@FreeBSD.org +COMMENT= Qt/C++ wrapper for ZIP/UNZIP package + +LICENSE= LGPL21 +LICENSE_FILE= ${WRKSRC}/COPYING + +USES= cmake +USE_LDCONFIG= yes +USE_QT5= core buildtools_build qmake_build + +CMAKE_ARGS= -DBUILD_WITH_QT4:BOOL=FALSE + +.include Property changes on: head/archivers/quazip-qt5/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/quazip-qt5/distinfo =================================================================== --- head/archivers/quazip-qt5/distinfo (nonexistent) +++ head/archivers/quazip-qt5/distinfo (revision 404686) @@ -0,0 +1,2 @@ +SHA256 (quazip-0.7.1.tar.gz) = 78c984103555c51e6f7ef52e3a2128e2beb9896871b2cc4d4dbd4d64bff132de +SIZE (quazip-0.7.1.tar.gz) = 390629 Property changes on: head/archivers/quazip-qt5/distinfo ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/quazip-qt5/files/patch-coinstallable_with_qt4_version =================================================================== --- head/archivers/quazip-qt5/files/patch-coinstallable_with_qt4_version (nonexistent) +++ head/archivers/quazip-qt5/files/patch-coinstallable_with_qt4_version (revision 404686) @@ -0,0 +1,110 @@ +This patch contains several upstream commits that will be part of the 0.7.2 +release that allow the port to be installed together with archivers/quazip (the +Qt4 version). It works by adding a "5" suffix to the files installed by the Qt5 +version of the port. + +------------------------------------------------------------------------ +r252 | alqualos | 2015-01-29 19:04:27 +0100 (Thu, 29 Jan 2015) | 1 line + +Link to correct Qt library (patch #23) +------------------------------------------------------------------------ +r254 | alqualos | 2015-01-29 19:18:07 +0100 (Thu, 29 Jan 2015) | 1 line + +Make quazip coinstallable for Qt5 and Qt4 (patch #22) +------------------------------------------------------------------------ +r255 | alqualos | 2015-01-29 19:22:35 +0100 (Thu, 29 Jan 2015) | 1 line + +Fix conflict between patches #23 and #22 +------------------------------------------------------------------------ +r257 | alqualos | 2015-02-06 16:45:25 +0100 (Fri, 06 Feb 2015) | 1 line + +Patch #25 (Make devel packages coinstallable too) +------------------------------------------------------------------------ + +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt (revision 250) ++++ CMakeLists.txt (working copy) +@@ -10,10 +10,11 @@ + + if (Qt5Core_FOUND) + set(QTCORE_LIBRARIES ${Qt5Core_LIBRARIES}) ++ set(QUAZIP_LIB_VERSION_SUFFIX 5) + # if there is no QT_ROOT, try to deduce it from Qt QtCore include + if ("${QT_ROOT}" STREQUAL "") + set(QT_ROOT ${QT_QTCORE_INCLUDE_DIR}/../..) +- endif() ++ endif() + include_directories(${Qt5Core_INCLUDE_DIRS}) + + macro(qt_wrap_cpp) +@@ -48,7 +49,9 @@ + + set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)") + set(LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Library directory name" FORCE) ++set(QUAZIP_LIB_TARGET_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX} CACHE ++ INTERNAL "Target name of libquazip" FORCE) + + add_subdirectory(quazip) + +-install(FILES FindQuaZip.cmake DESTINATION ${CMAKE_ROOT}/Modules) ++install(FILES FindQuaZip.cmake RENAME FindQuaZip${QUAZIP_LIB_VERSION_SUFFIX}.cmake DESTINATION ${CMAKE_ROOT}/Modules) +Index: FindQuaZip.cmake +=================================================================== +--- FindQuaZip.cmake (revision 250) ++++ FindQuaZip.cmake (working copy) +@@ -9,14 +9,17 @@ + # in cache already + SET(QUAZIP_FOUND TRUE) + ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) ++ IF (Qt5Core_FOUND) ++ set(QUAZIP_LIB_VERSION_SUFFIX 5) ++ ENDIF() + IF (WIN32) + FIND_PATH(QUAZIP_LIBRARY_DIR + WIN32_DEBUG_POSTFIX d +- NAMES libquazip.dll ++ NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll + HINTS "C:/Programme/" "C:/Program Files" + PATH_SUFFIXES QuaZip/lib + ) +- FIND_LIBRARY(QUAZIP_LIBRARIES NAMES libquazip.dll HINTS ${QUAZIP_LIBRARY_DIR}) ++ FIND_LIBRARY(QUAZIP_LIBRARIES NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll HINTS ${QUAZIP_LIBRARY_DIR}) + FIND_PATH(QUAZIP_INCLUDE_DIR NAMES quazip.h HINTS ${QUAZIP_LIBRARY_DIR}/../ PATH_SUFFIXES include/quazip) + FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR NAMES zlib.h) + ELSE(WIN32) +@@ -25,12 +28,12 @@ + pkg_check_modules(PC_QUAZIP quazip) + FIND_LIBRARY(QUAZIP_LIBRARIES + WIN32_DEBUG_POSTFIX d +- NAMES quazip ++ NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX} + HINTS /usr/lib /usr/lib64 + ) + FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h + HINTS /usr/include /usr/local/include +- PATH_SUFFIXES quazip ++ PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX} + ) + FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include) + ENDIF (WIN32) +Index: quazip/CMakeLists.txt +=================================================================== +--- quazip/CMakeLists.txt (revision 250) ++++ quazip/CMakeLists.txt (working copy) +@@ -14,10 +14,10 @@ + qt_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS}) + set(SRCS ${SRCS} ${MOC_SRCS}) + +-add_library(quazip SHARED ${SRCS}) +-set_target_properties(quazip PROPERTIES VERSION 1.0.0 SOVERSION 1) ++add_library(${QUAZIP_LIB_TARGET_NAME} SHARED ${SRCS}) ++set_target_properties(${QUAZIP_LIB_TARGET_NAME} PROPERTIES VERSION 1.0.0 SOVERSION 1) + # Link against ZLIB_LIBRARIES if needed (on Windows this variable is empty) +-target_link_libraries(quazip ${QT_QTMAIN_LIBRARY} ${QT_QTCORE_LIBRARY} ${ZLIB_LIBRARIES}) ++target_link_libraries(${QUAZIP_LIB_TARGET_NAME} ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES}) + +-install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip) +-install(TARGETS quazip LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION}) ++install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip${QUAZIP_LIB_VERSION_SUFFIX}) ++install(TARGETS ${QUAZIP_LIB_TARGET_NAME} LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION}) Property changes on: head/archivers/quazip-qt5/files/patch-coinstallable_with_qt4_version ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/quazip-qt5/pkg-descr =================================================================== --- head/archivers/quazip-qt5/pkg-descr (nonexistent) +++ head/archivers/quazip-qt5/pkg-descr (revision 404686) @@ -0,0 +1,4 @@ +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/ Property changes on: head/archivers/quazip-qt5/pkg-descr ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/archivers/quazip-qt5/pkg-plist =================================================================== --- head/archivers/quazip-qt5/pkg-plist (nonexistent) +++ head/archivers/quazip-qt5/pkg-plist (revision 404686) @@ -0,0 +1,20 @@ +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 +%%QT_LIBDIR%%/libquazip5.so +%%QT_LIBDIR%%/libquazip5.so.1 +%%QT_LIBDIR%%/libquazip5.so.1.0.0 +share/cmake/Modules/FindQuaZip5.cmake Property changes on: head/archivers/quazip-qt5/pkg-plist ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property