[87975] trunk/dports/devel/lua-numlua

and.damore at macports.org and.damore at macports.org
Wed Dec 14 13:50:24 PST 2011


Revision: 87975
          http://trac.macports.org/changeset/87975
Author:   and.damore at macports.org
Date:     2011-12-14 13:50:23 -0800 (Wed, 14 Dec 2011)
Log Message:
-----------
port lua-numlua: adding .diff suffix to patchfiles' name

Modified Paths:
--------------
    trunk/dports/devel/lua-numlua/Portfile

Added Paths:
-----------
    trunk/dports/devel/lua-numlua/files/patch-Makefile.diff
    trunk/dports/devel/lua-numlua/files/patch-lib-Makefile.diff
    trunk/dports/devel/lua-numlua/files/patch-lib-config.diff
    trunk/dports/devel/lua-numlua/files/patch-src-Makefile.diff

Removed Paths:
-------------
    trunk/dports/devel/lua-numlua/files/patch-Makefile
    trunk/dports/devel/lua-numlua/files/patch-lib-Makefile
    trunk/dports/devel/lua-numlua/files/patch-lib-config
    trunk/dports/devel/lua-numlua/files/patch-src-Makefile

Modified: trunk/dports/devel/lua-numlua/Portfile
===================================================================
--- trunk/dports/devel/lua-numlua/Portfile	2011-12-14 21:46:46 UTC (rev 87974)
+++ trunk/dports/devel/lua-numlua/Portfile	2011-12-14 21:50:23 UTC (rev 87975)
@@ -33,10 +33,10 @@
 
 depends_lib-append      lib:fftw:fftw-3 
 
-patchfiles              patch-Makefile \
-                        patch-lib-config \
-                        patch-lib-Makefile \
-                        patch-src-Makefile
+patchfiles              patch-Makefile.diff \
+                        patch-lib-config.diff \
+                        patch-lib-Makefile.diff \
+                        patch-src-Makefile.diff
 pre-build {
 	system "cd ${worksrcpath}/lib && make"
 }

Deleted: trunk/dports/devel/lua-numlua/files/patch-Makefile
===================================================================
--- trunk/dports/devel/lua-numlua/files/patch-Makefile	2011-12-14 21:46:46 UTC (rev 87974)
+++ trunk/dports/devel/lua-numlua/files/patch-Makefile	2011-12-14 21:50:23 UTC (rev 87975)
@@ -1,64 +0,0 @@
---- Makefile.orig	2011-12-14 22:36:59.000000000 +0100
-+++ Makefile	2011-12-14 22:41:28.000000000 +0100
-@@ -3,8 +3,8 @@
- # modify src/Makefile to your taste
- # $Id: Makefile,v 1.3 2006-09-11 02:27:11 carvalho Exp $
- 
--# linux | win32 : edit src/Makefile accordingly
--TARGET = linux
-+# linux | win32 | darwin : edit src/Makefile accordingly
-+TARGET = darwin
- 
- # these are based on default settings in luaconf.h
- ifeq ($(TARGET), linux)
-@@ -13,10 +13,17 @@
- INSTALL_LIB = $(INSTALL_ROOT)/lib/lua/5.1
- INSTALL_LUA = $(INSTALL_ROOT)/share/lua/5.1/numlua
- else
-+  ifeq ($(TARGET), win32)
- INSTALL_ROOT = C:\\Program Files\\Lua51
- INSTALL_INC = $(INSTALL_ROOT)\\include
- INSTALL_LIB = $(INSTALL_ROOT)
- INSTALL_LUA = $(INSTALL_ROOT)\\lua\\numlua
-+  else #ifeq ($(TARGET), darwin)
-+INSTALL_ROOT = @PREFIX@
-+INSTALL_INC = $(INSTALL_ROOT)/include
-+INSTALL_LIB = $(INSTALL_ROOT)/lib/lua/5.1
-+INSTALL_LUA = $(INSTALL_ROOT)/share/lua/5.1/numlua
-+  endif
- endif
- 
- INSTALL = cp
-@@ -28,20 +35,24 @@
- TO_INC = $(LIBS:%=%.h)
- TO_LUA = $(LIBS:lua%=%.lua) init.lua
- ifeq ($(TARGET), linux)
--TO_LIB = $(LIBS:%=%.so)
--else
--TO_LIB = $(LIBS:%=%.dll)
-+ TO_LIB = $(LIBS:%=%.so)
-+else 
-+ ifeq ($(TARGET), win32)
-+  TO_LIB = $(LIBS:%=%.dll)
-+ else #ifeq ($(TARGET), darwin)
-+  TO_LIB = $(LIBS:%=%.so)
-+ endif
- endif
- 
- all clean klean refresh :
- 	cd src; make $@
- 
- install : all
--	mkdir -p "$(INSTALL_ROOT)"
--	mkdir -p $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_LUA)
--	cd src; $(INSTALL) $(TO_INC) $(INSTALL_INC)
--	cd src; $(INSTALL) $(TO_LIB) $(INSTALL_LIB)
--	cd lua; $(INSTALL) $(TO_LUA) $(INSTALL_LUA)
-+	mkdir -p "$(DESTDIR)$(INSTALL_ROOT)"
-+	mkdir -p $(DESTDIR)$(INSTALL_INC) $(DESTDIR)$(INSTALL_LIB) $(DESTDIR)$(INSTALL_LUA)
-+	cd src; $(INSTALL) $(TO_INC) $(DESTDIR)$(INSTALL_INC)
-+	cd src; $(INSTALL) $(TO_LIB) $(DESTDIR)$(INSTALL_LIB)
-+	cd lua; $(INSTALL) $(TO_LUA) $(DESTDIR)$(INSTALL_LUA)
- 
- lib :
- 	cd $@; make

