Index: head/graphics/zint/Makefile =================================================================== --- head/graphics/zint/Makefile (revision 479371) +++ head/graphics/zint/Makefile (revision 479372) @@ -1,24 +1,26 @@ # Created by: Gvozdikov Veniamin # $FreeBSD$ PORTNAME= zint -PORTVERSION= 2.4.3 -PORTREVISION= 4 +DISTVERSION= 2.6.3_rc2 # NOT a "release candidate", fixup for 2.6.3 CATEGORIES= graphics -MASTER_SITES= SF +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2.6.3 +DISTNAME= ${PORTNAME}-${DISTVERSION}.src MAINTAINER= ports@FreeBSD.org COMMENT= Zint Barcode Generator LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING +PORTSCOUT= skipv:2.6.3 + LIB_DEPENDS= libpng.so:graphics/png -USES= cmake qt:4 +USES= cmake qt:5 USE_LDCONFIG= yes -USE_QT= gui xml qmake_build uic_build moc_build rcc_build designer +USE_QT= buildtools_build qmake_build uitools_build core gui widgets DESKTOP_ENTRIES="Zint" "Barcode generator" "" "zint-qt" "" false .include Index: head/graphics/zint/distinfo =================================================================== --- head/graphics/zint/distinfo (revision 479371) +++ head/graphics/zint/distinfo (revision 479372) @@ -1,2 +1,3 @@ -SHA256 (zint-2.4.3.tar.gz) = de2f4fd0d008530511f5dea2cff7f96f45df4c029b57431b2411b7e1f3a523e8 -SIZE (zint-2.4.3.tar.gz) = 403544 +TIMESTAMP = 1519159191 +SHA256 (zint-2.6.3_rc2.src.tar.gz) = db7e91ce917d85bc2f710e96a2adde9d942ad7aebc23a497222d32a6e8484c63 +SIZE (zint-2.6.3_rc2.src.tar.gz) = 769756 Index: head/graphics/zint/files/patch-backend_maxicode.c =================================================================== --- head/graphics/zint/files/patch-backend_maxicode.c (revision 479371) +++ head/graphics/zint/files/patch-backend_maxicode.c (nonexistent) @@ -1,10 +0,0 @@ ---- backend/maxicode.c.orig 2011-03-30 15:17:49.000000000 +0800 -+++ backend/maxicode.c 2011-03-30 15:18:15.000000000 +0800 -@@ -29,7 +29,6 @@ - #ifdef __APPLE__ - #include - #else --#include - #endif - - int maxi_codeword[144]; Property changes on: head/graphics/zint/files/patch-backend_maxicode.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/zint/files/patch-backend_code1.c =================================================================== --- head/graphics/zint/files/patch-backend_code1.c (revision 479371) +++ head/graphics/zint/files/patch-backend_code1.c (nonexistent) @@ -1,10 +0,0 @@ ---- backend/code1.c.orig 2011-03-30 15:18:25.000000000 +0800 -+++ backend/code1.c 2011-03-30 15:18:35.000000000 +0800 -@@ -28,7 +28,6 @@ - #ifdef __APPLE__ - #include - #else --#include - #endif - - void horiz(struct zint_symbol *symbol, int row_no, int full) Property changes on: head/graphics/zint/files/patch-backend_code1.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/zint/files/patch-CMakeLists.txt =================================================================== --- head/graphics/zint/files/patch-CMakeLists.txt (nonexistent) +++ head/graphics/zint/files/patch-CMakeLists.txt (revision 479372) @@ -0,0 +1,16 @@ +--- CMakeLists.txt.orig 2018-02-15 10:47:59 UTC ++++ CMakeLists.txt +@@ -93,12 +93,7 @@ CONFIGURE_FILE( + ADD_CUSTOM_TARGET(uninstall + "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") + +-# staniek: don't install +-if (DATA_INSTALL_DIR) +- set(CMAKE_MODULES_INSTALL_PATH ${DATA_INSTALL_DIR}/cmake/modules) +-else (DATA_INSTALL_DIR) +- set(CMAKE_MODULES_INSTALL_PATH ${CMAKE_ROOT}/Modules) +-endif(DATA_INSTALL_DIR) ++set(CMAKE_MODULES_INSTALL_PATH ${CMAKE_ROOT}/Modules) + + install(FILES cmake/modules/FindZint.cmake DESTINATION ${CMAKE_MODULES_INSTALL_PATH} COMPONENT Devel) + Property changes on: head/graphics/zint/files/patch-CMakeLists.txt ___________________________________________________________________ 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/graphics/zint/files/patch-backend_CMakeLists.txt =================================================================== --- head/graphics/zint/files/patch-backend_CMakeLists.txt (revision 479371) +++ head/graphics/zint/files/patch-backend_CMakeLists.txt (revision 479372) @@ -1,21 +1,12 @@ ---- backend/CMakeLists.txt.orig 2011-03-30 15:13:56.000000000 +0800 -+++ backend/CMakeLists.txt 2011-03-30 15:14:34.000000000 +0800 +--- backend/CMakeLists.txt.orig 2018-02-15 10:47:59 UTC ++++ backend/CMakeLists.txt @@ -2,7 +2,8 @@ project(zint) -find_package(PNG) +find_package(PNG REQUIRED) +include_directories(${PNG_INCLUDE_DIR}) - set(zint_COMMON_SRCS common.c library.c render.c ps.c large.c reedsol.c gs1.c svg.c png.c) + set(zint_COMMON_SRCS common.c library.c render.c large.c reedsol.c gs1.c eci.c) set(zint_ONEDIM_SRCS code.c code128.c 2of5.c upcean.c telepen.c medical.c plessey.c rss.c) -@@ -21,7 +22,7 @@ add_library(zint SHARED ${zint_SRCS}) - set_target_properties(zint PROPERTIES SOVERSION "${ZINT_VERSION_MAJOR}.${ZINT_VERSION_MINOR}" - VERSION ${ZINT_VERSION}) - --target_link_libraries(zint ${PNG_LIBRARIES} ) -+target_link_libraries(zint ${PNG_LIBRARY} ) - target_link_libraries(zint -lm) - - install(TARGETS zint ${INSTALL_TARGETS_DEFAULT_ARGS} ) Index: head/graphics/zint/pkg-plist =================================================================== --- head/graphics/zint/pkg-plist (revision 479371) +++ head/graphics/zint/pkg-plist (revision 479372) @@ -1,11 +1,11 @@ bin/zint bin/zint-qt include/qzint.h include/zint.h lib/libQZint.so -lib/libQZint.so.2.4 -lib/libQZint.so.2.4.1 +lib/libQZint.so.2.6 +lib/libQZint.so.2.6.3 lib/libzint.so -lib/libzint.so.2.4 -lib/libzint.so.2.4.1 +lib/libzint.so.2.6 +lib/libzint.so.2.6.3 share/cmake/Modules/FindZint.cmake