Revision: 76340 http://trac.macports.org/changeset/76340 Author: ryandesign@macports.org Date: 2011-02-20 03:18:35 -0800 (Sun, 20 Feb 2011) Log Message: ----------- arb: fix runtime failure with libpng 1.4, and ensure we always use X11 parts from ${prefix}; see #28276 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 2011-02-20 11:08:49 UTC (rev 76339) +++ trunk/dports/science/arb/Portfile 2011-02-20 11:18:35 UTC (rev 76340) @@ -6,6 +6,7 @@ name arb version 5.1 epoch 1 +revision 1 categories science maintainers me.com:matt.cottrell platforms darwin Modified: trunk/dports/science/arb/files/patch-ARB-makefile.diff =================================================================== --- trunk/dports/science/arb/files/patch-ARB-makefile.diff 2011-02-20 11:08:49 UTC (rev 76339) +++ trunk/dports/science/arb/files/patch-ARB-makefile.diff 2011-02-20 11:18:35 UTC (rev 76340) @@ -1,20 +1,41 @@ ---- Makefile (revision 6192) +Index: Makefile +=================================================================== +--- Makefile (revision 6215) +++ Makefile (working copy) -@@ -202,11 +202,11 @@ +@@ -31,11 +31,12 @@ + # configurable in config.makefile + # + # ----------------------------------------------------- ++ + # Read configuration + include config.makefile + + ifeq ($(LD_LIBRARY_PATH),'') +-LD_LIBRARY_PATH:=${ARBHOME}/lib ++ LD_LIBRARY_PATH:=${ARBHOME}/lib + endif + + FORCEMASK = umask 002 +@@ -198,15 +197,15 @@ + + #---------------------- X11 location + +-XHOME:=/usr/X11R6 ++XHOME:=$(PREFIX) 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/X11/include -I$(OSX_SDK)/usr/include/krb5 -I$(OSX_FW)/GLUT.framework/Headers -I$(PREFIX)/include ++ XINCLUDES += -I$(OSX_FW)/OpenGL.framework/Headers -I$(OSX_SDK)/usr/include/krb5 -I$(OSX_FW)/GLUT.framework/Headers endif ifdef DARWIN - XLIBS := -L/usr/OpenMotif/lib -lXm -L$(XHOME)/lib -lpng -lXt -lX11 -lXext -lXp -lc -lXmu -lXi -+ XLIBS := -L$(PREFIX)/lib -lXm -L$(XHOME)/lib -lpng -lXt -lX11 -lXext -lXp -lc -lXmu -lXi ++ 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 else XLIBS:=-L$(XHOME)/$(CROSS_LIB) -lXm -lXpm -lXp -lXt -lXext -lX11 -@@ -225,14 +225,9 @@ +@@ -225,14 +224,9 @@ GL_PNGLIBS := -L$(ARBHOME)/GL/glpng -lglpng_arb -lpng @@ -32,7 +53,7 @@ GL_LIBS := $(GL_LIB) $(GLEWLIB) $(GLUTLIB) $(GL_PNGLIBS) #XLIBS += $(GL_LIB) -@@ -247,11 +242,7 @@ +@@ -247,11 +241,7 @@ #---------------------- tiff lib: @@ -45,12 +66,16 @@ #---------------------- basic libs: -@@ -318,7 +309,7 @@ +@@ -317,11 +307,7 @@ + # other used tools CTAGS := etags - ifdef DARWIN +-ifdef DARWIN - XMKMF := /usr/X11/bin/xmkmf -+ XMKMF := $(PREFIX)/bin/xmkmf - else - XMKMF := /usr/bin/X11/xmkmf - endif \ No newline at end of file +-else +- XMKMF := /usr/bin/X11/xmkmf +-endif ++XMKMF := $(PREFIX)/bin/xmkmf + MAKEDEPEND_PLAIN = makedepend + + MAKEDEPEND = $(FORCEMASK);$(MAKEDEPEND_PLAIN)