Copied: trunk/dports/devel/lua-numlua/files/patch-Makefile.diff (from rev 87973, trunk/dports/devel/lua-numlua/files/patch-Makefile)
===================================================================
--- trunk/dports/devel/lua-numlua/files/patch-Makefile.diff	                        (rev 0)
+++ trunk/dports/devel/lua-numlua/files/patch-Makefile.diff	2011-12-14 21:50:23 UTC (rev 87975)
@@ -0,0 +1,64 @@
+--- Makefile.orig	2011-12-14 22:36:59.000000000 +0100
++++ Makefile	2011-12-14 22:41:28.000000000 +0100
+@@ -3,8 +3,8 @@
+ # modify src/Makefile to your taste
+ # $Id: Makefile,v 1.3 2006-09-11 02:27:11 carvalho Exp $
+ 
+-# linux | win32 : edit src/Makefile accordingly
+-TARGET = linux
++# linux | win32 | darwin : edit src/Makefile accordingly
++TARGET = darwin
+ 
+ # these are based on default settings in luaconf.h
+ ifeq ($(TARGET), linux)
+@@ -13,10 +13,17 @@
+ INSTALL_LIB = $(INSTALL_ROOT)/lib/lua/5.1
+ INSTALL_LUA = $(INSTALL_ROOT)/share/lua/5.1/numlua
+ else
++  ifeq ($(TARGET), win32)
+ INSTALL_ROOT = C:\\Program Files\\Lua51
+ INSTALL_INC = $(INSTALL_ROOT)\\include
+ INSTALL_LIB = $(INSTALL_ROOT)
+ INSTALL_LUA = $(INSTALL_ROOT)\\lua\\numlua
++  else #ifeq ($(TARGET), darwin)
++INSTALL_ROOT = @PREFIX@
++INSTALL_INC = $(INSTALL_ROOT)/include
++INSTALL_LIB = $(INSTALL_ROOT)/lib/lua/5.1
++INSTALL_LUA = $(INSTALL_ROOT)/share/lua/5.1/numlua
++  endif
+ endif
+ 
+ INSTALL = cp
+@@ -28,20 +35,24 @@
+ TO_INC = $(LIBS:%=%.h)
+ TO_LUA = $(LIBS:lua%=%.lua) init.lua
+ ifeq ($(TARGET), linux)
+-TO_LIB = $(LIBS:%=%.so)
+-else
+-TO_LIB = $(LIBS:%=%.dll)
++ TO_LIB = $(LIBS:%=%.so)
++else 
++ ifeq ($(TARGET), win32)
++  TO_LIB = $(LIBS:%=%.dll)
++ else #ifeq ($(TARGET), darwin)
++  TO_LIB = $(LIBS:%=%.so)
++ endif
+ endif
+ 
+ all clean klean refresh :
+ 	cd src; make $@
+ 
+ install : all
+-	mkdir -p "$(INSTALL_ROOT)"
+-	mkdir -p $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_LUA)
+-	cd src; $(INSTALL) $(TO_INC) $(INSTALL_INC)
+-	cd src; $(INSTALL) $(TO_LIB) $(INSTALL_LIB)
+-	cd lua; $(INSTALL) $(TO_LUA) $(INSTALL_LUA)
++	mkdir -p "$(DESTDIR)$(INSTALL_ROOT)"
++	mkdir -p $(DESTDIR)$(INSTALL_INC) $(DESTDIR)$(INSTALL_LIB) $(DESTDIR)$(INSTALL_LUA)
++	cd src; $(INSTALL) $(TO_INC) $(DESTDIR)$(INSTALL_INC)
++	cd src; $(INSTALL) $(TO_LIB) $(DESTDIR)$(INSTALL_LIB)
++	cd lua; $(INSTALL) $(TO_LUA) $(DESTDIR)$(INSTALL_LUA)
+ 
+ lib :
+ 	cd $@; make

