[81025] trunk/dports/devel/ncurses

[jmr at macports.org]

Revision: 81025
          http://trac.macports.org/changeset/81025
Author:   jmr at macports.org
Date:     2011-07-23 11:16:26 -0700 (Sat, 23 Jul 2011)
Log Message:
-----------
ncurses: fix (unused) types in constructor declarations, which fixes building with clang (#30312)

Modified Paths:
--------------
    trunk/dports/devel/ncurses/Portfile

Added Paths:
-----------
    trunk/dports/devel/ncurses/files/constructor_types.diff

Modified: trunk/dports/devel/ncurses/Portfile
===================================================================
--- trunk/dports/devel/ncurses/Portfile	2011-07-23 17:32:10 UTC (rev 81024)
+++ trunk/dports/devel/ncurses/Portfile	2011-07-23 18:16:26 UTC (rev 81025)
@@ -27,7 +27,8 @@
 depends_build   port:ncursesw
 
 # from http://www.opensource.apple.com/source/ncurses/ncurses-27/patches/
-patchfiles      hex.diff ungetch_guard.diff configure.diff
+patchfiles      hex.diff ungetch_guard.diff configure.diff \
+                constructor_types.diff
 
 configure.cppflags
 configure.ldflags
@@ -44,13 +45,6 @@
                 --enable-symlinks
 # using symlinks because of ticket #13601
 
-# BUILD FIX TODO: clang C++
-# ncurses doesn't build with clang as of 2011.06.27
-# clang doesn't like ncurses C++
-if {${configure.compiler} == "clang"} {
-    configure.compiler llvm-gcc-4.2
-}
-
 if {[variant_isset universal]} {
     configure.args-append --with-chtype=int
 

Added: trunk/dports/devel/ncurses/files/constructor_types.diff
===================================================================
--- trunk/dports/devel/ncurses/files/constructor_types.diff	                        (rev 0)
+++ trunk/dports/devel/ncurses/files/constructor_types.diff	2011-07-23 18:16:26 UTC (rev 81025)
@@ -0,0 +1,40 @@
+--- c++/cursesf.h.orig	2011-07-23 10:05:34.000000000 +0200
++++ c++/cursesf.h	2011-07-23 10:06:20.000000000 +0200
+@@ -677,7 +677,7 @@
+   }
+ 
+ public:
+-  NCursesUserForm (NCursesFormField Fields[],
++  NCursesUserForm (NCursesFormField* Fields[],
+ 		   const T* p_UserData = STATIC_CAST(T*)(0),
+ 		   bool with_frame=FALSE,
+ 		   bool autoDelete_Fields=FALSE)
+@@ -686,7 +686,7 @@
+ 	set_user (const_cast<void *>(p_UserData));
+   };
+ 
+-  NCursesUserForm (NCursesFormField Fields[],
++  NCursesUserForm (NCursesFormField* Fields[],
+ 		   int nlines,
+ 		   int ncols,
+ 		   int begin_y = 0,
+--- c++/cursesm.h.orig	2011-07-23 10:05:50.000000000 +0200
++++ c++/cursesm.h	2011-07-23 10:06:46.000000000 +0200
+@@ -635,7 +635,7 @@
+   }
+ 
+ public:
+-  NCursesUserMenu (NCursesMenuItem Items[],
++  NCursesUserMenu (NCursesMenuItem* Items[],
+ 		   const T* p_UserData = STATIC_CAST(T*)(0),
+ 		   bool with_frame=FALSE,
+ 		   bool autoDelete_Items=FALSE)
+@@ -644,7 +644,7 @@
+ 	set_user (const_cast<void *>(p_UserData));
+   };
+ 
+-  NCursesUserMenu (NCursesMenuItem Items[],
++  NCursesUserMenu (NCursesMenuItem* Items[],
+ 		   int nlines,
+ 		   int ncols,
+ 		   int begin_y = 0,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110723/bdbbf82d/attachment.html>