[49018] trunk/dports/print/pdflib

[mcalhoun at macports.org]

Revision: 49018
          http://trac.macports.org/changeset/49018
Author:   mcalhoun at macports.org
Date:     2009-04-01 17:49:51 -0700 (Wed, 01 Apr 2009)
Log Message:
-----------
pdflib:
    * patch-libs__pdcore__pc_util.diff was added in r12125, but pc_core.h now includes sys/types.h.
    * Replace -I with -isystem so patch-config-mkcommon.inc.diff is no longer needed.
    * Without with-pyincl, Python 2.5 header files are always used.

Modified Paths:
--------------
    trunk/dports/print/pdflib/Portfile

Removed Paths:
-------------
    trunk/dports/print/pdflib/files/patch-config-mkcommon.inc.diff
    trunk/dports/print/pdflib/files/patch-libs__pdcore__pc_util.diff

Modified: trunk/dports/print/pdflib/Portfile
===================================================================
--- trunk/dports/print/pdflib/Portfile	2009-04-02 00:30:27 UTC (rev 49017)
+++ trunk/dports/print/pdflib/Portfile	2009-04-02 00:49:51 UTC (rev 49018)
@@ -25,7 +25,6 @@
     rmd160 90f91e2ff08e0280dce63801899162411889f0b7
 
 patchfiles		\
-    patch-config-mkcommon.inc.diff patch-libs__pdcore__pc_util.diff \
     patch-perl_Makefile.diff
 
 test.run        yes
@@ -33,6 +32,10 @@
 configure.args	--without-java --without-perl --without-py --without-tcl --without-ruby
 configure.ccache        no
 
+# The existence of tiff header files interferes with PDFLib (#11789).
+configure.cppflags-delete -I${prefix}/include
+configure.cppflags-append -isystem${prefix}/include
+
 post-patch {
 	reinplace "s/PYTHONLIBDIR=`cat << EOF | python/PYTHONLIBDIR=`cat << EOF | \$PYTHONBIN/g" \
         ${worksrcpath}/configure
@@ -94,7 +97,9 @@
 	set pyversion           2.6
 	depends_lib-append			port:python[strsed ${pyversion} {g/[.]//}]
 	configure.args-delete	--without-py
-	configure.args-append	--with-py=${frameworks_dir}/Python.framework/Versions/${pyversion}
+	configure.args-append \
+        --with-py=${frameworks_dir}/Python.framework/Versions/${pyversion} \
+        --with-pyincl=${frameworks_dir}/Python.framework/Versions/${pyversion}/include/python${pyversion}
 	configure.env-append	PYTHONBIN=${prefix}/bin/python${pyversion}
 
 	post-destroot {

Deleted: trunk/dports/print/pdflib/files/patch-config-mkcommon.inc.diff
===================================================================
--- trunk/dports/print/pdflib/files/patch-config-mkcommon.inc.diff	2009-04-02 00:30:27 UTC (rev 49017)
+++ trunk/dports/print/pdflib/files/patch-config-mkcommon.inc.diff	2009-04-02 00:49:51 UTC (rev 49018)
@@ -1,11 +0,0 @@
---- config/mkcommon.inc.in	2007-03-13 13:32:10.000000000 +0100
-+++ config/mkcommon.inc.in.new	2007-04-18 21:37:26.000000000 +0200
-@@ -44,7 +44,7 @@
- # build related stuff (configure)
- LDFLAGS		= @LDFLAGS@
- CFLAGS		= @CFLAGS@ @DEFS@ $(PDFWALL) $(PDFPEDANTIC) $(MYCFLAGS) 
--CPPFLAGS	= @CPPFLAGS@ $(INCLUDES)
-+CPPFLAGS	= $(INCLUDES) @CPPFLAGS@ 
- CXXFLAGS	= @CXXFLAGS@
- PDFWALL		= @PDFWALL@
- PDFPEDANTIC	= @PDFPEDANTIC@

Deleted: trunk/dports/print/pdflib/files/patch-libs__pdcore__pc_util.diff
===================================================================
--- trunk/dports/print/pdflib/files/patch-libs__pdcore__pc_util.diff	2009-04-02 00:30:27 UTC (rev 49017)
+++ trunk/dports/print/pdflib/files/patch-libs__pdcore__pc_util.diff	2009-04-02 00:49:51 UTC (rev 49018)
@@ -1,10 +0,0 @@
---- libs/pdcore/pc_util.h.orig	2005-05-02 01:24:15.000000000 -0400
-+++ libs/pdcore/pc_util.h	2005-05-02 01:24:21.000000000 -0400
-@@ -19,6 +19,7 @@
- #ifndef PC_UTIL_H
- #define PC_UTIL_H
- 
-+#include <sys/types.h>
- #include <stdlib.h>
- #include <string.h>
- #include <limits.h>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090401/290780e1/attachment.html>