- Unbreak on 5.X

PR:		ports/106110
Submitted by:	Peter Johnson <johnson.peter@gmail.com>

6 files changed, 184 insertions, 13 deletions

diff --git a/devel/clint/Makefile b/devel/clint/Makefile
index 4bd2d7a97353..ad9b319d6534 100644
--- a/devel/clint/Makefile
+++ b/devel/clint/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	clint
 PORTVERSION=	0.1.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -26,11 +26,6 @@ INFO=		clint
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 502126
-BROKEN=		Does not compile on FreeBSD >= 5.x
-USE_GCC=	3.3
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/devel/clint/files/patch-python.h b/devel/clint/files/patch-python.h
index 8b204a313795..88e8ee15e347 100644
--- a/devel/clint/files/patch-python.h
+++ b/devel/clint/files/patch-python.h
@@ -1,6 +1,29 @@
---- lib/python/python.h.orig	Fri Sep  6 21:53:18 2002
-+++ lib/python/python.h	Fri Sep  6 21:56:38 2002
-@@ -12,13 +12,17 @@
+--- lib/python/python.h.orig	Mon Apr 16 12:53:21 2001
++++ lib/python/python.h	Thu Nov 30 22:25:14 2006
+@@ -3,6 +3,22 @@
+ 
+ #pragma interface
+ 
++#include <ctype.h>
++#undef isalnum
++#undef isalpha
++#undef iscntrl
++#undef isdigit
++#undef isgraph
++#undef islower
++#undef isprint
++#undef ispunct
++#undef isspace
++#undef isupper
++#undef isxdigit
++#undef tolower
++#undef toupper
++#include <iostream>
++
+ #include <Python.h>
+ #include <string>
+ #include <iterator>
+@@ -12,13 +28,17 @@
  #include "debug.h"
  
  // I hate #define macros, seee if I can remove this
@@ -11,13 +34,13 @@
 -#  define STANDARD_LIBRARY_HAS_ITERATOR_TRAITS 0
 +#  undef STANDARD_LIBRARY_HAS_RANDOM_ACCESS_ITERATOR
 +#  define STANDARD_LIBRARY_HAS_RANDOM_ACCESS_ITERATOR 0
++#endif
++
++#if defined (__GNUG__) && (__GNUG__ >= 3)
++#  undef STANDARD_LIBRARY_HAS_RANDOM_ACCESS_ITERATOR
  #endif
  
 -#if STANDARD_LIBRARY_HAS_ITERATOR_TRAITS
-+#if defined (__GNUG__) && (__GNUG__ >= 3)
-+#  undef STANDARD_LIBRARY_HAS_RANDOM_ACCESS_ITERATOR
-+#endif
-+
 +#if STANDARD_LIBRARY_HAS_RANDOM_ACCESS_ITERATOR
  #  define random_access_iterator_parent(itemtype) std::random_access_iterator<itemtype, int>
  #else
