Date: Tue, 20 Feb 2007 21:14:43 GMT From: "Herbert J. Skuhra"<h.skuhra@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/109373: [PATCH] x11-wm/ion-3ds: Update to devel snapshot from 20070203 Message-ID: <200702202114.l1KLEhGx023674@www.freebsd.org> Resent-Message-ID: <200702202120.l1KLK2Yq086933@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 109373 >Category: ports >Synopsis: [PATCH] x11-wm/ion-3ds: Update to devel snapshot from 20070203 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Feb 20 21:20:02 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Herbert J. Skuhra >Release: FreeBSD 6.2-STABLE >Organization: >Environment: FreeBSD oslo.ath.cx 6.2-STABLE FreeBSD 6.2-STABLE #0: Wed Feb 14 21:21:47 CET 2007 root@oslo.ath.cx:/usr/obj/usr/src/sys/PC1 i386 >Description: This patch updates x11-wm/ion-3ds to the latest devel snapshot. It's also available from my website: http://norway.ath.cx/freebsd/ion-3ds_20070203.diff ---- The below patch keeps files/patch-system.mk untouched: http://norway.ath.cx/freebsd/ion-3ds_20070203_2.diff You have to copy the below file to ion3-ds/files by hand: http://norway.ath.cx/freebsd/patch-system.mk >How-To-Repeat: >Fix: diff -ruN x11-wm/ion-3ds.bak/Makefile x11-wm/ion-3ds/Makefile --- x11-wm/ion-3ds.bak/Makefile Tue Feb 20 21:02:07 2007 +++ x11-wm/ion-3ds/Makefile Tue Feb 20 21:22:33 2007 @@ -6,7 +6,7 @@ # PORTNAME= ion-3ds -PORTVERSION= 20061223 +PORTVERSION= 20070203 CATEGORIES= x11-wm MASTER_SITES= http://modeemi.fi/~tuomov/dl/ @@ -20,13 +20,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 diff -ruN x11-wm/ion-3ds.bak/distinfo x11-wm/ion-3ds/distinfo --- x11-wm/ion-3ds.bak/distinfo Tue Feb 20 21:02:07 2007 +++ x11-wm/ion-3ds/distinfo Tue Feb 20 21:02:44 2007 @@ -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 -ruN x11-wm/ion-3ds.bak/files/patch-system.mk x11-wm/ion-3ds/files/patch-system.mk --- x11-wm/ion-3ds.bak/files/patch-system.mk Tue Feb 20 21:02:07 2007 +++ x11-wm/ion-3ds/files/patch-system.mk Tue Feb 20 21:24:17 2007 @@ -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 -ruN x11-wm/ion-3ds.bak/pkg-plist x11-wm/ion-3ds/pkg-plist --- x11-wm/ion-3ds.bak/pkg-plist Tue Feb 20 21:02:07 2007 +++ x11-wm/ion-3ds/pkg-plist Tue Feb 20 21:39:04 2007 @@ -4,6 +4,7 @@ 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 @@ -11,7 +12,6 @@ etc/ion3/cfg_sp.lua etc/ion3/cfg_statusbar.lua etc/ion3/cfg_tiling.lua -etc/ion3/look.lua etc/ion3/look_brownsteel.lua etc/ion3/look_clean.lua etc/ion3/look_cleanios.lua >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200702202114.l1KLEhGx023674>