From 1a773232535f7cfe113fe662b426cba9326249aa Mon Sep 17 00:00:00 2001 From: Stefan Walter Date: Fri, 23 Feb 2007 19:21:55 +0000 Subject: Update to 20070203. PR: ports/109373 Submitted by: "Herbert J. Skuhra" Approved by: maintainer --- x11-wm/ion-3/Makefile | 9 +-------- x11-wm/ion-3/distinfo | 6 +++--- x11-wm/ion-3/files/patch-system.mk | 38 +++++++++++++----------------------- x11-wm/ion-3/pkg-plist | 1 + x11-wm/ion-3ds/Makefile | 9 +-------- x11-wm/ion-3ds/distinfo | 6 +++--- x11-wm/ion-3ds/files/patch-system.mk | 38 +++++++++++++----------------------- x11-wm/ion-3ds/pkg-plist | 1 + 8 files changed, 38 insertions(+), 70 deletions(-) (limited to 'x11-wm') diff --git a/x11-wm/ion-3/Makefile b/x11-wm/ion-3/Makefile index ef41662aa244..ebab6936e783 100644 --- a/x11-wm/ion-3/Makefile +++ b/x11-wm/ion-3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= ion-3ds -PORTVERSION= 20061223 +PORTVERSION= 20070203 CATEGORIES= x11-wm MASTER_SITES= http://modeemi.fi/~tuomov/dl/ @@ -21,13 +21,6 @@ USE_GMAKE= yes USE_LUA= 5.1 MAKE_ENV= DEFINES="${IONDEFINES}" -.if !defined(WITH_XINERAMA) -IONDEFINES+= -DCF_NO_XINERAMA -.else -IONDEFINES+= -DCF_XINERAMA -MAKE_ENV+= XINERAMA_LIBS=-lXinerama -.endif - .if defined(WITHOUT_NLS) IONDEFINES+= -DCF_NO_LOCALE .endif diff --git a/x11-wm/ion-3/distinfo b/x11-wm/ion-3/distinfo index 0bf16223cf03..1fe7e7ed9aa7 100644 --- a/x11-wm/ion-3/distinfo +++ b/x11-wm/ion-3/distinfo @@ -1,3 +1,3 @@ -MD5 (ion-3ds-20061223.tar.gz) = 861887705546ddb5f240f10dbdab5098 -SHA256 (ion-3ds-20061223.tar.gz) = 0970fef74de659de45813471560ebe2f97b893de7a238ea00755fcaeb9b7d89e -SIZE (ion-3ds-20061223.tar.gz) = 649463 +MD5 (ion-3ds-20070203.tar.gz) = 15b8f253c9a62b97a9881d431908da2a +SHA256 (ion-3ds-20070203.tar.gz) = 950a2d27123d105d06d807b705c9ed5f6c93541976451078fbbb19c2150d8058 +SIZE (ion-3ds-20070203.tar.gz) = 644970 diff --git a/x11-wm/ion-3/files/patch-system.mk b/x11-wm/ion-3/files/patch-system.mk index 4a615f011041..f171967487c6 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 Nov 2 20:15:51 2006 -+++ system.mk Thu Nov 2 20:40:45 2006 +--- system.mk.orig Tue Feb 20 21:06:40 2007 ++++ system.mk Tue Feb 20 21:14:47 2007 @@ -7,7 +7,7 @@ ## Installation paths ## @@ -53,26 +53,16 @@ # SunOS/Solaris #X11_PREFIX=/usr/openwin -@@ -82,8 +82,8 @@ - X11_INCLUDES=-I$(X11_PREFIX)/include - - # Change commenting to disable Xinerama support --XINERAMA_LIBS=-lXinerama --DEFINES += -DCF_XINERAMA -+#XINERAMA_LIBS=-lXinerama -+#DEFINES += -DCF_XINERAMA - # For Solaris - #XINERAMA_LIBS= - #DEFINES += -DCF_SUN_XINERAMA -@@ -101,7 +101,6 @@ - # on SunOS. - #DEFINES += -DCF_SUN_F1X_REMAP - -- - ## - ## libc - ## -@@ -110,7 +109,7 @@ +@@ -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. +-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 @@ # 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. @@ -81,7 +71,7 @@ # If you're on an archaic system (such as relatively recent *BSD releases) -@@ -119,24 +118,24 @@ +@@ -112,24 +112,24 @@ #DEFINES += -DCF_NO_LOCALE # On some other systems you may something like this: @@ -112,7 +102,7 @@ EXPORT_DYNAMIC=-Xlinker --export-dynamic # The following options are mainly for development use and can be used -@@ -150,7 +149,7 @@ +@@ -143,7 +143,7 @@ #POSIX_SOURCE=-D_POSIX_SOURCE # Most systems diff --git a/x11-wm/ion-3/pkg-plist b/x11-wm/ion-3/pkg-plist index 988f49e97858..64825f4f5f02 100644 --- a/x11-wm/ion-3/pkg-plist +++ b/x11-wm/ion-3/pkg-plist @@ -4,6 +4,7 @@ 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 diff --git a/x11-wm/ion-3ds/Makefile b/x11-wm/ion-3ds/Makefile index ef41662aa244..ebab6936e783 100644 --- a/x11-wm/ion-3ds/Makefile +++ b/x11-wm/ion-3ds/Makefile @@ -6,7 +6,7 @@ # PORTNAME= ion-3ds -PORTVERSION= 20061223 +PORTVERSION= 20070203 CATEGORIES= x11-wm MASTER_SITES= http://modeemi.fi/~tuomov/dl/ @@ -21,13 +21,6 @@ USE_GMAKE= yes USE_LUA= 5.1 MAKE_ENV= DEFINES="${IONDEFINES}" -.if !defined(WITH_XINERAMA) -IONDEFINES+= -DCF_NO_XINERAMA -.else -IONDEFINES+= -DCF_XINERAMA -MAKE_ENV+= XINERAMA_LIBS=-lXinerama -.endif - .if defined(WITHOUT_NLS) IONDEFINES+= -DCF_NO_LOCALE .endif diff --git a/x11-wm/ion-3ds/distinfo b/x11-wm/ion-3ds/distinfo index 0bf16223cf03..1fe7e7ed9aa7 100644 --- a/x11-wm/ion-3ds/distinfo +++ b/x11-wm/ion-3ds/distinfo @@ -1,3 +1,3 @@ -MD5 (ion-3ds-20061223.tar.gz) = 861887705546ddb5f240f10dbdab5098 -SHA256 (ion-3ds-20061223.tar.gz) = 0970fef74de659de45813471560ebe2f97b893de7a238ea00755fcaeb9b7d89e -SIZE (ion-3ds-20061223.tar.gz) = 649463 +MD5 (ion-3ds-20070203.tar.gz) = 15b8f253c9a62b97a9881d431908da2a +SHA256 (ion-3ds-20070203.tar.gz) = 950a2d27123d105d06d807b705c9ed5f6c93541976451078fbbb19c2150d8058 +SIZE (ion-3ds-20070203.tar.gz) = 644970 diff --git a/x11-wm/ion-3ds/files/patch-system.mk b/x11-wm/ion-3ds/files/patch-system.mk index 4a615f011041..f171967487c6 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 Nov 2 20:15:51 2006 -+++ system.mk Thu Nov 2 20:40:45 2006 +--- system.mk.orig Tue Feb 20 21:06:40 2007 ++++ system.mk Tue Feb 20 21:14:47 2007 @@ -7,7 +7,7 @@ ## Installation paths ## @@ -53,26 +53,16 @@ # SunOS/Solaris #X11_PREFIX=/usr/openwin -@@ -82,8 +82,8 @@ - X11_INCLUDES=-I$(X11_PREFIX)/include - - # Change commenting to disable Xinerama support --XINERAMA_LIBS=-lXinerama --DEFINES += -DCF_XINERAMA -+#XINERAMA_LIBS=-lXinerama -+#DEFINES += -DCF_XINERAMA - # For Solaris - #XINERAMA_LIBS= - #DEFINES += -DCF_SUN_XINERAMA -@@ -101,7 +101,6 @@ - # on SunOS. - #DEFINES += -DCF_SUN_F1X_REMAP - -- - ## - ## libc - ## -@@ -110,7 +109,7 @@ +@@ -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. +-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 @@ # 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. @@ -81,7 +71,7 @@ # If you're on an archaic system (such as relatively recent *BSD releases) -@@ -119,24 +118,24 @@ +@@ -112,24 +112,24 @@ #DEFINES += -DCF_NO_LOCALE # On some other systems you may something like this: @@ -112,7 +102,7 @@ EXPORT_DYNAMIC=-Xlinker --export-dynamic # The following options are mainly for development use and can be used -@@ -150,7 +149,7 @@ +@@ -143,7 +143,7 @@ #POSIX_SOURCE=-D_POSIX_SOURCE # Most systems diff --git a/x11-wm/ion-3ds/pkg-plist b/x11-wm/ion-3ds/pkg-plist index 988f49e97858..64825f4f5f02 100644 --- a/x11-wm/ion-3ds/pkg-plist +++ b/x11-wm/ion-3ds/pkg-plist @@ -4,6 +4,7 @@ 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 -- cgit v1.2.3