Date: Thu, 2 Nov 2006 20:19:37 GMT From: "Herbert J. Skuhra"<h.skuhra@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/105084: [PATCH] Update x11-wm/ion-3ds Message-ID: <200611022019.kA2KJbAQ079206@www.freebsd.org> Resent-Message-ID: <200611022020.kA2KKYaY080149@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 105084 >Category: ports >Synopsis: [PATCH] Update x11-wm/ion-3ds >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: Thu Nov 02 20:20:34 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Herbert J. Skuhra >Release: FreeBSD 6.2-PRERELEASE >Organization: >Environment: FreeBSD oslo.ath.cx 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #0: Mon Oct 30 23:48:15 CET 2006 root@oslo.ath.cx:/usr/obj/usr/src/sys/PC1 i386 >Description: This patch updates x11-wm/ion-3ds to recent version (20061029) Only link -lXinerama, when "WITH_XINERAMA" is defined. The patch is also available at: http://norway.ath.cx/freebsd/ion-3ds-20061029.diff >How-To-Repeat: >Fix: diff -ruN x11-wm/ion-3ds.orig/Makefile x11-wm/ion-3ds/Makefile --- x11-wm/ion-3ds.orig/Makefile Thu Nov 2 18:57:11 2006 +++ x11-wm/ion-3ds/Makefile Thu Nov 2 21:05:44 2006 @@ -6,7 +6,7 @@ # PORTNAME= ion-3ds -PORTVERSION= 20060524 +PORTVERSION= 20061029 CATEGORIES= x11-wm MASTER_SITES= http://modeemi.fi/~tuomov/dl/ @@ -23,6 +23,9 @@ .if !defined(WITH_XINERAMA) IONDEFINES+= -DCF_NO_XINERAMA +.else +IONDEFINES+= -DCF_XINERAMA +MAKE_ENV+= XINERAMA_LIBS=-lXinerama .endif .if defined(WITHOUT_NLS) diff -ruN x11-wm/ion-3ds.orig/distinfo x11-wm/ion-3ds/distinfo --- x11-wm/ion-3ds.orig/distinfo Thu Nov 2 18:57:11 2006 +++ x11-wm/ion-3ds/distinfo Thu Nov 2 18:58:11 2006 @@ -1,3 +1,3 @@ -MD5 (ion-3ds-20060524.tar.gz) = f9dbab5a5150c9944d7c6ed9e24daef6 -SHA256 (ion-3ds-20060524.tar.gz) = 421c4c9297cef7b5d01aabc9713d5ac2931d0b3834a2578690e01f8dec3e8a9a -SIZE (ion-3ds-20060524.tar.gz) = 620416 +MD5 (ion-3ds-20061029.tar.gz) = 245d045a3524adf9586625e0a50717dc +SHA256 (ion-3ds-20061029.tar.gz) = a4414c7db188c1fa6f0a50ed2079b1045ae19d9674842b52b2e231b2b7d46c0e +SIZE (ion-3ds-20061029.tar.gz) = 646591 diff -ruN x11-wm/ion-3ds.orig/files/___ x11-wm/ion-3ds/files/___ --- x11-wm/ion-3ds.orig/files/___ Thu Jan 1 01:00:00 1970 +++ x11-wm/ion-3ds/files/___ Thu Nov 2 20:24:00 2006 @@ -0,0 +1,121 @@ +--- system.mk.orig Thu Nov 2 20:15:51 2006 ++++ system.mk Thu Nov 2 20:22:10 2006 +@@ -7,7 +7,7 @@ + ## Installation paths + ## + +-PREFIX=/usr/local ++#PREFIX=/usr/local + + # Unless you are creating a package conforming to some OS's standards, you + # probably do not want to modify the following directories: +@@ -19,7 +19,7 @@ + # Some .lua files and ion-* shell scripts + SHAREDIR=$(PREFIX)/share/ion3 + # Manual pages +-MANDIR=$(PREFIX)/share/man ++MANDIR=$(MANPREFIX)/man + # Some documents + DOCDIR=$(PREFIX)/share/doc/ion3 + # Nothing at the moment +@@ -47,7 +47,7 @@ + #PRELOAD_MODULES=1 + + # Flags to link with libdl. +-DL_LIBS=-ldl ++#DL_LIBS=-ldl + + + ## +@@ -56,11 +56,11 @@ + + # 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=$(LOCALBASE) ++LUA_LIBS = -L$(LUA_LIBDIR) -llua ++LUA_INCLUDES = -I$(LUA_INCDIR) ++LUA=$(LUA_BINDIR)/lua ++LUAC=$(LUA_BINDIR)/luac + + # If you are using the Debian packages, the following settings should be + # what you want. +@@ -74,7 +74,7 @@ + ## X libraries, includes and options + ## + +-X11_PREFIX=/usr/X11R6 ++X11_PREFIX=$(X11BASE) + # SunOS/Solaris + #X11_PREFIX=/usr/openwin + +@@ -83,7 +83,7 @@ + + # Change commenting to disable Xinerama support + XINERAMA_LIBS=-lXinerama +-DEFINES += -DCF_XINERAMA ++#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 @@ + # 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) +@@ -119,24 +118,24 @@ + #DEFINES += -DCF_NO_LOCALE + + # On some other systems you may something like this: +-#EXTRA_LIBS += -lintl +-#EXTRA_INCLUDES += ++EXTRA_LIBS += -L$(LOCALBASE)/lib -lintl ++EXTRA_INCLUDES += -I$(LOCALBASE)/include + + + ## + ## C compiler + ## + +-CC=gcc ++CC?=gcc + + # Same as '-Wall -pedantic' without '-Wunused' as callbacks often + # have unused variables. + WARN= -W -Wimplicit -Wreturn-type -Wswitch -Wcomment \ + -Wtrigraphs -Wformat -Wchar-subscripts \ +- -Wparentheses -pedantic -Wuninitialized ++ -Wparentheses + +-CFLAGS=-g -Os $(WARN) $(DEFINES) $(EXTRA_INCLUDES) $(INCLUDES) +-LDFLAGS=-g -Os $(EXTRA_LIBS) $(LIBS) ++CFLAGS+=$(WARN) $(DEFINES) $(EXTRA_INCLUDES) $(INCLUDES) ++LDFLAGS+=$(EXTRA_LIBS) $(LIBS) + EXPORT_DYNAMIC=-Xlinker --export-dynamic + + # The following options are mainly for development use and can be used +@@ -150,7 +149,7 @@ + #POSIX_SOURCE=-D_POSIX_SOURCE + + # 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__ + diff -ruN x11-wm/ion-3ds.orig/files/patch-system.mk x11-wm/ion-3ds/files/patch-system.mk --- x11-wm/ion-3ds.orig/files/patch-system.mk Thu Nov 2 18:57:11 2006 +++ x11-wm/ion-3ds/files/patch-system.mk Thu Nov 2 20:49:20 2006 @@ -1,5 +1,5 @@ ---- ./system.mk.orig Wed May 24 13:23:51 2006 -+++ ./system.mk Mon Jul 17 18:15:24 2006 +--- system.mk.orig Thu Nov 2 20:15:51 2006 ++++ system.mk Thu Nov 2 20:40:45 2006 @@ -7,7 +7,7 @@ ## Installation paths ## @@ -53,7 +53,26 @@ # SunOS/Solaris #X11_PREFIX=/usr/openwin -@@ -107,7 +107,7 @@ +@@ -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 @@ # 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. @@ -62,7 +81,7 @@ # If you're on an archaic system (such as relatively recent *BSD releases) -@@ -116,24 +116,24 @@ +@@ -119,24 +118,24 @@ #DEFINES += -DCF_NO_LOCALE # On some other systems you may something like this: @@ -93,7 +112,7 @@ EXPORT_DYNAMIC=-Xlinker --export-dynamic # The following options are mainly for development use and can be used -@@ -147,7 +147,7 @@ +@@ -150,7 +149,7 @@ #POSIX_SOURCE=-D_POSIX_SOURCE # Most systems diff -ruN x11-wm/ion-3ds.orig/pkg-plist x11-wm/ion-3ds/pkg-plist --- x11-wm/ion-3ds.orig/pkg-plist Thu Nov 2 18:57:11 2006 +++ x11-wm/ion-3ds/pkg-plist Thu Nov 2 19:06:18 2006 @@ -1,18 +1,16 @@ bin/ion3 bin/pwm3 etc/ion3/cfg_dock.lua -etc/ion3/cfg_floatws.lua etc/ion3/cfg_ion.lua etc/ion3/cfg_ioncore.lua -etc/ion3/cfg_ionws.lua etc/ion3/cfg_kludges.lua etc/ion3/cfg_menu.lua etc/ion3/cfg_modules.lua -etc/ion3/cfg_panews.lua etc/ion3/cfg_pwm.lua etc/ion3/cfg_query.lua 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 @@ -37,30 +35,26 @@ lib/ion3/lc/ioncore_wd.lc lib/ion3/lc/ioncore_winprops.lc lib/ion3/lc/mod_dock.lc -lib/ion3/lc/mod_floatws.lc -lib/ion3/lc/mod_ionws.lc lib/ion3/lc/mod_menu.lc lib/ion3/lc/mod_mgmtmode.lc -lib/ion3/lc/mod_panews.lc lib/ion3/lc/mod_query.lc lib/ion3/lc/mod_query_chdir.lc lib/ion3/lc/mod_sm.lc lib/ion3/lc/mod_sp.lc lib/ion3/lc/mod_statusbar.lc +lib/ion3/lc/mod_tiling.lc lib/ion3/lc/statusd_date.lc lib/ion3/lc/statusd_load.lc lib/ion3/lc/statusd_mail.lc lib/ion3/mod/de.so lib/ion3/mod/mod_dock.so -lib/ion3/mod/mod_floatws.so -lib/ion3/mod/mod_ionws.so lib/ion3/mod/mod_menu.so lib/ion3/mod/mod_mgmtmode.so -lib/ion3/mod/mod_panews.so lib/ion3/mod/mod_query.so lib/ion3/mod/mod_sm.so lib/ion3/mod/mod_sp.so lib/ion3/mod/mod_statusbar.so +lib/ion3/mod/mod_tiling.so %%DOCSDIR%%/ChangeLog %%DOCSDIR%%/LICENSE %%DOCSDIR%%/README >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611022019.kA2KJbAQ079206>