final stable version. supersedes all previous versions

svn path=/; revision=15

15 files changed, 15 insertions, 160 deletions

diff --git a/x11-wm/ion3/files/20071109/201_all_fix-paths.patch b/x11-wm/ion3/files/20071109/201_all_fix-paths.patch
deleted file mode 100644
index cb27bfc..0000000
--- a/x11-wm/ion3/files/20071109/201_all_fix-paths.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- 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
diff --git a/x11-wm/ion3/files/20071109/202_all_fix-menus.patch b/x11-wm/ion3/files/20071109/202_all_fix-menus.patch
deleted file mode 100644
index c2d77c8..0000000
--- a/x11-wm/ion3/files/20071109/202_all_fix-menus.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur ../work/ion-3ds-20061223/etc/cfg_ioncore.lua ion-3ds-20061223/etc/cfg_ioncore.lua
---- ../work/ion-3ds-20061223/etc/cfg_ioncore.lua	2006-12-23 17:59:43.000000000 +0300
-+++ ion-3ds-20061223/etc/cfg_ioncore.lua	2006-12-31 15:35:59.000000000 +0300
-@@ -331,7 +331,8 @@
- defmenu("mainmenu", {
-     menuentry("Run...",         "mod_query.query_exec(_)"),
-     menuentry("Terminal",       "ioncore.exec_on(_, XTERM or 'xterm')"),
--    menuentry("Lock screen",    "ioncore.exec_on(_, 'xlock')"),
-+    menuentry("Lock screen",                                                                                                                                  
-+              "ioncore.exec_on(_, ioncore.lookup_script('ion-lock'))"),                                                                                       
-     menuentry("Help",           "mod_query.query_man(_)"),
-     menuentry("About Ion",      "mod_query.show_about_ion(_)"),
-     submenu("Styles",           "stylemenu"),
diff --git a/x11-wm/ion3/files/20071109/205_all_ion-lock.patch b/x11-wm/ion3/files/20071109/205_all_ion-lock.patch
deleted file mode 100644
index dda2016..0000000
--- a/x11-wm/ion3/files/20071109/205_all_ion-lock.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Nur ion3-20050322.orig/utils/Makefile ion3-20050322/utils/Makefile
---- ion3-20050322.orig/utils/Makefile	2005-03-22 14:31:06.000000000 +0000
-+++ ion3-20050322/utils/Makefile	2005-03-22 16:29:37.197355881 +0000
-@@ -11,7 +11,7 @@
- SUBDIRS=ion-completefile
- INSTALL_SUBDIRS=$(SUBDIRS)
- 
--SHELLSCRIPTS = ion-runinxterm ion-completeman
-+SHELLSCRIPTS = ion-runinxterm ion-completeman ion-lock
- 
- TARGETS = ion-completeman
- 
-diff -Nur ion3-20050322.orig/utils/ion-lock ion3-20050322/utils/ion-lock
---- ion3-20050322.orig/utils/ion-lock	1970-01-01 00:00:00.000000000 +0000
-+++ ion3-20050322/utils/ion-lock	2005-03-22 16:29:19.550092305 +0000
-@@ -0,0 +1,6 @@
-+#!/bin/sh
-+if xscreensaver-command -version >/dev/null 2>&1; then
-+	exec xscreensaver-command -lock
-+else
-+	exec xlock
-+fi
diff --git a/x11-wm/ion3/files/20071109/208_all_as-needed.patch b/x11-wm/ion3/files/20071109/208_all_as-needed.patch
deleted file mode 100644
index 662a078..0000000
--- a/x11-wm/ion3/files/20071109/208_all_as-needed.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr ion-3ds-20070318.orig/de/Makefile ion-3ds-20070318/de/Makefile
---- ion-3ds-20070318.orig/de/Makefile	2007-03-18 21:31:37.000000000 +0100
-+++ ion-3ds-20070318/de/Makefile	2007-04-30 17:30:23.000000000 +0200
-@@ -17,6 +17,8 @@
- 
- MAKE_EXPORTS=de
- 
-+LDFLAGS+=-lXext
-+
- ######################################
- 
- include $(TOPDIR)/build/rules.mk
diff --git a/x11-wm/ion3/files/20070902/201_all_fix-paths.patch b/x11-wm/ion3/files/20080207/201_all_fix-paths.patch
index cb27bfc..9cc3ca4 100644
--- a/x11-wm/ion3/files/20070902/201_all_fix-paths.patch
+++ b/x11-wm/ion3/files/20080207/201_all_fix-paths.patch
@@ -1,15 +1,16 @@
---- 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
- ##
+diff -uNr ion-3-20080207.orig/system.mk ion-3-20080207/system.mk
+--- ion-3-20080207.orig/system.mk	2008-02-08 20:23:22.000000000 +0100
++++ ion-3-20080207/system.mk	2008-02-08 23:04:55.000000000 +0100
+@@ -8,7 +8,7 @@
  
+ # Installation path prefix. Unless you know what you're doing, the default
+ # of /usr/local is likely the correct choice.
 -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 @@
+@@ -16,7 +16,7 @@
  # Main binaries
  BINDIR=$(PREFIX)/bin
  # Configuration .lua files
@@ -18,7 +19,7 @@
  # Some .lua files and ion-* shell scripts
  SHAREDIR=$(PREFIX)/share/ion3
  # Manual pages
-@@ -56,18 +56,18 @@
+@@ -62,18 +62,18 @@
  
  # If you have installed Lua 5.1 from the official tarball without changing
  # paths, this should do it.
@@ -46,16 +47,16 @@
  
  
  ##
-@@ -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.
+@@ -127,7 +127,7 @@
+ # You may uncomment this if you know that your system C libary provides
+ # asprintf and  vasprintf. (GNU libc does.) If HAS_SYSTEM_ASPRINTF is not
+ # defined, an implementation provided in libtu/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 @@
+ # The following setting is needed with GNU libc for clock_gettime and the
+ # monotonic clock. Other systems may not need it, or may not provide a
+@@ -169,14 +169,14 @@
  
  #C89_SOURCE=-ansi
  
diff --git a/x11-wm/ion3/files/20070902/202_all_fix-menus.patch b/x11-wm/ion3/files/20080207/202_all_fix-menus.patch
index c2d77c8..c2d77c8 100644
--- a/x11-wm/ion3/files/20070902/202_all_fix-menus.patch
+++ b/x11-wm/ion3/files/20080207/202_all_fix-menus.patch
diff --git a/x11-wm/ion3/files/20070902/205_all_ion-lock.patch b/x11-wm/ion3/files/20080207/205_all_ion-lock.patch
index dda2016..dda2016 100644
--- a/x11-wm/ion3/files/20070902/205_all_ion-lock.patch
+++ b/x11-wm/ion3/files/20080207/205_all_ion-lock.patch
diff --git a/x11-wm/ion3/files/20070902/208_all_as-needed.patch b/x11-wm/ion3/files/20080207/208_all_as-needed.patch
index 662a078..662a078 100644
--- a/x11-wm/ion3/files/20070902/208_all_as-needed.patch
+++ b/x11-wm/ion3/files/20080207/208_all_as-needed.patch
diff --git a/x11-wm/ion3/files/digest-ion3-20070720 b/x11-wm/ion3/files/digest-ion3-20070720
deleted file mode 100644
index fccc717..0000000
--- a/x11-wm/ion3/files/digest-ion3-20070720
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 cef18d7a4aa476b400ecf722c57f6e6a ion-3rc-20070720.tar.gz 655409
-RMD160 a97944850d88b81dd20d234f3f114e9f3038d0b3 ion-3rc-20070720.tar.gz 655409
-SHA256 c1d412444bbcbb541adab4efd9fecb131065f3c8c908b2fe9dd17707ac03df61 ion-3rc-20070720.tar.gz 655409
-MD5 42db17925e8e745c2385f1b42fa26f78 ion-doc-3rc-20070708.tar.gz 669854
-RMD160 ba3bdb7b4ca4331738faa0aa2501d662644d0a39 ion-doc-3rc-20070708.tar.gz 669854
-SHA256 d1651f219a43f413de618a7bf158ddbc42c2c3025807965271c97214bba10ef3 ion-doc-3rc-20070708.tar.gz 669854
diff --git a/x11-wm/ion3/files/digest-ion3-20070720-r1 b/x11-wm/ion3/files/digest-ion3-20070720-r1
deleted file mode 100644
index cfd9c1a..0000000
--- a/x11-wm/ion3/files/digest-ion3-20070720-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 cef18d7a4aa476b400ecf722c57f6e6a ion-3rc-20070720.tar.gz 655409
-RMD160 a97944850d88b81dd20d234f3f114e9f3038d0b3 ion-3rc-20070720.tar.gz 655409
-SHA256 c1d412444bbcbb541adab4efd9fecb131065f3c8c908b2fe9dd17707ac03df61 ion-3rc-20070720.tar.gz 655409
-MD5 27f2d86dda6f9afc9e7c439d85427cd0 ion-doc-3rc-20070720.tar.gz 669878
-RMD160 d485145fd8493bebe3c5076605c86d427c8105fb ion-doc-3rc-20070720.tar.gz 669878
-SHA256 6da15a64ac01c0e1df0548214dfb3bc5874006f31a2c84fe160127829301dd99 ion-doc-3rc-20070720.tar.gz 669878
diff --git a/x11-wm/ion3/files/digest-ion3-20070902 b/x11-wm/ion3/files/digest-ion3-20070902
deleted file mode 100644
index 6827700..0000000
--- a/x11-wm/ion3/files/digest-ion3-20070902
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 cdaff06fd9519c593f898a81ce01b5f9 ion-3rc-20070902.tar.gz 655566
-RMD160 abca8f424869cc78d8880c869981c796c8e7dd83 ion-3rc-20070902.tar.gz 655566
-SHA256 b42321986a84e16f95ad2e3d955749e0c3edaca0e7d202230c90fcdf5f064a18 ion-3rc-20070902.tar.gz 655566
-MD5 24c60a4a2d4eeb554dc8a3d76a9c637d ion-doc-3rc-20070902.tar.gz 670268
-RMD160 9d561a72cfcdeab5f4e4af42cb8b5f7e233a8f05 ion-doc-3rc-20070902.tar.gz 670268
-SHA256 a5f12b469c013c77dcc3c0a9d56f02009f974cb6f9b3b15bdda2b826145ed585 ion-doc-3rc-20070902.tar.gz 670268
diff --git a/x11-wm/ion3/files/digest-ion3-20071109 b/x11-wm/ion3/files/digest-ion3-20071109
deleted file mode 100644
index db7461b..0000000
--- a/x11-wm/ion3/files/digest-ion3-20071109
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 7f71cae5be800ccfa456380f3d45b2b5 ion-3rc-20071109.tar.gz 646945
-RMD160 b89b725ec1f508161e30126c26f8494bd7ccfd28 ion-3rc-20071109.tar.gz 646945
-SHA256 fdfb2fe6faa571942ec89b00ef64f88a4f48965ea20abc72cb7d5ad7b3ef6697 ion-3rc-20071109.tar.gz 646945
-MD5 746d87834564cbfa3333e1c0ddf08877 ion-doc-3rc-20071109.tar.gz 670886
-RMD160 3c30de69762d6567a322e46b7be348388e857e72 ion-doc-3rc-20071109.tar.gz 670886
-SHA256 0f4e2cfe529b371845ed7f72fba18a173f0610ba0e14f389eed40bf05db70c65 ion-doc-3rc-20071109.tar.gz 670886
diff --git a/x11-wm/ion3/files/ion3-scripts-20070902.tar.bz2 b/x11-wm/ion3/files/ion3-scripts-20070902.tar.bz2
deleted file mode 100644
index b54ad56..0000000
--- a/x11-wm/ion3/files/ion3-scripts-20070902.tar.bz2
+++ /dev/null
diff --git a/x11-wm/ion3/files/ion3-scripts-20071117.tar.bz2 b/x11-wm/ion3/files/ion3-scripts-20071117.tar.bz2
deleted file mode 100644
index ea3ae20..0000000
--- a/x11-wm/ion3/files/ion3-scripts-20071117.tar.bz2
+++ /dev/null
diff --git a/x11-wm/ion3/files/ion3-scripts-20080130.tar.bz2 b/x11-wm/ion3/files/ion3-scripts-20080130.tar.bz2
new file mode 100644
index 0000000..4793d7c
--- /dev/null
+++ b/x11-wm/ion3/files/ion3-scripts-20080130.tar.bz2