From owner-svn-ports-all@freebsd.org Wed Feb 1 17:39:42 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DA7EACC4506; Wed, 1 Feb 2017 17:39:42 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9B0361113; Wed, 1 Feb 2017 17:39:42 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v11Hdf59095224; Wed, 1 Feb 2017 17:39:41 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v11HdfEC095218; Wed, 1 Feb 2017 17:39:41 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201702011739.v11HdfEC095218@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Wed, 1 Feb 2017 17:39:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433058 - in head/emulators: linux_base-c6 linux_base-c7 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Feb 2017 17:39:43 -0000 Author: tijl Date: Wed Feb 1 17:39:40 2017 New Revision: 433058 URL: https://svnweb.freebsd.org/changeset/ports/433058 Log: Update GIO module cache on installation. Modified: head/emulators/linux_base-c6/Makefile head/emulators/linux_base-c6/pkg-plist.amd64 head/emulators/linux_base-c6/pkg-plist.i386 head/emulators/linux_base-c7/Makefile head/emulators/linux_base-c7/pkg-plist.amd64 head/emulators/linux_base-c7/pkg-plist.i386 Modified: head/emulators/linux_base-c6/Makefile ============================================================================== --- head/emulators/linux_base-c6/Makefile Wed Feb 1 17:35:00 2017 (r433057) +++ head/emulators/linux_base-c6/Makefile Wed Feb 1 17:39:40 2017 (r433058) @@ -3,7 +3,7 @@ PORTNAME= c6 PORTVERSION= ${LINUX_DIST_VER} -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= emulators linux PKGNAMEPREFIX= linux_base- BIN_DISTNAMES= bash-4.1.2-41.el6_8 \ Modified: head/emulators/linux_base-c6/pkg-plist.amd64 ============================================================================== --- head/emulators/linux_base-c6/pkg-plist.amd64 Wed Feb 1 17:35:00 2017 (r433057) +++ head/emulators/linux_base-c6/pkg-plist.amd64 Wed Feb 1 17:39:40 2017 (r433058) @@ -577,6 +577,7 @@ usr/lib/gconv/libISOIR165.so usr/lib/gconv/libJIS.so usr/lib/gconv/libJISX0213.so usr/lib/gconv/libKSC.so +@rmtry usr/lib/gio/modules/giomodule.cache usr/lib/gio/modules/libgiofam.so usr/lib/i686/nosegneg/libc-2.12.so usr/lib/i686/nosegneg/libc.so.6 @@ -1016,6 +1017,7 @@ usr/lib64/gconv/libISOIR165.so usr/lib64/gconv/libJIS.so usr/lib64/gconv/libJISX0213.so usr/lib64/gconv/libKSC.so +@rmtry usr/lib64/gio/modules/giomodule.cache usr/lib64/gio/modules/libgiofam.so usr/lib64/krb5/plugins/kdb/db2.so usr/lib64/ld-2.12.so @@ -2808,3 +2810,5 @@ var/mail @postexec mkdir -p %D/sys @postunexec rmdir %D/sys 2>/dev/null || true @postexec %D/usr/sbin/ldconfig +@postexec %D/usr/bin/gio-querymodules-32 /usr/lib/gio/modules +@postexec %D/usr/bin/gio-querymodules-64 /usr/lib64/gio/modules Modified: head/emulators/linux_base-c6/pkg-plist.i386 ============================================================================== --- head/emulators/linux_base-c6/pkg-plist.i386 Wed Feb 1 17:35:00 2017 (r433057) +++ head/emulators/linux_base-c6/pkg-plist.i386 Wed Feb 1 17:39:40 2017 (r433058) @@ -572,6 +572,7 @@ usr/lib/gconv/libISOIR165.so usr/lib/gconv/libJIS.so usr/lib/gconv/libJISX0213.so usr/lib/gconv/libKSC.so +@rmtry usr/lib/gio/modules/giomodule.cache usr/lib/gio/modules/libgiofam.so usr/lib/i686/nosegneg/libc-2.12.so usr/lib/i686/nosegneg/libc.so.6 @@ -2380,3 +2381,4 @@ var/mail @postexec mkdir -p %D/sys @postunexec rmdir %D/sys 2>/dev/null || true @postexec %D/usr/sbin/ldconfig +@postexec %D/usr/bin/gio-querymodules-32 /usr/lib/gio/modules Modified: head/emulators/linux_base-c7/Makefile ============================================================================== --- head/emulators/linux_base-c7/Makefile Wed Feb 1 17:35:00 2017 (r433057) +++ head/emulators/linux_base-c7/Makefile Wed Feb 1 17:39:40 2017 (r433058) @@ -2,7 +2,7 @@ PORTNAME= c7 PORTVERSION= ${LINUX_DIST_VER} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators linux PKGNAMEPREFIX= linux_base- BIN_DISTNAMES= centos-release-7-3.1611.el7.centos \ @@ -147,7 +147,7 @@ post-extract: post-patch: @${RM} -r ${REMOVE_DIRS:S|^|${WRKSRC}/|} @${RM} ${REMOVE_FILES:S|^|${WRKSRC}/|} - @${FIND} ${WRKSRC}/usr -type d -empty -delete + @${FIND} ${WRKSRC}/usr -type d -empty -not -path '*/lib*/gio/*' -delete @${BRANDELF} -t Linux ${WRKSRC}/usr/lib/ld-2.17.so .if ${LINUX_ARCH} == x86_64 @${BRANDELF} -t Linux ${WRKSRC}/usr/lib64/ld-2.17.so Modified: head/emulators/linux_base-c7/pkg-plist.amd64 ============================================================================== --- head/emulators/linux_base-c7/pkg-plist.amd64 Wed Feb 1 17:35:00 2017 (r433057) +++ head/emulators/linux_base-c7/pkg-plist.amd64 Wed Feb 1 17:39:40 2017 (r433058) @@ -609,6 +609,7 @@ usr/lib/gconv/libISOIR165.so usr/lib/gconv/libJIS.so usr/lib/gconv/libJISX0213.so usr/lib/gconv/libKSC.so +@rmtry usr/lib/gio/modules/giomodule.cache usr/lib/i686/nosegneg/libc-2.17.so usr/lib/i686/nosegneg/libc.so.6 usr/lib/i686/nosegneg/libm-2.17.so @@ -1066,6 +1067,7 @@ usr/lib64/gconv/libISOIR165.so usr/lib64/gconv/libJIS.so usr/lib64/gconv/libJISX0213.so usr/lib64/gconv/libKSC.so +@rmtry usr/lib64/gio/modules/giomodule.cache usr/lib64/krb5/plugins/tls/k5tls.so usr/lib64/ld-2.17.so usr/lib64/ld-linux-x86-64.so.2 @@ -3038,6 +3040,8 @@ var/mail @dir etc/xinetd.d @dir opt @dir srv +@dir usr/lib/gio/modules +@dir usr/lib64/gio/modules @dir var/adm @dir var/cache/ldconfig @dir var/empty @@ -3064,3 +3068,5 @@ var/mail @postexec mkdir -p %D/sys @postunexec rmdir %D/sys 2>/dev/null || true @postexec %D/usr/sbin/ldconfig +@postexec %D/usr/bin/gio-querymodules-32 /usr/lib/gio/modules +@postexec %D/usr/bin/gio-querymodules-64 /usr/lib64/gio/modules Modified: head/emulators/linux_base-c7/pkg-plist.i386 ============================================================================== --- head/emulators/linux_base-c7/pkg-plist.i386 Wed Feb 1 17:35:00 2017 (r433057) +++ head/emulators/linux_base-c7/pkg-plist.i386 Wed Feb 1 17:39:40 2017 (r433058) @@ -606,6 +606,7 @@ usr/lib/gconv/libISOIR165.so usr/lib/gconv/libJIS.so usr/lib/gconv/libJISX0213.so usr/lib/gconv/libKSC.so +@rmtry usr/lib/gio/modules/giomodule.cache usr/lib/i686/nosegneg/libc-2.17.so usr/lib/i686/nosegneg/libc.so.6 usr/lib/i686/nosegneg/libm-2.17.so @@ -2593,6 +2594,7 @@ var/mail @dir etc/xinetd.d @dir opt @dir srv +@dir usr/lib/gio/modules @dir var/adm @dir var/cache/ldconfig @dir var/empty @@ -2619,3 +2621,4 @@ var/mail @postexec mkdir -p %D/sys @postunexec rmdir %D/sys 2>/dev/null || true @postexec %D/usr/sbin/ldconfig +@postexec %D/usr/bin/gio-querymodules-32 /usr/lib/gio/modules