diff options
author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-12-25 00:10:29 +0800 |
---|---|---|
committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-12-25 00:10:29 +0800 |
commit | 1b02e083b8c1b96da581a193ed2a851473c6e838 (patch) | |
tree | 1eebdaa7902e4c10d7b0be88cf2dcb7100aaf6a8 /Mk | |
parent | c92d07fdca0d3432a1d2321105a60cb4f3bd9974 (diff) | |
download | marcuscom-ports-1b02e083b8c1b96da581a193ed2a851473c6e838.tar marcuscom-ports-1b02e083b8c1b96da581a193ed2a851473c6e838.tar.gz marcuscom-ports-1b02e083b8c1b96da581a193ed2a851473c6e838.tar.bz2 marcuscom-ports-1b02e083b8c1b96da581a193ed2a851473c6e838.tar.lz marcuscom-ports-1b02e083b8c1b96da581a193ed2a851473c6e838.tar.xz marcuscom-ports-1b02e083b8c1b96da581a193ed2a851473c6e838.tar.zst marcuscom-ports-1b02e083b8c1b96da581a193ed2a851473c6e838.zip |
Chance how GLIB_SCHEMAS works, instead of running glib-compile-schemas [--uninstall]
after every gschemas.xml file. Now only run it after all the schema files are
installed/deinstalled. This fixes ports that install multiple schema files [1].
While here fix tablation with libgnomekbd entry.
Noticed by: [1] gsettings-desktop-schemas 0.1.3.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14941 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'Mk')
-rw-r--r-- | Mk/bsd.gnome.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index 8c7a0e3e2..8ae3d9a1c 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -3,7 +3,7 @@ # # $FreeBSD$ # $NetBSD: $ -# $MCom: ports/Mk/bsd.gnome.mk,v 1.512 2010/10/26 09:02:45 kwm Exp $ +# $MCom: ports/Mk/bsd.gnome.mk,v 1.513 2010/12/16 15:45:17 kwm Exp $ # # Please view me with 4 column tabs! @@ -581,7 +581,7 @@ gnomesharp20_BUILD_DEPENDS= ${gnomesharp20_DETECT}:${PORTSDIR}/x11-toolkits/gnom gnomesharp20_RUN_DEPENDS= ${gnomesharp20_DETECT}:${PORTSDIR}/x11-toolkits/gnome-sharp20 gnomesharp20_USE_GNOME_IMPL= gnomepanel gtkhtml3 gtksharp20 librsvg2 vte -libgnomekbd_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomekbd.pc +libgnomekbd_DETECT= ${LOCALBASE}/libdata/pkgconfig/libgnomekbd.pc libgnomekbd_LIB_DEPENDS= gnomekbd.4:${PORTSDIR}/x11/libgnomekbd libgnomekbd_USE_GNOME_IMPL= gconf2 @@ -881,11 +881,11 @@ gnome-post-install: . if defined(GLIB_SCHEMAS) @for i in ${GLIB_SCHEMAS}; do \ ${ECHO_CMD} "share/glib-2.0/schemas/$${i}" >> ${TMPPLIST}; \ - ${ECHO_CMD} "@exec glib-compile-schemas %D/share/glib-2.0/schemas > /dev/null || /usr/bin/true" \ + done; \ + ${ECHO_CMD} "@exec glib-compile-schemas %D/share/glib-2.0/schemas > /dev/null || /usr/bin/true" \ >> ${TMPPLIST}; \ - ${ECHO_CMD} "@unexec glib-compile-schemas --uninstall %D/share/glib-2.0/schemas > /dev/null || /usr/bin/true" \ - >> ${TMPPLIST}; \ - done + ${ECHO_CMD} "@unexec glib-compile-schemas --uninstall %D/share/glib-2.0/schemas > /dev/null || /usr/bin/true" \ + >> ${TMPPLIST}; .endif . if defined(INSTALLS_OMF) |