8 files changed, 44 insertions, 32 deletions

diff --git a/x11-wm/ion-3/Makefile b/x11-wm/ion-3/Makefile
index ebab6936e783..846b06e1bc14 100644
--- a/x11-wm/ion-3/Makefile
+++ b/x11-wm/ion-3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ion-3ds
-PORTVERSION=	20070203
+PORTVERSION=	20070318
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://modeemi.fi/~tuomov/dl/
 
diff --git a/x11-wm/ion-3/distinfo b/x11-wm/ion-3/distinfo
index 1fe7e7ed9aa7..6f65812b6071 100644
--- a/x11-wm/ion-3/distinfo
+++ b/x11-wm/ion-3/distinfo
@@ -1,3 +1,3 @@
-MD5 (ion-3ds-20070203.tar.gz) = 15b8f253c9a62b97a9881d431908da2a
-SHA256 (ion-3ds-20070203.tar.gz) = 950a2d27123d105d06d807b705c9ed5f6c93541976451078fbbb19c2150d8058
-SIZE (ion-3ds-20070203.tar.gz) = 644970
+MD5 (ion-3ds-20070318.tar.gz) = f02264ab7ecc990c2cd322f57a5e8a4d
+SHA256 (ion-3ds-20070318.tar.gz) = 712da027fb12774f67d933d95a95452d98a5658617fc5515011ca79b6035258a
+SIZE (ion-3ds-20070318.tar.gz) = 657282
diff --git a/x11-wm/ion-3/files/patch-system.mk b/x11-wm/ion-3/files/patch-system.mk
index f171967487c6..5e261bc0704c 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	Tue Feb 20 21:06:40 2007
-+++ system.mk	Tue Feb 20 21:14:47 2007
+--- system.mk.orig	Sun Mar 18 21:32:12 2007
++++ system.mk	Sat Mar 31 22:49:58 2007
 @@ -7,7 +7,7 @@
  ## Installation paths
  ##
@@ -53,24 +53,24 @@
  # SunOS/Solaris
  #X11_PREFIX=/usr/openwin
  
-@@ -84,7 +84,7 @@
- # XFree86 libraries up to 4.3.0 have a bug that will cause Ion to segfault
- # if Opera is used when i18n support is enabled. The following setting
- # should work around that situation.
+@@ -83,7 +83,7 @@
+ 
+ # XFree86 libraries up to 4.3.0 have a bug that can cause a segfault.
+ # The following setting  should  work around that situation.
 -DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND
 +#DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND
  
- # Use the Xutf8 routines (XFree86 extension) instead of Xmb routines in
- # an UTF8 locale.
-@@ -103,7 +103,7 @@
+ # Use the Xutf8 routines (XFree86 extension) instead of the Xmb routines
+ # in an UTF-8 locale. (No, you don't need this in UTF-8 locales, and 
+@@ -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 
 @@ -112,24 +112,24 @@
  #DEFINES += -DCF_NO_LOCALE
  
diff --git a/x11-wm/ion-3/pkg-plist b/x11-wm/ion-3/pkg-plist
index 64825f4f5f02..f213aec5f644 100644
--- a/x11-wm/ion-3/pkg-plist
+++ b/x11-wm/ion-3/pkg-plist
@@ -1,12 +1,12 @@
 bin/ion3
 bin/pwm3
+etc/ion3/cfg_defaults.lua
 etc/ion3/cfg_dock.lua
 etc/ion3/cfg_ion.lua
 etc/ion3/cfg_ioncore.lua
 etc/ion3/cfg_kludges.lua
 etc/ion3/cfg_layouts.lua
 etc/ion3/cfg_menu.lua
-etc/ion3/cfg_modules.lua
 etc/ion3/cfg_pwm.lua
 etc/ion3/cfg_query.lua
 etc/ion3/cfg_sp.lua
@@ -20,13 +20,19 @@ etc/ion3/look_cleanviolet.lua
 etc/ion3/look_dusky.lua
 etc/ion3/look_greyviolet.lua
 etc/ion3/look_ios.lua
+etc/ion3/look_newviolet.lua
 etc/ion3/look_simpleblue.lua
 etc/ion3/lookcommon_clean.lua
+etc/ion3/lookcommon_clean_frame.lua
+etc/ion3/lookcommon_clean_stdisp.lua
+etc/ion3/lookcommon_clean_tab.lua
 etc/ion3/lookcommon_emboss.lua
+etc/ion3/lookcommon_emboss_frame.lua
+etc/ion3/lookcommon_emboss_stdisp.lua
+etc/ion3/lookcommon_emboss_tab.lua
 lib/ion3/bin/ion-completefile
 lib/ion3/bin/ion-statusd
 lib/ion3/lc/de.lc
-lib/ion3/lc/ext_statusbar.lc
 lib/ion3/lc/ioncore_bindings.lc
 lib/ion3/lc/ioncore_efbb.lc
 lib/ion3/lc/ioncore_ext.lc
