svn commit: r353042 - in head/mail/libmapi: . files

[Koop Mast]

Author: kwm
Date: Mon May  5 21:00:20 2014
New Revision: 353042
URL: http://svnweb.freebsd.org/changeset/ports/353042
QAT: https://qat.redports.org/buildarchive/r353042/

Log:
  Tell configure to use python27-config instead of python-config.
  Add forgotten patch.
  
  Reported by:	Gustau Perez

Added:
  head/mail/libmapi/files/
  head/mail/libmapi/files/patch-Makefile   (contents, props changed)
Modified:
  head/mail/libmapi/Makefile

Modified: head/mail/libmapi/Makefile
==============================================================================
--- head/mail/libmapi/Makefile	Mon May  5 20:59:40 2014	(r353041)
+++ head/mail/libmapi/Makefile	Mon May  5 21:00:20 2014	(r353042)
@@ -29,7 +29,8 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-samba=${LOCALBASE}
-CONFIGURE_ENV=	ac_cv_path_DOXYGEN=""
+CONFIGURE_ENV=	ac_cv_path_DOXYGEN="" \
+		PYTHON_CONFIG=${LOCALBASE}/bin/python${PYTHON_VER}-config
 SHEBANG_FILES=	libmapi/conf/mparse.pl \
 		script/check_exchange \
 		setup/openchange_newuser \

Added: head/mail/libmapi/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/libmapi/files/patch-Makefile	Mon May  5 21:00:20 2014	(r353042)
@@ -0,0 +1,52 @@
+--- Makefile.orig	2014-05-05 15:10:56.000000000 +0200
++++ Makefile	2014-05-05 15:11:14.000000000 +0200
+@@ -246,9 +246,6 @@
+ 	$(INSTALL) -m 0644 gen_ndr/property.h $(DESTDIR)$(includedir)/gen_ndr/
+ 	$(INSTALL) -m 0644 gen_ndr/ndr_exchange.h $(DESTDIR)$(includedir)/gen_ndr/
+ 	$(INSTALL) -m 0644 gen_ndr/ndr_property.h $(DESTDIR)$(includedir)/gen_ndr/
+-	@$(SED) $(DESTDIR)$(includedir)/libmapi/*.h
+-	@$(SED) $(DESTDIR)$(includedir)/libmapi/socket/*.h
+-	@$(SED) $(DESTDIR)$(includedir)/gen_ndr/*.h
+ 
+ libmapi-installscript:
+ 	$(INSTALL) -d $(DESTDIR)$(datadir)/setup/profiles
+@@ -388,7 +385,6 @@
+ 	$(INSTALL) -m 0644 libmapi++/profile.h $(DESTDIR)$(includedir)/libmapi++/
+ 	$(INSTALL) -m 0644 libmapi++/property_container.h $(DESTDIR)$(includedir)/libmapi++/
+ 	$(INSTALL) -m 0644 libmapi++/session.h $(DESTDIR)$(includedir)/libmapi++/
+-	@$(SED) $(DESTDIR)$(includedir)/libmapi++/*.h
+ 
+ libmapixx-libs-clean:
+ 	rm -f libmapi++/src/*.po
+@@ -559,7 +555,6 @@
+ 	@echo "[*] install: libmapiadmin headers"
+ 	$(INSTALL) -d $(DESTDIR)$(includedir)/libmapiadmin 
+ 	$(INSTALL) -m 0644 libmapiadmin/libmapiadmin.h $(DESTDIR)$(includedir)/libmapiadmin/
+-	@$(SED) $(DESTDIR)$(includedir)/libmapiadmin/*.h
+ 
+ libmapiadmin-uninstallpc:
+ 	rm -f $(DESTDIR)$(libdir)/pkgconfig/libmapiadmin.pc
+@@ -630,7 +625,6 @@
+ 	@echo "[*] install: libocpf headers"
+ 	$(INSTALL) -d $(DESTDIR)$(includedir)/libocpf
+ 	$(INSTALL) -m 0644 libocpf/ocpf.h $(DESTDIR)$(includedir)/libocpf/
+-	@$(SED) $(DESTDIR)$(includedir)/libocpf/*.h
+ 
+ libocpf-uninstallpc:
+ 	rm -f $(DESTDIR)$(libdir)/pkgconfig/libocpf.pc
+@@ -794,7 +788,6 @@
+ endif
+ 	$(INSTALL) -m 0644 mapiproxy/libmapiserver/libmapiserver.h $(DESTDIR)$(includedir)/
+ 	$(INSTALL) -m 0644 mapiproxy/libmapiserver.pc $(DESTDIR)$(libdir)/pkgconfig
+-	@$(SED) $(DESTDIR)$(includedir)/*.h
+ 
+ libmapiserver-clean:
+ 	rm -f mapiproxy/libmapiserver/*.po mapiproxy/libmapiserver/*.o
+@@ -881,7 +874,6 @@
+ 	$(INSTALL) -m 0644 mapiproxy/libmapiserver.pc $(DESTDIR)$(libdir)/pkgconfig
+ 	$(INSTALL) -d $(DESTDIR)$(datadir)/setup/mapistore
+ 	$(INSTALL) -m 0644 setup/mapistore/*.ldif $(DESTDIR)$(datadir)/setup/mapistore/
+-	@$(SED) $(DESTDIR)$(includedir)/mapistore/*.h
+ 
+ libmapistore-clean:	$(OC_MAPISTORE_CLEAN)
+ 	rm -f mapiproxy/libmapistore/*.po mapiproxy/libmapistore/*.o