diff options
| author | Mark Linimon <linimon@FreeBSD.org> | 2006-09-15 08:17:11 +0000 |
|---|---|---|
| committer | Mark Linimon <linimon@FreeBSD.org> | 2006-09-15 08:17:11 +0000 |
| commit | c5aeb93cd5e4998728da54611bdf63c686a2fdfd (patch) | |
| tree | f418d7aa01e7bae10fc4d0734eec45cd9e925529 /x11-wm/ion3/files | |
| parent | f4c5a682e5c43c1c1477307463458409ae3b3de5 (diff) | |
| download | ports-c5aeb93cd5e4998728da54611bdf63c686a2fdfd.tar.gz ports-c5aeb93cd5e4998728da54611bdf63c686a2fdfd.zip | |
Modify these files to reflect bsd.lua.mk as tested on the cluster.
PR: ports/101612
Submitted by: alepulver
Hat: portmgr
Notes
Notes:
svn path=/head/; revision=173100
Diffstat (limited to 'x11-wm/ion3/files')
| -rw-r--r-- | x11-wm/ion3/files/patch-rules.mk | 4 | ||||
| -rw-r--r-- | x11-wm/ion3/files/patch-system.mk | 20 |
2 files changed, 16 insertions, 8 deletions
diff --git a/x11-wm/ion3/files/patch-rules.mk b/x11-wm/ion3/files/patch-rules.mk index 0dbc8606502d..5e7292efdd52 100644 --- a/x11-wm/ion3/files/patch-rules.mk +++ b/x11-wm/ion3/files/patch-rules.mk @@ -1,5 +1,5 @@ ---- rules.mk Wed Apr 7 09:15:54 2004 -+++ rules.mk.bsd Sun Apr 11 12:55:10 2004 +--- ./rules.mk.orig Thu Jul 29 00:10:32 2004 ++++ ./rules.mk Mon Jul 17 21:50:19 2006 @@ -91,6 +91,7 @@ module_install: $(INSTALLDIR) $(MODULEDIR) diff --git a/x11-wm/ion3/files/patch-system.mk b/x11-wm/ion3/files/patch-system.mk index 37e33a105ee9..80061f5ff69e 100644 --- a/x11-wm/ion3/files/patch-system.mk +++ b/x11-wm/ion3/files/patch-system.mk @@ -1,5 +1,5 @@ ---- system.mk.orig Tue Jun 1 16:35:23 2004 -+++ system.mk Sat Jun 5 13:27:08 2004 +--- ./system.mk.orig Thu Jul 29 00:10:32 2004 ++++ ./system.mk Mon Jul 17 21:53:01 2006 @@ -7,7 +7,7 @@ ## Installation paths ## @@ -33,15 +33,23 @@ # The following should do it if you have manually installed libtool 1.5 in # $(LIBTOOLDIR). -@@ -72,7 +72,7 @@ +@@ -72,11 +72,11 @@ # If you have installed Lua 5.0 from the official tarball without changing # paths, this should do it. -LUA_DIR=/usr/local +-LUA_LIBS = -L$(LUA_DIR)/lib -R$(LUA_DIR)/lib -llua -llualib +-LUA_INCLUDES = -I$(LUA_DIR)/include +-LUA=$(LUA_DIR)/bin/lua +-LUAC=$(LUA_DIR)/bin/luac +LUA_DIR=$(LOCALBASE) - LUA_LIBS = -L$(LUA_DIR)/lib -R$(LUA_DIR)/lib -llua -llualib - LUA_INCLUDES = -I$(LUA_DIR)/include - LUA=$(LUA_DIR)/bin/lua ++LUA_LIBS = -L$(LUA_LIBDIR) -R$(LUA_LIBDIR) -llua -llualib ++LUA_INCLUDES = -I$(LUA_INCDIR) ++LUA=$(LUA_BINDIR)/lua ++LUAC=$(LUA_BINDIR)/luac + + # If you are using the Debian packages, the following settings should be + # what you want. @@ -90,7 +90,7 @@ ## X libraries, includes and options ## |