Deleted: trunk/dports/devel/lua-numlua/files/patch-lib-Makefile
===================================================================
--- trunk/dports/devel/lua-numlua/files/patch-lib-Makefile	2011-12-14 21:46:46 UTC (rev 87974)
+++ trunk/dports/devel/lua-numlua/files/patch-lib-Makefile	2011-12-14 21:50:23 UTC (rev 87975)
@@ -1,12 +0,0 @@
---- lib/Makefile.orig	2009-09-16 17:40:23.000000000 +0200
-+++ lib/Makefile	2009-09-16 17:43:23.000000000 +0200
-@@ -1,7 +1,8 @@
- # Top makefile for netlib libs
- # $Id :$
- 
--LIBS = libdcdflib.a libfnlib.a libranlib.a libblas.a liblapack.a
-+#LIBS = libdcdflib.a libfnlib.a libranlib.a libblas.a liblapack.a
-+LIBS = libdcdflib.a libfnlib.a libranlib.a
- NOLAPACK = libdcdflib.a libfnlib.a libranlib.a libblas.a
- NOBLAS = libdcdflib.a libfnlib.a libranlib.a
- MAKE = make

Copied: trunk/dports/devel/lua-numlua/files/patch-lib-Makefile.diff (from rev 87969, trunk/dports/devel/lua-numlua/files/patch-lib-Makefile)
===================================================================
--- trunk/dports/devel/lua-numlua/files/patch-lib-Makefile.diff	                        (rev 0)
+++ trunk/dports/devel/lua-numlua/files/patch-lib-Makefile.diff	2011-12-14 21:50:23 UTC (rev 87975)
@@ -0,0 +1,12 @@
+--- lib/Makefile.orig	2009-09-16 17:40:23.000000000 +0200
++++ lib/Makefile	2009-09-16 17:43:23.000000000 +0200
+@@ -1,7 +1,8 @@
+ # Top makefile for netlib libs
+ # $Id :$
+ 
+-LIBS = libdcdflib.a libfnlib.a libranlib.a libblas.a liblapack.a
++#LIBS = libdcdflib.a libfnlib.a libranlib.a libblas.a liblapack.a
++LIBS = libdcdflib.a libfnlib.a libranlib.a
+ NOLAPACK = libdcdflib.a libfnlib.a libranlib.a libblas.a
+ NOBLAS = libdcdflib.a libfnlib.a libranlib.a
+ MAKE = make

Deleted: trunk/dports/devel/lua-numlua/files/patch-lib-config
===================================================================
--- trunk/dports/devel/lua-numlua/files/patch-lib-config	2011-12-14 21:46:46 UTC (rev 87974)
+++ trunk/dports/devel/lua-numlua/files/patch-lib-config	2011-12-14 21:50:23 UTC (rev 87975)
@@ -1,20 +0,0 @@
---- lib/config.orig	2009-09-16 17:40:27.000000000 +0200
-+++ lib/config	2009-09-16 17:42:14.000000000 +0200
-@@ -3,14 +3,14 @@
- 
- # change LUADIR below to where lua is installed, that is, INSTALL_TOP in lua's
- # main Makefile
--LUADIR = /usr
-+LUADIR = @PREFIX@
- 
- # FORTRAN flags (used by blas, lapack, dcdflib, and fnlib)
--FC = g77
-+FC = gfortran-mp-4.3
- FFLAGS = -fno-f2c -funroll-all-loops -fomit-frame-pointer -O
- 
- # C flags (used by ranlib)
--CC = gcc
-+CC = gcc-mp-4.3
- CFLAGS = -W -Wall -pedantic
- OPTFLAGS = -fomit-frame-pointer -O2
- INCFLAGS = -I../../src -I$(LUADIR)/include/lua5.1