diff --git a/x11-wm/ion-3ds/Makefile b/x11-wm/ion-3ds/Makefile
index ebab6936e783..846b06e1bc14 100644
--- a/x11-wm/ion-3ds/Makefile
+++ b/x11-wm/ion-3ds/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ion-3ds
-PORTVERSION=	20070203
+PORTVERSION=	20070318
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://modeemi.fi/~tuomov/dl/
 
diff --git a/x11-wm/ion-3ds/distinfo b/x11-wm/ion-3ds/distinfo
index 1fe7e7ed9aa7..6f65812b6071 100644
--- a/x11-wm/ion-3ds/distinfo
+++ b/x11-wm/ion-3ds/distinfo
@@ -1,3 +1,3 @@
-MD5 (ion-3ds-20070203.tar.gz) = 15b8f253c9a62b97a9881d431908da2a
-SHA256 (ion-3ds-20070203.tar.gz) = 950a2d27123d105d06d807b705c9ed5f6c93541976451078fbbb19c2150d8058
-SIZE (ion-3ds-20070203.tar.gz) = 644970
+MD5 (ion-3ds-20070318.tar.gz) = f02264ab7ecc990c2cd322f57a5e8a4d
+SHA256 (ion-3ds-20070318.tar.gz) = 712da027fb12774f67d933d95a95452d98a5658617fc5515011ca79b6035258a
+SIZE (ion-3ds-20070318.tar.gz) = 657282
diff --git a/x11-wm/ion-3ds/files/patch-system.mk b/x11-wm/ion-3ds/files/patch-system.mk
index f171967487c6..5e261bc0704c 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	Tue Feb 20 21:06:40 2007
-+++ system.mk	Tue Feb 20 21:14:47 2007
+--- system.mk.orig	Sun Mar 18 21:32:12 2007
++++ system.mk	Sat Mar 31 22:49:58 2007
 @@ -7,7 +7,7 @@
  ## Installation paths
  ##
@@ -53,24 +53,24 @@
  # SunOS/Solaris
  #X11_PREFIX=/usr/openwin
  
-@@ -84,7 +84,7 @@
- # XFree86 libraries up to 4.3.0 have a bug that will cause Ion to segfault
- # if Opera is used when i18n support is enabled. The following setting
- # should work around that situation.
+@@ -83,7 +83,7 @@
+ 
+ # XFree86 libraries up to 4.3.0 have a bug that can cause a segfault.
+ # The following setting  should  work around that situation.
 -DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND
 +#DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND
  
- # Use the Xutf8 routines (XFree86 extension) instead of Xmb routines in
- # an UTF8 locale.
-@@ -103,7 +103,7 @@
+ # Use the Xutf8 routines (XFree86 extension) instead of the Xmb routines
+ # in an UTF-8 locale. (No, you don't need this in UTF-8 locales, and 
+@@ -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 
 @@ -112,24 +112,24 @@
  #DEFINES += -DCF_NO_LOCALE
  
diff --git a/x11-wm/ion-3ds/pkg-plist b/x11-wm/ion-3ds/pkg-plist
index 64825f4f5f02..f213aec5f644 100644
--- a/x11-wm/ion-3ds/pkg-plist
+++ b/x11-wm/ion-3ds/pkg-plist
@@ -1,12 +1,12 @@
 bin/ion3
 bin/pwm3
+etc/ion3/cfg_defaults.lua
 etc/ion3/cfg_dock.lua
 etc/ion3/cfg_ion.lua
 etc/ion3/cfg_ioncore.lua
 etc/ion3/cfg_kludges.lua
 etc/ion3/cfg_layouts.lua
 etc/ion3/cfg_menu.lua
-etc/ion3/cfg_modules.lua
 etc/ion3/cfg_pwm.lua
 etc/ion3/cfg_query.lua
 etc/ion3/cfg_sp.lua
@@ -20,13 +20,19 @@ etc/ion3/look_cleanviolet.lua
 etc/ion3/look_dusky.lua
 etc/ion3/look_greyviolet.lua
 etc/ion3/look_ios.lua
+etc/ion3/look_newviolet.lua
 etc/ion3/look_simpleblue.lua
 etc/ion3/lookcommon_clean.lua
+etc/ion3/lookcommon_clean_frame.lua
+etc/ion3/lookcommon_clean_stdisp.lua
+etc/ion3/lookcommon_clean_tab.lua
 etc/ion3/lookcommon_emboss.lua
+etc/ion3/lookcommon_emboss_frame.lua
+etc/ion3/lookcommon_emboss_stdisp.lua
+etc/ion3/lookcommon_emboss_tab.lua
 lib/ion3/bin/ion-completefile
 lib/ion3/bin/ion-statusd
 lib/ion3/lc/de.lc
-lib/ion3/lc/ext_statusbar.lc
 lib/ion3/lc/ioncore_bindings.lc
 lib/ion3/lc/ioncore_efbb.lc
 lib/ion3/lc/ioncore_ext.lc