Attachment 181159 Details for Bug 218067 – v2

[patch] v2

pkgconfig.diff (text/plain), 8.21 KB, created by Mathieu Arnold on 2017-03-24 19:28:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu Arnold

Created: 2017-03-24 19:28:16 UTC

Size: 8.21 KB

patch

obsolete

>base commit: r436822
>diff --git Mk/bsd.port.mk Mk/bsd.port.mk
>index 27b9adc..6b6f2a4 100644
>--- Mk/bsd.port.mk
>+++ Mk/bsd.port.mk
>@@ -3486,6 +3486,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
>@@ -5249,7 +5262,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 audio/lilv/Makefile audio/lilv/Makefile
>index 54dd17a..f6bec47 100644
>--- audio/lilv/Makefile
>+++ 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 audio/lv2/Makefile audio/lv2/Makefile
>index 30bba7a..93981ef 100644
>--- audio/lv2/Makefile
>+++ 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 audio/msbcg729/pkg-plist audio/msbcg729/pkg-plist
>index 18155a9cd..7e73b82 100644
>--- audio/msbcg729/pkg-plist
>+++ 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 audio/sratom/Makefile audio/sratom/Makefile
>index 984f6e4..8095094 100644
>--- audio/sratom/Makefile
>+++ 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 <bsd.port.mk>
>diff --git audio/sratom/pkg-plist audio/sratom/pkg-plist
>index 560b901..bec783d 100644
>--- audio/sratom/pkg-plist
>+++ 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 audio/suil/Makefile audio/suil/Makefile
>index 33d57793..357df42 100644
>--- audio/suil/Makefile
>+++ 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 audio/suil/pkg-plist audio/suil/pkg-plist
>index 26f776c..675fcd2 100644
>--- audio/suil/pkg-plist
>+++ 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 databases/monetdb/Makefile databases/monetdb/Makefile
>index bc8dabd..170b43d 100644
>--- databases/monetdb/Makefile
>+++ 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 deskutils/cairo-dock-plugins/Makefile deskutils/cairo-dock-plugins/Makefile
>index b233529..3df171c 100644
>--- deskutils/cairo-dock-plugins/Makefile
>+++ 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 <bsd.port.mk>
>diff --git devel/google-perftools/Makefile devel/google-perftools/Makefile
>index 235fe5a..23adf4c 100644
>--- devel/google-perftools/Makefile
>+++ devel/google-perftools/Makefile
>@@ -63,8 +63,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 devel/serd/Makefile devel/serd/Makefile
>index dd02285..556d8e2 100644
>--- devel/serd/Makefile
>+++ 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 devel/sord/Makefile devel/sord/Makefile
>index 4d91f47..bb646e7 100644
>--- devel/sord/Makefile
>+++ 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 devel/sord/pkg-plist devel/sord/pkg-plist
>index 1bf91b8..996f739 100644
>--- devel/sord/pkg-plist
>+++ 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 security/gnomint/Makefile security/gnomint/Makefile
>index 4d2c219..b760bc1 100644
>--- security/gnomint/Makefile
>+++ 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 <bsd.port.mk>
>diff --git sysutils/fluent-bit/pkg-plist sysutils/fluent-bit/pkg-plist
>index 519934c..f71df3b 100644
>--- sysutils/fluent-bit/pkg-plist
>+++ sysutils/fluent-bit/pkg-plist
>@@ -687,4 +687,4 @@ lib/libmbedcrypto.a
> lib/libmbedtls.a
> lib/libmbedx509.a
> lib/libmsgpackc.a
>-lib/pkgconfig/msgpack.pc
>+@comment libdata/pkgconfig/msgpack.pc
>diff --git x11-toolkits/gtkada/Makefile x11-toolkits/gtkada/Makefile
>index 6c63719..bca2649 100644
>--- x11-toolkits/gtkada/Makefile
>+++ 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 <bsd.port.mk>

Actions: View | Diff

Attachments on bug 218067: 181143 | 181159 | 183059