diff options
| author | kwm <kwm@FreeBSD.org> | 2012-08-17 01:51:49 +0800 |
|---|---|---|
| committer | kwm <kwm@FreeBSD.org> | 2012-08-17 01:51:49 +0800 |
| commit | 9ad9b859edd4396da6e4e949b9bae036cdd40348 (patch) | |
| tree | f914b5f8fbe02a3252a544ae968a7958cf4c8f2d | |
| parent | b24df4f0ff4c42c0e072d3da99b8f58c1f1d7e12 (diff) | |
| download | freebsd-ports-gnome-9ad9b859edd4396da6e4e949b9bae036cdd40348.tar.gz freebsd-ports-gnome-9ad9b859edd4396da6e4e949b9bae036cdd40348.tar.zst freebsd-ports-gnome-9ad9b859edd4396da6e4e949b9bae036cdd40348.zip | |
Merge the patch-Makefile.in into patch-aa which already patched Makefile.in.
| -rw-r--r-- | textproc/libxml2/files/patch-Makefile.in | 11 | ||||
| -rw-r--r-- | textproc/libxml2/files/patch-aa | 25 |
2 files changed, 18 insertions, 18 deletions
diff --git a/textproc/libxml2/files/patch-Makefile.in b/textproc/libxml2/files/patch-Makefile.in deleted file mode 100644 index 9bd2f4a72418..000000000000 --- a/textproc/libxml2/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2010-11-04 20:28:16.000000000 +0300 -+++ Makefile.in 2012-08-16 11:15:53.000000000 +0400 -@@ -1069,7 +1069,7 @@ - @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - - .c.lo: --@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -fPIC -DPIC -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo - @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ diff --git a/textproc/libxml2/files/patch-aa b/textproc/libxml2/files/patch-aa index 91bee0a4204b..b5f110bd8368 100644 --- a/textproc/libxml2/files/patch-aa +++ b/textproc/libxml2/files/patch-aa @@ -1,6 +1,8 @@ ---- Makefile.in.orig 2010-03-20 17:51:45.000000000 -0400 -+++ Makefile.in 2010-03-20 17:52:13.000000000 -0400 -@@ -562,7 +562,7 @@ top_build_prefix = @top_build_prefix@ + $FreeBSD$ + +--- Makefile.in.orig 2012-08-16 19:47:20.000000000 +0200 ++++ Makefile.in 2012-08-16 19:47:48.000000000 +0200 +@@ -564,7 +564,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I m4 @@ -9,7 +11,7 @@ DIST_SUBDIRS = include . doc example python xstc INCLUDES = -I$(top_builddir)/include -I@srcdir@/include @THREAD_CFLAGS@ @Z_CFLAGS@ bin_SCRIPTS = xml2-config -@@ -572,7 +572,7 @@ libxml2_la_LIBADD = @THREAD_LIBS@ @Z_LIB +@@ -574,7 +574,7 @@ libxml2_la_LIBADD = @THREAD_LIBS@ @Z_LIB @USE_VERSION_SCRIPT_TRUE@LIBXML2_VERSION_SCRIPT = $(VERSION_SCRIPT_FLAGS)$(srcdir)/libxml2.syms libxml2_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ \ $(LIBXML2_VERSION_SCRIPT) \ @@ -18,7 +20,7 @@ @MODULE_PLATFORM_LIBS@ @WITH_TRIO_SOURCES_FALSE@libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c \ -@@ -688,7 +688,7 @@ runxmlconf_LDFLAGS = +@@ -690,7 +690,7 @@ runxmlconf_LDFLAGS = runxmlconf_DEPENDENCIES = $(DEPS) runxmlconf_LDADD = $(LDADDS) CLEANFILES = xml2Conf.sh *.gcda *.gcno @@ -27,7 +29,7 @@ confexec_DATA = xml2Conf.sh CVS_EXTRA_DIST = EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \ -@@ -711,8 +711,8 @@ pkgconfig_DATA = libxml-2.0.pc +@@ -713,8 +713,8 @@ pkgconfig_DATA = libxml-2.0.pc # Install the tests program sources as examples # BASE_DIR = $(datadir)/doc @@ -38,7 +40,16 @@ # # Coverage support, largely borrowed from libvirt -@@ -1546,7 +1546,7 @@ distcleancheck: distclean +@@ -1069,7 +1069,7 @@ distclean-compile: + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: +-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -fPIC -DPIC -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< + @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@@ -1548,7 +1548,7 @@ distcleancheck: distclean exit 1; } >&2 check-am: all-am check: check-recursive |