diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2016-11-01 01:28:42 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2016-11-01 01:28:42 +0000 |
| commit | 3d53a3f5b810933491ccf66263b98fac1f50a809 (patch) | |
| tree | 69a470d5b3f3a5505cd1d5a3e1ec31fbc2aae937 /comms/uhd | |
| parent | e58d5042dc74c381bf8be342aa7b40b6de6210da (diff) | |
| download | ports-3d53a3f5b810933491ccf66263b98fac1f50a809.tar.gz ports-3d53a3f5b810933491ccf66263b98fac1f50a809.zip | |
devel/pkgconf doesn't search under lib/pkgconfig by default
Notes
Notes:
svn path=/head/; revision=425042
Diffstat (limited to 'comms/uhd')
| -rw-r--r-- | comms/uhd/Makefile | 9 | ||||
| -rw-r--r-- | comms/uhd/pkg-plist | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/comms/uhd/Makefile b/comms/uhd/Makefile index d4fd55931ce0..0528585f3a3d 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 863ade4d7573..af94f4a5b818 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 |