Use USES=pathfix where applicable.

PR:		213195
Submitted by:	mat
Exp-run by:	antoine
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D8093

4 files changed, 11 insertions, 21 deletions

diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index aa588640fe88..d62c4b8bca1a 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -76,7 +76,7 @@ LIGHTTPD_DESC=		RUN_DEPEND on Lighttpd instead of Apache
 SETUID_DESC=		Run as root:mail with setuid (insecure)
 
 MAKE_JOBS_UNSAFE=	yes
-USES=		perl5 libtool shebangfix
+USES=		perl5 libtool pathfix shebangfix
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -512,13 +512,6 @@ pre-configure:
 .endif
 
 post-install:
-########
-# stupid hack until I figure out where/how to patch
-	@${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig
-	${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/dspam.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/dspam.pc
-	${TEST} `ls -1 ${STAGEDIR}${PREFIX}/lib/pkgconfig | wc -l` -eq 0 && \
-		${RM} -R ${STAGEDIR}${PREFIX}/lib/pkgconfig || true
-
 .if ${PORT_OPTIONS:MEXAMPLES}
 .if ${PORT_OPTIONS:MMYSQL}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/mysql
diff --git a/mail/evolution-mapi/Makefile b/mail/evolution-mapi/Makefile
index c643887a5767..631da556569c 100644
--- a/mail/evolution-mapi/Makefile
+++ b/mail/evolution-mapi/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	evolution>=3.0.0:mail/evolution
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake gnome libtool pkgconfig tar:xz
+USES=		gettext gmake gnome libtool pathfix pkgconfig tar:xz
 USE_GNOME=	intltool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
@@ -28,8 +28,6 @@ CONFIGURE_ARGS+=	--datarootdir=${PREFIX}/share/
 INSTALL_TARGET=	install-strip
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
-		${WRKSRC}/src/libexchangemapi/Makefile.in
 	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
 		-e 's|$$(prefix)/$$(DATADIRNAME)/|$$(prefix)/share/|g' \
 		${WRKSRC}/configure
diff --git a/mail/libmapi/Makefile b/mail/libmapi/Makefile
index b82f3426b5d5..8f9aca077923 100644
--- a/mail/libmapi/Makefile
+++ b/mail/libmapi/Makefile
@@ -29,6 +29,7 @@ WRKSRC=		${WRKDIR}/openchange-openchange-${PORTVERSION}-${CODENAME}
 USE_MYSQL=	yes
 USES=		autoreconf:build bison compiler:c++11-lib gmake pathfix \
 		pkgconfig python shebangfix sqlite
+PATHFIX_MAKEFILEIN=	Makefile
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -44,7 +45,6 @@ SHEBANG_FILES=	libmapi/conf/mparse.pl \
 		setup/openchange_neworganization \
 		setup/openchange_newuser \
 		setup/openchange_provision
-PATHFIX_MAKEFILEIN=	Makefile.am
 
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	BOOST DOXYGEN
@@ -71,8 +71,7 @@ PLIST_SUB+=	SAMBA=samba42
 #  --enable-openchange-qt4 Compile OpenChange Qt4 wrapper.
 
 post-patch:
-	@${REINPLACE_CMD} -e "s/mkdir --parent/mkdir -p/g; \
-		s,(libdir)/pkgconfig,(prefix)/libdata/pkgconfig,g" \
+	@${REINPLACE_CMD} -e "s/mkdir --parent/mkdir -p/g" \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|<endian.h>|<sys/endian.h>|g' \
 		${WRKSRC}/configure.ac
diff --git a/mail/libmapi/files/patch-Makefile b/mail/libmapi/files/patch-Makefile
index 2baa76c7f2ac..4471ee88e83e 100644
--- a/mail/libmapi/files/patch-Makefile
+++ b/mail/libmapi/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2015-05-16 17:22:04.000000000 +0200
-+++ Makefile	2015-12-20 13:01:04.141904000 +0100
-@@ -255,9 +255,6 @@
+--- Makefile.orig	2016-10-21 15:02:43 UTC
++++ Makefile
+@@ -255,9 +255,6
  	$(INSTALL) -m 0644 gen_ndr/ndr_property.h $(DESTDIR)$(includedir)/gen_ndr/
  	$(INSTALL) -m 0644 gen_ndr/asyncemsmdb.h $(DESTDIR)$(includedir)/gen_ndr/
  	$(INSTALL) -m 0644 gen_ndr/ndr_asyncemsmdb.h $(DESTDIR)$(includedir)/gen_ndr/
@@ -25,7 +25,7 @@
 -	@$(SED) $(DESTDIR)$(includedir)/libmapiadmin/*.h
  
  libmapiadmin-uninstallpc:
- 	rm -f $(DESTDIR)$(libdir)/pkgconfig/libmapiadmin.pc
+ 	rm -f $(DESTDIR)$(prefix)/libdata/pkgconfig/libmapiadmin.pc
 @@ -643,7 +638,6 @@
  	@echo "[*] install: libocpf headers"
  	$(INSTALL) -d $(DESTDIR)$(includedir)/libocpf
@@ -33,17 +33,17 @@
 -	@$(SED) $(DESTDIR)$(includedir)/libocpf/*.h
  
  libocpf-uninstallpc:
- 	rm -f $(DESTDIR)$(libdir)/pkgconfig/libocpf.pc
+ 	rm -f $(DESTDIR)$(prefix)/libdata/pkgconfig/libocpf.pc
 @@ -830,7 +824,6 @@
  endif
  	$(INSTALL) -m 0644 mapiproxy/libmapiserver/libmapiserver.h $(DESTDIR)$(includedir)/
- 	$(INSTALL) -m 0644 mapiproxy/libmapiserver.pc $(DESTDIR)$(libdir)/pkgconfig
+ 	$(INSTALL) -m 0644 mapiproxy/libmapiserver.pc $(DESTDIR)$(prefix)/libdata/pkgconfig
 -	@$(SED) $(DESTDIR)$(includedir)/*.h
  
  libmapiserver-clean:
  	rm -f mapiproxy/libmapiserver/*.po mapiproxy/libmapiserver/*.o
 @@ -920,7 +913,6 @@
- 	$(INSTALL) -m 0644 mapiproxy/libmapiserver.pc $(DESTDIR)$(libdir)/pkgconfig
+ 	$(INSTALL) -m 0644 mapiproxy/libmapiserver.pc $(DESTDIR)$(prefix)/libdata/pkgconfig
  	$(INSTALL) -d $(DESTDIR)$(datadir)/setup/mapistore
  	$(INSTALL) -m 0644 setup/mapistore/*.ldif $(DESTDIR)$(datadir)/setup/mapistore/
 -	@$(SED) $(DESTDIR)$(includedir)/mapistore/*.h