devel/pkgconf doesn't search under lib/pkgconfig by default

12 files changed, 24 insertions, 15 deletions

diff --git a/comms/uhd/Makefile b/comms/uhd/Makefile
index d4fd559..0528585 100644
--- a/comms/uhd/Makefile
+++ b/comms/uhd/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	uhd
 PORTVERSION=	3.9.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://files.ettus.com/binaries/images/
 DISTFILES=	${IMAGE_FILE}
@@ -24,7 +24,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/boost/tuple/tuple.hpp:devel/boost-libs \
 		orcc:devel/orc \
 		${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako
 
-USES=			compiler:c++0x cmake:outsource gmake pkgconfig dos2unix python:2.7 pathfix
+USES=			compiler:c++0x cmake:outsource gmake pkgconfig dos2unix python:2.7
 USE_LDCONFIG=		yes
 CMAKE_SOURCE_PATH=	${WRKSRC}/host
 #MAKE_JOBS_UNSAFE=	yes
@@ -49,6 +49,11 @@ CMAKE_ARGS+=	-DENABLE_DOXYGEN:STRING="ON"
 HAVEDOCS=	YES
 .endif
 
+post-patch:
+# USES=pathfix handles LIBRARY_INSTALL_DIR but not LIBRARY_DIR
+	@${REINPLACE_CMD} '/pkgconfig/s|LIBRARY_DIR}|CMAKE_INSTALL_PREFIX}/libdata|' \
+		${PATCH_WRKSRC}/host/CMakeLists.txt
+
 do-install:
 # install host component
 # hack the install prefix now
diff --git a/comms/uhd/pkg-plist b/comms/uhd/pkg-plist
index 863ade4..af94f4a 100644
--- a/comms/uhd/pkg-plist
+++ b/comms/uhd/pkg-plist
@@ -108,7 +108,7 @@ lib/cmake/uhd/UHDConfigVersion.cmake
 lib/libuhd.so
 lib/libuhd.so.003
 lib/libuhd.so.003.009
-lib/pkgconfig/uhd.pc
+libdata/pkgconfig/uhd.pc
 %%DOXYGEN%%%%DOCSDIR%%/LICENSE
 %%DOXYGEN%%%%DOCSDIR%%/README.md
 %%DOXYGEN%%%%DOCSDIR%%/doxygen/html/Ettus_Logo.png
diff --git a/devel/libxo/Makefile b/devel/libxo/Makefile
index c5d662be..4f25a59 100644
--- a/devel/libxo/Makefile
+++ b/devel/libxo/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	libxo
 PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	devel textproc
 MASTER_SITES=	http://github.com/Juniper/${PORTNAME}/releases/download/${PORTVERSION}/
 
@@ -11,7 +12,7 @@ COMMENT=	Library to generate text, XML, JSON, and HTML output
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/Copyright
 
-USES=		autoreconf gmake libtool perl5
+USES=		autoreconf gmake libtool pathfix perl5
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_PERL5=	run
diff --git a/devel/libxo/pkg-plist b/devel/libxo/pkg-plist
index 12c95c6..e1b88ae 100644
--- a/devel/libxo/pkg-plist
+++ b/devel/libxo/pkg-plist
@@ -19,7 +19,7 @@ lib/libxo/encoder/libenc_test.so
 lib/libxo/encoder/libenc_test.so.0
 lib/libxo/encoder/libenc_test.so.0.0.0
 lib/libxo/encoder/test.enc
-lib/pkgconfig/libxo.pc
+libdata/pkgconfig/libxo.pc
 man/man1/xo.1.gz
 man/man1/xohtml.1.gz
 man/man1/xolint.1.gz
diff --git a/math/scalapack/Makefile b/math/scalapack/Makefile
index ad5a073..5fa9c45 100644
--- a/math/scalapack/Makefile
+++ b/math/scalapack/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	scalapack
 PORTVERSION=	2.0.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math
 MASTER_SITES=	NL
 DISTFILES=	scalapack-${PORTVERSION}.tgz manpages.tgz
@@ -19,7 +19,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 CONFLICTS=	elmer-mathlibs-1*
 
 USE_LDCONFIG=	yes
-USES=		cmake fortran
+USES=		cmake fortran pathfix
 CMAKE_ARGS_ST=	-DBUILD_STATIC_LIBS:BOOL=ON
 CMAKE_ARGS_SH=	-DBUILD_SHARED_LIBS:BOOL=ON
 CMAKE_ARGS=	${CMAKE_ARGS_ST}
diff --git a/math/scalapack/pkg-plist b/math/scalapack/pkg-plist
index 685bf74..3f2b238 100644
--- a/math/scalapack/pkg-plist
+++ b/math/scalapack/pkg-plist
@@ -11,7 +11,7 @@ lib/cmake/scalapack-%%PORTVERSION%%/scalapack-targets.cmake
 lib/libscalapack.a
 lib/libscalapack.so
 lib/libscalapack.so.%%SVERSION%%
-lib/pkgconfig/scalapack.pc
+libdata/pkgconfig/scalapack.pc
 man/manl/cdbtf2.l.gz
 man/manl/cdbtrf.l.gz
 man/manl/cdttrf.l.gz
diff --git a/net/liboping/Makefile b/net/liboping/Makefile
index 50c6423..7d87453 100644
--- a/net/liboping/Makefile
+++ b/net/liboping/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	liboping
 PORTVERSION=	1.8.0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://noping.cc/files/
 
@@ -11,9 +12,10 @@ COMMENT=	Liboping, a C library, and utility to generate ICMP echo requests
 
 LICENSE=	GPLv2
 
-USES=		libtool pathfix ncurses perl5 shebangfix
+USES=		libtool ncurses perl5 shebangfix
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-pkgconfigdir="${PREFIX}/libdata/pkgconfig"
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Net/Oping/Oping.so
diff --git a/net/liboping/pkg-plist b/net/liboping/pkg-plist
index fb95c29..ea36668 100644
--- a/net/liboping/pkg-plist
+++ b/net/liboping/pkg-plist
@@ -8,7 +8,7 @@ lib/liboping.so.0.2.11
 %%SITE_ARCH%%/Net/Oping.pm
 %%SITE_ARCH%%/auto/Net/Oping/Oping.so
 %%PERL5_MAN3%%/Net::Oping.3.gz
-lib/pkgconfig/liboping.pc
+libdata/pkgconfig/liboping.pc
 man/man3/liboping.3.gz
 man/man3/ping_construct.3.gz
 man/man3/ping_get_error.3.gz
diff --git a/sysutils/pacman/Makefile b/sysutils/pacman/Makefile
index c8a81a7..eac7f60 100644
--- a/sysutils/pacman/Makefile
+++ b/sysutils/pacman/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pacman
 PORTVERSION=	4.2.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.archlinux.org/other/pacman/ \
 		http://mirror.amdmi3.ru/distfiles/
@@ -18,7 +19,7 @@ BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
 RUN_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libarchive.so.13:archivers/libarchive
 
-USES=		gmake libtool perl5 pkgconfig shebangfix
+USES=		gmake libtool pathfix perl5 pkgconfig shebangfix
 SHEBANG_FILES=	${WRKSRC}/scripts/makepkg-template.pl.in
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-root-dir="${PACMAN_ROOT}" \
diff --git a/sysutils/pacman/pkg-plist b/sysutils/pacman/pkg-plist
index 301addf..e8c1cab 100644
--- a/sysutils/pacman/pkg-plist
+++ b/sysutils/pacman/pkg-plist
@@ -22,7 +22,7 @@ lib/libalpm.a
 lib/libalpm.so
 lib/libalpm.so.9
 lib/libalpm.so.9.0.0
-lib/pkgconfig/libalpm.pc
+libdata/pkgconfig/libalpm.pc
 man/man1/makepkg-template.1.gz
 man/man3/libalpm.3.gz
 man/man5/PKGBUILD.5.gz
diff --git a/textproc/senna/Makefile b/textproc/senna/Makefile
index 07d9280..1fcb175 100644
--- a/textproc/senna/Makefile
+++ b/textproc/senna/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	senna
 PORTVERSION=	1.1.5
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	textproc
 MASTER_SITES=	SFJP/senna/46945
@@ -14,7 +14,7 @@ BROKEN_powerpc64=	Does not build
 
 GNU_CONFIGURE=	YES
 USE_GCC=	any
-USES=		gmake libtool
+USES=		gmake libtool pathfix
 USE_LDCONFIG=	YES
 CONFIGURE_ARGS=	--with-sennahome=${SENNA_HOME}
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
diff --git a/textproc/senna/pkg-plist b/textproc/senna/pkg-plist
index 018af7b..5bbe3af 100644
--- a/textproc/senna/pkg-plist
+++ b/textproc/senna/pkg-plist
@@ -2,7 +2,7 @@ bin/senna
 bin/senna-cfg
 bin/sennachk
 include/senna/senna.h
-lib/pkgconfig/senna.pc
+libdata/pkgconfig/senna.pc
 lib/libsenna.a
 lib/libsenna.so
 lib/libsenna.so.0