diff options
| author | obache <obache@pkgsrc.org> | 2011-06-05 12:13:47 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2011-06-05 12:13:47 +0000 |
| commit | b53d950cd3ef057ceee2e9fb1b2270fedce345be (patch) | |
| tree | 1cee9e9b80d18e075ba05bae8fd75dfe3d5e9e2b /x11/gtk3 | |
| parent | 01f54111af90af23f7aad9e75ecd04a48d021d12 (diff) | |
| download | pkgsrc-b53d950cd3ef057ceee2e9fb1b2270fedce345be.tar.gz | |
Rename immodule related variable names, and not to conflict with gtk2 immodules.
Diffstat (limited to 'x11/gtk3')
| -rw-r--r-- | x11/gtk3/Makefile | 4 | ||||
| -rw-r--r-- | x11/gtk3/files/immodules.tmpl | 12 | ||||
| -rw-r--r-- | x11/gtk3/modules.mk | 10 |
3 files changed, 13 insertions, 13 deletions
diff --git a/x11/gtk3/Makefile b/x11/gtk3/Makefile index d18dcce0c8c..25d72b14941 100644 --- a/x11/gtk3/Makefile +++ b/x11/gtk3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2011/05/25 09:39:57 drochner Exp $ +# $NetBSD: Makefile,v 1.6 2011/06/05 12:13:47 obache Exp $ DISTNAME= gtk+-3.0.10 PKGNAME= ${DISTNAME:S/gtk/gtk3/} @@ -62,7 +62,7 @@ CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" # anew in the +INSTALL script as part of the POST-INSTALL action. # post-install: - ${RM} -f ${DESTDIR}${GTK_IMMODULES_DB} + ${RM} -f ${DESTDIR}${GTK3_IMMODULES_DB} _BUILDING_GTK3= yes .include "modules.mk" diff --git a/x11/gtk3/files/immodules.tmpl b/x11/gtk3/files/immodules.tmpl index 9a5fbc3b844..56373d6430d 100644 --- a/x11/gtk3/files/immodules.tmpl +++ b/x11/gtk3/files/immodules.tmpl @@ -1,21 +1,21 @@ -# $NetBSD: immodules.tmpl,v 1.1.1.1 2011/03/18 17:06:10 drochner Exp $ +# $NetBSD: immodules.tmpl,v 1.2 2011/06/05 12:13:47 obache Exp $ # # Rebuild the GTK3 immodules database. # -GTK_IMMODULES_DB="@GTK_IMMODULES_DB@" -GTK_QUERY_IMMODULES="@GTK_QUERY_IMMODULES@" +GTK3_IMMODULES_DB="@GTK3_IMMODULES_DB@" +GTK3_QUERY_IMMODULES="@GTK3_QUERY_IMMODULES@" case ${STAGE} in POST-INSTALL) - ${GTK_QUERY_IMMODULES} > ${GTK_IMMODULES_DB} + ${GTK3_QUERY_IMMODULES} > ${GTK3_IMMODULES_DB} ;; DEINSTALL) - [ "${PKGBASE}" = "gtk3+" ] && ${RM} -f ${GTK_IMMODULES_DB} + [ "${PKGBASE}" = "gtk3+" ] && ${RM} -f ${GTK3_IMMODULES_DB} ;; POST-DEINSTALL) [ "${PKGBASE}" != "gtk3+" ] && \ - ${GTK_QUERY_IMMODULES} > ${GTK_IMMODULES_DB} + ${GTK3_QUERY_IMMODULES} > ${GTK3_IMMODULES_DB} ;; *) ;; diff --git a/x11/gtk3/modules.mk b/x11/gtk3/modules.mk index 16db9ce205c..15fbc558199 100644 --- a/x11/gtk3/modules.mk +++ b/x11/gtk3/modules.mk @@ -1,4 +1,4 @@ -# $NetBSD: modules.mk,v 1.1.1.1 2011/03/18 17:06:10 drochner Exp $ +# $NetBSD: modules.mk,v 1.2 2011/06/05 12:13:47 obache Exp $ # # This Makefile fragment is intended to be included by packages that install # GTK3 modules. It takes care of rebuilding the corresponding databases at @@ -11,7 +11,7 @@ .if !defined(GTK3_MODULES_MK) GTK3_MODULES_MK= # defined -GTK_QUERY_IMMODULES= ${BUILDLINK_PREFIX.gtk3}/bin/gtk-query-immodules-3.0 +GTK3_QUERY_IMMODULES= ${BUILDLINK_PREFIX.gtk3}/bin/gtk-query-immodules-3.0 .if defined(_BUILDING_GTK3) BUILDLINK_PREFIX.gtk3= ${PREFIX} @@ -19,9 +19,9 @@ GTK3_IMMODULES= YES .endif .if defined(GTK3_IMMODULES) && !empty(GTK3_IMMODULES:M[Yy][Ee][Ss]) -FILES_SUBST+= GTK_IMMODULES_DB=${GTK_IMMODULES_DB:Q} -FILES_SUBST+= GTK_QUERY_IMMODULES=${GTK_QUERY_IMMODULES:Q} -GTK_IMMODULES_DB= ${BUILDLINK_PREFIX.gtk3}/libdata/gtk-3.0/gtk.immodules +FILES_SUBST+= GTK3_IMMODULES_DB=${GTK3_IMMODULES_DB:Q} +FILES_SUBST+= GTK3_QUERY_IMMODULES=${GTK3_QUERY_IMMODULES:Q} +GTK3_IMMODULES_DB= ${BUILDLINK_PREFIX.gtk3}/libdata/gtk-3.0/gtk.immodules INSTALL_TEMPLATES+= ../../x11/gtk3/files/immodules.tmpl DEINSTALL_TEMPLATES+= ../../x11/gtk3/files/immodules.tmpl .endif |