svn commit: r425042 - in head: comms/uhd devel/libxo math/scalapack net/liboping sysutils/pacman textproc/senna
Jan Beich
jbeich at FreeBSD.org
Tue Nov 1 01:28:45 UTC 2016
Author: jbeich
Date: Tue Nov 1 01:28:42 2016
New Revision: 425042
URL: https://svnweb.freebsd.org/changeset/ports/425042
Log:
devel/pkgconf doesn't search under lib/pkgconfig by default
Modified:
head/comms/uhd/Makefile (contents, props changed)
head/comms/uhd/pkg-plist (contents, props changed)
head/devel/libxo/Makefile (contents, props changed)
head/devel/libxo/pkg-plist (contents, props changed)
head/math/scalapack/Makefile (contents, props changed)
head/math/scalapack/pkg-plist (contents, props changed)
head/net/liboping/Makefile (contents, props changed)
head/net/liboping/pkg-plist (contents, props changed)
head/sysutils/pacman/Makefile (contents, props changed)
head/sysutils/pacman/pkg-plist (contents, props changed)
head/textproc/senna/Makefile (contents, props changed)
head/textproc/senna/pkg-plist (contents, props changed)
Modified: head/comms/uhd/Makefile
==============================================================================
--- head/comms/uhd/Makefile Tue Nov 1 01:28:21 2016 (r425041)
+++ head/comms/uhd/Makefile Tue Nov 1 01:28:42 2016 (r425042)
@@ -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/boos
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
Modified: head/comms/uhd/pkg-plist
==============================================================================
--- head/comms/uhd/pkg-plist Tue Nov 1 01:28:21 2016 (r425041)
+++ head/comms/uhd/pkg-plist Tue Nov 1 01:28:42 2016 (r425042)
@@ -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
Modified: head/devel/libxo/Makefile
==============================================================================
--- head/devel/libxo/Makefile Tue Nov 1 01:28:21 2016 (r425041)
+++ head/devel/libxo/Makefile Tue Nov 1 01:28:42 2016 (r425042)
@@ -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,
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
Modified: head/devel/libxo/pkg-plist
==============================================================================
--- head/devel/libxo/pkg-plist Tue Nov 1 01:28:21 2016 (r425041)
+++ head/devel/libxo/pkg-plist Tue Nov 1 01:28:42 2016 (r425042)
@@ -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
Modified: head/math/scalapack/Makefile
==============================================================================
--- head/math/scalapack/Makefile Tue Nov 1 01:28:21 2016 (r425041)
+++ head/math/scalapack/Makefile Tue Nov 1 01:28:42 2016 (r425042)
@@ -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}
Modified: head/math/scalapack/pkg-plist
==============================================================================
--- head/math/scalapack/pkg-plist Tue Nov 1 01:28:21 2016 (r425041)
+++ head/math/scalapack/pkg-plist Tue Nov 1 01:28:42 2016 (r425042)
@@ -11,7 +11,7 @@ lib/cmake/scalapack-%%PORTVERSION%%/scal
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
Modified: head/net/liboping/Makefile
==============================================================================
--- head/net/liboping/Makefile Tue Nov 1 01:28:21 2016 (r425041)
+++ head/net/liboping/Makefile Tue Nov 1 01:28:42 2016 (r425042)
@@ -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 util
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
Modified: head/net/liboping/pkg-plist
==============================================================================
--- head/net/liboping/pkg-plist Tue Nov 1 01:28:21 2016 (r425041)
+++ head/net/liboping/pkg-plist Tue Nov 1 01:28:42 2016 (r425042)
@@ -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
Modified: head/sysutils/pacman/Makefile
==============================================================================
--- head/sysutils/pacman/Makefile Tue Nov 1 01:28:21 2016 (r425041)
+++ head/sysutils/pacman/Makefile Tue Nov 1 01:28:42 2016 (r425042)
@@ -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/asciido
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}" \
Modified: head/sysutils/pacman/pkg-plist
==============================================================================
--- head/sysutils/pacman/pkg-plist Tue Nov 1 01:28:21 2016 (r425041)
+++ head/sysutils/pacman/pkg-plist Tue Nov 1 01:28:42 2016 (r425042)
@@ -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
Modified: head/textproc/senna/Makefile
==============================================================================
--- head/textproc/senna/Makefile Tue Nov 1 01:28:21 2016 (r425041)
+++ head/textproc/senna/Makefile Tue Nov 1 01:28:42 2016 (r425042)
@@ -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
Modified: head/textproc/senna/pkg-plist
==============================================================================
--- head/textproc/senna/pkg-plist Tue Nov 1 01:28:21 2016 (r425041)
+++ head/textproc/senna/pkg-plist Tue Nov 1 01:28:42 2016 (r425042)
@@ -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
More information about the svn-ports-head
mailing list