diff --git a/devel/clint/files/patch-python_plugin.cc b/devel/clint/files/patch-python_plugin.cc
new file mode 100644
index 000000000000..15f50a49b9b5
--- /dev/null
+++ b/devel/clint/files/patch-python_plugin.cc
@@ -0,0 +1,15 @@
+--- plugins/python/python_plugin.cc.orig	Mon Apr 16 13:23:28 2001
++++ plugins/python/python_plugin.cc	Thu Nov 30 22:35:49 2006
+@@ -51,11 +51,11 @@
+             rules.push_back( rule );
+          }
+       }
++      closedir(curdir);
+    } else {
+       // There is something wrong with the directory. Probably doesn't
+       // exist
+    }
+-   closedir(curdir);
+    return;
+ }
+ 
diff --git a/devel/clint/files/patch-seqbase_const_iter.cc b/devel/clint/files/patch-seqbase_const_iter.cc
new file mode 100644
index 000000000000..fde1b44e84e1
--- /dev/null
+++ b/devel/clint/files/patch-seqbase_const_iter.cc
@@ -0,0 +1,60 @@
+--- lib/python/seqbase_const_iter.cc.orig	Mon Apr 16 12:53:23 2001
++++ lib/python/seqbase_const_iter.cc	Thu Nov 30 22:11:19 2006
+@@ -61,7 +61,7 @@
+       return seq->getItem(count + i);
+    }
+ 
+-   template<class T>
++   template<class T> typename
+    SeqBase<T>::const_iterator::const_iterator& SeqBase<T>::const_iterator::operator=(const const_iterator& other) {
+       if (this == &other) return *this;
+       seq = other.seq;
+@@ -69,23 +69,23 @@
+       return *this;
+    }
+ 
+-   template<class T>
++   template<class T> typename
+    SeqBase<T>::const_iterator::const_iterator SeqBase<T>::const_iterator::operator+(int n) const {
+       return const_iterator(seq, count + n);
+    }
+ 
+-   template<class T>
++   template<class T> typename
+    SeqBase<T>::const_iterator::const_iterator SeqBase<T>::const_iterator::operator-(int n) const {
+       return const_iterator(seq, count - n);
+    }
+ 
+-   template<class T>
++   template<class T> typename
+    SeqBase<T>::const_iterator::const_iterator& SeqBase<T>::const_iterator::operator+=(int n) {
+       count = count + n;
+       return *this;
+    }
+ 
+-   template<class T>
++   template<class T> typename
+   SeqBase<T>::const_iterator::const_iterator& SeqBase<T>::const_iterator::operator-=(int n) {
+       count = count - n;
+       return *this;
+@@ -98,16 +98,16 @@
+       return count - other.count;
+    }
+    // prefix ++
+-   template<class T>
++   template<class T> typename
+    SeqBase<T>::const_iterator::const_iterator& SeqBase<T>::const_iterator::operator++ () { count++; return *this;}
+    // postfix ++
+-   template<class T>
++   template<class T> typename
+    SeqBase<T>::const_iterator::const_iterator SeqBase<T>::const_iterator::operator++ (int) { return const_iterator(seq, count++);}
+    // prefix --
+-   template<class T>
++   template<class T> typename
+    SeqBase<T>::const_iterator::const_iterator& SeqBase<T>::const_iterator::operator-- () { count--; return *this;}
+    // postfix --
+-   template<class T>
++   template<class T> typename
+    SeqBase<T>::const_iterator::const_iterator SeqBase<T>::const_iterator::operator-- (int) { return const_iterator(seq, count--);}
+ 
+ }
diff --git a/devel/clint/files/patch-seqbase_iter.cc b/devel/clint/files/patch-seqbase_iter.cc
new file mode 100644
index 000000000000..04de79ed65a0
--- /dev/null
+++ b/devel/clint/files/patch-seqbase_iter.cc
@@ -0,0 +1,60 @@
+--- lib/python/seqbase_iter.cc.orig	Mon Apr 16 12:53:23 2001
++++ lib/python/seqbase_iter.cc	Thu Nov 30 22:09:39 2006
+@@ -61,7 +61,7 @@
+          return seqref<T>(*seq, count + i);
+       }
+ 
+-   template<class T>
++   template<class T> typename
+       SeqBase<T>::iterator&  SeqBase<T>::iterator::operator=(const iterator& other) {
+          if (this == &other) return *this;
+          seq = other.seq;
+@@ -69,23 +69,23 @@
+          return *this;
+       }
+ 
+-   template<class T>
++   template<class T> typename
+       SeqBase<T>::iterator  SeqBase<T>::iterator::operator+(int n) const {
+          return iterator(seq, count + n);
+       }
+ 
+-   template<class T>
++   template<class T> typename
+       SeqBase<T>::iterator  SeqBase<T>::iterator::operator-(int n) const {
+          return iterator(seq, count - n);
+       }
+ 
+-   template<class T>
++   template<class T> typename
+       SeqBase<T>::iterator&  SeqBase<T>::iterator::operator+=(int n) {
+          count = count + n;
+          return *this;
+       }
+ 
+-   template<class T>
++   template<class T> typename
+       SeqBase<T>::iterator&  SeqBase<T>::iterator::operator-=(int n) {
+          count = count - n;
+          return *this;
+@@ -99,16 +99,16 @@
+       }
+ 
+    // prefix ++
+-   template<class T>
++   template<class T> typename
+       SeqBase<T>::iterator&  SeqBase<T>::iterator::operator++ () { count++; return *this;}
+    // postfix ++
+-   template<class T>
++   template<class T> typename
+       SeqBase<T>::iterator  SeqBase<T>::iterator::operator++ (int) { return iterator(seq, count++);}
+    // prefix --
+-   template<class T>
++   template<class T> typename
+       SeqBase<T>::iterator&  SeqBase<T>::iterator::operator-- () { count--; return *this;}
+    // postfix --
+-   template<class T>
++   template<class T> typename
+       SeqBase<T>::iterator SeqBase<T>::iterator::operator-- (int) { return iterator(seq, count--);}
+ 
+    template<class T>
diff --git a/devel/clint/files/patch-utility.cc b/devel/clint/files/patch-utility.cc
new file mode 100644
index 000000000000..8e511b506d8e
--- /dev/null
+++ b/devel/clint/files/patch-utility.cc
@@ -0,0 +1,18 @@
+--- src/utility.cc.orig	Mon Apr 16 13:19:36 2001
++++ src/utility.cc	Thu Nov 30 22:31:32 2006
+@@ -40,6 +40,7 @@
+                filelist.push_back(filename);
+             }
+          }
++         closedir(curdir);
+       } else {
+          // There is something wrong with the directory. Probably
+          // doesn't exist
+@@ -47,7 +48,6 @@
+          // directory
+          // throw std::invalid_argument("get_plugin_list: something is wrong with the directory " + directory);
+       }
+-      closedir(curdir);
+       return;
+    }
+