diff options
| author | jmmv <jmmv@pkgsrc.org> | 2004-01-22 12:38:46 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2004-01-22 12:38:46 +0000 |
| commit | 23f98282afdebde9699c78a7b2c140a4d0e0dd19 (patch) | |
| tree | 16ec01d625cb6e3b07c6998aefc1462c9e1bbb5d /x11/gtk2/patches | |
| parent | db4e126be7d75842418fe4108f7e50734ce45b66 (diff) | |
| download | pkgsrc-23f98282afdebde9699c78a7b2c140a4d0e0dd19.tar.gz | |
Move "configuration" files from PKG_SYSCONFDIR to PREFIX/libdata. Those
files are not intended to be configured by the end user, but should be
automatically regenerated when (de)installing extra GTK modules.
Bump PKGREVISION to 3 because of this change.
While doing this, implement a framework so that other packages installing
GTK modules can rebuild those databases easily at (de)install time.
Diffstat (limited to 'x11/gtk2/patches')
| -rw-r--r-- | x11/gtk2/patches/patch-af | 28 | ||||
| -rw-r--r-- | x11/gtk2/patches/patch-ah | 32 |
2 files changed, 1 insertions, 59 deletions
diff --git a/x11/gtk2/patches/patch-af b/x11/gtk2/patches/patch-af deleted file mode 100644 index 00012e91a6d..00000000000 --- a/x11/gtk2/patches/patch-af +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-af,v 1.8 2003/01/04 17:29:05 jmmv Exp $ - ---- modules/input/Makefile.in.orig Sat Dec 21 02:35:03 2002 -+++ modules/input/Makefile.in -@@ -23,7 +23,7 @@ bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ --sysconfdir = @sysconfdir@ -+sysconfdir = @datadir@/examples/gtk2 - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ -@@ -801,10 +801,10 @@ maintainer-clean-generic clean mostlycle - # not work at all, so skip it. - install-data-local: - @if $(RUN_QUERY_IMMODULES_TEST) ; then \ -- echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \ -- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \ -- echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules" ; \ -- $(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ; \ -+ echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir) ; \ -+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir) ; \ -+ echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk.immodules" ; \ -+ $(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk.immodules ; \ - else \ - echo "***" ; \ - echo "*** Warning: gtk.immodules not built" ; \ diff --git a/x11/gtk2/patches/patch-ah b/x11/gtk2/patches/patch-ah index 436b96fbab4..ab5ead25609 100644 --- a/x11/gtk2/patches/patch-ah +++ b/x11/gtk2/patches/patch-ah @@ -1,26 +1,7 @@ -$NetBSD: patch-ah,v 1.5 2003/01/04 17:29:05 jmmv Exp $ +$NetBSD: patch-ah,v 1.6 2004/01/22 12:38:47 jmmv Exp $ --- gdk-pixbuf/Makefile.in.orig Sat Dec 21 02:34:56 2002 +++ gdk-pixbuf/Makefile.in -@@ -23,7 +23,8 @@ bindir = @bindir@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ --sysconfdir = @sysconfdir@ -+sysconfdir = @datadir@/examples/gtk2 -+realsysconfdir = @sysconfdir@ - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ -@@ -370,7 +371,7 @@ INCLUDES = @STRIP_BEGIN@ \ - -I$(top_srcdir) -I$(top_builddir) \ - -I$(top_srcdir)/gdk-pixbuf \ - -I$(top_builddir)/gdk-pixbuf \ -- -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ -+ -DGTK_SYSCONFDIR=\"$(realsysconfdir)\" \ - -DGTK_VERSION=\"@GTK_VERSION@\" \ - -DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\" \ - -DG_DISABLE_DEPRECATED \ @@ -383,7 +384,7 @@ INCLUDES = @STRIP_BEGIN@ \ @@ -30,14 +11,3 @@ $NetBSD: patch-ah,v 1.5 2003/01/04 17:29:05 jmmv Exp $ noinst_PROGRAMS = test-gdk-pixbuf test_gdk_pixbuf_LDADD = $(LDADDS) -@@ -1338,8 +1339,8 @@ $(srcdir)/gdk-pixbuf-marshal.c: @REBUILD - # not work at all, so skip it - install-data-local: install-ms-lib install-libtool-import-lib - @if $(RUN_QUERY_LOADER_TEST) ; then \ -- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \ -- $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders > $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \ -+ $(mkinstalldirs) $(DESTDIR)$(sysconfdir) ; \ -+ $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders > $(DESTDIR)$(sysconfdir)/gdk-pixbuf.loaders ; \ - else \ - echo "***" ; \ - echo "*** Warning: gdk-pixbuf.loaders not built" ; \ |