[109105] trunk/dports/science/solid

[jeremyhu at macports.org]

Revision: 109105
          https://trac.macports.org/changeset/109105
Author:   jeremyhu at macports.org
Date:     2013-08-07 18:40:50 -0700 (Wed, 07 Aug 2013)
Log Message:
-----------
solid: Use compiler.blacklist and other build fixes

Modified Paths:
--------------
    trunk/dports/science/solid/Portfile

Added Paths:
-----------
    trunk/dports/science/solid/files/patch-configure.ac.diff

Removed Paths:
-------------
    trunk/dports/science/solid/files/patch-examples-Makefile.in.diff

Modified: trunk/dports/science/solid/Portfile
===================================================================
--- trunk/dports/science/solid/Portfile	2013-08-08 01:11:28 UTC (rev 109104)
+++ trunk/dports/science/solid/Portfile	2013-08-08 01:40:50 UTC (rev 109105)
@@ -19,16 +19,20 @@
 
 extract.suffix      .tgz
 patchfiles          patch-examples-mnm.cpp.diff patch-examples-physics.cpp.diff \
-                    patch-examples-gldemo.cpp.diff patch-examples-Makefile.in.diff
+                    patch-examples-gldemo.cpp.diff patch-configure.ac.diff
 
 depends_lib         port:qhull
 
-if {${configure.compiler} == "clang"} {
-    configure.compiler llvm-gcc-4.2
-}
+# This project has buggy C++ code
+compiler.blacklist  clang
 
-configure.args      --infodir=${prefix}/share/info
+use_autoreconf      yes
+autoreconf.args     -fvi
+autoreconf.env      AUTOMAKE="automake --foreign"
 
-build.args          CFLAGS='-O2 -fno-gcse -fno-strict-aliasing -DNDEBUG -fpermissive -framework GLUT' CXXFLAGS='-O2 -fno-gcse -fno-strict-aliasing -DNDEBUG -fpermissive -framework GLUT'
+configure.cflags    -fno-gcse -fno-strict-aliasing -DNDEBUG -fpermissive
+configure.cxxflags  -fno-gcse -fno-strict-aliasing -DNDEBUG -fpermissive
 
+build.args          GLLIBS="-framework OpenGL -framework GLUT"
+
 livecheck.type      none

Added: trunk/dports/science/solid/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/science/solid/files/patch-configure.ac.diff	                        (rev 0)
+++ trunk/dports/science/solid/files/patch-configure.ac.diff	2013-08-08 01:40:50 UTC (rev 109105)
@@ -0,0 +1,23 @@
+--- configure.ac.orig	2013-08-07 18:31:33.000000000 -0700
++++ configure.ac	2013-08-07 18:31:44.000000000 -0700
+@@ -39,20 +39,6 @@ AC_MSG_RESULT(no)
+ fi
+ AC_SUBST([TRACER_FLAG])
+ 
+-AC_MSG_CHECKING(whether to enable debugging)
+-debug_default="no"
+-AC_ARG_ENABLE(debug, [  --enable-debug=[no/yes] turn on debugging
+-                       [default=$debug_default]],, enable_debug=$debug_default)
+-if test "x$enable_debug" = "xyes"; then
+-   CFLAGS="-g"
+-   CXXFLAGS="-g"
+-AC_MSG_RESULT(yes)
+-else
+-   CFLAGS="-O2 -fno-gcse -DNDEBUG"	
+-   CXXFLAGS="-O2 -fno-gcse -DNDEBUG"
+-AC_MSG_RESULT(no)
+-fi
+-
+ AC_CHECK_LIB([glut], [glutInit])
+ 
+ # Checks for libraries.

Deleted: trunk/dports/science/solid/files/patch-examples-Makefile.in.diff
===================================================================
--- trunk/dports/science/solid/files/patch-examples-Makefile.in.diff	2013-08-08 01:11:28 UTC (rev 109104)
+++ trunk/dports/science/solid/files/patch-examples-Makefile.in.diff	2013-08-08 01:40:50 UTC (rev 109105)
@@ -1,11 +0,0 @@
---- examples/Makefile.in	2006-10-03 11:12:39.000000000 +0200
-+++ examples/Makefile.in	2012-07-22 22:43:55.000000000 +0200
-@@ -192,7 +192,7 @@
- gldemo_SOURCES = gldemo.cpp
- physics_SOURCES = physics.cpp
- mnm_SOURCES = mnm.cpp
--GLLIBS = -lglut -lGLU -lGL -L/usr/X11R6/lib -lXmu -lXi -lX11
-+GLLIBS = -framework OpenGL -framework GLUT
- sample_LDADD = ../src/libsolid.la  
- gldemo_LDADD = ../src/libsolid.la $(GLLIBS)
- physics_LDADD = dynamics/libdynamics.la ../src/libsolid.la $(GLLIBS)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130807/e455fd78/attachment-0001.html>