From owner-svn-ports-all@freebsd.org Mon Sep 10 08:17:48 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 187401082FC4; Mon, 10 Sep 2018 08:17:48 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C2C1175AB2; Mon, 10 Sep 2018 08:17:47 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BDB0D25BE6; Mon, 10 Sep 2018 08:17:47 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8A8HlYJ087812; Mon, 10 Sep 2018 08:17:47 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8A8HkKF087807; Mon, 10 Sep 2018 08:17:46 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201809100817.w8A8HkKF087807@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Mon, 10 Sep 2018 08:17:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r479372 - in head/graphics/zint: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/graphics/zint: . files X-SVN-Commit-Revision: 479372 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Sep 2018 08:17:48 -0000 Author: danfe Date: Mon Sep 10 08:17:46 2018 New Revision: 479372 URL: https://svnweb.freebsd.org/changeset/ports/479372 Log: Update `graphics/zint' to version 2.6.3 (judging by the DISTVERSION, it looks like it is -RC2, but what really happened is that first, version 2.6.3 was released on Feb 17 2018 which had erroneously listed 2.6.2 as version in many places. Instead of rerolling the tarball, author have decided to upload another one, named zint-2.6.3-rc2, on Feb 21 2018). Add a comment opposite of the DISTVERSION summarizing the above and set the PORTSCOUT accordingly. Unfortunately, Zint now requires Qt 5, rather than 4, to build against. Added: head/graphics/zint/files/patch-CMakeLists.txt (contents, props changed) Deleted: head/graphics/zint/files/patch-backend_code1.c head/graphics/zint/files/patch-backend_maxicode.c Modified: head/graphics/zint/Makefile head/graphics/zint/distinfo head/graphics/zint/files/patch-backend_CMakeLists.txt head/graphics/zint/pkg-plist Modified: head/graphics/zint/Makefile ============================================================================== --- head/graphics/zint/Makefile Mon Sep 10 08:13:39 2018 (r479371) +++ head/graphics/zint/Makefile Mon Sep 10 08:17:46 2018 (r479372) @@ -2,10 +2,10 @@ # $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 @@ -13,11 +13,13 @@ 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 Modified: head/graphics/zint/distinfo ============================================================================== --- head/graphics/zint/distinfo Mon Sep 10 08:13:39 2018 (r479371) +++ head/graphics/zint/distinfo Mon Sep 10 08:17:46 2018 (r479372) @@ -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 Added: head/graphics/zint/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/zint/files/patch-CMakeLists.txt Mon Sep 10 08:17:46 2018 (r479372) @@ -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) + Modified: head/graphics/zint/files/patch-backend_CMakeLists.txt ============================================================================== --- head/graphics/zint/files/patch-backend_CMakeLists.txt Mon Sep 10 08:13:39 2018 (r479371) +++ head/graphics/zint/files/patch-backend_CMakeLists.txt Mon Sep 10 08:17:46 2018 (r479372) @@ -1,5 +1,5 @@ ---- 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) @@ -8,14 +8,5 @@ +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} ) Modified: head/graphics/zint/pkg-plist ============================================================================== --- head/graphics/zint/pkg-plist Mon Sep 10 08:13:39 2018 (r479371) +++ head/graphics/zint/pkg-plist Mon Sep 10 08:17:46 2018 (r479372) @@ -3,9 +3,9 @@ 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