[57778] trunk/dports/news/nget

[jmr at macports.org]

Revision: 57778
          http://trac.macports.org/changeset/57778
Author:   jmr at macports.org
Date:     2009-09-16 07:58:57 -0700 (Wed, 16 Sep 2009)
Log Message:
-----------
nget: apply upstream patch to fix compiling with recent gcc

Modified Paths:
--------------
    trunk/dports/news/nget/Portfile

Added Paths:
-----------
    trunk/dports/news/nget/files/
    trunk/dports/news/nget/files/patch-auto_map.h

Modified: trunk/dports/news/nget/Portfile
===================================================================
--- trunk/dports/news/nget/Portfile	2009-09-16 14:18:50 UTC (rev 57777)
+++ trunk/dports/news/nget/Portfile	2009-09-16 14:58:57 UTC (rev 57778)
@@ -20,6 +20,8 @@
 
 depends_lib		port:popt port:uudeview
 
+patchfiles      patch-auto_map.h
+
 configure.args	--mandir='\${prefix}/share/man'
 configure.cxxflags-append	"-I${prefix}/include"
 

Added: trunk/dports/news/nget/files/patch-auto_map.h
===================================================================
--- trunk/dports/news/nget/files/patch-auto_map.h	                        (rev 0)
+++ trunk/dports/news/nget/files/patch-auto_map.h	2009-09-16 14:58:57 UTC (rev 57778)
@@ -0,0 +1,40 @@
+--- auto_map.h	2004/06/17 20:59:44	1.8
++++ auto_map.h	2008/03/03 06:41:59	1.9
+@@ -23,10 +23,10 @@
+ #include <assert.h>
+ #include <map>
+ 
+-template <class K, class T, template <class BK, class BT> class Base>
+-class auto_map_base : public Base<K, restricted_ptr<T> > {
++template <class K, class T,  class Base>
++class auto_map_base : public Base {
+ 	protected:
+-		typedef Base<K, restricted_ptr<T> > super;
++		typedef Base super;
+ 	public:
+ 		typedef typename super::iterator iterator;
+ 
+@@ -55,9 +55,9 @@
+ 
+ 
+ template <class K, class T>
+-class auto_map : public auto_map_base<K, T, std::map> {
++class auto_map : public auto_map_base<K, T, std::map<K, restricted_ptr<T> > > {
+ 	public:
+-		typedef typename auto_map_base<K, T, std::map>::super super;
++		typedef typename auto_map_base<K, T, std::map<K, restricted_ptr<T> > >::super super;
+ 		typedef typename super::iterator iterator;
+ 		typedef typename super::value_type value_type;
+ 		/*super::value_type value_type(const K &k, T*p) {
+@@ -74,9 +74,9 @@
+ };
+ 
+ template <class K, class T>
+-class auto_multimap : public auto_map_base<K, T, std::multimap> {
++class auto_multimap : public auto_map_base<K, T, std::multimap<K, restricted_ptr<T> > > {
+ 	public:
+-		typedef typename auto_map_base<K, T, std::multimap>::super super;
++		typedef typename auto_map_base<K, T, std::multimap<K, restricted_ptr<T> > >::super super;
+ 		typedef typename super::iterator iterator;
+ 		typedef typename super::value_type value_type;
+ 		iterator insert_value(const K &k, T* p) { //we can't really use the normal insert funcs, but we don't want to just name it insert since it would be easy to confuse with all the normal map insert funcs
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090916/5539cf92/attachment.html>