Remove bogus const which caused gcc 3.3.2 to issue warnings like

"/usr/pkg/include/popt.h:444: warning: type qualifiers ignored on
function return type" every time popt.h was included.

4 files changed, 31 insertions, 3 deletions

diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index dc987f2eee9..20db73de745 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2003/11/12 01:25:25 salo Exp $
+# $NetBSD: Makefile,v 1.23 2003/11/24 19:13:19 gson Exp $
 #
 
 DISTNAME=	popt-1.7
-PKGREVISION=	3
+PKGREVISION=	4
 WRKSRC=		${WRKDIR}/${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/		\
diff --git a/devel/popt/distinfo b/devel/popt/distinfo
index d8c34a19bb3..264ab4ea3eb 100644
--- a/devel/popt/distinfo
+++ b/devel/popt/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.13 2003/11/12 01:25:25 salo Exp $
+$NetBSD: distinfo,v 1.14 2003/11/24 19:13:19 gson Exp $
 
 SHA1 (popt-1.7.tar.gz) = 66f3c77b87a160951b180447f4a6dce68ad2f71b
 Size (popt-1.7.tar.gz) = 574549 bytes
 SHA1 (patch-ab) = e3f4376c7090b59fbe4b2ef4404560f28bcc3079
 SHA1 (patch-ac) = d95914024999789d60bd530865bb8613ed13f17c
 SHA1 (patch-ad) = 33ac94c57ad05d2fe99c9620181b59ce1402c21e
+SHA1 (patch-ae) = 4ed189cb6b91a334e56be266ecfc90e3099b6564
+SHA1 (patch-af) = 0b01a94513ba9efcbaa6b6200cdf100ca1007ebb
diff --git a/devel/popt/patches/patch-ae b/devel/popt/patches/patch-ae
new file mode 100644
index 00000000000..3673b32cae9
--- /dev/null
+++ b/devel/popt/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2003/11/24 19:13:19 gson Exp $
+
+--- popt.h.orig	2002-07-28 07:52:33.000000000 -0700
++++ popt.h
+@@ -440,7 +440,7 @@ int poptConfigFileToString(FILE *fp, /*@
+  * @return		error string
+  */
+ /*@-redecl@*/
+-/*@observer@*/ const char *const poptStrerror(const int error)
++/*@observer@*/ const char *poptStrerror(const int error)
+ 	/*@*/;
+ /*@=redecl@*/
+ 
diff --git a/devel/popt/patches/patch-af b/devel/popt/patches/patch-af
new file mode 100644
index 00000000000..e7109ee5832
--- /dev/null
+++ b/devel/popt/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2003/11/24 19:13:19 gson Exp $
+
+--- popt.c.orig	2002-08-22 07:17:44.000000000 -0700
++++ popt.c
+@@ -1153,7 +1153,7 @@ const char * poptBadOption(poptContext c
+     /*@=nullderef@*/
+ }
+ 
+-const char *const poptStrerror(const int error)
++const char *poptStrerror(const int error)
+ {
+     switch (error) {
+       case POPT_ERROR_NOARG: