From b81107bee592f8dfc033fded7f8ab26e80dcabdb Mon Sep 17 00:00:00 2001 From: kwm Date: Sun, 20 Oct 2013 15:21:28 +0000 Subject: Stageify, remove JOBS_UNSAFE. remove extra call to gtk-query-immodules-3.0 in the plist and use the --update-cache option. This outputs the cache to the standard location instead of stdout. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18802 df743ca5-7f9a-e211-a948-0013205c9059 --- x11-toolkits/gtk30/Makefile | 21 ++++++++++----------- x11-toolkits/gtk30/pkg-plist | 3 ++- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 85f92b2ef..b5f336e66 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -17,7 +17,6 @@ COMMENT= Gimp Toolkit for X11 GUI (current stable version) LICENSE= LGPL20 -NO_STAGE= yes USE_XZ= yes .if !defined(REFERENCE_PORT) @@ -29,7 +28,6 @@ RUN_DEPENDS+= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hico ${LOCALBASE}/libdata/pkgconfig/atk-bridge-2.0.pc:${PORTSDIR}/accessibility/at-spi2-atk USE_PERL5= build -MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= yes USE_AUTOTOOLS= libtool USE_GNOME= atk pango gdkpixbuf2 ltverhack gtk-update-icon-cache @@ -46,8 +44,6 @@ GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \ org.gtk.Settings.ColorChooser.gschema.xml \ org.gtk.Settings.FileChooser.gschema.xml -MAN1= gtk-query-immodules-3.0.1 - OPTIONS_DEFINE= CUPS COLORD DEBUG OPTIONS_DEFAULT=CUPS COLORD COLORD_DESC= Color profile support @@ -93,13 +89,16 @@ pre-build: @${RM} -rf ${WRKSRC}/docs/gtk.info* post-install: - -@${FIND} ${LOCALBASE}/share/icons -type d -depth 1 -exec \ - ${PREFIX}/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null - @${MKDIR} ${PREFIX}/lib/gtk-3.0/modules - @${MKDIR} ${PREFIX}/lib/gtk-3.0/${GTK3_VERSION}/engines - @${MKDIR} ${PREFIX}/lib/gtk-3.0/${GTK3_VERSION}/loaders - ${INSTALL_MAN} ${MAN1:S|^|${WRKSRC}/docs/reference/gtk/|} \ - ${PREFIX}/man/man1 + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/modules + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/${GTK3_VERSION}/engines + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/${GTK3_VERSION}/loaders + ${INSTALL_MAN} ${WRKSRC}/docs/reference/gtk/gtk-query-immodules-3.0.1 \ + ${STAGEDIR}${PREFIX}/man/man1 + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdk-3.so.0 + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgtk-3.so.0 + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgailutil-3.so.0 + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/3.0.0/immodules/im*.so + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/3.0.0/printbackends/libprintbackend-*.so .include diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist index 8905265ba..825806637 100644 --- a/x11-toolkits/gtk30/pkg-plist +++ b/x11-toolkits/gtk30/pkg-plist @@ -397,6 +397,7 @@ libdata/pkgconfig/gdk-x11-3.0.pc libdata/pkgconfig/gtk+-3.0.pc libdata/pkgconfig/gtk+-unix-print-3.0.pc libdata/pkgconfig/gtk+-x11-3.0.pc +man/man1/gtk-query-immodules-3.0.1.gz share/aclocal/gtk-3.0.m4 share/gir-1.0/Gdk-3.0.gir share/gir-1.0/GdkX11-3.0.gir @@ -725,7 +726,7 @@ share/themes/Emacs/gtk-3.0/gtk-keys.css @dirrm lib/gtk-3.0/%%GTK3_VERSION%%/engines @dirrm lib/gtk-3.0/%%GTK3_VERSION%% @dirrm lib/gtk-3.0 -@exec %D/bin/gtk-query-immodules-3.0 > /dev/null 2>&1 && %D/bin/gtk-query-immodules-3.0 > %D/lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache 2>/dev/null || /usr/bin/true +@exec %D/bin/gtk-query-immodules-3.0 --update-cache > /dev/null 2>&1 || /usr/bin/true @unexec /bin/rm -f %D/lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache @dirrm include/gtk-3.0/unix-print/gtk @dirrm include/gtk-3.0/unix-print -- cgit v1.2.3