Use archivers/quazip 1.3. Comments, OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/geo/qmapshack/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- Makefile    11 Mar 2022 19:06:18 -0000      1.8
+++ Makefile    26 Aug 2022 20:29:29 -0000
@@ -5,7 +5,7 @@ COMMENT =       map management tool
 GH_ACCOUNT =   Maproom
 GH_PROJECT =   qmapshack
 GH_TAGNAME =   V_1.16.0
-REVISION =     0
+REVISION =     1
 
 CATEGORIES =   geo
 
@@ -17,13 +17,14 @@ PERMIT_PACKAGE =    Yes
 WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5DBus Qt5Gui Qt5Help
 WANTLIB += Qt5Network Qt5Positioning Qt5PrintSupport Qt5Qml Qt5QmlModels
 WANTLIB += Qt5Quick Qt5Sql Qt5WebChannel Qt5WebEngineCore Qt5WebEngineWidgets
-WANTLIB += Qt5Widgets Qt5Xml c gdal jpeg m proj quazip5 routino
+WANTLIB += Qt5Widgets Qt5Xml c gdal jpeg m proj quazip1-qt5 routino
+WANTLIB += z
 
 MODULES =              devel/cmake x11/qt5
 
 RUN_DEPENDS =          devel/desktop-file-utils \
                        x11/gtk+3,-guic
-LIB_DEPENDS =          archivers/quazip \
+LIB_DEPENDS =          archivers/quazip>=1.3 \
                        devel/proj \
                        geo/gdal,-main \
                        geo/routino \
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/geo/qmapshack/patches/patch-CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt        11 Mar 2022 19:06:18 -0000      1.2
+++ patches/patch-CMakeLists_txt        26 Aug 2022 20:29:29 -0000
@@ -1,21 +1,14 @@
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -154,16 +154,12 @@ find_package(GDAL                   REQUIRED)
- find_package(PROJ                   REQUIRED)
- find_package(JPEG                   REQUIRED)
- find_package(ROUTINO                REQUIRED)
--find_package(QuaZip-Qt5             REQUIRED)
-+find_package(QuaZip5                REQUIRED)
- find_package(ALGLIB                         ) # optional as we can use our 
local version
- 
- 
- if(${Qt5Widgets_VERSION} VERSION_LESS 5.8.0)
+@@ -162,10 +162,6 @@ if(${Qt5Widgets_VERSION} VERSION_LESS 5.8.0)
      message( SEND_ERROR "You need at least Qt5.8 or newer.")
--endif()
--
--if(${PROJ_VERSION} VERSION_LESS 7.2.1)
--    message( SEND_ERROR "You need at least PROJ 7.2.1 or newer.")
  endif()
  
+-if(${PROJ_VERSION} VERSION_LESS 7.2.1)
+-    message( SEND_ERROR "You need at least PROJ 7.2.1 or newer.")
+-endif()
+-
  if(USE_QT5DBus)
+     find_package(Qt5DBus REQUIRED)
+     if(Qt5DBus_FOUND)
Index: patches/patch-src_qmapshack_CMakeLists_txt
===================================================================
RCS file: patches/patch-src_qmapshack_CMakeLists_txt
diff -N patches/patch-src_qmapshack_CMakeLists_txt
--- patches/patch-src_qmapshack_CMakeLists_txt  11 Mar 2022 19:06:18 -0000      
1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-Index: src/qmapshack/CMakeLists.txt
---- src/qmapshack/CMakeLists.txt.orig
-+++ src/qmapshack/CMakeLists.txt
-@@ -927,6 +927,7 @@ include_directories(
-     ${PROJ_INCLUDE_DIRS}
-     ${ROUTINO_INCLUDE_DIRS}
-     ${ALGLIB_INCLUDE_DIRS}
-+    ${QUAZIP_INCLUDE_DIR}
- )
- 
- if(APPLE)
-@@ -974,7 +975,7 @@ target_link_libraries(${APPLICATION_NAME}
-     ${PROJ_LIBRARIES}
-     ${ROUTINO_LIBRARIES}
-     ${ALGLIB_LIBRARIES}
--    QuaZip::QuaZip
-+    ${QUAZIP_LIBRARIES}
- )
- 
- if(APPLE)

Reply via email to