Use USES=pathfix where applicable.

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

7 files changed, 3 insertions, 24 deletions

diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 0dcb6b2ae0aa..2ce5067e08ae 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -56,7 +56,7 @@ DMG_XAR_USE=		GNOME=libxml2
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USES=		cpe gmake libtool ncurses
+USES=		cpe gmake libtool ncurses pathfix
 INSTALL_TARGET=	install-strip
 USE_RC_SUBR=	clamav-clamd clamav-freshclam
 
@@ -177,8 +177,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|-lthr|g' \
 			  -e 's|LC_REVISION=22|LC_REVISION=24|' \
 		${WRKSRC}/${CONFIGURE_SCRIPT}
-	@${REINPLACE_CMD} -e 's,^\(pkgconfigdir = \).*$$,\1$$\(prefix\)/libdata/pkgconfig,g' \
-		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} ${SED_CONF} \
 		${WRKSRC}/etc/clamd.conf.sample \
 		${WRKSRC}/etc/freshclam.conf.sample \
diff --git a/security/d0_blind_id/Makefile b/security/d0_blind_id/Makefile
index 62a03a1faeca..936fce9f681c 100644
--- a/security/d0_blind_id/Makefile
+++ b/security/d0_blind_id/Makefile
@@ -15,7 +15,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	divVerent
 GH_TAGNAME=	ff1ce7e
 
-USES=		autoreconf libtool ssl
+USES=		autoreconf libtool pathfix ssl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-openssl
 USE_LDCONFIG=	yes
diff --git a/security/d0_blind_id/files/patch-Makefile.am b/security/d0_blind_id/files/patch-Makefile.am
deleted file mode 100644
index d9401ffa45eb..000000000000
--- a/security/d0_blind_id/files/patch-Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./Makefile.am.orig	2014-03-17 06:18:23.208622713 +0000
-+++ ./Makefile.am	2014-03-17 06:18:59.472680831 +0000
-@@ -33,7 +33,7 @@
- libd0_blind_id_la_CFLAGS = -fvisibility=hidden -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement
- library_includedir = $(includedir)/d0_blind_id
- library_include_HEADERS = d0_blind_id.h d0.h
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_HEADERS = d0_blind_id.pc
- 
- if ENABLE_RIJNDAEL
diff --git a/security/sssd/Makefile b/security/sssd/Makefile
index d9bc069b4d3a..080e34963bbd 100644
--- a/security/sssd/Makefile
+++ b/security/sssd/Makefile
@@ -55,7 +55,6 @@ USE_LDCONFIG=	yes
 USE_OPENLDAP=	yes
 USES=		autoreconf cpe gettext gmake iconv libtool pathfix pkgconfig \
 		python:2 shebangfix gssapi:mit
-PATHFIX_MAKEFILEIN=	Makefile.am
 INSTALL_TARGET=	install-strip
 CPE_VENDOR=	fedoraproject
 
diff --git a/security/suricata/Makefile b/security/suricata/Makefile
index 89271299f6db..43348eb693a9 100644
--- a/security/suricata/Makefile
+++ b/security/suricata/Makefile
@@ -27,8 +27,6 @@ CPE_VENDOR=	openinfosecfoundation
 INSTALL_TARGET=		install-strip
 TEST_TARGET=		check
 
-PATHFIX_MAKEFILEIN=	Makefile.am
-
 OPTIONS_DEFINE=		GEOIP HTP_PORT IPFW JSON NETMAP NSS PORTS_PCAP PRELUDE SC TESTS
 OPTIONS_DEFAULT=	HTP_PORT IPFW JSON NETMAP PRELUDE
 OPTIONS_SUB=		yes
diff --git a/security/yara/Makefile b/security/yara/Makefile
index 5fe790a8450a..84311d2c01d5 100644
--- a/security/yara/Makefile
+++ b/security/yara/Makefile
@@ -18,7 +18,6 @@ GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USES=		alias autoreconf libtool pathfix ssl
 USE_LDCONFIG=	yes
-PATHFIX_MAKEFILEIN=	Makefile.am
 CPPFLAGS+=	-isystem ${OPENSSLINC}
 LIBS+=		-L${OPENSSLLIB}
 
diff --git a/security/ykpers/Makefile b/security/ykpers/Makefile
index 1f1df7d7f8ac..2f06f778cbe1 100644
--- a/security/ykpers/Makefile
+++ b/security/ykpers/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS=	libyubikey.so:security/libyubikey
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USES=		libtool pkgconfig
+USES=		libtool pathfix pkgconfig
 
 PLIST_FILES=	bin/ykchalresp \
 		bin/ykinfo \
@@ -42,10 +42,6 @@ MAKE_JOBS_UNSAFE=	yes
 
 LDFLAGS+=	-L/usr/lib
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|^pkgconfigdir = .*|pkgconfigdir = /usr/local/libdata/pkgconfig|g' \
-		${WRKSRC}/Makefile.in
-
 regression-test: build
 	@(cd ${WRKSRC}; ${MAKE} check)