Index: head/Mk/bsd.port.mk =================================================================== --- head/Mk/bsd.port.mk +++ head/Mk/bsd.port.mk @@ -3424,6 +3424,19 @@ . 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_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 \ Index: head/audio/lilv/Makefile =================================================================== --- head/audio/lilv/Makefile +++ head/audio/lilv/Makefile @@ -22,9 +22,8 @@ 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 Index: head/audio/lv2/Makefile =================================================================== --- head/audio/lv2/Makefile +++ head/audio/lv2/Makefile @@ -39,10 +39,6 @@ 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} {} + Index: head/audio/msbcg729/pkg-plist =================================================================== --- head/audio/msbcg729/pkg-plist +++ head/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 Index: head/audio/sratom/Makefile =================================================================== --- head/audio/sratom/Makefile +++ head/audio/sratom/Makefile @@ -20,7 +20,6 @@ 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 Index: head/audio/sratom/pkg-plist =================================================================== --- head/audio/sratom/pkg-plist +++ head/audio/sratom/pkg-plist @@ -3,4 +3,3 @@ lib/libsratom-0.so.0 lib/libsratom-0.so.0.6.0 libdata/pkgconfig/sratom-0.pc -@dir lib/pkgconfig Index: head/audio/suil/Makefile =================================================================== --- head/audio/suil/Makefile +++ head/audio/suil/Makefile @@ -29,7 +29,6 @@ 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 Index: head/audio/suil/pkg-plist =================================================================== --- head/audio/suil/pkg-plist +++ head/audio/suil/pkg-plist @@ -7,4 +7,3 @@ lib/suil-0/libsuil_x11_in_gtk2.so lib/suil-0/libsuil_x11_in_qt4.so libdata/pkgconfig/suil-0.pc -@dir lib/pkgconfig Index: head/databases/monetdb/Makefile =================================================================== --- head/databases/monetdb/Makefile +++ head/databases/monetdb/Makefile @@ -226,7 +226,6 @@ ${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} Index: head/deskutils/cairo-dock-plugins/Makefile =================================================================== --- head/deskutils/cairo-dock-plugins/Makefile +++ head/deskutils/cairo-dock-plugins/Makefile @@ -169,10 +169,9 @@ 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 Index: head/devel/google-perftools/Makefile =================================================================== --- head/devel/google-perftools/Makefile +++ head/devel/google-perftools/Makefile @@ -64,8 +64,6 @@ @${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.* Index: head/devel/serd/Makefile =================================================================== --- head/devel/serd/Makefile +++ head/devel/serd/Makefile @@ -18,7 +18,6 @@ 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 Index: head/devel/sord/Makefile =================================================================== --- head/devel/sord/Makefile +++ head/devel/sord/Makefile @@ -19,7 +19,6 @@ 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 Index: head/devel/sord/pkg-plist =================================================================== --- head/devel/sord/pkg-plist +++ head/devel/sord/pkg-plist @@ -8,4 +8,3 @@ libdata/pkgconfig/sord-0.pc man/man1/sord_validate.1.gz man/man1/sordi.1.gz -@dir lib/pkgconfig Index: head/security/gnomint/Makefile =================================================================== --- head/security/gnomint/Makefile +++ head/security/gnomint/Makefile @@ -30,7 +30,4 @@ NLS_USES= gettext-runtime NLS_CONFIGURE_ENABLE= nls -post-install: - ${RMDIR} ${STAGEDIR}${PREFIX}/lib/pkgconfig - .include Index: head/sysutils/cmocka/Makefile =================================================================== --- head/sysutils/cmocka/Makefile +++ head/sysutils/cmocka/Makefile @@ -21,7 +21,7 @@ lib/libcmocka.so \ lib/libcmocka.so.0 \ lib/libcmocka.so.0.4.0 \ - lib/pkgconfig/cmocka.pc + libdata/pkgconfig/cmocka.pc OPTIONS_DEFINE= STATIC Index: head/sysutils/fluent-bit/pkg-plist =================================================================== --- head/sysutils/fluent-bit/pkg-plist +++ head/sysutils/fluent-bit/pkg-plist @@ -689,4 +689,4 @@ include/msgpack/zone.hpp include/msgpack/zone_decl.hpp lib/libfluent-bit.so -lib/pkgconfig/msgpack.pc +@comment libdata/pkgconfig/msgpack.pc Index: head/x11-toolkits/gtkada/Makefile =================================================================== --- head/x11-toolkits/gtkada/Makefile +++ head/x11-toolkits/gtkada/Makefile @@ -64,8 +64,6 @@ ${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