From 9de6aff58e9e34227f73dd6b173ff5c839a4060e Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Tue, 6 Jun 2017 16:38:00 +0000 Subject: [PATCH] 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 --- Mk/bsd.port.mk | 15 ++++++++++++++- audio/lilv/Makefile | 3 +-- audio/lv2/Makefile | 4 ---- audio/msbcg729/pkg-plist | 2 +- audio/sratom/Makefile | 1 - audio/sratom/pkg-plist | 1 - audio/suil/Makefile | 1 - audio/suil/pkg-plist | 1 - databases/monetdb/Makefile | 1 - deskutils/cairo-dock-plugins/Makefile | 3 +-- devel/google-perftools/Makefile | 2 -- devel/serd/Makefile | 1 - devel/sord/Makefile | 1 - devel/sord/pkg-plist | 1 - security/gnomint/Makefile | 3 --- sysutils/cmocka/Makefile | 2 +- sysutils/fluent-bit/pkg-plist | 2 +- x11-toolkits/gtkada/Makefile | 2 -- 18 files changed, 19 insertions(+), 27 deletions(-) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 8936d25a9a2e..40e9bbba34c5 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -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 \ diff --git a/audio/lilv/Makefile b/audio/lilv/Makefile index 54dd17a16360..f6bec4752257 100644 --- a/audio/lilv/Makefile +++ b/audio/lilv/Makefile @@ -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 diff --git a/audio/lv2/Makefile b/audio/lv2/Makefile index 30bba7a4b529..93981ef082a1 100644 --- a/audio/lv2/Makefile +++ b/audio/lv2/Makefile @@ -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} {} + diff --git a/audio/msbcg729/pkg-plist b/audio/msbcg729/pkg-plist index 18155a9cd1aa..7e73b828f645 100644 --- a/audio/msbcg729/pkg-plist +++ b/audio/msbcg729/pkg-plist @@ -1,4 +1,4 @@ lib/mediastreamer/plugins/libmsbcg729.so lib/mediastreamer/plugins/libmsbcg729.so.0 lib/mediastreamer/plugins/libmsbcg729.so.0.0.0 -@comment lib/pkgconfig/libbcg729.pc +@comment libdata/pkgconfig/libbcg729.pc diff --git a/audio/sratom/Makefile b/audio/sratom/Makefile index 984f6e434b73..809509484520 100644 --- a/audio/sratom/Makefile +++ b/audio/sratom/Makefile @@ -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 diff --git a/audio/sratom/pkg-plist b/audio/sratom/pkg-plist index 560b901d01e8..bec783dba8dc 100644 --- a/audio/sratom/pkg-plist +++ b/audio/sratom/pkg-plist @@ -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 -@dir lib/pkgconfig diff --git a/audio/suil/Makefile b/audio/suil/Makefile index 33d577930c02..357df42a9383 100644 --- a/audio/suil/Makefile +++ b/audio/suil/Makefile @@ -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 diff --git a/audio/suil/pkg-plist b/audio/suil/pkg-plist index 26f776c25ccc..675fcd2f1d7b 100644 --- a/audio/suil/pkg-plist +++ b/audio/suil/pkg-plist @@ -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 -@dir lib/pkgconfig diff --git a/databases/monetdb/Makefile b/databases/monetdb/Makefile index bc8dabd82025..170b43d1d9c1 100644 --- a/databases/monetdb/Makefile +++ b/databases/monetdb/Makefile @@ -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} diff --git a/deskutils/cairo-dock-plugins/Makefile b/deskutils/cairo-dock-plugins/Makefile index 0f92a99a064c..96215ce38de3 100644 --- a/deskutils/cairo-dock-plugins/Makefile +++ b/deskutils/cairo-dock-plugins/Makefile @@ -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 diff --git a/devel/google-perftools/Makefile b/devel/google-perftools/Makefile index 10b362396934..1ee956ccb764 100644 --- a/devel/google-perftools/Makefile +++ b/devel/google-perftools/Makefile @@ -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.* diff --git a/devel/serd/Makefile b/devel/serd/Makefile index dd0228517ac4..556d8e2129ed 100644 --- a/devel/serd/Makefile +++ b/devel/serd/Makefile @@ -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 diff --git a/devel/sord/Makefile b/devel/sord/Makefile index 4d91f47acb35..bb646e78bccd 100644 --- a/devel/sord/Makefile +++ b/devel/sord/Makefile @@ -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 diff --git a/devel/sord/pkg-plist b/devel/sord/pkg-plist index 1bf91b837ba7..996f7390ca71 100644 --- a/devel/sord/pkg-plist +++ b/devel/sord/pkg-plist @@ -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 -@dir lib/pkgconfig diff --git a/security/gnomint/Makefile b/security/gnomint/Makefile index 4d2c219456c8..b760bc133dcd 100644 --- a/security/gnomint/Makefile +++ b/security/gnomint/Makefile @@ -30,7 +30,4 @@ OPTIONS_SUB= yes NLS_USES= gettext-runtime NLS_CONFIGURE_ENABLE= nls -post-install: - ${RMDIR} ${STAGEDIR}${PREFIX}/lib/pkgconfig - .include diff --git a/sysutils/cmocka/Makefile b/sysutils/cmocka/Makefile index 7f95839fb4c6..d2eaacaa276b 100644 --- a/sysutils/cmocka/Makefile +++ b/sysutils/cmocka/Makefile @@ -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 diff --git a/sysutils/fluent-bit/pkg-plist b/sysutils/fluent-bit/pkg-plist index 9e15b63ef03b..f3212ba919f3 100644 --- a/sysutils/fluent-bit/pkg-plist +++ b/sysutils/fluent-bit/pkg-plist @@ -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 +@comment libdata/pkgconfig/msgpack.pc diff --git a/x11-toolkits/gtkada/Makefile b/x11-toolkits/gtkada/Makefile index 8fd07e17ace5..d789a5dfade8 100644 --- a/x11-toolkits/gtkada/Makefile +++ b/x11-toolkits/gtkada/Makefile @@ -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