Subject: Re: pkg/36108 ([patch] Update pkgsrc/wm/ion3-devel to 20070203)
To: None <joerg@NetBSD.org, gnats-admin@netbsd.org, pkgsrc-bugs@netbsd.org,>
From: Philip Paeps <philip@paeps.cx>
List: pkgsrc-bugs
Date: 06/13/2007 12:40:04
The following reply was made to PR pkg/36108; it has been noted by GNATS.
From: Philip Paeps <philip@paeps.cx>
To: gnats-bugs@NetBSD.org
Cc:
Subject: Re: pkg/36108 ([patch] Update pkgsrc/wm/ion3-devel to 20070203)
Date: Wed, 13 Jun 2007 14:35:02 +0200
--O3RTKUHj+75w1tg5
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
On 2007-06-04 10:14:42 (+0200), Philip Paeps <philip@paeps.cx> wrote:
> Attached is a patch to update the package to 20070318, which has also been
> sitting locally for a while. I might get around to updating to ion-3rc,
> which is newer, "soon", but in the mean time, this patch would be very nice
> to have in the tree.
Attached.
Since this is a release candidate, now is probably a good time to repo-copy
the wm/ion3-devel package to wm/ion3. After release candidates, the -devel
suffix is a bit redundant.
Cheers,
- Philip
--
Philip Paeps 100% recycled electrons
philip@paeps.cx
Real programmers don't eat muffins.
--O3RTKUHj+75w1tg5
Content-Type: text/x-diff; charset=utf-8
Content-Disposition: attachment; filename="ion-3rc-20070608.diff"
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/wm/ion3-devel/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile 6 Nov 2006 11:33:52 -0000 1.21
+++ Makefile 13 Jun 2007 12:30:55 -0000
@@ -1,9 +1,8 @@
# $NetBSD: Makefile,v 1.21 2006/11/06 11:33:52 joerg Exp $
#
-DISTNAME= ion-3ds-20060524
+DISTNAME= ion-3rc-20070608
PKGNAME= ${DISTNAME:S/-3ds-/3-/}
-PKGREVISION= 1
CATEGORIES= wm x11
MASTER_SITES= http://modeemi.fi/~tuomov/dl/
@@ -22,17 +21,17 @@
PKG_SYSCONFSUBDIR= ion3
EGDIR= ${PREFIX}/share/examples/ion3
-EGFILES= cfg_dock.lua cfg_floatws.lua cfg_ion.lua \
- cfg_ioncore.lua cfg_ionws.lua cfg_kludges.lua \
- cfg_menu.lua cfg_modules.lua cfg_panews.lua \
- cfg_pwm.lua cfg_query.lua cfg_sp.lua \
- cfg_statusbar.lua \
+EGFILES= cfg_defaults.lua cfg_dock.lua cfg_ioncore.lua \
+ cfg_ion.lua cfg_kludges.lua cfg_layouts.lua \
+ cfg_menu.lua cfg_pwm.lua cfg_query.lua \
+ cfg_sp.lua cfg_statusbar.lua cfg_tiling.lua \
look.lua look_brownsteel.lua \
- look_clean.lua look_cleanios.lua \
+ look_clean.lua look_cleanios.lua \
look_cleanviolet.lua look_dusky.lua \
- look_greyviolet.lua look_ios.lua \
- look_simpleblue.lua \
- lookcommon_clean.lua lookcommon_emboss.lua
+ look_greenlight.lua look_greyviolet.lua \
+ look_ios.lua look_newviolet.lua \
+ look_simpleblue.lua lookcommon_clean.lua \
+ lookcommon_emboss.lua
.for f in ${EGFILES}
CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
.endfor
@@ -44,6 +43,5 @@
.include "../../x11/xextproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libXinerama/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/wm/ion3-devel/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- PLIST 14 Aug 2006 22:42:04 -0000 1.4
+++ PLIST 13 Jun 2007 12:30:55 -0000
@@ -4,44 +4,36 @@
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
lib/ion3/lc/ioncore_luaext.lc
lib/ion3/lc/ioncore_menudb.lc
lib/ion3/lc/ioncore_misc.lc
+lib/ion3/lc/ioncore_tabnum.lc
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_query.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
man/cs/man1/ion3.1
man/cs/man1/pwm3.1
-man/de/man1/ion3.1
-man/de/man1/pwm3.1
man/fi/man1/ion3.1
man/fi/man1/pwm3.1
man/man1/ion3.1
@@ -50,44 +42,42 @@
share/doc/ion3/LICENSE
share/doc/ion3/README
share/doc/ion3/RELNOTES
+share/examples/ion3/cfg_defaults.lua
share/examples/ion3/cfg_dock.lua
-share/examples/ion3/cfg_floatws.lua
-share/examples/ion3/cfg_ion.lua
share/examples/ion3/cfg_ioncore.lua
-share/examples/ion3/cfg_ionws.lua
+share/examples/ion3/cfg_ion.lua
share/examples/ion3/cfg_kludges.lua
+share/examples/ion3/cfg_layouts.lua
share/examples/ion3/cfg_menu.lua
-share/examples/ion3/cfg_modules.lua
-share/examples/ion3/cfg_panews.lua
share/examples/ion3/cfg_pwm.lua
share/examples/ion3/cfg_query.lua
share/examples/ion3/cfg_sp.lua
share/examples/ion3/cfg_statusbar.lua
+share/examples/ion3/cfg_tiling.lua
share/examples/ion3/look.lua
share/examples/ion3/look_brownsteel.lua
share/examples/ion3/look_clean.lua
share/examples/ion3/look_cleanios.lua
share/examples/ion3/look_cleanviolet.lua
share/examples/ion3/look_dusky.lua
+share/examples/ion3/look_greenlight.lua
share/examples/ion3/look_greyviolet.lua
share/examples/ion3/look_ios.lua
+share/examples/ion3/look_newviolet.lua
share/examples/ion3/look_simpleblue.lua
share/examples/ion3/lookcommon_clean.lua
share/examples/ion3/lookcommon_emboss.lua
share/ion3/ion-completeman
share/ion3/ion-runinxterm
share/ion3/welcome.cs.txt
-share/ion3/welcome.de.txt
share/ion3/welcome.fi.txt
share/ion3/welcome.txt
share/locale/cs/LC_MESSAGES/ion3.mo
-share/locale/de/LC_MESSAGES/ion3.mo
share/locale/fi/LC_MESSAGES/ion3.mo
-share/locale/ru/LC_MESSAGES/ion3.mo
@dirrm share/ion3
@dirrm share/examples/ion3
@dirrm share/doc/ion3
-@dirrm lib/ion3/bin
@dirrm lib/ion3/mod
@dirrm lib/ion3/lc
+@dirrm lib/ion3/bin
@dirrm lib/ion3
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/wm/ion3-devel/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo 3 Nov 2006 07:02:23 -0000 1.7
+++ distinfo 13 Jun 2007 12:30:56 -0000
@@ -1,17 +1,15 @@
$NetBSD: distinfo,v 1.7 2006/11/03 07:02:23 wiz Exp $
-SHA1 (ion-3ds-20060524.tar.gz) = 65b6bb55205e9c16f02438e3586876416222999e
-RMD160 (ion-3ds-20060524.tar.gz) = 97a86785437fce3ba91e8edfbd412e199415f545
-Size (ion-3ds-20060524.tar.gz) = 620416 bytes
-SHA1 (patch-aa) = 2d818efecf435904ac61dd6396d841db438dc2bf
-SHA1 (patch-ab) = 80a2649065db9e8a6ac59c6d7bf589175b63332c
-SHA1 (patch-ac) = 7f10320ad611bcc92c7db37e475e086be7e14074
-SHA1 (patch-ad) = 75883f474d16cda265c58784ad60c61a5eed98c7
-SHA1 (patch-ae) = 763c5b24fa8f4ba3c6f09d547714a95e87a864ac
-SHA1 (patch-ag) = 0a4e7a5b0afc8393e5085898cc3ec782fb07d005
-SHA1 (patch-ah) = 185eb5a98967976ef2a1532bd515af52f145984d
-SHA1 (patch-ai) = 0d2e440163caceb8e5dd7a88548569083cd16653
-SHA1 (patch-aj) = d9a2f02f7b560bd950290758a980d72780fdfca0
-SHA1 (patch-ak) = 4f7a8dffb06aa03aaebcf645b22b93ef4e0fe2bc
-SHA1 (patch-al) = ee48b28578c8c5168f7b40e6b9bdfe8cf38facb3
-SHA1 (patch-am) = 0ff629d6b9f60760e10fa30c23ccbe24dac284b1
+SHA1 (ion-3rc-20070608.tar.gz) = e6a8afa4b177bcd95d6dd79b7f8f8e268738c7bf
+RMD160 (ion-3rc-20070608.tar.gz) = 41fd6d581e27770e63f7bc66122684d8c11667f2
+Size (ion-3rc-20070608.tar.gz) = 655442 bytes
+SHA1 (patch-aa) = 16c548331f747c1cfbfa94b6241128afffdb10fb
+SHA1 (patch-ab) = f16cb96af26a779398fc791b1381b34ec4526794
+SHA1 (patch-ac) = cf0194f39d4823ea890e7afa66485565acb30684
+SHA1 (patch-ae) = 7a81f82b6d7f1aebd5f4d07cb778392cb61c4f19
+SHA1 (patch-ag) = 9db03d4511e77390f51c917ebcc2f403773ca649
+SHA1 (patch-ah) = b30b29fb383838c9008920dfc0435f7a815f963f
+SHA1 (patch-aj) = 08e04586bd0432ea1242ea16d3ab3edf72e34ec1
+SHA1 (patch-ak) = e3951c02a5b70e9ff8ec00567f27bc5a96575e25
+SHA1 (patch-al) = d6a2d2167fcd9971f881a9af6373a6f33609e603
+SHA1 (patch-am) = 6a55713477b0408ce4700762558116f53da0084e
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/wm/ion3-devel/patches/patch-aa,v
retrieving revision 1.3
diff -u -r1.3 patch-aa
--- patches/patch-aa 20 Sep 2006 13:25:25 -0000 1.3
+++ patches/patch-aa 13 Jun 2007 12:30:56 -0000
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.3 2006/09/20 13:25:25 joerg Exp $
+$NetBSD$
---- mod_ionws/Makefile.orig 2006-09-20 13:50:46.000000000 +0200
-+++ mod_ionws/Makefile
-@@ -10,6 +10,7 @@ include $(TOPDIR)/system-inc.mk
+--- mod_tiling/Makefile.orig 2007-03-30 12:00:17.325708691 +0200
++++ mod_tiling/Makefile 2007-03-30 12:01:07.915538829 +0200
+@@ -10,6 +10,7 @@
INCLUDES += $(X11_INCLUDES) $(LIBTU_INCLUDES) $(LIBEXTL_INCLUDES) -I..
CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE)
+LIBS += $(LIBTU_LIBS)
- SOURCES=main.c ionws.c placement.c split.c split-stdisp.c \
- splitfloat.c panehandle.c
+ SOURCES=main.c tiling.c placement.c split.c split-stdisp.c \
+ splitfloat.c panehandle.c ops.c
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/wm/ion3-devel/patches/patch-ab,v
retrieving revision 1.3
diff -u -r1.3 patch-ab
--- patches/patch-ab 20 Sep 2006 13:25:25 -0000 1.3
+++ patches/patch-ab 13 Jun 2007 12:30:56 -0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2006/09/20 13:25:25 joerg Exp $
+$NetBSD$
---- mod_statusbar/Makefile.orig 2006-09-20 13:50:29.000000000 +0200
-+++ mod_statusbar/Makefile
-@@ -10,6 +10,7 @@ include $(TOPDIR)/system-inc.mk
+--- mod_statusbar/Makefile.orig 2007-03-30 12:01:40.796229869 +0200
++++ mod_statusbar/Makefile 2007-03-30 12:01:59.324238660 +0200
+@@ -10,6 +10,7 @@
INCLUDES += $(X11_INCLUDES) $(LIBTU_INCLUDES) $(LIBEXTL_INCLUDES) -I..
CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE)
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/wm/ion3-devel/patches/patch-ac,v
retrieving revision 1.2
diff -u -r1.2 patch-ac
--- patches/patch-ac 14 Aug 2006 22:42:04 -0000 1.2
+++ patches/patch-ac 13 Jun 2007 12:30:56 -0000
@@ -1,12 +1,10 @@
-$NetBSD: patch-ac,v 1.2 2006/08/14 22:42:04 wiz Exp $
-
---- etc/Makefile.orig 2006-05-24 16:23:26.000000000 +0000
-+++ etc/Makefile
-@@ -23,5 +23,5 @@ include $(TOPDIR)/rules.mk
+--- etc/Makefile.orig 2007-06-04 09:17:40.000000000 +0200
++++ etc/Makefile 2007-06-04 09:17:59.000000000 +0200
+@@ -26,5 +26,5 @@
######################################
_install: etc_install
- rm -f $(ETCDIR)/look.lua
-- ln -s look_cleanviolet.lua $(ETCDIR)/look.lua
+- ln -s look_newviolet.lua $(ETCDIR)/look.lua
+ rm -f $(EXDIR)/look.lua
-+ ln -s look_cleanviolet.lua $(EXDIR)/look.lua
++ ln -s look_newviolet.lua $(EXDIR)/look.lua
Index: patches/patch-ad
===================================================================
RCS file: patches/patch-ad
diff -N patches/patch-ad
--- patches/patch-ad 14 Aug 2006 22:42:04 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,45 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2006/08/14 22:42:04 wiz Exp $
-
---- mod_statusbar/ion-statusd/statusd_load.lua.orig 2006-05-24 16:23:26.000000000 +0000
-+++ mod_statusbar/ion-statusd/statusd_load.lua
-@@ -42,7 +42,7 @@ end
- local function get_load_uptime()
- local f=io.popen('uptime', 'r')
- if not f then
-- return "??"
-+ return ""
- end
- local s=f:read('*l')
- f:close()
-@@ -50,11 +50,30 @@ local function get_load_uptime()
- return (load or "")
- end
-
-+local function get_load_sysctl()
-+ local f=io.popen('sysctl -n vm.loadavg', 'r')
-+ if not f then
-+ return ""
-+ end
-+ local s=f:read('*l')
-+ f:close()
-+ local st, en, load=string.find(s, '^\{? ?(%d+%.%d+) %d+%.%d+ %d+%.%d+ ?\}?$')
-+ return (load or "")
-+end
-+
-+local function get_load_na()
-+ return "(n/a)"
-+end
-+
- local function detect_load_fn()
- if get_load_proc()~="" then
- return get_load_proc
-- else
-+ elseif get_load_uptime()~="" then
- return get_load_uptime
-+ elseif get_load_sysctl()~="" then
-+ return get_load_sysctl
-+ else
-+ return get_load_na
- end
- end
-
Index: patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/wm/ion3-devel/patches/patch-ae,v
retrieving revision 1.4
diff -u -r1.4 patch-ae
--- patches/patch-ae 14 Aug 2006 22:42:04 -0000 1.4
+++ patches/patch-ae 13 Jun 2007 12:30:56 -0000
@@ -1,16 +1,12 @@
-$NetBSD: patch-ae,v 1.4 2006/08/14 22:42:04 wiz Exp $
+$NetBSD$
---- ion/Makefile.orig 2006-05-24 16:23:26.000000000 +0000
-+++ ion/Makefile
-@@ -15,9 +15,10 @@ INCLUDES += $(X11_INCLUDES)
- INCLUDES += $(LIBMAINLOOP_INCLUDES) $(LIBTU_INCLUDES) $(LIBEXTL_INCLUDES)
- INCLUDES += -I..
-
--LIBS += $(X11_LIBS) $(XINERAMA_LIBS)
-+LIBS += $(XINERAMA_LIBS) $(X11_LIBS)
+--- ion/Makefile.orig 2007-03-30 12:06:53.097843787 +0200
++++ ion/Makefile 2007-03-30 12:07:12.744676273 +0200
+@@ -22,6 +22,7 @@
+ LIBS += $(X11_LIBS)
LIBS += $(WHOLEA) $(LIBMAINLOOP_LIBS) $(LIBEXTL_LIBS) $(LIBTU_LIBS) $(NO_WHOLEA)
LIBS += $(LUA_LIBS) $(DL_LIBS)
+LIBS += $(INTL_LIBS)
LIBS += -lm
- EXT_OBJS += ../ioncore/ioncore.a
+ ifeq ($(PRELOAD_MODULES),1)
Index: patches/patch-ag
===================================================================
RCS file: /cvsroot/pkgsrc/wm/ion3-devel/patches/patch-ag,v
retrieving revision 1.4
diff -u -r1.4 patch-ag
--- patches/patch-ag 14 Aug 2006 22:42:04 -0000 1.4
+++ patches/patch-ag 13 Jun 2007 12:30:56 -0000
@@ -1,20 +1,16 @@
-$NetBSD: patch-ag,v 1.4 2006/08/14 22:42:04 wiz Exp $
+$NetBSD$
---- pwm/Makefile.orig 2006-05-24 16:23:26.000000000 +0000
-+++ pwm/Makefile
-@@ -15,9 +15,10 @@ INCLUDES += $(X11_INCLUDES)
- INCLUDES += $(LIBMAINLOOP_INCLUDES) $(LIBTU_INCLUDES) $(LIBEXTL_INCLUDES)
- INCLUDES += -I..
-
--LIBS += $(X11_LIBS) $(XINERAMA_LIBS)
-+LIBS += $(XINERAMA_LIBS) $(X11_LIBS)
+--- pwm/Makefile.orig 2007-03-30 13:16:57.980722339 +0200
++++ pwm/Makefile 2007-03-30 13:18:00.912597331 +0200
+@@ -24,6 +24,7 @@
+ LIBS += $(X11_LIBS)
LIBS += $(WHOLEA) $(LIBMAINLOOP_LIBS) $(LIBEXTL_LIBS) $(LIBTU_LIBS) $(NO_WHOLEA)
LIBS += $(LUA_LIBS) $(DL_LIBS)
+LIBS += $(INTL_LIBS)
LIBS += -lm
- EXT_OBJS += ../ioncore/ioncore.a
-@@ -27,7 +28,7 @@ DEFINES += -DETCDIR=\"$(ETCDIR)\" -DSHAR
+ ifeq ($(PRELOAD_MODULES),1)
+@@ -45,7 +46,7 @@
-DLCDIR=\"$(LCDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\"
ifndef PWM_ETCDIR
Index: patches/patch-ah
===================================================================
RCS file: /cvsroot/pkgsrc/wm/ion3-devel/patches/patch-ah,v
retrieving revision 1.2
diff -u -r1.2 patch-ah
--- patches/patch-ah 14 Aug 2006 22:42:04 -0000 1.2
+++ patches/patch-ah 13 Jun 2007 12:30:56 -0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.2 2006/08/14 22:42:04 wiz Exp $
+$NetBSD$
---- rules.mk.orig 2006-05-24 16:23:26.000000000 +0000
-+++ rules.mk
-@@ -153,9 +153,9 @@ lc_install:
+--- build/rules.mk.orig 2007-03-30 14:59:23.167755140 +0200
++++ build/rules.mk 2007-03-30 14:59:43.807466807 +0200
+@@ -153,9 +153,9 @@
done
etc_install:
Index: patches/patch-ai
===================================================================
RCS file: patches/patch-ai
diff -N patches/patch-ai
--- patches/patch-ai 4 Oct 2004 20:50:57 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2004/10/04 20:50:57 cube Exp $
-
---- system-ac.mk.in.orig 2004-09-06 20:25:27.000000000 +0200
-+++ system-ac.mk.in
-@@ -16,11 +16,11 @@ exec_prefix=@exec_prefix@
- # Main binaries
- BINDIR=@bindir@
- # Configuration .lua files
--ETCDIR=@sysconfdir@/@PACKAGE_TARNAME@
-+ETCDIR=@sysconfdir@
- # Some .lua files and ion-* shell scripts
- SHAREDIR=@datadir@/@PACKAGE_TARNAME@
- # Manual pages
--MANDIR=@datadir@/man
-+MANDIR=@prefix@/man
- # Some documents
- DOCDIR=@datadir@/doc/@PACKAGE_TARNAME@
- # Nothing at the moment
-@@ -37,7 +37,8 @@ EXTRABINDIR=@libexecdir@/@PACKAGE_TARNAM
- #VARDIR=@localstatedir@/cache/@PACKAGE_TARNAME@
- VARDIR=/var/cache/@PACKAGE_TARNAME@
- # Message catalogs
--LOCALEDIR=@prefix@/share/locale
-+LOCALEDIR=@PKGLOCALEDIR@
-+EXDIR=@datadir@/examples/@PACKAGE_TARNAME@
-
-
- ##
-@@ -50,6 +51,7 @@ PRELOAD_MODULES=@PRELOAD_MODULES@
-
- # Flags to link with libdl.
- DL_LIBS=@DL_LIBS@
-+INTL_LIBS=@INTL_LIBS@
-
-
- ##
Index: patches/patch-aj
===================================================================
RCS file: /cvsroot/pkgsrc/wm/ion3-devel/patches/patch-aj,v
retrieving revision 1.1
diff -u -r1.1 patch-aj
--- patches/patch-aj 11 Feb 2006 10:03:48 -0000 1.1
+++ patches/patch-aj 13 Jun 2007 12:30:56 -0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.1 2006/02/11 10:03:48 cube Exp $
+$NetBSD$
---- mod_statusbar/ion-statusd/Makefile.orig 2005-06-20 22:53:30.000000000 +0200
-+++ mod_statusbar/ion-statusd/Makefile
-@@ -10,6 +10,7 @@ include $(TOPDIR)/system-inc.mk
+--- mod_statusbar/ion-statusd/Makefile.orig 2007-03-30 13:22:35.881433415 +0200
++++ mod_statusbar/ion-statusd/Makefile 2007-03-30 13:23:18.168693657 +0200
+@@ -10,6 +10,7 @@
INCLUDES += $(LIBMAINLOOP_INCLUDES) $(LIBEXTL_INCLUDES) $(LIBTU_INCLUDES)
LIBS += $(LIBMAINLOOP_LIBS) $(LIBEXTL_LIBS) $(LIBTU_LIBS) $(LUA_LIBS) $(DL_LIBS) -lm
Index: patches/patch-ak
===================================================================
RCS file: /cvsroot/pkgsrc/wm/ion3-devel/patches/patch-ak,v
retrieving revision 1.1
diff -u -r1.1 patch-ak
--- patches/patch-ak 11 Feb 2006 10:03:48 -0000 1.1
+++ patches/patch-ak 13 Jun 2007 12:30:56 -0000
@@ -1,13 +1,11 @@
-$NetBSD: patch-ak,v 1.1 2006/02/11 10:03:48 cube Exp $
-
---- utils/ion-completefile/Makefile.orig 2005-06-20 22:56:47.000000000 +0200
-+++ utils/ion-completefile/Makefile
-@@ -8,7 +8,7 @@ include $(TOPDIR)/system-inc.mk
+--- utils/ion-completefile/Makefile.orig 2007-06-13 14:02:20.000000000 +0200
++++ utils/ion-completefile/Makefile 2007-06-13 14:03:01.000000000 +0200
+@@ -8,7 +8,7 @@
######################################
-LIBS += $(LIBTU_LIBS)
+LIBS += $(LIBTU_LIBS) $(INTL_LIBS)
INCLUDES += $(LIBTU_INCLUDES)
- CFLAGS += $(XOPEN_SOURCE)
+ CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE)
Index: patches/patch-al
===================================================================
RCS file: /cvsroot/pkgsrc/wm/ion3-devel/patches/patch-al,v
retrieving revision 1.3
diff -u -r1.3 patch-al
--- patches/patch-al 3 Nov 2006 07:02:23 -0000 1.3
+++ patches/patch-al 13 Jun 2007 12:30:56 -0000
@@ -1,7 +1,5 @@
-$NetBSD: patch-al,v 1.3 2006/11/03 07:02:23 wiz Exp $
-
---- system.mk.orig 2006-05-24 16:23:51.000000000 +0000
-+++ system.mk
+--- system.mk.orig 2007-06-13 14:05:37.000000000 +0200
++++ system.mk 2007-06-13 14:07:20.000000000 +0200
@@ -7,7 +7,7 @@
## Installation paths
##
@@ -11,7 +9,7 @@
# 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 @@ ETCDIR=$(PREFIX)/etc/ion3
+@@ -19,7 +19,7 @@
# Some .lua files and ion-* shell scripts
SHAREDIR=$(PREFIX)/share/ion3
# Manual pages
@@ -20,7 +18,7 @@
# Some documents
DOCDIR=$(PREFIX)/share/doc/ion3
# Nothing at the moment
-@@ -47,7 +47,7 @@ LOCALEDIR=$(PREFIX)/share/locale
+@@ -47,7 +47,7 @@
#PRELOAD_MODULES=1
# Flags to link with libdl.
@@ -29,7 +27,7 @@
##
-@@ -56,7 +56,7 @@ DL_LIBS=-ldl
+@@ -56,7 +56,7 @@
# If you have installed Lua 5.1 from the official tarball without changing
# paths, this should do it.
@@ -38,24 +36,23 @@
LUA_LIBS = -L$(LUA_DIR)/lib -llua
LUA_INCLUDES = -I$(LUA_DIR)/include
LUA=$(LUA_DIR)/bin/lua
-@@ -116,8 +116,7 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WOR
- #DEFINES += -DCF_NO_LOCALE
-
+@@ -114,6 +114,7 @@
# On some other systems you may something like this:
--#EXTRA_LIBS += -lintl
--#EXTRA_INCLUDES +=
-+INTL_LIBS += -lintl
-
-
- ##
-@@ -132,8 +131,8 @@ WARN= -W -Wimplicit -Wreturn-type -Wswit
+ #EXTRA_LIBS += -lintl
+ #EXTRA_INCLUDES +=
++EXTRA_LIBS += -lintl
+
+ # clock_gettime for monotonic time
+ EXTRA_LIBS += -lrt
+@@ -131,9 +132,9 @@
-Wtrigraphs -Wformat -Wchar-subscripts \
-Wparentheses -pedantic -Wuninitialized
-CFLAGS=-g -Os $(WARN) $(DEFINES) $(EXTRA_INCLUDES) $(INCLUDES)
-LDFLAGS=-g -Os $(EXTRA_LIBS) $(LIBS)
+ EXPORT_DYNAMIC=-Xlinker --export-dynamic
+CFLAGS+= $(WARN) $(DEFINES) $(EXTRA_INCLUDES) $(INCLUDES) -fPIC
+LDFLAGS+= $(EXTRA_LIBS) $(LIBS)
- EXPORT_DYNAMIC=-Xlinker --export-dynamic
# The following options are mainly for development use and can be used
+ # to check that the code seems to conform to some standards. Depending
Index: patches/patch-am
===================================================================
RCS file: /cvsroot/pkgsrc/wm/ion3-devel/patches/patch-am,v
retrieving revision 1.1
diff -u -r1.1 patch-am
--- patches/patch-am 11 Feb 2006 10:03:48 -0000 1.1
+++ patches/patch-am 13 Jun 2007 12:30:56 -0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-am,v 1.1 2006/02/11 10:03:48 cube Exp $
+$NetBSD$
---- mod_statusbar/ion-statusd/ion-statusd.c.orig 2005-09-29 10:50:12.000000000 +0200
-+++ mod_statusbar/ion-statusd/ion-statusd.c
+--- mod_statusbar/ion-statusd/ion-statusd.c.orig 2007-03-30 13:27:17.972480286 +0200
++++ mod_statusbar/ion-statusd/ion-statusd.c 2007-03-30 13:27:47.120836168 +0200
@@ -9,6 +9,8 @@
* (at your option) any later version.
*/
--O3RTKUHj+75w1tg5--