diff options
author | jmmv <jmmv> | 2004-01-22 13:39:23 +0000 |
---|---|---|
committer | jmmv <jmmv> | 2004-01-22 13:39:23 +0000 |
commit | 545c418b0e91786bdc9c1a946496580f3e75152e (patch) | |
tree | 6afb3a659c38606023a78874b06e629e098c86a5 /devel/pango | |
parent | f959eeab21000af321916d24bc54bc90c77604b5 (diff) | |
download | pkgsrc-545c418b0e91786bdc9c1a946496580f3e75152e.tar.gz |
Move "configuration" files from PKG_SYSCONFDIR to PREFIX/libdata. What pango
installs are something like databases that need to be handled automatically
by the package system during installation of modules, not by the end user.
Bump PKGREVISION to 1. (As a side effect, the package gets simplified a lot).
There are no packages in pkgsrc installing pango modules at the moment.
When they come, we can easily add a framework to handle them, as has been
done for x11/gtk2.
Diffstat (limited to 'devel/pango')
-rw-r--r-- | devel/pango/Makefile | 10 | ||||
-rw-r--r-- | devel/pango/PLIST | 8 | ||||
-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 |
6 files changed, 7 insertions, 80 deletions
diff --git a/devel/pango/Makefile b/devel/pango/Makefile index 9c1a78a6595..934c1c6e6c1 100644 --- a/devel/pango/Makefile +++ b/devel/pango/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.31 2004/01/22 08:24:30 grant Exp $ +# $NetBSD: Makefile,v 1.32 2004/01/22 13:39:23 jmmv Exp $ # DISTNAME= pango-1.2.5 +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.2/ \ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.2/ \ @@ -27,13 +28,8 @@ PKGCONFIG_OVERRIDE+= ${WRKSRC}/pangox.pc.in PKGCONFIG_OVERRIDE+= ${WRKSRC}/pangowin32.pc.in PKGCONFIG_OVERRIDE+= ${WRKSRC}/pangoxft.pc.in -PKG_SYSCONFSUBDIR= pango -EGDIR= ${PREFIX}/share/examples/pango -CONF_FILES= ${EGDIR}/pango.modules ${PKG_SYSCONFDIR}/pango.modules -CONF_FILES+= ${EGDIR}/pangox.aliases ${PKG_SYSCONFDIR}/pangox.aliases - CONFIGURE_ARGS+= --enable-gtk-doc=no -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/libdata CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html CONFIGURE_ARGS+= --with-qt=no diff --git a/devel/pango/PLIST b/devel/pango/PLIST index 4e93e560653..da54ee19817 100644 --- a/devel/pango/PLIST +++ b/devel/pango/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.14 2003/09/08 14:17:43 adam Exp $ +@comment $NetBSD: PLIST,v 1.15 2004/01/22 13:39:23 jmmv Exp $ bin/pango-querymodules include/pango-1.0/pango/pango-attributes.h include/pango-1.0/pango/pango-break.h @@ -113,6 +113,8 @@ lib/pkgconfig/pango.pc lib/pkgconfig/pangoft2.pc lib/pkgconfig/pangox.pc lib/pkgconfig/pangoxft.pc +libdata/pango/pango.modules +libdata/pango/pangox.aliases share/doc/html/pango/PangoMarkupFormat.html share/doc/html/pango/home.png share/doc/html/pango/index.html @@ -141,10 +143,8 @@ share/doc/html/pango/pango.html share/doc/html/pango/rendering.html share/doc/html/pango/right.png share/doc/html/pango/up.png -share/examples/pango/pango.modules -share/examples/pango/pangox.aliases -@dirrm share/examples/pango @dirrm share/doc/html/pango +@dirrm libdata/pango @dirrm lib/pango/1.2.0/modules @dirrm lib/pango/1.2.0 @dirrm lib/pango diff --git a/devel/pango/patches/patch-aa b/devel/pango/patches/patch-aa deleted file mode 100644 index cf42bd3acbe..00000000000 --- a/devel/pango/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.7 2002/12/24 03:41:11 wiz Exp $ - ---- examples/Makefile.in.orig Fri Dec 20 18:23:05 2002 -+++ examples/Makefile.in -@@ -118,7 +118,7 @@ XFT_CFLAGS = @XFT_CFLAGS@ - XFT_LIBS = @XFT_LIBS@ - ms_librarian = @ms_librarian@ - --aliasdir = $(sysconfdir)/pango -+aliasdir = $(datadir)/examples/@PACKAGE@ - - INCLUDES = \ - -DG_DISABLE_DEPRECATED \ diff --git a/devel/pango/patches/patch-ab b/devel/pango/patches/patch-ab deleted file mode 100644 index ac70cdc8efb..00000000000 --- a/devel/pango/patches/patch-ab +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-ab,v 1.7 2002/12/24 03:41:12 wiz Exp $ - ---- modules/Makefile.in.orig Fri Dec 20 18:23:01 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@ -@@ -339,12 +339,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 deleted file mode 100644 index 5cae9ebeb63..00000000000 --- a/devel/pango/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$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 deleted file mode 100644 index 00fda733d3e..00000000000 --- a/devel/pango/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.5 2002/12/24 03:41:12 wiz Exp $ - ---- pango/pangox-fontmap.c.orig Tue Oct 15 00:50:47 2002 -+++ pango/pangox-fontmap.c -@@ -912,7 +912,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); - |