2 files changed, 47 insertions, 0 deletions
diff --git a/mail/libvmime/files/patch-Makefile.in b/mail/libvmime/files/patch-Makefile.in
new file mode 100644
index 000000000000..d93f868c096b
--- /dev/null
+++ b/mail/libvmime/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Sun Sep 18 22:07:16 2005
++++ Makefile.in	Sun Sep 18 22:08:38 2005
+@@ -206,7 +206,7 @@
+ 
+ #AUTOMAKE_OPTIONS = dist-bzip2
+ AUTOMAKE_OPTIONS = no-dist
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = $(GENERIC_VERSIONED_LIBRARY_NAME).pc
+ EXTRA_DIST = SConstruct bootstrap
+ doc_DATA = AUTHORS ChangeLog COPYING INSTALL NEWS README
diff --git a/mail/libvmime/files/patch-src__Makefile.in b/mail/libvmime/files/patch-src__Makefile.in
new file mode 100644
index 000000000000..1ba384858eef
--- /dev/null
+++ b/mail/libvmime/files/patch-src__Makefile.in
@@ -0,0 +1,36 @@
+--- src/Makefile.in.orig	Tue Jun 21 19:11:35 2005
++++ src/Makefile.in	Mon Sep 19 12:28:03 2005
+@@ -212,11 +212,11 @@
+ am__depfiles_maybe =
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CXXFLAGS) $(CXXFLAGS)
+ CXXLD = $(CXX)
+-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libvmime_la_SOURCES)
+ DIST_SOURCES = $(am__libvmime_la_SOURCES_DIST)
+@@ -356,7 +356,7 @@
+ target_vendor = @target_vendor@
+ AUTOMAKE_OPTIONS = no-dependencies foreign
+ INTERNALS = 
+-INCLUDES = -I$(top_srcdir) -I$(srcdir) @PKGCONFIG_CFLAGS@ @EXTRA_CFLAGS@
++INCLUDES = -I$(prefix)/include -I$(top_srcdir) -I$(srcdir) @PKGCONFIG_CFLAGS@ @EXTRA_CFLAGS@
+ lib_LTLIBRARIES = libvmime.la
+ libvmime_la_LDFLAGS = -export-dynamic -version-info @LIBRARY_VERSION@ @PKGCONFIG_LIBS@ @EXTRA_LIBS@
+ libvmime_la_SOURCES = address.cpp \
+@@ -473,8 +473,8 @@
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++	    echo " $(LIBTOOL) --tag=CXX --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
++	    $(LIBTOOL) --tag=CXX --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ 	  else :; fi; \
+ 	done
+