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 | |
parent | Remove DESTDIR as it is currently problematic. (diff) |
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')
-rw-r--r-- | x11-wm/ion-2/Makefile | 7 | ||||
-rw-r--r-- | x11-wm/ion-2/files/patch-rules.mk | 4 | ||||
-rw-r--r-- | x11-wm/ion-2/files/patch-system.mk | 20 | ||||
-rw-r--r-- | x11-wm/ion-3/Makefile | 2 | ||||
-rw-r--r-- | x11-wm/ion-3/files/patch-system.mk | 20 | ||||
-rw-r--r-- | x11-wm/ion-3ds/Makefile | 2 | ||||
-rw-r--r-- | x11-wm/ion-3ds/files/patch-system.mk | 20 | ||||
-rw-r--r-- | x11-wm/ion3/Makefile | 7 | ||||
-rw-r--r-- | x11-wm/ion3/files/patch-rules.mk | 4 | ||||
-rw-r--r-- | x11-wm/ion3/files/patch-system.mk | 20 |
10 files changed, 68 insertions, 38 deletions
diff --git a/x11-wm/ion-2/Makefile b/x11-wm/ion-2/Makefile index 5bdd1fc06fdd..265f3aaa118f 100644 --- a/x11-wm/ion-2/Makefile +++ b/x11-wm/ion-2/Makefile @@ -15,15 +15,14 @@ MASTER_SITES= http://modeemi.fi/~tuomov/ion/dl/ MAINTAINER= anthony.ginepro@laposte.net COMMENT= Ion is a tiling tabbed window manager -LIB_DEPENDS= lua.5:${PORTSDIR}/lang/lua50 - CONFLICTS= ion-2002* ion-devel-* pwm-* -GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 libltdl:15 USE_X_PREFIX= yes +USE_AUTOTOOLS= libtool:15 libltdl:15 +USE_LUA= 5.0 USE_GMAKE= yes MAKE_ENV= DEFINES="${IONDEFINES}" +GNU_CONFIGURE= yes .if !defined(WITH_MULTIBYTE) IONDEFINES+= -DCF_NO_MB_SUPPORT diff --git a/x11-wm/ion-2/files/patch-rules.mk b/x11-wm/ion-2/files/patch-rules.mk index 0dbc8606502d..5e7292efdd52 100644 --- a/x11-wm/ion-2/files/patch-rules.mk +++ b/x11-wm/ion-2/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/ion-2/files/patch-system.mk b/x11-wm/ion-2/files/patch-system.mk index 37e33a105ee9..80061f5ff69e 100644 --- a/x11-wm/ion-2/files/patch-system.mk +++ b/x11-wm/ion-2/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 ## 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 ## diff --git a/x11-wm/ion-3ds/Makefile b/x11-wm/ion-3ds/Makefile index 42f99ece8fc0..c9c3ffef7b4b 100644 --- a/x11-wm/ion-3ds/Makefile +++ b/x11-wm/ion-3ds/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-3ds/files/patch-system.mk b/x11-wm/ion-3ds/files/patch-system.mk index 1b438949e5a0..24bf426e3ea4 100644 --- a/x11-wm/ion-3ds/files/patch-system.mk +++ b/x11-wm/ion-3ds/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 ## diff --git a/x11-wm/ion3/Makefile b/x11-wm/ion3/Makefile index 5bdd1fc06fdd..265f3aaa118f 100644 --- a/x11-wm/ion3/Makefile +++ b/x11-wm/ion3/Makefile @@ -15,15 +15,14 @@ MASTER_SITES= http://modeemi.fi/~tuomov/ion/dl/ MAINTAINER= anthony.ginepro@laposte.net COMMENT= Ion is a tiling tabbed window manager -LIB_DEPENDS= lua.5:${PORTSDIR}/lang/lua50 - CONFLICTS= ion-2002* ion-devel-* pwm-* -GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 libltdl:15 USE_X_PREFIX= yes +USE_AUTOTOOLS= libtool:15 libltdl:15 +USE_LUA= 5.0 USE_GMAKE= yes MAKE_ENV= DEFINES="${IONDEFINES}" +GNU_CONFIGURE= yes .if !defined(WITH_MULTIBYTE) IONDEFINES+= -DCF_NO_MB_SUPPORT 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 ## |