diff options
author | jmmv <jmmv@pkgsrc.org> | 2002-12-22 18:06:21 +0000 |
---|---|---|
committer | jmmv <jmmv@pkgsrc.org> | 2002-12-22 18:06:21 +0000 |
commit | 280d89bf2ea8eb374c71f77d1499bf50c1256a0c (patch) | |
tree | ad9b6c068de2d6bf773c655c98716de9ec2e4b23 /devel/pango/patches | |
parent | b85a7cd41ea65f1e9438cecd78f1ff4d0ffe50d1 (diff) | |
download | pkgsrc-280d89bf2ea8eb374c71f77d1499bf50c1256a0c.tar.gz |
Make this package install its configuration files under the examples tree
and let bsd.pkg.install.mk copy them to PKG_SYSCONFDIR.
Bump PKGREVISION to 1.
Reviewed by wiz.
Diffstat (limited to 'devel/pango/patches')
-rw-r--r-- | devel/pango/patches/patch-aa | 13 | ||||
-rw-r--r-- | devel/pango/patches/patch-ab | 30 | ||||
-rw-r--r-- | devel/pango/patches/patch-ac | 13 | ||||
-rw-r--r-- | devel/pango/patches/patch-ad | 13 |
4 files changed, 69 insertions, 0 deletions
diff --git a/devel/pango/patches/patch-aa b/devel/pango/patches/patch-aa new file mode 100644 index 00000000000..59555ce4c51 --- /dev/null +++ b/devel/pango/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.6 2002/12/22 18:06:21 jmmv Exp $ + +--- examples/Makefile.in.orig Sun Oct 13 18:50:53 2002 ++++ examples/Makefile.in +@@ -116,7 +116,7 @@ XFT_LIBS = @XFT_LIBS@ + YACC = @YACC@ + ms_librarian = @ms_librarian@ + +-aliasdir = $(sysconfdir)/pango ++aliasdir = $(datadir)/examples/@PACKAGE@ + + INCLUDES = -DG_DISABLE_DEPRECATED -I$(top_srcdir) $(QT_INCLUDES) $(GLIB_CFLAGS) $(FREETYPE_CFLAGS) + diff --git a/devel/pango/patches/patch-ab b/devel/pango/patches/patch-ab new file mode 100644 index 00000000000..f033052406e --- /dev/null +++ b/devel/pango/patches/patch-ab @@ -0,0 +1,30 @@ +$NetBSD: patch-ab,v 1.6 2002/12/22 18:06:22 jmmv Exp $ + +--- modules/Makefile.in.orig Sun Dec 22 11:55:17 2002 ++++ modules/Makefile.in +@@ -23,7 +23,7 @@ bindir = @bindir@ + sbindir = @sbindir@ + libexecdir = @libexecdir@ + datadir = @datadir@ +-sysconfdir = @sysconfdir@ ++sysconfdir = @datadir@/examples/@PACKAGE@ + sharedstatedir = @sharedstatedir@ + localstatedir = @localstatedir@ + libdir = @libdir@ +@@ -337,12 +337,12 @@ maintainer-clean-generic clean mostlycle + + install-data-local: + @if $(RUN_QUERY_IMMODULES_TEST) ; then \ +- echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango \&\& \ ++ echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir) \&\& \ + $(top_builddir)/pango/pango-querymodules \ +- \> $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \ +- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/pango && \ ++ \> $(DESTDIR)$(sysconfdir)/pango.modules ; \ ++ $(mkinstalldirs) $(DESTDIR)$(sysconfdir) && \ + $(top_builddir)/pango/pango-querymodules \ +- > $(DESTDIR)$(sysconfdir)/pango/pango.modules ; \ ++ > $(DESTDIR)$(sysconfdir)/pango.modules ; \ + else \ + echo "***" ; \ + echo "*** Warning: pango.modules not created" ; \ diff --git a/devel/pango/patches/patch-ac b/devel/pango/patches/patch-ac new file mode 100644 index 00000000000..5cae9ebeb63 --- /dev/null +++ b/devel/pango/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.6 2002/12/22 18:06:22 jmmv Exp $ + +--- pango/pango-utils.c.orig Wed Oct 2 01:47:51 2002 ++++ pango/pango-utils.c +@@ -666,7 +666,7 @@ pango_get_sysconf_subdirectory (void) + + return result; + #else +- return SYSCONFDIR "/pango"; ++ return SYSCONFDIR; + #endif + } + diff --git a/devel/pango/patches/patch-ad b/devel/pango/patches/patch-ad new file mode 100644 index 00000000000..4aa4f9ce673 --- /dev/null +++ b/devel/pango/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.4 2002/12/22 18:06:22 jmmv Exp $ + +--- pango/pangox-fontmap.c.orig Mon Mar 25 21:22:52 2002 ++++ pango/pangox-fontmap.c +@@ -874,7 +874,7 @@ pango_x_font_map_read_aliases (PangoXFon + int n; + + if (!files_str) +- files_str = g_strdup ("~/.pangox_aliases:" SYSCONFDIR "/pango/pangox.aliases"); ++ files_str = g_strdup ("~/.pangox_aliases:" SYSCONFDIR "/pangox.aliases"); + + files = pango_split_file_list (files_str); + |