[88462] trunk/dports/textproc/qpdf/files
ryandesign at macports.org
ryandesign at macports.org
Tue Jan 3 00:33:25 PST 2012
Revision: 88462
http://trac.macports.org/changeset/88462
Author: ryandesign at macports.org
Date: 2012-01-03 00:33:25 -0800 (Tue, 03 Jan 2012)
Log Message:
-----------
qpdf: add correct patchfile; remove incorrect patchfile
Added Paths:
-----------
trunk/dports/textproc/qpdf/files/patch-FLAGS.diff
Removed Paths:
-------------
trunk/dports/textproc/qpdf/files/patch-make-libtool.mk.diff
Added: trunk/dports/textproc/qpdf/files/patch-FLAGS.diff
===================================================================
--- trunk/dports/textproc/qpdf/files/patch-FLAGS.diff (rev 0)
+++ trunk/dports/textproc/qpdf/files/patch-FLAGS.diff 2012-01-03 08:33:25 UTC (rev 88462)
@@ -0,0 +1,98 @@
+--- examples/build.mk.orig 2011-08-11 14:55:06.000000000 -0500
++++ examples/build.mk 2012-01-03 02:17:19.000000000 -0600
+@@ -36,4 +36,4 @@
+
+ $(foreach B,$(BINS_examples) $(CBINS_examples),$(eval \
+ examples/$(OUTPUT_DIR)/$(call binname,$(B)): $(OBJS_$(B)) ; \
+- $(call makebin,$(OBJS_$(B)),$$@,$(LDFLAGS) $(LDFLAGS_libqpdf),$(LIBS_libqpdf) $(LIBS))))
++ $(call makebin,$(OBJS_$(B)),$$@,$(LDFLAGS_libqpdf) $(LDFLAGS),$(LIBS_libqpdf) $(LIBS))))
+--- libtests/build.mk.orig 2011-08-11 14:55:06.000000000 -0500
++++ libtests/build.mk 2012-01-03 02:16:59.000000000 -0600
+@@ -37,4 +37,4 @@
+
+ $(foreach B,$(BINS_libtests),$(eval \
+ libtests/$(OUTPUT_DIR)/$(call binname,$(B)): $(OBJS_$(B)) ; \
+- $(call makebin,$(OBJS_$(B)),$$@,$(LDFLAGS) $(LDFLAGS_libqpdf),$(LIBS) $(LIBS_libqpdf))))
++ $(call makebin,$(OBJS_$(B)),$$@,$(LDFLAGS_libqpdf) $(LDFLAGS),$(LIBS) $(LIBS_libqpdf))))
+--- make/libtool.mk.orig 2011-08-11 14:55:06.000000000 -0500
++++ make/libtool.mk 2012-01-03 02:04:20.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
+--- qpdf/build.mk.orig 2011-08-11 14:55:06.000000000 -0500
++++ qpdf/build.mk 2012-01-03 02:13:13.000000000 -0600
+@@ -30,4 +30,4 @@
+
+ $(foreach B,$(BINS_qpdf) $(CBINS_qpdf),$(eval \
+ qpdf/$(OUTPUT_DIR)/$(call binname,$(B)): $(OBJS_$(B)) ; \
+- $(call makebin,$(OBJS_$(B)),$$@,$(LDFLAGS) $(LDFLAGS_libqpdf),$(LIBS_libqpdf) $(LIBS))))
++ $(call makebin,$(OBJS_$(B)),$$@,$(LDFLAGS_libqpdf) $(LDFLAGS),$(LIBS_libqpdf) $(LIBS))))
+--- zlib-flate/build.mk.orig 2011-08-11 14:55:06.000000000 -0500
++++ zlib-flate/build.mk 2012-01-03 02:16:39.000000000 -0600
+@@ -19,4 +19,4 @@
+ $(call compile,$<,$(INCLUDES_zlib-flate))
+
+ zlib-flate/$(OUTPUT_DIR)/$(call binname,zlib-flate): $(OBJS_zlib-flate)
+- $(call makebin,$(OBJS_zlib-flate),$@,$(LDFLAGS) $(LDFLAGS_libqpdf),$(LIBS_libqpdf) $(LIBS))
++ $(call makebin,$(OBJS_zlib-flate),$@,$(LDFLAGS_libqpdf) $(LDFLAGS),$(LIBS_libqpdf) $(LIBS))
Deleted: trunk/dports/textproc/qpdf/files/patch-make-libtool.mk.diff
===================================================================
--- trunk/dports/textproc/qpdf/files/patch-make-libtool.mk.diff 2012-01-03 08:29:19 UTC (rev 88461)
+++ trunk/dports/textproc/qpdf/files/patch-make-libtool.mk.diff 2012-01-03 08:33:25 UTC (rev 88462)
@@ -1,66 +0,0 @@
---- 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/2b930b3b/attachment.html>
More information about the macports-changes
mailing list