Update to Podofo 0.9.2 for various bug fixes and improved encryption

support. Additionally, build shared libraries.

5 files changed, 22 insertions, 22 deletions

diff --git a/print/podofo/Makefile b/print/podofo/Makefile
index d2ec329da42..fb04837beb9 100644
--- a/print/podofo/Makefile
+++ b/print/podofo/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2013/07/04 21:27:58 adam Exp $
+# $NetBSD: Makefile,v 1.17 2013/07/05 21:12:45 joerg Exp $
 #
 
-DISTNAME=	podofo-0.9.1
-PKGREVISION=	8
+DISTNAME=	podofo-0.9.2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=podofo/}
 
@@ -14,14 +13,14 @@ LICENSE=	gnu-lgpl-v2 AND gnu-gpl-v2
 USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config
+CMAKE_ARGS+=	-DPODOFO_BUILD_SHARED:BOOL=TRUE -DPODOFO_BUILD_STATIC:BOOL=TRUE
 CMAKE_ARGS+=	-DFREETYPE_INCLUDE_DIR_FT2BUILD:PATH=${BUILDLINK_PREFIX.freetype2}/include
 CMAKE_ARGS+=	-DFREETYPE_LIB_PATHS:PATH=${BUILDLINK_PREFIX.freetype2}/lib
-CFLAGS+=	-fPIC
-CXXFLAGS+=	-fPIC
 
 .include "options.mk"
 
 # tests-depend on cppunit (for unit tests)
+.include "../../devel/libidn/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
diff --git a/print/podofo/PLIST b/print/podofo/PLIST
index 5943e1213ab..8647bcb9aa1 100644
--- a/print/podofo/PLIST
+++ b/print/podofo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2011/10/26 19:28:00 gls Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/07/05 21:12:45 joerg Exp $
 bin/podofobox
 bin/podofocolor
 bin/podofocountpages
@@ -53,7 +53,6 @@ include/podofo/base/PdfRect.h
 include/podofo/base/PdfRefCountedBuffer.h
 include/podofo/base/PdfRefCountedInputDevice.h
 include/podofo/base/PdfReference.h
-include/podofo/base/PdfRijndael.h
 include/podofo/base/PdfStream.h
 include/podofo/base/PdfString.h
 include/podofo/base/PdfTokenizer.h
@@ -74,6 +73,7 @@ include/podofo/base/util/PdfMutexWrapper.h
 include/podofo/doc/PdfAcroForm.h
 include/podofo/doc/PdfAction.h
 include/podofo/doc/PdfAnnotation.h
+include/podofo/doc/PdfCMapEncoding.h
 include/podofo/doc/PdfContents.h
 include/podofo/doc/PdfDestination.h
 include/podofo/doc/PdfDifferenceEncoding.h
@@ -86,6 +86,7 @@ include/podofo/doc/PdfFileSpec.h
 include/podofo/doc/PdfFont.h
 include/podofo/doc/PdfFontCID.h
 include/podofo/doc/PdfFontCache.h
+include/podofo/doc/PdfFontConfigWrapper.h
 include/podofo/doc/PdfFontFactory.h
 include/podofo/doc/PdfFontFactoryBase14Data.h
 include/podofo/doc/PdfFontMetrics.h
@@ -119,6 +120,8 @@ include/podofo/doc/PdfXObject.h
 include/podofo/podofo-base.h
 include/podofo/podofo.h
 lib/libpodofo.a
+lib/libpodofo.so
+lib/libpodofo.so.0.9.1
 man/man1/podofobox.1
 man/man1/podofocountpages.1
 man/man1/podofocrop.1