Copied: trunk/dports/devel/lua-numlua/files/patch-lib-config.diff (from rev 87969, trunk/dports/devel/lua-numlua/files/patch-lib-config)
===================================================================
--- trunk/dports/devel/lua-numlua/files/patch-lib-config.diff	                        (rev 0)
+++ trunk/dports/devel/lua-numlua/files/patch-lib-config.diff	2011-12-14 21:50:23 UTC (rev 87975)
@@ -0,0 +1,20 @@
+--- lib/config.orig	2009-09-16 17:40:27.000000000 +0200
++++ lib/config	2009-09-16 17:42:14.000000000 +0200
+@@ -3,14 +3,14 @@
+ 
+ # change LUADIR below to where lua is installed, that is, INSTALL_TOP in lua's
+ # main Makefile
+-LUADIR = /usr
++LUADIR = @PREFIX@
+ 
+ # FORTRAN flags (used by blas, lapack, dcdflib, and fnlib)
+-FC = g77
++FC = gfortran-mp-4.3
+ FFLAGS = -fno-f2c -funroll-all-loops -fomit-frame-pointer -O
+ 
+ # C flags (used by ranlib)
+-CC = gcc
++CC = gcc-mp-4.3
+ CFLAGS = -W -Wall -pedantic
+ OPTFLAGS = -fomit-frame-pointer -O2
+ INCFLAGS = -I../../src -I$(LUADIR)/include/lua5.1

Deleted: trunk/dports/devel/lua-numlua/files/patch-src-Makefile
===================================================================
--- trunk/dports/devel/lua-numlua/files/patch-src-Makefile	2011-12-14 21:46:46 UTC (rev 87974)
+++ trunk/dports/devel/lua-numlua/files/patch-src-Makefile	2011-12-14 21:50:23 UTC (rev 87975)
@@ -1,79 +0,0 @@
---- src/Makefile.orig	2007-03-18 20:05:34.000000000 +0100
-+++ src/Makefile	2009-09-16 17:49:40.000000000 +0200
-@@ -1,8 +1,8 @@
--# Makefile for numlua
-+# Makefile for numlua
- # $Id: Makefile,v 1.8 2006-09-11 02:25:38 carvalho Exp $
- 
--# linux | win32
--TARGET = linux
-+# linux | win32 | darwin
-+TARGET = darwin
- 
- # atlas | atlas_threaded | blas | custom
- BLAS = custom
-@@ -13,13 +13,13 @@
- # Intel's MKL
- #CUSTOMBLAS = -L/opt/intel/mkl/8.0/lib/32 -lmkl_lapack -lmkl_ia32 -lguide -lpthread -lg2c
- # Ubuntu with atlas
--CUSTOMBLAS = -llapack -lblas -lg2c
-+CUSTOMBLAS = -faltivec -framework Accelerate -lm -lgfortran
- 
- # change LUADIR below to where lua is installed, that is, INSTALL_TOP in lua's
- # main Makefile
--LUADIR = /usr
-+LUADIR = @PREFIX@
- 
--CC = gcc
-+CC = MACOSX_DEPLOYMENT_TARGET="10.3" gcc-mp-4.3
- CFLAGS = -W -Wall -pedantic -fshort-enums
- OPTFLAGS = -fomit-frame-pointer -O2
- 
-@@ -45,6 +45,10 @@
- endif
- ifeq ($(TARGET), win32)
- LIBS += -L$(LUADIR)/lib -llua
-+else
-+  ifeq ($(TARGET), darwin)
-+LIBS += -L$(LUADIR)/lib -llua
-+  endif
- endif
- 
- OBJ = luaspfun.o luarng.o luacomplex.o
-@@ -56,22 +60,36 @@
- DLIB = $(LIB:.a=.so)
- LMDLIB = $(LMLIB:.a=.so)
- else
-+  ifeq ($(TARGET), win32)
- DLIB = $(LIB:.a=.dll)
- LMDLIB = $(LMLIB:.a=.dll)
-+  else
-+DLIB = $(LIB:.a=.so)
-+LMDLIB = $(LMLIB:.a=.so)
-+  endif
- endif
- 
- OBJFLAGS = -I$(LUADIR)/include/lua5.1
- ifeq ($(TARGET), linux)
- LDFLAGS = -fpic
- endif
-+ifeq ($(TARGET), darwin)
-+LDFLAGS += -bundle -undefined dynamic_lookup
-+else
- LDFLAGS += -shared
-+endif
- 
- all : $(LIB) $(LMLIB) $(DLIB) $(LMDLIB)
- 
- ifeq ($(TARGET), linux)
- $(DLIB) : %.so : %.o
- else
-+  ifeq ($(TARGET), win32)
- $(DLIB) : %.dll : %.o
-+  else
-+$(DLIB) : %.so : %.o
-+  endif
-+
- endif
- 	$(CC) $(CFLAGS) $< $(LDFLAGS) -o $@ $(LIBS)
- #	$(STRIP) $@

