Extended patch-aa (main.c) to make the variable addresses used in a

struct initializer constant. Bumped PKGREVISION.

3 files changed, 58 insertions, 8 deletions

diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile
index ad06acce1f0..dfc553b0861 100644
--- a/devel/pkgconfig/Makefile
+++ b/devel/pkgconfig/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2005/04/21 08:22:32 xtraeme Exp $
+# $NetBSD: Makefile,v 1.27 2005/07/13 21:38:26 rillig Exp $
 #
 
 DISTNAME=	pkgconfig-0.17.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.freedesktop.org/software/pkgconfig/releases/
 
diff --git a/devel/pkgconfig/distinfo b/devel/pkgconfig/distinfo
index 95ba787ad2b..9eb5521111f 100644
--- a/devel/pkgconfig/distinfo
+++ b/devel/pkgconfig/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.16 2005/04/21 08:22:32 xtraeme Exp $
+$NetBSD: distinfo,v 1.17 2005/07/13 21:38:26 rillig Exp $
 
 SHA1 (pkgconfig-0.17.2.tar.gz) = 93e32aa176fceb2f7fe4d4e938f599ade74edb09
 RMD160 (pkgconfig-0.17.2.tar.gz) = ff6de406416abf9dcd5eaa77d1d8ef5e6bc6d935
 Size (pkgconfig-0.17.2.tar.gz) = 965129 bytes
-SHA1 (patch-aa) = 58592474033f44f244c639a29b89b73a9966b1a2
+SHA1 (patch-aa) = 6927d53131e9be90d81856ecd0e209c9c6015c9f
diff --git a/devel/pkgconfig/patches/patch-aa b/devel/pkgconfig/patches/patch-aa
index 5f25950e44a..593e16798f4 100644
--- a/devel/pkgconfig/patches/patch-aa
+++ b/devel/pkgconfig/patches/patch-aa
@@ -1,8 +1,58 @@
-$NetBSD: patch-aa,v 1.5 2005/04/21 08:22:32 xtraeme Exp $
+$NetBSD: patch-aa,v 1.6 2005/07/13 21:38:26 rillig Exp $
 
---- main.c.orig	2005-04-21 10:11:45.000000000 +0200
-+++ main.c	2005-04-21 10:12:43.000000000 +0200
-@@ -278,13 +278,17 @@
+The static variables are needed because they are used in a struct
+initializer. The IRIX/mipseb C compiler needs those addresses to be
+constant.
+
+--- main.c.orig	Tue Apr 12 13:08:13 2005
++++ main.c	Wed Jul 13 04:26:50 2005
+@@ -172,26 +172,26 @@ pkg_uninstalled (Package *pkg)
+ int
+ main (int argc, char **argv)
+ {
+-  int want_my_version = 0;
+-  int want_version = 0;
+-  int want_libs = 0;
+-  int want_cflags = 0;
+-  int want_l_libs = 0;
+-  int want_L_libs = 0;
+-  int want_other_libs = 0;
+-  int want_I_cflags = 0;
+-  int want_other_cflags = 0;
+-  int want_list = 0;
+-  int want_static_lib_list = ENABLE_INDIRECT_DEPS;
++  static int want_my_version = 0;
++  static int want_version = 0;
++  static int want_libs = 0;
++  static int want_cflags = 0;
++  static int want_l_libs = 0;
++  static int want_L_libs = 0;
++  static int want_other_libs = 0;
++  static int want_I_cflags = 0;
++  static int want_other_cflags = 0;
++  static int want_list = 0;
++  static int want_static_lib_list = ENABLE_INDIRECT_DEPS;
+   int result;
+-  int want_uninstalled = 0;
+-  char *variable_name = NULL;
+-  int want_exists = 0;
+-  char *required_atleast_version = NULL;
+-  char *required_exact_version = NULL;
+-  char *required_max_version = NULL;
+-  char *required_pkgconfig_version = NULL;
+-  int want_silence_errors = 0;
++  static int want_uninstalled = 0;
++  static char *variable_name = NULL;
++  static int want_exists = 0;
++  static char *required_atleast_version = NULL;
++  static char *required_exact_version = NULL;
++  static char *required_max_version = NULL;
++  static char *required_pkgconfig_version = NULL;
++  static int want_silence_errors = 0;
+   GString *str;
+   GSList *packages = NULL;
+   char *search_path;
+@@ -278,13 +278,17 @@ main (int argc, char **argv)
        debug_spew ("PKG_CONFIG_DEBUG_SPEW variable enabling debug spew\n");
      }