Update print/podofo to 0.9.1.

Upstream changes are unknown, Changelog only says: 'see SVN changelog'

4 files changed, 151 insertions, 94 deletions

diff --git a/print/podofo/Makefile b/print/podofo/Makefile
index 039f1ea5448..cb2f2be232f 100644
--- a/print/podofo/Makefile
+++ b/print/podofo/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.6 2011/05/02 11:53:51 shattered Exp $
+# $NetBSD: Makefile,v 1.7 2011/10/26 19:28:00 gls Exp $
 #
 
-DISTNAME=	podofo-0.7.0
-PKGREVISION=	3
+DISTNAME=	podofo-0.9.1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=podofo/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://podofo.sourceforge.net/
 COMMENT=	Library to work with the PDF file format
-#LICENSE=	gnu-lgpl-v? AND gnu-gpl-v?
+LICENSE=	gnu-lgpl-v2 AND gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -28,6 +27,7 @@ CXXFLAGS+=	-fPIC
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/podofo/PLIST b/print/podofo/PLIST
index 0879dc6e20e..5943e1213ab 100644
--- a/print/podofo/PLIST
+++ b/print/podofo/PLIST
@@ -1,91 +1,136 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/11 09:41:35 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2011/10/26 19:28:00 gls Exp $
+bin/podofobox
+bin/podofocolor
+bin/podofocountpages
+bin/podofocrop
 bin/podofoencrypt
+bin/podofogc
+bin/podofoimg2pdf
 bin/podofoimgextract
 bin/podofoimpose
+bin/podofoincrementalupdates
 bin/podofomerge
+bin/podofopages
 bin/podofopdfinfo
 bin/podofotxt2pdf
 bin/podofotxtextract
 bin/podofouncompress
