Teach pkg-config to look in the default lib/pkgconfig subdirectories along

with the FreeBSD-specific, hier(7)-friendly libdata/pkgconfig subdirectories.
This is being done to be developer-friendly.  A port SHOULD NEVER install
a pkg-config (.pc) file to a lib/pkgconfig subdirectory.

PR:		91213
Submitted by:	anholt (with some modifications)

6 files changed, 24 insertions, 6 deletions

diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile
index 210bd46187fa..f5403912d2c3 100644
--- a/devel/pkg-config/Makefile
+++ b/devel/pkg-config/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	pkgconfig
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://pkgconfig.freedesktop.org/releases/
 DISTNAME=	pkg-config-${PORTVERSION}
@@ -25,11 +26,14 @@ MAN1=		pkg-config.1
 .include <bsd.port.pre.mk>
 
 PC_PATH=${PREFIX}/libdata/pkgconfig
+PC_PATH:=${PREFIX}/lib/pkgconfig
 .if ${LOCALBASE} != ${PREFIX}
 PC_PATH:=	${PC_PATH}:${LOCALBASE}/libdata/pkgconfig
+PC_PATH:=	${PC_PATH}:${LOCALBASE}/lib/pkgconfig
 .endif
 .if ${X11BASE} != ${PREFIX}
 PC_PATH:=	${PC_PATH}:${X11BASE}/libdata/pkgconfig
+PC_PATH:=	${PC_PATH}:${X11BASE}/lib/pkgconfig
 .endif
 
 CONFIGURE_ARGS=	--disable-threads \
diff --git a/devel/pkg-config/pkg-descr b/devel/pkg-config/pkg-descr
index c24838f6230e..cbf7c6b4a78a 100644
--- a/devel/pkg-config/pkg-descr
+++ b/devel/pkg-config/pkg-descr
@@ -6,8 +6,10 @@ the end-user.
 pkg-config retrieves information about packages from special metadata files.
 These files are named after the package, with the extension .pc. By default,
 pkg-config looks for these files in the following directories:
-${PREFIX}/libdata/pkgconfig, ${LOCALBASE}/libdata/pkgconfig and
-${X11BASE}/libdata/pkgconfig; it will also look in the list of directories
-specified by the PKG_CONFIG_PATH environment variable.
+${PREFIX}/libdata/pkgconfig, ${PREFIX}/lib/pkgconfig,
+${LOCALBASE}/libdata/pkgconfig, ${LOCALBASE}/lib/pkgconfig,
+${X11BASE}/libdata/pkgconfig, and ${X11BASE}/lib/pkgconfig; it will also look
+in the list of directories specified by the PKG_CONFIG_PATH environment
+variable.
 
 WWW: http://pkgconfig.freedesktop.org/wiki/
diff --git a/devel/pkg-config/pkg-plist b/devel/pkg-config/pkg-plist
index 19fec741c7d7..5d6a4afddb18 100644
--- a/devel/pkg-config/pkg-plist
+++ b/devel/pkg-config/pkg-plist
@@ -1,2 +1,5 @@
 bin/pkg-config
 share/aclocal/pkg.m4
+@dirrmtry lib/pkgconfig
+@unexec rmdir %%LOCALBASE%%/lib/pkgconfig 2>/dev/null || true
+@unexec rmdir %%X11BASE%%/lib/pkgconfig 2>/dev/null || true
diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile
index 210bd46187fa..f5403912d2c3 100644
--- a/devel/pkgconfig/Makefile
+++ b/devel/pkgconfig/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	pkgconfig
 PORTVERSION=	0.20
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://pkgconfig.freedesktop.org/releases/
 DISTNAME=	pkg-config-${PORTVERSION}
@@ -25,11 +26,14 @@ MAN1=		pkg-config.1
 .include <bsd.port.pre.mk>
 
 PC_PATH=${PREFIX}/libdata/pkgconfig
+PC_PATH:=${PREFIX}/lib/pkgconfig
 .if ${LOCALBASE} != ${PREFIX}
 PC_PATH:=	${PC_PATH}:${LOCALBASE}/libdata/pkgconfig
+PC_PATH:=	${PC_PATH}:${LOCALBASE}/lib/pkgconfig
 .endif
 .if ${X11BASE} != ${PREFIX}
 PC_PATH:=	${PC_PATH}:${X11BASE}/libdata/pkgconfig
+PC_PATH:=	${PC_PATH}:${X11BASE}/lib/pkgconfig
 .endif
 
 CONFIGURE_ARGS=	--disable-threads \
diff --git a/devel/pkgconfig/pkg-descr b/devel/pkgconfig/pkg-descr
index c24838f6230e..cbf7c6b4a78a 100644
--- a/devel/pkgconfig/pkg-descr
+++ b/devel/pkgconfig/pkg-descr
@@ -6,8 +6,10 @@ the end-user.
 pkg-config retrieves information about packages from special metadata files.
 These files are named after the package, with the extension .pc. By default,
 pkg-config looks for these files in the following directories:
-${PREFIX}/libdata/pkgconfig, ${LOCALBASE}/libdata/pkgconfig and
-${X11BASE}/libdata/pkgconfig; it will also look in the list of directories
-specified by the PKG_CONFIG_PATH environment variable.
+${PREFIX}/libdata/pkgconfig, ${PREFIX}/lib/pkgconfig,
+${LOCALBASE}/libdata/pkgconfig, ${LOCALBASE}/lib/pkgconfig,
+${X11BASE}/libdata/pkgconfig, and ${X11BASE}/lib/pkgconfig; it will also look
+in the list of directories specified by the PKG_CONFIG_PATH environment
+variable.
 
 WWW: http://pkgconfig.freedesktop.org/wiki/
diff --git a/devel/pkgconfig/pkg-plist b/devel/pkgconfig/pkg-plist
index 19fec741c7d7..5d6a4afddb18 100644
--- a/devel/pkgconfig/pkg-plist
+++ b/devel/pkgconfig/pkg-plist
@@ -1,2 +1,5 @@
 bin/pkg-config
 share/aclocal/pkg.m4
+@dirrmtry lib/pkgconfig
+@unexec rmdir %%LOCALBASE%%/lib/pkgconfig 2>/dev/null || true
+@unexec rmdir %%X11BASE%%/lib/pkgconfig 2>/dev/null || true