[88461] trunk/dports/textproc/qpdf

[ryandesign at macports.org]

Revision: 88461
          http://trac.macports.org/changeset/88461
Author:   ryandesign at macports.org
Date:     2012-01-03 00:29:19 -0800 (Tue, 03 Jan 2012)
Log Message:
-----------
qpdf: prevent build errors when older version is installed and active; see #32095

Modified Paths:
--------------
    trunk/dports/textproc/qpdf/Portfile

Added Paths:
-----------
    trunk/dports/textproc/qpdf/files/
    trunk/dports/textproc/qpdf/files/patch-make-libtool.mk.diff

Modified: trunk/dports/textproc/qpdf/Portfile
===================================================================
--- trunk/dports/textproc/qpdf/Portfile	2012-01-03 03:42:14 UTC (rev 88460)
+++ trunk/dports/textproc/qpdf/Portfile	2012-01-03 08:29:19 UTC (rev 88461)
@@ -21,3 +21,6 @@
                     sha256  36824387cebd324c908d97bac13a8169b04fea7593e7c9c7314c8fd6cf9045bb
 
 depends_lib         port:pcre
+
+# Prevent build errors when upgrading from an older version.
+patchfiles          patch-FLAGS.diff

Added: trunk/dports/textproc/qpdf/files/patch-make-libtool.mk.diff
===================================================================
--- trunk/dports/textproc/qpdf/files/patch-make-libtool.mk.diff	                        (rev 0)
+++ trunk/dports/textproc/qpdf/files/patch-make-libtool.mk.diff	2012-01-03 08:29:19 UTC (rev 88461)
@@ -0,0 +1,66 @@
+--- make/libtool.mk.orig	2011-08-11 14:55:06.000000000 -0500
++++ make/libtool.mk	2012-01-03 02:03:15.000000000 -0600
+@@ -31,18 +31,20 @@
+ #                       1   2
+ # Usage: $(call compile,src,includes)
+ define compile
+-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) \
++	$(CXX) $(CXXFLAGS) \
+ 		$(call depflags,$(basename $(call src_to_obj,$(1)))) \
+ 		$(foreach I,$(2),-I$(I)) \
++		$(CPPFLAGS) \
+ 		-c $(1) -o $(call src_to_obj,$(1))
+ endef
+ 
+ #                       1   2
+ # Usage: $(call c_compile,src,includes)
+ define c_compile
+-	$(CC) $(CPPFLAGS) $(CFLAGS) \
++	$(CC) $(CFLAGS) \
+ 		$(call depflags,$(basename $(call c_src_to_obj,$(1)))) \
+ 		$(foreach I,$(2),-I$(I)) \
++		$(CPPFLAGS) \
+ 		-c $(1) -o $(call c_src_to_obj,$(1))
+ endef
+ 
+@@ -50,9 +52,10 @@
+ # Usage: $(call libcompile,src,includes)
+ define libcompile
+ 	$(LIBTOOL) --quiet --mode=compile \
+-		$(CXX) $(CPPFLAGS) $(CXXFLAGS) \
++		$(CXX) $(CXXFLAGS) \
+ 		$(call libdepflags,$(basename $(call src_to_obj,$(1)))) \
+ 		$(foreach I,$(2),-I$(I)) \
++		$(CPPFLAGS) \
+ 		-c $(1) -o $(call src_to_obj,$(1)); \
+ 	$(call fixdeps,$(basename $(call src_to_obj,$(1))))
+ endef
+@@ -61,9 +64,10 @@
+ # Usage: $(call libcompile,src,includes)
+ define c_libcompile
+ 	$(LIBTOOL) --quiet --mode=compile \
+-		$(CC) $(CPPFLAGS) $(CXXFLAGS) \
++		$(CC) $(CXXFLAGS) \
+ 		$(call libdepflags,$(basename $(call c_src_to_obj,$(1)))) \
+ 		$(foreach I,$(2),-I$(I)) \
++		$(CPPFLAGS) \
+ 		-c $(1) -o $(call c_src_to_obj,$(1)); \
+ 	$(call fixdeps,$(basename $(call src_to_obj,$(1))))
+ endef
+@@ -80,14 +84,14 @@
+ # Usage: $(call makelib,objs,library,ldflags,libs,current,revision,age)
+ define makelib
+ 	$(LIBTOOL) --mode=link \
+-		$(CXX) $(CXXFLAGS) -o $(2) $(1) $(3) $(4) \
++		$(CXX) $(CXXFLAGS) -o $(2) $(1) $(4) $(3) \
+ 		 -rpath $(libdir) -version-info $(5):$(6):$(7)
+ endef
+ 
+ #                       1    2      3       4
+ # Usage: $(call makebin,objs,binary,ldflags,libs)
+ define makebin
+-	$(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(1) -o $(2) $(3) $(4)
++	$(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(1) -o $(2) $(4) $(3)
+ endef
+ 
+ # Install target
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120103/b8b94677/attachment.html>