From b43888d360d32e5f30d122b2d9ca24da5ef75f5c Mon Sep 17 00:00:00 2001 From: Matti Bickel Date: Sat, 17 Nov 2007 10:43:10 +0000 Subject: version bump svn path=/; revision=14 --- x11-wm/ion3/files/20071109/201_all_fix-paths.patch | 75 ++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 x11-wm/ion3/files/20071109/201_all_fix-paths.patch (limited to 'x11-wm/ion3/files/20071109/201_all_fix-paths.patch') diff --git a/x11-wm/ion3/files/20071109/201_all_fix-paths.patch b/x11-wm/ion3/files/20071109/201_all_fix-paths.patch new file mode 100644 index 0000000..cb27bfc --- /dev/null +++ b/x11-wm/ion3/files/20071109/201_all_fix-paths.patch @@ -0,0 +1,75 @@ +--- ion-3rc-20070708.orig/system.mk 2007-07-14 12:40:45.000000000 +0200 ++++ ion-3rc-20070708/system.mk 2007-07-14 15:54:39.000000000 +0200 +@@ -7,7 +7,7 @@ + ## Installation paths + ## + +-PREFIX=/usr/local ++PREFIX=/usr + + # Unless you are creating a package conforming to some OS's standards, you + # probably do not want to modify the following directories: +@@ -15,7 +15,7 @@ + # Main binaries + BINDIR=$(PREFIX)/bin + # Configuration .lua files +-ETCDIR=$(PREFIX)/etc/ion3 ++ETCDIR=/etc/X11/ion3 + # Some .lua files and ion-* shell scripts + SHAREDIR=$(PREFIX)/share/ion3 + # Manual pages +@@ -56,18 +56,18 @@ + + # 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=/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 + + # If you are using the Debian packages, the following settings should be + # what you want. +-#LUA_LIBS=`pkg-config --libs lua5.1` +-#LUA_INCLUDES=`pkg-config --cflags lua5.1` +-#LUA=/usr/bin/lua5.1 +-#LUAC=/usr/bin/luac5.1 ++LUA_LIBS=`pkg-config --libs lua` ++LUA_INCLUDES=`pkg-config --cflags lua` ++LUA=/usr/bin/lua ++LUAC=/usr/bin/luac + + + ## +@@ -104,7 +104,7 @@ + # asprintf and vasprintf in the c library. (gnu libc has.) + # If HAS_SYSTEM_ASPRINTF is not defined, an implementation + # in sprintf_2.2/ is used. +-#HAS_SYSTEM_ASPRINTF=1 ++HAS_SYSTEM_ASPRINTF=1 + + # If you're on an archaic system (such as relatively recent *BSD releases) + # without even dummy multibyte/widechar and localisation support, you may +@@ -143,14 +143,14 @@ + + #C89_SOURCE=-ansi + +-#POSIX_SOURCE=-D_POSIX_C_SOURCE=200112L ++POSIX_SOURCE=-D_POSIX_C_SOURCE=200112L + + # Most systems +-#XOPEN_SOURCE=-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED ++XOPEN_SOURCE=-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED + # SunOS, (Irix) + #XOPEN_SOURCE=-D__EXTENSIONS__ + +-#C99_SOURCE=-std=c99 -DCF_HAS_VA_COPY ++C99_SOURCE=-std=c99 -DCF_HAS_VA_COPY + + # The -DCF_HAS_VA_COPY option should allow for some optimisations, and + # in some cases simply defining -- cgit v1.2.3-65-gdbad