pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/pango Move "configuration" files from PKG_SYSCON...
details: https://anonhg.NetBSD.org/pkgsrc/rev/92d54682de28
branches: trunk
changeset: 466729:92d54682de28
user: jmmv <jmmv%pkgsrc.org@localhost>
date: Thu Jan 22 13:39:23 2004 +0000
description:
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:
devel/pango/Makefile | 10 +++-------
devel/pango/PLIST | 8 ++++----
devel/pango/patches/patch-aa | 13 -------------
devel/pango/patches/patch-ab | 30 ------------------------------
devel/pango/patches/patch-ac | 13 -------------
devel/pango/patches/patch-ad | 13 -------------
6 files changed, 7 insertions(+), 80 deletions(-)
diffs (143 lines):
diff -r 3f0dfc9e1aba -r 92d54682de28 devel/pango/Makefile
--- a/devel/pango/Makefile Thu Jan 22 13:32:32 2004 +0000
+++ b/devel/pango/Makefile Thu Jan 22 13:39:23 2004 +0000
@@ -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}/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 -r 3f0dfc9e1aba -r 92d54682de28 devel/pango/PLIST
--- a/devel/pango/PLIST Thu Jan 22 13:32:32 2004 +0000
+++ b/devel/pango/PLIST Thu Jan 22 13:39:23 2004 +0000
@@ -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/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/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 -r 3f0dfc9e1aba -r 92d54682de28 devel/pango/patches/patch-aa
--- a/devel/pango/patches/patch-aa Thu Jan 22 13:32:32 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 3f0dfc9e1aba -r 92d54682de28 devel/pango/patches/patch-ab
--- a/devel/pango/patches/patch-ab Thu Jan 22 13:32:32 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 3f0dfc9e1aba -r 92d54682de28 devel/pango/patches/patch-ac
--- a/devel/pango/patches/patch-ac Thu Jan 22 13:32:32 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 3f0dfc9e1aba -r 92d54682de28 devel/pango/patches/patch-ad
--- a/devel/pango/patches/patch-ad Thu Jan 22 13:32:32 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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);
-
Home |
Main Index |
Thread Index |
Old Index