svn commit: r442784 - in head: Mk audio/lilv audio/lv2 audio/msbcg729 audio/sratom audio/suil databases/monetdb deskutils/cairo-dock-plugins devel/google-perftools devel/serd devel/sord security/gn...
Mathieu Arnold
mat at FreeBSD.org
Tue Jun 6 16:38:04 UTC 2017
Author: mat
Date: Tue Jun 6 16:38:00 2017
New Revision: 442784
URL: https://svnweb.freebsd.org/changeset/ports/442784
Log:
Add a fixup-lib-pkgconfig target to move files in lib/pkgconfig into
libdata/pkgconfig.
Fix ports that where installing the file in the wrong place.
PR: 218067
Submitted by: mat
Exp-run by: antoine
Reviewed by: rene, antoine
Sponsored by: Absolight
Differential Revision: https://reviews.freebsd.org/D10129
Modified:
head/Mk/bsd.port.mk (contents, props changed)
head/audio/lilv/Makefile (contents, props changed)
head/audio/lv2/Makefile (contents, props changed)
head/audio/msbcg729/pkg-plist (contents, props changed)
head/audio/sratom/Makefile (contents, props changed)
head/audio/sratom/pkg-plist (contents, props changed)
head/audio/suil/Makefile (contents, props changed)
head/audio/suil/pkg-plist (contents, props changed)
head/databases/monetdb/Makefile (contents, props changed)
head/deskutils/cairo-dock-plugins/Makefile (contents, props changed)
head/devel/google-perftools/Makefile (contents, props changed)
head/devel/serd/Makefile (contents, props changed)
head/devel/sord/Makefile (contents, props changed)
head/devel/sord/pkg-plist (contents, props changed)
head/security/gnomint/Makefile (contents, props changed)
head/sysutils/cmocka/Makefile (contents, props changed)
head/sysutils/fluent-bit/pkg-plist (contents, props changed)
head/x11-toolkits/gtkada/Makefile (contents, props changed)
Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk Tue Jun 6 16:18:16 2017 (r442783)
+++ head/Mk/bsd.port.mk Tue Jun 6 16:38:00 2017 (r442784)
@@ -3424,6 +3424,19 @@ install-ldconfig-file:
. endif
.endif
+.if !defined(USE_LINUX_PREFIX)
+. if !target(fixup-lib-pkgconfig)
+fixup-lib-pkgconfig:
+ @if [ -d ${STAGEDIR}${PREFIX}/lib/pkgconfig ]; then \
+ if [ -z "$$(${FIND} ${STAGEDIR}${PREFIX}/lib/pkgconfig -maxdepth 0 -empty)" ]; then \
+ ${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig; \
+ ${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/* ${STAGEDIR}${PREFIX}/libdata/pkgconfig; \
+ fi; \
+ ${RMDIR} ${STAGEDIR}${PREFIX}/lib/pkgconfig; \
+ fi
+. endif
+.endif
+
.if !target(create-users-groups)
.if defined(GROUPS) || defined(USERS)
_UG_INSTALL= ${WRKDIR}/users-groups-install.sh
@@ -5176,7 +5189,7 @@ _STAGE_DEP= build
_STAGE_SEQ= 050:stage-message 100:stage-dir 150:run-depends \
151:lib-depends 200:apply-slist 300:pre-install \
400:generate-plist 450:pre-su-install 475:create-users-groups \
- 500:do-install 550:kmod-post-install 700:post-install \
+ 500:do-install 550:kmod-post-install 600:fixup-lib-pkgconfig 700:post-install \
750:post-install-script 800:post-stage 850:compress-man \
860:install-rc-script 870:install-ldconfig-file \
880:install-license 890:install-desktop-entries \
Modified: head/audio/lilv/Makefile
==============================================================================
--- head/audio/lilv/Makefile Tue Jun 6 16:18:16 2017 (r442783)
+++ head/audio/lilv/Makefile Tue Jun 6 16:38:00 2017 (r442784)
@@ -22,9 +22,8 @@ USE_LDCONFIG= yes
PLIST_SUB= VERSION=${PORTVERSION}
post-install:
- @${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/*.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
@${MV} ${STAGEDIR}${PREFIX}/share/man/man1 ${STAGEDIR}${PREFIX}/man/
- @${RMDIR} ${STAGEDIR}${PREFIX}/share/man ${STAGEDIR}${PREFIX}/lib/pkgconfig
+ @${RMDIR} ${STAGEDIR}${PREFIX}/share/man
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblilv-0.so.${PORTVERSION}
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lilv-bench
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lv2apply
Modified: head/audio/lv2/Makefile
==============================================================================
--- head/audio/lv2/Makefile Tue Jun 6 16:18:16 2017 (r442783)
+++ head/audio/lv2/Makefile Tue Jun 6 16:38:00 2017 (r442784)
@@ -39,10 +39,6 @@ EXAMPLES_USE= GNOME=cairo,gtk20
EXAMPLES_CONFIGURE_ENV= CC='${CC} -Wl,--as-needed' # Gtk deps
post-install:
-# Waf doesn't support changing pkg-config data install path
- @${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/*.pc \
- ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
- @${RMDIR} ${STAGEDIR}${PREFIX}/lib/pkgconfig/
# Waf doesn't have built-in strip support
@${FIND} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} \
-name '*.so' -exec ${STRIP_CMD} {} +
Modified: head/audio/msbcg729/pkg-plist
==============================================================================
--- head/audio/msbcg729/pkg-plist Tue Jun 6 16:18:16 2017 (r442783)
+++ head/audio/msbcg729/pkg-plist Tue Jun 6 16:38:00 2017 (r442784)
@@ -1,4 +1,4 @@
lib/mediastreamer/plugins/libmsbcg729.so
lib/mediastreamer/plugins/libmsbcg729.so.0
lib/mediastreamer/plugins/libmsbcg729.so.0.0.0
- at comment lib/pkgconfig/libbcg729.pc
+ at comment libdata/pkgconfig/libbcg729.pc
Modified: head/audio/sratom/Makefile
==============================================================================
--- head/audio/sratom/Makefile Tue Jun 6 16:18:16 2017 (r442783)
+++ head/audio/sratom/Makefile Tue Jun 6 16:38:00 2017 (r442784)
@@ -20,7 +20,6 @@ USES= pkgconfig python:build tar:bzip2 waf
USE_LDCONFIG= yes
post-install:
- @${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/*.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsratom-0.so.0.6.0
.include <bsd.port.mk>
Modified: head/audio/sratom/pkg-plist
==============================================================================
--- head/audio/sratom/pkg-plist Tue Jun 6 16:18:16 2017 (r442783)
+++ head/audio/sratom/pkg-plist Tue Jun 6 16:38:00 2017 (r442784)
@@ -3,4 +3,3 @@ lib/libsratom-0.so
lib/libsratom-0.so.0
lib/libsratom-0.so.0.6.0
libdata/pkgconfig/sratom-0.pc
- at dir lib/pkgconfig
Modified: head/audio/suil/Makefile
==============================================================================
--- head/audio/suil/Makefile Tue Jun 6 16:18:16 2017 (r442783)
+++ head/audio/suil/Makefile Tue Jun 6 16:38:00 2017 (r442784)
@@ -29,7 +29,6 @@ CONFIGURE_ARGS= --no-qt5
PLIST_SUB= SUILVERSION=${PORTVERSION}
post-install:
- @${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/*.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsuil-0.so.${PORTVERSION}
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/suil-0/libsuil_gtk2_in_qt4.so
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/suil-0/libsuil_qt4_in_gtk2.so
Modified: head/audio/suil/pkg-plist
==============================================================================
--- head/audio/suil/pkg-plist Tue Jun 6 16:18:16 2017 (r442783)
+++ head/audio/suil/pkg-plist Tue Jun 6 16:38:00 2017 (r442784)
@@ -7,4 +7,3 @@ lib/suil-0/libsuil_qt4_in_gtk2.so
lib/suil-0/libsuil_x11_in_gtk2.so
lib/suil-0/libsuil_x11_in_qt4.so
libdata/pkgconfig/suil-0.pc
- at dir lib/pkgconfig
Modified: head/databases/monetdb/Makefile
==============================================================================
--- head/databases/monetdb/Makefile Tue Jun 6 16:18:16 2017 (r442783)
+++ head/databases/monetdb/Makefile Tue Jun 6 16:38:00 2017 (r442784)
@@ -226,7 +226,6 @@ pre-install:
${INSTALL_DATA} ${WRKSRC}/sql/dump-restore.* ${STAGEDIR}${DOCSDIR}
post-install:
- ${RM} -r ${STAGEDIR}${PREFIX}/lib/pkgconfig
${RM} -r ${STAGEDIR}${PREFIX}/share/doc/MonetDB-SQL-11.15.19
${RM} -r ${STAGEDIR}${PREFIX}/etc/tmpfiles.d
${MV} ${STAGEDIR}${PREFIX}/var/* ${STAGEDIR}${PREFIX}
Modified: head/deskutils/cairo-dock-plugins/Makefile
==============================================================================
--- head/deskutils/cairo-dock-plugins/Makefile Tue Jun 6 16:18:16 2017 (r442783)
+++ head/deskutils/cairo-dock-plugins/Makefile Tue Jun 6 16:38:00 2017 (r442784)
@@ -169,10 +169,9 @@ post-patch:
s|/usr/share/applications|${LOCALBASE}/share/applications|g; \
s|/usr/share/cairo-dock|${LOCALBASE}/share/cairo-dock|g'
-post-install:
+#post-install:
#.if defined(VALA)
# ${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/CDApplet.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
#.endif
- ${RM} -R ${STAGEDIR}${PREFIX}/lib/pkgconfig
.include <bsd.port.mk>
Modified: head/devel/google-perftools/Makefile
==============================================================================
--- head/devel/google-perftools/Makefile Tue Jun 6 16:18:16 2017 (r442783)
+++ head/devel/google-perftools/Makefile Tue Jun 6 16:38:00 2017 (r442784)
@@ -64,8 +64,6 @@ post-build:
@${ECHO}
post-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/libdata
- ${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig ${STAGEDIR}${PREFIX}/libdata
${MV} ${STAGEDIR}${PREFIX}/bin/pprof ${STAGEDIR}${PREFIX}/bin/perftools-pprof
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.*
Modified: head/devel/serd/Makefile
==============================================================================
--- head/devel/serd/Makefile Tue Jun 6 16:18:16 2017 (r442783)
+++ head/devel/serd/Makefile Tue Jun 6 16:38:00 2017 (r442784)
@@ -18,7 +18,6 @@ USE_LDCONFIG= yes
PLIST_SUB= VERSION=${PORTVERSION}
post-install:
- @${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig ${STAGEDIR}${PREFIX}/libdata/
@${MV} ${STAGEDIR}${PREFIX}/share/man/man1 ${STAGEDIR}${PREFIX}/man/
@${RMDIR} ${STAGEDIR}${PREFIX}/share/man
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/serdi
Modified: head/devel/sord/Makefile
==============================================================================
--- head/devel/sord/Makefile Tue Jun 6 16:18:16 2017 (r442783)
+++ head/devel/sord/Makefile Tue Jun 6 16:38:00 2017 (r442784)
@@ -19,7 +19,6 @@ USES= pkgconfig python:build tar:bzip2 waf
USE_LDCONFIG= yes
post-install:
- @${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/*.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
@${MV} ${STAGEDIR}${PREFIX}/share/man/man1 ${STAGEDIR}${PREFIX}/man/
@${RMDIR} ${STAGEDIR}${PREFIX}/share/man
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsord-0.so.0.16.0
Modified: head/devel/sord/pkg-plist
==============================================================================
--- head/devel/sord/pkg-plist Tue Jun 6 16:18:16 2017 (r442783)
+++ head/devel/sord/pkg-plist Tue Jun 6 16:38:00 2017 (r442784)
@@ -8,4 +8,3 @@ lib/libsord-0.so.0.16.0
libdata/pkgconfig/sord-0.pc
man/man1/sord_validate.1.gz
man/man1/sordi.1.gz
- at dir lib/pkgconfig
Modified: head/security/gnomint/Makefile
==============================================================================
--- head/security/gnomint/Makefile Tue Jun 6 16:18:16 2017 (r442783)
+++ head/security/gnomint/Makefile Tue Jun 6 16:38:00 2017 (r442784)
@@ -30,7 +30,4 @@ OPTIONS_SUB= yes
NLS_USES= gettext-runtime
NLS_CONFIGURE_ENABLE= nls
-post-install:
- ${RMDIR} ${STAGEDIR}${PREFIX}/lib/pkgconfig
-
.include <bsd.port.mk>
Modified: head/sysutils/cmocka/Makefile
==============================================================================
--- head/sysutils/cmocka/Makefile Tue Jun 6 16:18:16 2017 (r442783)
+++ head/sysutils/cmocka/Makefile Tue Jun 6 16:38:00 2017 (r442784)
@@ -21,7 +21,7 @@ PLIST_FILES= include/cmocka.h \
lib/libcmocka.so \
lib/libcmocka.so.0 \
lib/libcmocka.so.0.4.0 \
- lib/pkgconfig/cmocka.pc
+ libdata/pkgconfig/cmocka.pc
OPTIONS_DEFINE= STATIC
Modified: head/sysutils/fluent-bit/pkg-plist
==============================================================================
--- head/sysutils/fluent-bit/pkg-plist Tue Jun 6 16:18:16 2017 (r442783)
+++ head/sysutils/fluent-bit/pkg-plist Tue Jun 6 16:38:00 2017 (r442784)
@@ -689,4 +689,4 @@ include/msgpack/zone.h
include/msgpack/zone.hpp
include/msgpack/zone_decl.hpp
lib/libfluent-bit.so
-lib/pkgconfig/msgpack.pc
+ at comment libdata/pkgconfig/msgpack.pc
Modified: head/x11-toolkits/gtkada/Makefile
==============================================================================
--- head/x11-toolkits/gtkada/Makefile Tue Jun 6 16:18:16 2017 (r442783)
+++ head/x11-toolkits/gtkada/Makefile Tue Jun 6 16:38:00 2017 (r442784)
@@ -64,8 +64,6 @@ do-build:
${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET}
post-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/libdata
- @${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig ${STAGEDIR}${PREFIX}/libdata/
${RM} -r ${STAGEDIR}${PREFIX}/share/doc/gtkada/gtkada_ug/_sources
.include <bsd.port.mk>
More information about the svn-ports-head
mailing list