aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortijl <tijl@FreeBSD.org>2017-02-02 01:39:40 +0800
committertijl <tijl@FreeBSD.org>2017-02-02 01:39:40 +0800
commitaaf7c439682c2dc081b0c52216eb70bb781bd9c8 (patch)
tree14f39331e301454ad10b35d1d5660abffaa491a0
parent92f9432a7d012ac968ade50f49e55b4678abeaa5 (diff)
downloadfreebsd-ports-gnome-aaf7c439682c2dc081b0c52216eb70bb781bd9c8.tar.gz
freebsd-ports-gnome-aaf7c439682c2dc081b0c52216eb70bb781bd9c8.tar.zst
freebsd-ports-gnome-aaf7c439682c2dc081b0c52216eb70bb781bd9c8.zip
Update GIO module cache on installation.
-rw-r--r--emulators/linux_base-c6/Makefile2
-rw-r--r--emulators/linux_base-c6/pkg-plist.amd644
-rw-r--r--emulators/linux_base-c6/pkg-plist.i3862
-rw-r--r--emulators/linux_base-c7/Makefile4
-rw-r--r--emulators/linux_base-c7/pkg-plist.amd646
-rw-r--r--emulators/linux_base-c7/pkg-plist.i3863
6 files changed, 18 insertions, 3 deletions
diff --git a/emulators/linux_base-c6/Makefile b/emulators/linux_base-c6/Makefile
index 3f1f2b91d773..f6c6c4aa0451 100644
--- a/emulators/linux_base-c6/Makefile
+++ b/emulators/linux_base-c6/Makefile
@@ -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 \
diff --git a/emulators/linux_base-c6/pkg-plist.amd64 b/emulators/linux_base-c6/pkg-plist.amd64
index d56f13dca902..7db19bf5b82d 100644
--- a/emulators/linux_base-c6/pkg-plist.amd64
+++ b/emulators/linux_base-c6/pkg-plist.amd64
@@ -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
diff --git a/emulators/linux_base-c6/pkg-plist.i386 b/emulators/linux_base-c6/pkg-plist.i386
index c16dd632a4a0..92b20add1bd9 100644
--- a/emulators/linux_base-c6/pkg-plist.i386
+++ b/emulators/linux_base-c6/pkg-plist.i386
@@ -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
diff --git a/emulators/linux_base-c7/Makefile b/emulators/linux_base-c7/Makefile
index c214634c25a3..fb2e8b65ea20 100644
--- a/emulators/linux_base-c7/Makefile
+++ b/emulators/linux_base-c7/Makefile
@@ -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
diff --git a/emulators/linux_base-c7/pkg-plist.amd64 b/emulators/linux_base-c7/pkg-plist.amd64
index 9ab51c2e213b..a5cf99bb3d83 100644
--- a/emulators/linux_base-c7/pkg-plist.amd64
+++ b/emulators/linux_base-c7/pkg-plist.amd64
@@ -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
diff --git a/emulators/linux_base-c7/pkg-plist.i386 b/emulators/linux_base-c7/pkg-plist.i386
index a8047b223b7f..3b51d6428323 100644
--- a/emulators/linux_base-c7/pkg-plist.i386
+++ b/emulators/linux_base-c7/pkg-plist.i386
@@ -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