diff --git a/print/podofo/buildlink3.mk b/print/podofo/buildlink3.mk
index 951eff0c01b..ea426cc5269 100644
--- a/print/podofo/buildlink3.mk
+++ b/print/podofo/buildlink3.mk
@@ -1,14 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.7 2013/01/26 21:36:44 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2013/07/05 21:12:45 joerg Exp $
 
 BUILDLINK_TREE+=	podofo
 
 .if !defined(PODOFO_BUILDLINK3_MK)
 PODOFO_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.podofo+=	podofo>=0.7.0
-BUILDLINK_ABI_DEPENDS.podofo+=	podofo>=0.9.1nb3
+BUILDLINK_API_DEPENDS.podofo+=	podofo>=0.9.2
 BUILDLINK_PKGSRCDIR.podofo?=	../../print/podofo
-BUILDLINK_DEPMETHOD.podofo?=	build
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
diff --git a/print/podofo/distinfo b/print/podofo/distinfo
index d0c2507618d..6327d86785a 100644
--- a/print/podofo/distinfo
+++ b/print/podofo/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2013/05/04 12:51:31 joerg Exp $
+$NetBSD: distinfo,v 1.6 2013/07/05 21:12:45 joerg Exp $
 
-SHA1 (podofo-0.9.1.tar.gz) = d04c26b93dcf5f82a8dd90e02df6de95fb98ef47
-RMD160 (podofo-0.9.1.tar.gz) = 4d65f78cf4929eda44b5f27d518d104380e58160
-Size (podofo-0.9.1.tar.gz) = 1080079 bytes
-SHA1 (patch-aa) = 7d3bb709d86ad13b21120d41223a4d84c5d9215d
+SHA1 (podofo-0.9.2.tar.gz) = 8a6e27e17e0ed9f12e1a999cff66eae8eb97a4bc
+RMD160 (podofo-0.9.2.tar.gz) = 69bf1035f2466ba95208830038c6f8e303580a5b
+Size (podofo-0.9.2.tar.gz) = 1092131 bytes
+SHA1 (patch-aa) = 83740cf59f1c86b07e7ce498e19efe627c0b249e
 SHA1 (patch-ab) = 86ef3d5f6fced669cbeeae95890c046489467e69
 SHA1 (patch-ac) = b184fa648407141a373451334790aada66cc2ae2
 SHA1 (patch-src_base_PdfLocale.h) = ba209173509f1109d305765ae7dd56d8266a97d8
diff --git a/print/podofo/patches/patch-aa b/print/podofo/patches/patch-aa
index 3f4c1336b66..e908934dd1b 100644
--- a/print/podofo/patches/patch-aa
+++ b/print/podofo/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/10/11 09:41:35 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2013/07/05 21:12:45 joerg Exp $
 
---- cmake/modules/FindFREETYPE.cmake.orig	2007-11-07 17:45:20.000000000 +0000
+--- cmake/modules/FindFREETYPE.cmake.orig	2012-12-12 22:55:14.000000000 +0000
 +++ cmake/modules/FindFREETYPE.cmake
-@@ -41,7 +41,7 @@ ENDIF(NOT FREETYPE_FIND_QUIETLY)
+@@ -43,8 +43,6 @@ ENDIF(NOT FREETYPE_FIND_QUIETLY)

  SET(FREETYPE_LIBRARY_NAMES_DEBUG ${FREETYPE_LIBRARY_NAMES_DEBUG} freetyped libfreetyped)

  SET(FREETYPE_LIBRARY_NAMES_RELEASE ${FREETYPE_LIBRARY_NAMES_RELEASE} freetype libfreetype)

  

--SET(FREETYPE_LIB_PATHS /usr/lib /usr/local/lib)

-+#SET(FREETYPE_LIB_PATHS /usr/lib /usr/local/lib)

- 

+-SET(FREETYPE_LIB_PATHS /usr/lib /usr/local/lib /usr/X11/lib)

+-

  FIND_LIBRARY(FREETYPE_LIBRARY_RELEASE

    ${FREETYPE_LIBRARY_NAMES_RELEASE}

+   ${FREETYPE_LIBRARY_NAMES}