Copied: trunk/dports/devel/lua-numlua/files/patch-src-Makefile.diff (from rev 87969, trunk/dports/devel/lua-numlua/files/patch-src-Makefile)
===================================================================
--- trunk/dports/devel/lua-numlua/files/patch-src-Makefile.diff	                        (rev 0)
+++ trunk/dports/devel/lua-numlua/files/patch-src-Makefile.diff	2011-12-14 21:50:23 UTC (rev 87975)
@@ -0,0 +1,79 @@
+--- src/Makefile.orig	2007-03-18 20:05:34.000000000 +0100
++++ src/Makefile	2009-09-16 17:49:40.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile for numlua
++# Makefile for numlua
+ # $Id: Makefile,v 1.8 2006-09-11 02:25:38 carvalho Exp $
+ 
+-# linux | win32
+-TARGET = linux
++# linux | win32 | darwin
++TARGET = darwin
+ 
+ # atlas | atlas_threaded | blas | custom
+ BLAS = custom
+@@ -13,13 +13,13 @@
+ # Intel's MKL
+ #CUSTOMBLAS = -L/opt/intel/mkl/8.0/lib/32 -lmkl_lapack -lmkl_ia32 -lguide -lpthread -lg2c
+ # Ubuntu with atlas
+-CUSTOMBLAS = -llapack -lblas -lg2c
++CUSTOMBLAS = -faltivec -framework Accelerate -lm -lgfortran
+ 
+ # change LUADIR below to where lua is installed, that is, INSTALL_TOP in lua's
+ # main Makefile
+-LUADIR = /usr
++LUADIR = @PREFIX@
+ 
+-CC = gcc
++CC = MACOSX_DEPLOYMENT_TARGET="10.3" gcc-mp-4.3
+ CFLAGS = -W -Wall -pedantic -fshort-enums
+ OPTFLAGS = -fomit-frame-pointer -O2
+ 
+@@ -45,6 +45,10 @@
+ endif
+ ifeq ($(TARGET), win32)
+ LIBS += -L$(LUADIR)/lib -llua
++else
++  ifeq ($(TARGET), darwin)
++LIBS += -L$(LUADIR)/lib -llua
++  endif
+ endif
+ 
+ OBJ = luaspfun.o luarng.o luacomplex.o
+@@ -56,22 +60,36 @@
+ DLIB = $(LIB:.a=.so)
+ LMDLIB = $(LMLIB:.a=.so)
+ else
++  ifeq ($(TARGET), win32)
+ DLIB = $(LIB:.a=.dll)
+ LMDLIB = $(LMLIB:.a=.dll)
++  else
++DLIB = $(LIB:.a=.so)
++LMDLIB = $(LMLIB:.a=.so)
++  endif
+ endif
+ 
+ OBJFLAGS = -I$(LUADIR)/include/lua5.1
+ ifeq ($(TARGET), linux)
+ LDFLAGS = -fpic
+ endif
++ifeq ($(TARGET), darwin)
++LDFLAGS += -bundle -undefined dynamic_lookup
++else
+ LDFLAGS += -shared
++endif
+ 
+ all : $(LIB) $(LMLIB) $(DLIB) $(LMDLIB)
+ 
+ ifeq ($(TARGET), linux)
+ $(DLIB) : %.so : %.o
+ else
++  ifeq ($(TARGET), win32)
+ $(DLIB) : %.dll : %.o
++  else
++$(DLIB) : %.so : %.o
++  endif
++
+ endif
+ 	$(CC) $(CFLAGS) $< $(LDFLAGS) -o $@ $(LIBS)
+ #	$(STRIP) $@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111214/236ec462/attachment-0001.html>


More information about the macports-changes mailing list