cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a fixup-lib-pkgconfig target to move files in lib/pkgconfig into

Browse Source 
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
This commit is contained in:
Mathieu Arnold 2017-06-06 16:38:00 +00:00
parent 99761d7f4c
commit 9de6aff58e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=442784
18 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Mk/bsd.port.mk
View File

@ -3424,6 +3424,19 @@ install-ldconfig-file:
. endif . endif
.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 !target(create-users-groups)
.if defined(GROUPS) || defined(USERS) .if defined(GROUPS) || defined(USERS)
_UG_INSTALL= ${WRKDIR}/users-groups-install.sh _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 \ _STAGE_SEQ= 050:stage-message 100:stage-dir 150:run-depends \
151:lib-depends 200:apply-slist 300:pre-install \ 151:lib-depends 200:apply-slist 300:pre-install \
400:generate-plist 450:pre-su-install 475:create-users-groups \ 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 \ 750:post-install-script 800:post-stage 850:compress-man \
860:install-rc-script 870:install-ldconfig-file \ 860:install-rc-script 870:install-ldconfig-file \
880:install-license 890:install-desktop-entries \ 880:install-license 890:install-desktop-entries \

3
audio/lilv/Makefile
View File

@ -22,9 +22,8 @@ USE_LDCONFIG= yes
PLIST_SUB= VERSION=${PORTVERSION} PLIST_SUB= VERSION=${PORTVERSION}
post-install: post-install:
@${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/*.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
@${MV} ${STAGEDIR}${PREFIX}/share/man/man1 ${STAGEDIR}${PREFIX}/man/ @${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}/lib/liblilv-0.so.${PORTVERSION}
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lilv-bench @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lilv-bench
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lv2apply @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lv2apply

4
audio/lv2/Makefile
View File

@ -39,10 +39,6 @@ EXAMPLES_USE= GNOME=cairo,gtk20
EXAMPLES_CONFIGURE_ENV= CC='${CC} -Wl,--as-needed' # Gtk deps EXAMPLES_CONFIGURE_ENV= CC='${CC} -Wl,--as-needed' # Gtk deps
post-install: 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 # Waf doesn't have built-in strip support
@${FIND} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} \ @${FIND} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} \
-name '*.so' -exec ${STRIP_CMD} {} + -name '*.so' -exec ${STRIP_CMD} {} +

2
audio/msbcg729/pkg-plist
View File

@ -1,4 +1,4 @@
lib/mediastreamer/plugins/libmsbcg729.so lib/mediastreamer/plugins/libmsbcg729.so
lib/mediastreamer/plugins/libmsbcg729.so.0 lib/mediastreamer/plugins/libmsbcg729.so.0
lib/mediastreamer/plugins/libmsbcg729.so.0.0.0 lib/mediastreamer/plugins/libmsbcg729.so.0.0.0
@comment lib/pkgconfig/libbcg729.pc @comment libdata/pkgconfig/libbcg729.pc

1
audio/sratom/Makefile
View File

@ -20,7 +20,6 @@ USES= pkgconfig python:build tar:bzip2 waf
USE_LDCONFIG= yes USE_LDCONFIG= yes
post-install: post-install:
@${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/*.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsratom-0.so.0.6.0 @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsratom-0.so.0.6.0
.include <bsd.port.mk> .include <bsd.port.mk>

1
audio/sratom/pkg-plist
View File

@ -3,4 +3,3 @@ lib/libsratom-0.so
lib/libsratom-0.so.0 lib/libsratom-0.so.0
lib/libsratom-0.so.0.6.0 lib/libsratom-0.so.0.6.0
libdata/pkgconfig/sratom-0.pc libdata/pkgconfig/sratom-0.pc
@dir lib/pkgconfig

1
audio/suil/Makefile
View File

@ -29,7 +29,6 @@ CONFIGURE_ARGS= --no-qt5
PLIST_SUB= SUILVERSION=${PORTVERSION} PLIST_SUB= SUILVERSION=${PORTVERSION}
post-install: 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/libsuil-0.so.${PORTVERSION}
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/suil-0/libsuil_gtk2_in_qt4.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/suil-0/libsuil_gtk2_in_qt4.so
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/suil-0/libsuil_qt4_in_gtk2.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/suil-0/libsuil_qt4_in_gtk2.so

1
audio/suil/pkg-plist
View File

@ -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_gtk2.so
lib/suil-0/libsuil_x11_in_qt4.so lib/suil-0/libsuil_x11_in_qt4.so
libdata/pkgconfig/suil-0.pc libdata/pkgconfig/suil-0.pc
@dir lib/pkgconfig

1
databases/monetdb/Makefile
View File

@ -226,7 +226,6 @@ pre-install:
${INSTALL_DATA} ${WRKSRC}/sql/dump-restore.* ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/sql/dump-restore.* ${STAGEDIR}${DOCSDIR}
post-install: post-install:
${RM} -r ${STAGEDIR}${PREFIX}/lib/pkgconfig
${RM} -r ${STAGEDIR}${PREFIX}/share/doc/MonetDB-SQL-11.15.19 ${RM} -r ${STAGEDIR}${PREFIX}/share/doc/MonetDB-SQL-11.15.19
${RM} -r ${STAGEDIR}${PREFIX}/etc/tmpfiles.d ${RM} -r ${STAGEDIR}${PREFIX}/etc/tmpfiles.d
${MV} ${STAGEDIR}${PREFIX}/var/* ${STAGEDIR}${PREFIX} ${MV} ${STAGEDIR}${PREFIX}/var/* ${STAGEDIR}${PREFIX}

3
deskutils/cairo-dock-plugins/Makefile
View File

@ -169,10 +169,9 @@ post-patch:
s|/usr/share/applications|${LOCALBASE}/share/applications|g; \ s|/usr/share/applications|${LOCALBASE}/share/applications|g; \
s|/usr/share/cairo-dock|${LOCALBASE}/share/cairo-dock|g' s|/usr/share/cairo-dock|${LOCALBASE}/share/cairo-dock|g'
post-install: #post-install:
#.if defined(VALA) #.if defined(VALA)
# ${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/CDApplet.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/ # ${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/CDApplet.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
#.endif #.endif
${RM} -R ${STAGEDIR}${PREFIX}/lib/pkgconfig
.include <bsd.port.mk> .include <bsd.port.mk>

2
devel/google-perftools/Makefile
View File

@ -64,8 +64,6 @@ post-build:
@${ECHO} @${ECHO}
post-install: post-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/libdata
${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig ${STAGEDIR}${PREFIX}/libdata
${MV} ${STAGEDIR}${PREFIX}/bin/pprof ${STAGEDIR}${PREFIX}/bin/perftools-pprof ${MV} ${STAGEDIR}${PREFIX}/bin/pprof ${STAGEDIR}${PREFIX}/bin/perftools-pprof
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.* @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.*

1
devel/serd/Makefile
View File

@ -18,7 +18,6 @@ USE_LDCONFIG= yes
PLIST_SUB= VERSION=${PORTVERSION} PLIST_SUB= VERSION=${PORTVERSION}
post-install: post-install:
@${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig ${STAGEDIR}${PREFIX}/libdata/
@${MV} ${STAGEDIR}${PREFIX}/share/man/man1 ${STAGEDIR}${PREFIX}/man/ @${MV} ${STAGEDIR}${PREFIX}/share/man/man1 ${STAGEDIR}${PREFIX}/man/
@${RMDIR} ${STAGEDIR}${PREFIX}/share/man @${RMDIR} ${STAGEDIR}${PREFIX}/share/man
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/serdi @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/serdi

1
devel/sord/Makefile
View File

@ -19,7 +19,6 @@ USES= pkgconfig python:build tar:bzip2 waf
USE_LDCONFIG= yes USE_LDCONFIG= yes
post-install: post-install:
@${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/*.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
@${MV} ${STAGEDIR}${PREFIX}/share/man/man1 ${STAGEDIR}${PREFIX}/man/ @${MV} ${STAGEDIR}${PREFIX}/share/man/man1 ${STAGEDIR}${PREFIX}/man/
@${RMDIR} ${STAGEDIR}${PREFIX}/share/man @${RMDIR} ${STAGEDIR}${PREFIX}/share/man
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsord-0.so.0.16.0 @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsord-0.so.0.16.0

1
devel/sord/pkg-plist
View File

@ -8,4 +8,3 @@ lib/libsord-0.so.0.16.0
libdata/pkgconfig/sord-0.pc libdata/pkgconfig/sord-0.pc
man/man1/sord_validate.1.gz man/man1/sord_validate.1.gz
man/man1/sordi.1.gz man/man1/sordi.1.gz
@dir lib/pkgconfig

3
security/gnomint/Makefile
View File

@ -30,7 +30,4 @@ OPTIONS_SUB= yes
NLS_USES= gettext-runtime NLS_USES= gettext-runtime
NLS_CONFIGURE_ENABLE= nls NLS_CONFIGURE_ENABLE= nls
post-install:
${RMDIR} ${STAGEDIR}${PREFIX}/lib/pkgconfig
.include <bsd.port.mk> .include <bsd.port.mk>

2
sysutils/cmocka/Makefile
View File

@ -21,7 +21,7 @@ PLIST_FILES= include/cmocka.h \
lib/libcmocka.so \ lib/libcmocka.so \
lib/libcmocka.so.0 \ lib/libcmocka.so.0 \
lib/libcmocka.so.0.4.0 \ lib/libcmocka.so.0.4.0 \
lib/pkgconfig/cmocka.pc libdata/pkgconfig/cmocka.pc
OPTIONS_DEFINE= STATIC OPTIONS_DEFINE= STATIC

2
sysutils/fluent-bit/pkg-plist
View File

@ -689,4 +689,4 @@ include/msgpack/zone.h
include/msgpack/zone.hpp include/msgpack/zone.hpp
include/msgpack/zone_decl.hpp include/msgpack/zone_decl.hpp
lib/libfluent-bit.so lib/libfluent-bit.so
lib/pkgconfig/msgpack.pc @comment libdata/pkgconfig/msgpack.pc

2
x11-toolkits/gtkada/Makefile
View File

@ -64,8 +64,6 @@ do-build:
${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET}
post-install: post-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/libdata
@${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig ${STAGEDIR}${PREFIX}/libdata/
${RM} -r ${STAGEDIR}${PREFIX}/share/doc/gtkada/gtkada_ug/_sources ${RM} -r ${STAGEDIR}${PREFIX}/share/doc/gtkada/gtkada_ug/_sources
.include <bsd.port.mk> .include <bsd.port.mk>