1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-30 01:15:52 +00:00

- Fix SIZE_MAX buildfix patch, use other method now upstreamed

- Convert to USES=ssl
- Group IMPOSE options helpers together
This commit is contained in:
Pawel Pekala 2016-07-03 19:34:37 +00:00
parent 20c6e84e1e
commit 09be98d7d0
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=417996
2 changed files with 19 additions and 18 deletions

View File

@ -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 <bsd.port.mk>

View File

@ -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 @@
#endif
#endif // _WIN32
@@ -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<size_t>::max()
#endif
-#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