diff options
| author | jmmv <jmmv@pkgsrc.org> | 2003-01-04 17:29:04 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2003-01-04 17:29:04 +0000 |
| commit | df0daeb3ac8a69fdc458b77fefdbd50d1517551b (patch) | |
| tree | 549d43664c85ffd23431d2a149f76a6f7b5995e3 /x11/gtk2/patches | |
| parent | 76591e2d2179cdc7fe8a097f103d85748872d2e7 (diff) | |
| download | pkgsrc-df0daeb3ac8a69fdc458b77fefdbd50d1517551b.tar.gz | |
Make this package install its configuration files under the examples tree
and use bsd.pkg.install.mk to copy them to PKG_SYSCONFDIR.
Bump PKGREVISION to 2.
Diffstat (limited to 'x11/gtk2/patches')
| -rw-r--r-- | x11/gtk2/patches/patch-af | 28 | ||||
| -rw-r--r-- | x11/gtk2/patches/patch-ah | 34 |
2 files changed, 60 insertions, 2 deletions
diff --git a/x11/gtk2/patches/patch-af b/x11/gtk2/patches/patch-af new file mode 100644 index 00000000000..00012e91a6d --- /dev/null +++ b/x11/gtk2/patches/patch-af @@ -0,0 +1,28 @@ +$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 6619bc00a50..436b96fbab4 100644 --- a/x11/gtk2/patches/patch-ah +++ b/x11/gtk2/patches/patch-ah @@ -1,8 +1,27 @@ -$NetBSD: patch-ah,v 1.4 2002/12/24 04:07:34 wiz Exp $ +$NetBSD: patch-ah,v 1.5 2003/01/04 17:29:05 jmmv Exp $ --- gdk-pixbuf/Makefile.in.orig Sat Dec 21 02:34:56 2002 +++ gdk-pixbuf/Makefile.in -@@ -383,7 +383,7 @@ INCLUDES = @STRIP_BEGIN@ \ +@@ -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@ \ AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\"" @@ -11,3 +30,14 @@ $NetBSD: patch-ah,v 1.4 2002/12/24 04:07:34 wiz 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" ; \ |