--Multipart_Sun_Feb_27_22:06:50_2005-1
Content-Type: text/plain; charset=US-ASCII

After Makefile changed to 1.66, I needed some change 
on patch-ah.

The error I've got was:

 cc -DHAVE_CONFIG_H -I. -I.. -DG_LOG_DOMAIN=\"GLib\" -DG_DISABLE_CAST_CHECKS -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION -DPREFIX=/usr/pkg -DPKGLOCALEDIR=share -DPKG_SYSCONFDIR=/usr/pkg/etc -I/export/pkgsrc/devel/glib2/work.mini/.buildlink/include -pthread -O2 -Wall -MT gutils.lo -MD -MP -MF .deps/gutils.Tpo -c gutils.c  -fPIC -DPIC -o .libs/gutils.o~
gutils.c: In function `IA__g_get_system_data_dirs':~
gutils.c:1860: error: parse error before '/' token~
gutils.c: In function `IA__g_get_system_config_dirs':~
gutils.c:1903: error: parse error before '/' token~
gutils.c: In function `unalias_lang':~
gutils.c:1978: error: parse error before '/' token~
distcc[20924] ERROR: compile gutils.c on localhost failed~
gmake[4]: *** [gutils.lo]~

and the fix I made was attached. Is this problem only on
my environment ? (NetBSD/macppc 2.99.15)
---
Makoto Fujiwara, 
Chiba, Japan, Narita Airport and Disneyland prefecture.

--Multipart_Sun_Feb_27_22:06:50_2005-1
Content-Type: text/plain; charset=US-ASCII

Index: distinfo
===================================================================
RCS file: /e/st4200/cvsync/pkgsrc/devel/glib2/distinfo,v
retrieving revision 1.45
diff -u -r1.45 distinfo
--- distinfo	23 Feb 2005 22:24:15 -0000	1.45
+++ distinfo	27 Feb 2005 12:45:18 -0000
@@ -10,4 +10,4 @@
 SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
 SHA1 (patch-af) = c7f29961a832b65feef0e8f4cf218491a440f68c
 SHA1 (patch-ag) = 3917075e80139e0bd937ee9c2b42745fa6e69747
-SHA1 (patch-ah) = 81dc8f02aad56af7634479f5554cc68adbe730f9
+SHA1 (patch-ah) = e9efe0cafc706337e9e57a68ff429adb3adf91c7
Index: patches/patch-ah
===================================================================
RCS file: /e/st4200/cvsync/pkgsrc/devel/glib2/patches/patch-ah,v
retrieving revision 1.1
diff -u -r1.1 patch-ah
--- patches/patch-ah	9 Jan 2005 17:30:00 -0000	1.1
+++ patches/patch-ah	27 Feb 2005 12:41:54 -0000
@@ -7,7 +7,7 @@
  
        if (!data_dirs || !data_dirs[0])
 -          data_dirs = "/usr/local/share/:/usr/share/";
-+          data_dirs = PREFIX "/share/";
++          data_dirs = "PREFIX/share/";
  #endif
        data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
  
@@ -16,7 +16,7 @@
  
        if (!conf_dirs || !conf_dirs[0])
 -          conf_dirs = "/etc/xdg";
-+          conf_dirs = PKG_SYSCONFDIR "/xdg";
++          conf_dirs = "PKG_SYSCONFDIR/xdg";
  #endif
        conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
  
@@ -25,7 +25,7 @@
  
    if (!alias_table)
 -    read_aliases ("/usr/share/locale/locale.alias");
-+    read_aliases (PREFIX "/" PKGLOCALEDIR "/locale/locale.alias");
++    read_aliases ("PREFIX/PKGLOCALEDIR/locale/locale.alias");
  
    i = 0;
    while ((p = g_hash_table_lookup (alias_table, lang)) && (strcmp (p, lang) != 0))

--Multipart_Sun_Feb_27_22:06:50_2005-1--