[91244] trunk/dports/science/arb
ryandesign at macports.org
ryandesign at macports.org
Mon Mar 26 23:11:32 PDT 2012
Revision: 91244
https://trac.macports.org/changeset/91244
Author: ryandesign at macports.org
Date: 2012-03-26 23:11:32 -0700 (Mon, 26 Mar 2012)
Log Message:
-----------
arb: maintainer update to use llvm-gcc-4.2 instead of clang because of clang crash on Xcode 4.3.x; also update patch to fix some problems with graphics libraries; see #33756
Modified Paths:
--------------
trunk/dports/science/arb/Portfile
trunk/dports/science/arb/files/patch-ARB-makefile.diff
Modified: trunk/dports/science/arb/Portfile
===================================================================
--- trunk/dports/science/arb/Portfile 2012-03-27 05:45:08 UTC (rev 91243)
+++ trunk/dports/science/arb/Portfile 2012-03-27 06:11:32 UTC (rev 91244)
@@ -6,6 +6,7 @@
name arb
epoch 1
version 5.3
+revision 1
categories science
maintainers me.com:matt.cottrell
platforms darwin
@@ -39,11 +40,8 @@
port:lynx \
port:gsed \
port:sablotron \
- port:mesa \
port:glw \
port:glew \
- port:tiff \
- port:libpng \
port:xfig \
port:gv \
port:xorg-libXaw
@@ -88,8 +86,9 @@
ARBHOME=${worksrcpath} \
PATH=${worksrcpath}/bin:$env(PATH)
-if {${configure.compiler} == "llvm-gcc-4.2"} {
- configure.compiler clang
+# https://trac.macports.org/ticket/33756
+if {${configure.compiler} == "clang"} {
+ configure.compiler llvm-gcc-4.2
}
build.args GCC=${configure.cc} \
Modified: trunk/dports/science/arb/files/patch-ARB-makefile.diff
===================================================================
--- trunk/dports/science/arb/files/patch-ARB-makefile.diff 2012-03-27 05:45:08 UTC (rev 91243)
+++ trunk/dports/science/arb/files/patch-ARB-makefile.diff 2012-03-27 06:11:32 UTC (rev 91244)
@@ -1,43 +1,41 @@
---- Makefile.orig 2010-09-05 12:00:58.000000000 -0400
-+++ Makefile 2011-07-26 00:35:21.000000000 -0400
-@@ -31,22 +31,21 @@
- # configurable in config.makefile
- #
- # -----------------------------------------------------
-+
- # Read configuration
- include config.makefile
+--- Makefile.orig 2011-11-10 10:19:41.000000000 -0500
++++ Makefile 2012-03-24 12:16:11.000000000 -0400
+@@ -42,10 +42,15 @@
- ifeq ($(LD_LIBRARY_PATH),'')
--LD_LIBRARY_PATH:=${ARBHOME}/lib
-+ LD_LIBRARY_PATH:=${ARBHOME}/lib
- endif
-
- FORCEMASK = umask 002
-
# ---------------------- [unconditionally used options]
-GCC:=gcc
-GPP:=g++
-CPPreal:=cpp
-
--
-+#GCC:=gcc <Now set in the Portfile>
-+#GPP:=g++ <Now set in the Portfile>
-+#CPPreal:=cpp <Now set in the Portfile>
++ifdef DARWIN
++ #GCC:=gcc\xCA \xCA \xCA <Now set in the Portfile>
++ #GPP:=g++\xCA \xCA \xCA <Now set in the Portfile>
++ #CPPreal:=cpp\xCA <Now set in the Portfile>
++else
++ GCC:=gcc
++ GPP:=g++
++ CPPreal:=cpp
++endif
+
# ---------------------- compiler version detection
-
-@@ -71,7 +70,7 @@
+@@ -71,10 +76,10 @@
#---------------------- define special directories for non standard builds
ifdef DARWIN
-OSX_SDK:=/Developer/SDKs/MacOSX10.5.sdk
-+OSX_SDK:=
- OSX_FW:=/System/Library/Frameworks
- OSX_FW_OPENGL:=$(OSX_FW)/OpenGL.framework/Versions/A/Libraries
- OSX_FW_IMAGEIO:=$(OSX_FW)/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources
-@@ -186,7 +185,6 @@
+-OSX_FW:=/System/Library/Frameworks
+-OSX_FW_OPENGL:=$(OSX_FW)/OpenGL.framework/Versions/A/Libraries
+-OSX_FW_IMAGEIO:=$(OSX_FW)/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources
++ OSX_FW:=/System/Library/Frameworks
++ OSX_FW_OPENGL:=$(OSX_FW)/OpenGL.framework/Versions/A/Libraries
++ OSX_FW_GLUT:=$(OSX_FW)/GLUT.framework/Versions/A/Libraries
++ OSX_FW_IMAGEIO:=$(OSX_FW)/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources
+ endif
+
+ #----------------------
+@@ -186,7 +191,6 @@
dflags += -D$(MACH) # define machine
ifdef DARWIN
@@ -45,26 +43,35 @@
shared_cflags += -fno-common
else
dflags += $(shell getconf LFS_CFLAGS)
-@@ -199,15 +197,15 @@
+@@ -199,16 +203,23 @@
#---------------------- X11 location
-XHOME:=/usr/X11R6
-+XHOME:=$(PREFIX)
++ifdef DARWIN
++ XHOME:=$(PREFIX)
++else
++ XHOME:=/usr/X11R6
++endif
++
++
XINCLUDES:=-I$(XHOME)/include
ifdef DARWIN
- XINCLUDES := -I/sw/include -I$(OSX_SDK)/usr/X11/include -I$(OSX_SDK)/usr/include/krb5 -I/usr/OpenMotif/include #Snow Leopard couldn't find OpenMotif
-+ XINCLUDES += -I$(OSX_FW)/OpenGL.framework/Headers -I$(OSX_SDK)/usr/include/krb5 -I$(OSX_FW)/GLUT.framework/Headers
++ XINCLUDES += -I$(OSX_FW)/GLUT.framework/Headers -I$(OSX_FW)/OpenGL.framework/Headers -I$(OSX_SDK)/usr/include/krb5
endif
ifdef DARWIN
- XLIBS := -L/usr/OpenMotif/lib -lXm -L$(XHOME)/lib -lpng -lXt -lX11 -lXext -lc -lXmu -lXi
+- XLIBS += -lGLU -lGL -Wl,-dylib_file,$(OSX_FW_OPENGL)/libGL.dylib:$(OSX_FW_OPENGL)/libGL.dylib
+ XLIBS := -L$(XHOME)/lib -lXm -lpng -lz -lXt -lX11 -lXext -lXp -lXmu -lXi
- XLIBS += -lGLU -lGL -Wl,-dylib_file,$(OSX_FW_OPENGL)/libGL.dylib:$(OSX_FW_OPENGL)/libGL.dylib
++ XLIBS += -Wl,-dylib_file,$(OSX_FW_OPENGL)/libGL.dylib:$(OSX_FW_OPENGL)/libGL.dylib
++ XLIBS += -Wl,-dylib_file,$(OSX_FW_OPENGL)/libGLU.dylib:$(OSX_FW_OPENGL)/libGLU.dylib
else
- XLIBS:=-L$(XHOME)/$(CROSS_LIB) -lXm -lXpm -lXp -lXt -lXext -lX11
-@@ -226,14 +224,9 @@
+ XLIBS:=-L$(XHOME)/$(CROSS_LIB) -lXm -lXpm -lXt -lXext -lX11
+ endif
+@@ -226,13 +237,8 @@
GL_PNGLIBS := -L$(ARBHOME)/GL/glpng -lglpng_arb -lpng
@@ -72,17 +79,14 @@
- GLEWLIB := -L/usr/lib -lGLEW -L$(OSX_SDK)/usr/X11/lib -lGLw
- GLUTLIB := -L$(XHOME)/lib -lglut
- else
-- GLEWLIB := -lGLEW -lGLw
+ GLEWLIB := -lGLEW -lGLw
- GLUTLIB := -lglut
- endif
--
-+GLEWLIB := -lGLEW -lGLw
-+GLUTLIB := -lglut
-+
++ GLUTLIB := -glut
+
GL_LIBS := $(GL_LIB) $(GLEWLIB) $(GLUTLIB) $(GL_PNGLIBS)
- #XLIBS += $(GL_LIB)
-@@ -248,11 +241,7 @@
+@@ -248,11 +254,7 @@
#---------------------- tiff lib:
@@ -95,16 +99,32 @@
#---------------------- basic libs:
-@@ -318,11 +307,7 @@
+@@ -318,11 +320,13 @@
# other used tools
CTAGS := etags
--ifdef DARWIN
++
+ ifdef DARWIN
- XMKMF := /usr/X11/bin/xmkmf
--else
-- XMKMF := /usr/bin/X11/xmkmf
--endif
-+XMKMF := $(PREFIX)/bin/xmkmf
++ XMKMF := $(PREFIX)/bin/xmkmf
+ else
+ XMKMF := /usr/bin/X11/xmkmf
+ endif
++
MAKEDEPEND_PLAIN = makedepend
MAKEDEPEND = $(FORCEMASK);$(MAKEDEPEND_PLAIN)
+@@ -532,7 +536,12 @@
+ ARBDBPP_LIB=-lARBDBPP
+
+ LIBS = $(ARBDB_LIB) $(SYSLIBS)
+-GUI_LIBS = $(LIBS) -lAW -lAWT $(XLIBS)
++
++ifdef DARWIN
++ GUI_LIBS = -framework GLUT -framework OpenGL $(LIBS) -lAW -lAWT $(XLIBS)
++else
++ GUI_LIBS = $(LIBS) -lAW -lAWT $(XLIBS)
++endif
+
+ LIBPATH = -L$(ARBHOME)/LIBLINK
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120326/096298e4/attachment-0001.html>
More information about the macports-changes
mailing list