From owner-svn-ports-head@freebsd.org Sun Jul 3 19:34:39 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 107F3B9082A; Sun, 3 Jul 2016 19:34:39 +0000 (UTC) (envelope-from pawel@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 mx1.freebsd.org (Postfix) with ESMTPS id C7D9F2F34; Sun, 3 Jul 2016 19:34:38 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u63JYcta006818; Sun, 3 Jul 2016 19:34:38 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u63JYbLX006816; Sun, 3 Jul 2016 19:34:37 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201607031934.u63JYbLX006816@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Sun, 3 Jul 2016 19:34:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417996 - in head/graphics/podofo: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jul 2016 19:34:39 -0000 Author: pawel Date: Sun Jul 3 19:34:37 2016 New Revision: 417996 URL: https://svnweb.freebsd.org/changeset/ports/417996 Log: - Fix SIZE_MAX buildfix patch, use other method now upstreamed - Convert to USES=ssl - Group IMPOSE options helpers together Modified: head/graphics/podofo/Makefile head/graphics/podofo/files/patch-src_base_PdfMemoryManagement.cpp Modified: head/graphics/podofo/Makefile ============================================================================== --- head/graphics/podofo/Makefile Sun Jul 3 19:31:26 2016 (r417995) +++ head/graphics/podofo/Makefile Sun Jul 3 19:34:37 2016 (r417996) @@ -3,6 +3,7 @@ PORTNAME= podofo PORTVERSION= 0.9.4 +PORTREVISION= 1 CATEGORIES= graphics print MASTER_SITES= SF @@ -16,19 +17,19 @@ LIB_DEPENDS= libidn.so:dns/libidn \ libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig -USES= cmake dos2unix +USES= cmake dos2unix ssl CMAKE_ARGS= -DPODOFO_BUILD_SHARED:BOOL=TRUE \ -DPODOFO_BUILD_STATIC:BOOL=FALSE \ -DOPENSSL_INCLUDE_DIR:PATH="${OPENSSLINC}" \ -DOPENSSL_LIBRARIES:PATH="${OPENSSLDIR}" -USE_OPENSSL= yes USE_LDCONFIG= yes DOS2UNIX_FILES= cmake/modules/FindFREETYPE.cmake OPTIONS_DEFINE= IMPOSE JPEG PNG TIFF OPTIONS_DEFAULT= JPEG PNG TIFF -IMPOSE_DESC= Build impose tool (needs Lua) +IMPOSE_DESC= Build impose tool (needs Lua) +IMPOSE_USES= lua:51 IMPOSE_CMAKE_ON= -DWANT_LUA:BOOL=TRUE IMPOSE_CXXFLAGS= -I${LUA_INCDIR} IMPOSE_LDFLAGS= -L${LUA_LIBDIR} @@ -42,6 +43,4 @@ PNG_LIB_DEPENDS= libpng.so:graphics/png TIFF_CMAKE_ON= -DWANT_TIFF:BOOL=TRUE TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff -IMPOSE_USES= lua:51 - .include Modified: head/graphics/podofo/files/patch-src_base_PdfMemoryManagement.cpp ============================================================================== --- head/graphics/podofo/files/patch-src_base_PdfMemoryManagement.cpp Sun Jul 3 19:31:26 2016 (r417995) +++ head/graphics/podofo/files/patch-src_base_PdfMemoryManagement.cpp Sun Jul 3 19:34:37 2016 (r417996) @@ -1,17 +1,19 @@ ---- src/base/PdfMemoryManagement.cpp.orig 2016-06-16 16:10:23 UTC +--- src/base/PdfMemoryManagement.cpp.orig 2016-07-03 09:12:06 UTC +++ src/base/PdfMemoryManagement.cpp -@@ -44,6 +44,14 @@ +@@ -34,15 +34,9 @@ + #include "PdfMemoryManagement.h" + #include "PdfDefinesPrivate.h" + +-#ifdef _WIN32 + #ifndef SIZE_MAX +-#ifdef _WIN64 +-#define SIZE_MAX _UI64_MAX +-#else +-#define SIZE_MAX UINT_MAX +-#endif ++#define SIZE_MAX std::numeric_limits::max() #endif - #endif // _WIN32 +-#endif // _WIN32 -+#ifdef __FreeBSD__ -+#if __WORDSIZE == 64 -+#define SIZE_MAX UINT64_MAX -+#else -+#define SIZE_MAX UINT_MAX -+#endif -+#endif -+ #if defined(_MSC_VER) && ( _MSC_VER <= 1200 ) // errno.h isn't available in Visual C++ 6 (definitions are in stdlib.h which is already included) - #else