-include/podofo/Pdf3rdPtyForwardDecl.h
-include/podofo/PdfAcroForm.h
-include/podofo/PdfAction.h
-include/podofo/PdfAnnotation.h
-include/podofo/PdfArray.h
-include/podofo/PdfCanvas.h
-include/podofo/PdfColor.h
-include/podofo/PdfContents.h
-include/podofo/PdfContentsTokenizer.h
-include/podofo/PdfData.h
-include/podofo/PdfDataType.h
-include/podofo/PdfDate.h
-include/podofo/PdfDefines.h
-include/podofo/PdfDestination.h
-include/podofo/PdfDictionary.h
-include/podofo/PdfDifferenceEncoding.h
-include/podofo/PdfDocument.h
-include/podofo/PdfElement.h
-include/podofo/PdfEncoding.h
-include/podofo/PdfEncodingFactory.h
-include/podofo/PdfEncrypt.h
-include/podofo/PdfError.h
-include/podofo/PdfExtGState.h
-include/podofo/PdfField.h
-include/podofo/PdfFileSpec.h
-include/podofo/PdfFileStream.h
-include/podofo/PdfFilter.h
-include/podofo/PdfFiltersPrivate.h
-include/podofo/PdfFont.h
-include/podofo/PdfFontCID.h
-include/podofo/PdfFontCache.h
-include/podofo/PdfFontFactory.h
-include/podofo/PdfFontMetrics.h
-include/podofo/PdfFontSimple.h
-include/podofo/PdfFontTTFSubset.h
-include/podofo/PdfFontTrueType.h
-include/podofo/PdfFontType1.h
-include/podofo/PdfFunction.h
-include/podofo/PdfHintStream.h
-include/podofo/PdfImage.h
-include/podofo/PdfImmediateWriter.h
-include/podofo/PdfInfo.h
-include/podofo/PdfInputDevice.h
-include/podofo/PdfInputStream.h
-include/podofo/PdfLocale.h
-include/podofo/PdfMemDocument.h
-include/podofo/PdfMemStream.h
-include/podofo/PdfName.h
-include/podofo/PdfNamesTree.h
-include/podofo/PdfObject.h
-include/podofo/PdfOutlines.h
-include/podofo/PdfOutputDevice.h
-include/podofo/PdfOutputStream.h
-include/podofo/PdfPage.h
-include/podofo/PdfPagesTree.h
-include/podofo/PdfPainter.h
-include/podofo/PdfPainterMM.h
-include/podofo/PdfParser.h
-include/podofo/PdfParserObject.h
-include/podofo/PdfRect.h
-include/podofo/PdfRefCountedBuffer.h
-include/podofo/PdfRefCountedInputDevice.h
-include/podofo/PdfReference.h
-include/podofo/PdfRijndael.h
-include/podofo/PdfShadingPattern.h
-include/podofo/PdfStream.h
-include/podofo/PdfStreamedDocument.h
-include/podofo/PdfString.h
-include/podofo/PdfTable.h
-include/podofo/PdfTokenizer.h
-include/podofo/PdfVariant.h
-include/podofo/PdfVecObjects.h
-include/podofo/PdfVersion.h
-include/podofo/PdfWriter.h
-include/podofo/PdfXObject.h
-include/podofo/PdfXRef.h
-include/podofo/PdfXRefStream.h
+bin/podofoxmp
+include/podofo/base/Pdf3rdPtyForwardDecl.h
+include/podofo/base/PdfArray.h
+include/podofo/base/PdfCanvas.h
+include/podofo/base/PdfColor.h
+include/podofo/base/PdfCompilerCompat.h
+include/podofo/base/PdfCompilerCompatPrivate.h
+include/podofo/base/PdfContentsTokenizer.h
+include/podofo/base/PdfData.h
+include/podofo/base/PdfDataType.h
+include/podofo/base/PdfDate.h
+include/podofo/base/PdfDefines.h
+include/podofo/base/PdfDefinesPrivate.h
+include/podofo/base/PdfDictionary.h
+include/podofo/base/PdfEncoding.h
+include/podofo/base/PdfEncodingFactory.h
+include/podofo/base/PdfEncrypt.h
+include/podofo/base/PdfError.h
+include/podofo/base/PdfFileStream.h
+include/podofo/base/PdfFilter.h
+include/podofo/base/PdfFiltersPrivate.h
+include/podofo/base/PdfImmediateWriter.h
+include/podofo/base/PdfInputDevice.h
+include/podofo/base/PdfInputStream.h
+include/podofo/base/PdfLocale.h
+include/podofo/base/PdfMemStream.h
+include/podofo/base/PdfMemoryManagement.h
+include/podofo/base/PdfName.h
+include/podofo/base/PdfObject.h
+include/podofo/base/PdfObjectStreamParserObject.h
+include/podofo/base/PdfOutputDevice.h
+include/podofo/base/PdfOutputStream.h
+include/podofo/base/PdfParser.h
+include/podofo/base/PdfParserObject.h
+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
+include/podofo/base/PdfVariant.h
+include/podofo/base/PdfVecObjects.h
+include/podofo/base/PdfVersion.h
+include/podofo/base/PdfWriter.h
+include/podofo/base/PdfXRef.h
+include/podofo/base/PdfXRefStream.h
+include/podofo/base/PdfXRefStreamParserObject.h
+include/podofo/base/podofo_config.h
+include/podofo/base/podofoapi.h
+include/podofo/base/util/PdfMutex.h
+include/podofo/base/util/PdfMutexImpl_noop.h
+include/podofo/base/util/PdfMutexImpl_pthread.h
+include/podofo/base/util/PdfMutexImpl_win32.h
+include/podofo/base/util/PdfMutexWrapper.h
+include/podofo/doc/PdfAcroForm.h
+include/podofo/doc/PdfAction.h
+include/podofo/doc/PdfAnnotation.h
+include/podofo/doc/PdfContents.h
+include/podofo/doc/PdfDestination.h
+include/podofo/doc/PdfDifferenceEncoding.h
+include/podofo/doc/PdfDocument.h
+include/podofo/doc/PdfElement.h
+include/podofo/doc/PdfEncodingObjectFactory.h
+include/podofo/doc/PdfExtGState.h
+include/podofo/doc/PdfField.h
+include/podofo/doc/PdfFileSpec.h
+include/podofo/doc/PdfFont.h
+include/podofo/doc/PdfFontCID.h
+include/podofo/doc/PdfFontCache.h
+include/podofo/doc/PdfFontFactory.h
+include/podofo/doc/PdfFontFactoryBase14Data.h
+include/podofo/doc/PdfFontMetrics.h
+include/podofo/doc/PdfFontMetricsBase14.h
+include/podofo/doc/PdfFontMetricsFreetype.h
+include/podofo/doc/PdfFontMetricsObject.h
+include/podofo/doc/PdfFontSimple.h
+include/podofo/doc/PdfFontTTFSubset.h
+include/podofo/doc/PdfFontTrueType.h
+include/podofo/doc/PdfFontType1.h
+include/podofo/doc/PdfFontType1Base14.h
+include/podofo/doc/PdfFunction.h
+include/podofo/doc/PdfHintStream.h
+include/podofo/doc/PdfIdentityEncoding.h
+include/podofo/doc/PdfImage.h
+include/podofo/doc/PdfInfo.h
+include/podofo/doc/PdfMemDocument.h
+include/podofo/doc/PdfNamesTree.h
+include/podofo/doc/PdfOutlines.h
+include/podofo/doc/PdfPage.h
+include/podofo/doc/PdfPagesTree.h
+include/podofo/doc/PdfPagesTreeCache.h
+include/podofo/doc/PdfPainter.h
+include/podofo/doc/PdfPainterMM.h
+include/podofo/doc/PdfShadingPattern.h
+include/podofo/doc/PdfSignOutputDevice.h
+include/podofo/doc/PdfSignatureField.h
+include/podofo/doc/PdfStreamedDocument.h
+include/podofo/doc/PdfTable.h
+include/podofo/doc/PdfXObject.h
+include/podofo/podofo-base.h
 include/podofo/podofo.h
