8 files changed, 72 insertions, 15 deletions
diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index 1f9962c02927..437771424de7 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	popt
 PORTVERSION=	1.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.rpm.org/pub/rpm/dist/%SUBDIR%/ \
 		http://rpmfind.net/linux/rpm.org/rpm/dist/%SUBDIR%/ \
diff --git a/devel/popt/files/patch-Makefile.in b/devel/popt/files/patch-Makefile.in
index 9b7c8b3d86bd..aa772242f9a7 100644
--- a/devel/popt/files/patch-Makefile.in
+++ b/devel/popt/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Sat Aug 31 15:22:18 2002
-+++ Makefile.in	Sat Jun 26 22:12:19 2004
+--- ./Makefile.in.orig	Sat Aug 31 17:22:18 2002
++++ ./Makefile.in	Wed Apr  4 12:24:18 2007
 @@ -124,7 +124,7 @@
  	popt.ps
  
diff --git a/devel/popt/files/patch-configure b/devel/popt/files/patch-configure
index 6e0c811bff23..3abc913ea09a 100644
--- a/devel/popt/files/patch-configure
+++ b/devel/popt/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Sat Aug 31 15:22:20 2002
-+++ configure	Sat May  8 11:00:06 2004
+--- ./configure.orig	Sat Aug 31 17:22:20 2002
++++ ./configure	Wed Apr  4 12:24:18 2007
 @@ -8327,6 +8327,7 @@
  
  # This can be used to rebuild libtool when needed
diff --git a/devel/popt/files/patch-popt.3 b/devel/popt/files/patch-popt.3
new file mode 100644
index 000000000000..34152864f6d6
--- /dev/null
+++ b/devel/popt/files/patch-popt.3
@@ -0,0 +1,20 @@
+--- ./popt.3.orig	Wed Apr  4 12:24:38 2007
++++ ./popt.3	Wed Apr  4 12:25:14 2007
+@@ -24,7 +24,7 @@
+ .sp
+ .BI "const char ** poptGetArgs(poptContext " con );
+ .sp
+-.BI "const char *const poptStrerror(const int " error );
++.BI "const char * poptStrerror(const int " error );
+ .sp
+ .BI "const char * poptBadOption(poptContext " con ", int " flags );
+ .sp
+@@ -491,7 +491,7 @@
+ good error messages.
+ .HP
+ .nf
+-.BI "const char *const poptStrerror(const int " error ");"
++.BI "const char * poptStrerror(const int " error ");"
+ .fi
+ This function takes a popt error code and returns a string describing
+ .RB "the error, just as with the standard " strerror() " function."
diff --git a/devel/popt/files/patch-popt.c b/devel/popt/files/patch-popt.c
index 92d6f5b19587..9ce24f0ee3b1 100644
--- a/devel/popt/files/patch-popt.c
+++ b/devel/popt/files/patch-popt.c
@@ -1,11 +1,8 @@
-
-$FreeBSD$
-
---- popt.c	2001/01/31 09:50:38	1.1
-+++ popt.c	2001/01/31 09:51:08
-@@ -5,6 +5,9 @@
- #include "system.h"
- 
+--- ./popt.c.orig	Thu Aug 22 18:17:44 2002
++++ ./popt.c	Wed Apr  4 12:25:14 2007
+@@ -14,6 +14,9 @@
+ #include <float.h>
+ #endif
  #include <math.h>
 +#ifdef __FreeBSD__
 +#include <machine/float.h>
@@ -13,3 +10,12 @@ $FreeBSD$
  
  #include "findme.h"
  #include "poptint.h"
+@@ -1153,7 +1156,7 @@
+     /*@=nullderef@*/
+ }
+ 
+-const char *const poptStrerror(const int error)
++const char * poptStrerror(const int error)
+ {
+     switch (error) {
+       case POPT_ERROR_NOARG:
diff --git a/devel/popt/files/patch-popt.h b/devel/popt/files/patch-popt.h
new file mode 100644
index 000000000000..de901b40e1d0
--- /dev/null
+++ b/devel/popt/files/patch-popt.h
@@ -0,0 +1,11 @@
+--- ./popt.h.orig	Wed Apr  4 12:24:48 2007
++++ ./popt.h	Wed Apr  4 12:25:14 2007
+@@ -440,7 +440,7 @@
+  * @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/files/patch-popthelp.c b/devel/popt/files/patch-popthelp.c
new file mode 100644
index 000000000000..5be18ff6ac31
--- /dev/null
+++ b/devel/popt/files/patch-popthelp.c
@@ -0,0 +1,20 @@
+--- ./popthelp.c.orig	Wed Apr  4 12:25:01 2007
++++ ./popthelp.c	Wed Apr  4 12:25:14 2007
+@@ -67,7 +67,7 @@
+ /**
+  * @param table		option(s)
+  */
+-/*@observer@*/ /*@null@*/ static const char *const
++/*@observer@*/ /*@null@*/ static const char *
+ getTableTranslationDomain(/*@null@*/ const struct poptOption *table)
+ 	/*@*/
+ {
+@@ -85,7 +85,7 @@
+  * @param opt		option(s)
+  * @param translation_domain	translation domain
+  */
+-/*@observer@*/ /*@null@*/ static const char *const
++/*@observer@*/ /*@null@*/ static const char *
+ getArgDescrip(const struct poptOption * opt,
+ 		/*@-paramuse@*/ /* FIX: i18n macros disabled with lclint */
+ 		/*@null@*/ const char * translation_domain)
diff --git a/devel/popt/files/patch-test3.c b/devel/popt/files/patch-test3.c
index 112590a3226e..2b145a6c1ba7 100644
--- a/devel/popt/files/patch-test3.c
+++ b/devel/popt/files/patch-test3.c
@@ -1,5 +1,5 @@
---- test3.c.orig	Wed Aug 18 23:57:09 2004
-+++ test3.c	Thu Aug 19 00:01:27 2004
+--- ./test3.c.orig	Sat Jul 20 23:04:08 2002
++++ ./test3.c	Wed Apr  4 12:24:18 2007
 @@ -9,7 +9,7 @@
  int main (int argc, char **argv) {
      char *out;