svn commit: r302652 - head/textproc/libxml2/files

[Koop Mast]

Author: kwm
Date: Thu Aug 16 17:51:49 2012
New Revision: 302652
URL: http://svn.freebsd.org/changeset/ports/302652

Log:
  Merge the patch-Makefile.in into patch-aa which already patched Makefile.in.

Deleted:
  head/textproc/libxml2/files/patch-Makefile.in
Modified:
  head/textproc/libxml2/files/patch-aa

Modified: head/textproc/libxml2/files/patch-aa
==============================================================================
--- head/textproc/libxml2/files/patch-aa	Thu Aug 16 17:34:43 2012	(r302651)
+++ head/textproc/libxml2/files/patch-aa	Thu Aug 16 17:51:49 2012	(r302652)
@@ -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 at 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 at 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 at 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:
+- at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at 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