-include/podofo/podofoapi.h
-include/podofo/util/PdfMutex.h
-include/podofo/util/PdfMutexWrapper.h
 lib/libpodofo.a
+man/man1/podofobox.1
+man/man1/podofocountpages.1
+man/man1/podofocrop.1
+man/man1/podofoencrypt.1
+man/man1/podofoimg2pdf.1
+man/man1/podofoimgextract.1
+man/man1/podofoimpose.1
+man/man1/podofoincrementalupdates.1
+man/man1/podofomerge.1
+man/man1/podofopages.1
+man/man1/podofopdfinfo.1
+man/man1/podofotxt2pdf.1
+man/man1/podofotxtextract.1
+man/man1/podofouncompress.1
+man/man1/podofoxmp.1
diff --git a/print/podofo/distinfo b/print/podofo/distinfo
index f86d507b086..f0bc4b95bb4 100644
--- a/print/podofo/distinfo
+++ b/print/podofo/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2011/05/02 11:53:51 shattered Exp $
+$NetBSD: distinfo,v 1.3 2011/10/26 19:28:00 gls Exp $
 
-SHA1 (podofo-0.7.0.tar.gz) = bd9862770c99f5790e6be53a57c77c5d4796d841
-RMD160 (podofo-0.7.0.tar.gz) = 37721670a706da614b61ec9620fb1ef46aaff4ae
-Size (podofo-0.7.0.tar.gz) = 1117023 bytes
+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 (patch-ab) = 1f3284b7721862165941578b3710504f818c60e4
+SHA1 (patch-ab) = 86ef3d5f6fced669cbeeae95890c046489467e69
diff --git a/print/podofo/patches/patch-ab b/print/podofo/patches/patch-ab
index 2096abe22aa..d3a75b2381b 100644
--- a/print/podofo/patches/patch-ab
+++ b/print/podofo/patches/patch-ab
@@ -1,8 +1,11 @@
-$NetBSD: patch-ab,v 1.1 2011/05/02 11:53:51 shattered Exp $
+$NetBSD: patch-ab,v 1.2 2011/10/26 19:28:00 gls Exp $
 
---- CMakeLists.txt.orig	2008-12-30 12:16:23.000000000 +0000
+Make LUA optional (PR/43054). Make sure man pages are installed
+at the right place.
+
+--- CMakeLists.txt.orig	2011-04-26 18:02:47.000000000 +0000
 +++ CMakeLists.txt
-@@ -269,7 +269,9 @@ ELSE(DEFINED JPEG_RUNTIME_COMPATIBLE)
+@@ -407,7 +407,9 @@ ELSE(DEFINED JPEG_RUNTIME_COMPATIBLE)
  	ENDIF(NOT WIN32)
  ENDIF(DEFINED JPEG_RUNTIME_COMPATIBLE)
  
@@ -12,4 +15,13 @@ $NetBSD: patch-ab,v 1.1 2011/05/02 11:53:51 shattered Exp $
 +ENDIF(DEFINED LUA_ENABLED)
  IF(LUA_FOUND)
  	# If we have lua, we can build podofoimpose.
- 	MESSAGE("Lua found - PoDoFoImpose will be built with Lua support")
+ 	MESSAGE("Lua found - PoDoFoImpose and PoDoFoColor will be built with Lua support")
+@@ -485,7 +487,7 @@ SET(PODOFO_LIB
+ #
+ # Setup directories we will need
+ #
+-SET(MANDIR "share/man/")
++SET(MANDIR "man/")
+ 
+ # Create the config file. It'll be appended to as the subdirs run though
+ # then dependency information will be written to it at the end of the