diff options
| author | linimon <linimon@FreeBSD.org> | 2006-09-15 16:17:11 +0800 |
|---|---|---|
| committer | linimon <linimon@FreeBSD.org> | 2006-09-15 16:17:11 +0800 |
| commit | f2d8437c35c46dc1131c982c1f25abcd7d641fb3 (patch) | |
| tree | 61136cc420c647223541df746f011f5307a7b184 /x11-wm/ion-3 | |
| parent | 6c16383d95de00351d4ecaf674a95f310d209a6b (diff) | |
| download | freebsd-ports-gnome-f2d8437c35c46dc1131c982c1f25abcd7d641fb3.tar.gz freebsd-ports-gnome-f2d8437c35c46dc1131c982c1f25abcd7d641fb3.tar.zst freebsd-ports-gnome-f2d8437c35c46dc1131c982c1f25abcd7d641fb3.zip | |
Modify these files to reflect bsd.lua.mk as tested on the cluster.
PR: ports/101612
Submitted by: alepulver
Hat: portmgr
Diffstat (limited to 'x11-wm/ion-3')
| -rw-r--r-- | x11-wm/ion-3/Makefile | 2 | ||||
| -rw-r--r-- | x11-wm/ion-3/files/patch-system.mk | 20 |
2 files changed, 15 insertions, 7 deletions
diff --git a/x11-wm/ion-3/Makefile b/x11-wm/ion-3/Makefile index 42f99ece8fc0..c9c3ffef7b4b 100644 --- a/x11-wm/ion-3/Makefile +++ b/x11-wm/ion-3/Makefile @@ -13,12 +13,12 @@ MASTER_SITES= http://modeemi.fi/~tuomov/dl/ MAINTAINER= ed@fxq.nl COMMENT= The development version of the Ion window manager -BUILD_DEPENDS= ${LOCALBASE}/include/lua.hpp:${PORTSDIR}/lang/lua RUN_DEPENDS= run-mailcap:${PORTSDIR}/misc/mime-support USE_X_PREFIX= yes USE_GETTEXT= yes USE_GMAKE= yes +USE_LUA= 5.1 MAKE_ENV= DEFINES="${IONDEFINES}" .if !defined(WITH_XINERAMA) diff --git a/x11-wm/ion-3/files/patch-system.mk b/x11-wm/ion-3/files/patch-system.mk index 1b438949e5a0..24bf426e3ea4 100644 --- a/x11-wm/ion-3/files/patch-system.mk +++ b/x11-wm/ion-3/files/patch-system.mk @@ -1,5 +1,5 @@ ---- system.mk.orig Thu May 18 16:06:53 2006 -+++ system.mk Fri May 19 13:19:25 2006 +--- ./system.mk.orig Wed May 24 13:23:51 2006 ++++ ./system.mk Mon Jul 17 18:15:24 2006 @@ -7,7 +7,7 @@ ## Installation paths ## @@ -27,15 +27,23 @@ ## -@@ -56,7 +56,7 @@ +@@ -56,11 +56,11 @@ # If you have installed Lua 5.1 from the official tarball without changing # paths, this should do it. -LUA_DIR=/usr/local +-LUA_LIBS = -L$(LUA_DIR)/lib -llua +-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 -llua - LUA_INCLUDES = -I$(LUA_DIR)/include - LUA=$(LUA_DIR)/bin/lua ++LUA_LIBS = -L$(LUA_LIBDIR) -llua ++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. @@ -74,7 +74,7 @@ ## X libraries, includes and options ## |