diff options
Diffstat (limited to 'wm')
-rw-r--r-- | wm/Makefile | 3 | ||||
-rw-r--r-- | wm/ion3-devel/DESCR | 3 | ||||
-rw-r--r-- | wm/ion3-devel/Makefile | 54 | ||||
-rw-r--r-- | wm/ion3-devel/PLIST | 84 | ||||
-rw-r--r-- | wm/ion3-devel/distinfo | 15 | ||||
-rw-r--r-- | wm/ion3-devel/patches/patch-aa | 12 | ||||
-rw-r--r-- | wm/ion3-devel/patches/patch-ab | 12 | ||||
-rw-r--r-- | wm/ion3-devel/patches/patch-ac | 12 | ||||
-rw-r--r-- | wm/ion3-devel/patches/patch-ae | 12 | ||||
-rw-r--r-- | wm/ion3-devel/patches/patch-ag | 21 | ||||
-rw-r--r-- | wm/ion3-devel/patches/patch-ah | 16 | ||||
-rw-r--r-- | wm/ion3-devel/patches/patch-aj | 12 | ||||
-rw-r--r-- | wm/ion3-devel/patches/patch-ak | 13 | ||||
-rw-r--r-- | wm/ion3-devel/patches/patch-al | 64 | ||||
-rw-r--r-- | wm/ion3-devel/patches/patch-am | 13 |
15 files changed, 1 insertions, 345 deletions
diff --git a/wm/Makefile b/wm/Makefile index ef022cef5fd..22cfacb63dd 100644 --- a/wm/Makefile +++ b/wm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.98 2007/08/13 08:12:49 rillig Exp $ +# $NetBSD: Makefile,v 1.99 2007/10/28 12:31:53 tnn Exp $ # COMMENT= X11 window managers, configuration tools, and themes @@ -41,7 +41,6 @@ SUBDIR+= icewm SUBDIR+= icewm-imlib SUBDIR+= icewmconf SUBDIR+= ion -SUBDIR+= ion3-devel SUBDIR+= jwm SUBDIR+= larswm SUBDIR+= lwm diff --git a/wm/ion3-devel/DESCR b/wm/ion3-devel/DESCR deleted file mode 100644 index 0653e86618f..00000000000 --- a/wm/ion3-devel/DESCR +++ /dev/null @@ -1,3 +0,0 @@ -Ion is a window manager dividing the screen into frames rather than having -overlapping windows, much like the windows in Emacs. Navigation between -clients can be done solely using the keyboard without need for a mouse. diff --git a/wm/ion3-devel/Makefile b/wm/ion3-devel/Makefile deleted file mode 100644 index 7b7c3be0c6e..00000000000 --- a/wm/ion3-devel/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# $NetBSD: Makefile,v 1.25 2007/09/06 10:22:30 ghen Exp $ -# - -DISTNAME= ion-3rc-20070902 -PKGNAME= ${DISTNAME:S/-3rc-/3-/} -CATEGORIES= wm x11 -MASTER_SITES= http://modeemi.fi/~tuomov/dl/ -MASTER_SITES+= ${MASTER_SITE_FREEBSD_LOCAL:=philip/} - -MAINTAINER= philip@FreeBSD.org -HOMEPAGE= http://modeemi.fi/~tuomov/ion/ -COMMENT= Keyboard friendly tiling window manager - -PKG_INSTALLATION_TYPES= overwrite pkgviews -PKG_DESTDIR_SUPPORT= user-destdir - -USE_TOOLS+= gmake msgfmt -USE_PKGLOCALEDIR= YES - -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} -CONFIGURE_ENV+= PKGLOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale - -PKG_SYSCONFSUBDIR= ion3 -EGDIR= ${PREFIX}/share/examples/ion3 -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_cleanviolet.lua look_dusky.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 - -INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX} - -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "Linux" -MAKE_ENV+= PKGSRC_LIBRT=-lrt -.endif - -.include "../../devel/gettext-lib/buildlink3.mk" -.include "../../lang/lua/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" -.include "../../x11/libX11/buildlink3.mk" -.include "../../x11/libSM/buildlink3.mk" -.include "../../x11/libXext/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/wm/ion3-devel/PLIST b/wm/ion3-devel/PLIST deleted file mode 100644 index c12cc815f8e..00000000000 --- a/wm/ion3-devel/PLIST +++ /dev/null @@ -1,84 +0,0 @@ -@comment $NetBSD: PLIST,v 1.7 2007/08/06 09:52:31 ghen Exp $ -bin/ion3 -bin/pwm3 -lib/ion3/bin/ion-completefile -lib/ion3/bin/ion-statusd -lib/ion3/lc/de.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_menu.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_menu.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/fi/man1/ion3.1 -man/fi/man1/pwm3.1 -man/man1/ion3.1 -man/man1/pwm3.1 -share/doc/ion3/ChangeLog -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_ion.lua -share/examples/ion3/cfg_ioncore.lua -share/examples/ion3/cfg_kludges.lua -share/examples/ion3/cfg_layouts.lua -share/examples/ion3/cfg_menu.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.fi.txt -share/ion3/welcome.txt -share/locale/cs/LC_MESSAGES/ion3.mo -share/locale/fi/LC_MESSAGES/ion3.mo -share/locale/fr/LC_MESSAGES/ion3.mo -@dirrm share/ion3 -@dirrm share/examples/ion3 -@dirrm share/doc/ion3 -@dirrm lib/ion3/mod -@dirrm lib/ion3/lc -@dirrm lib/ion3/bin -@dirrm lib/ion3 diff --git a/wm/ion3-devel/distinfo b/wm/ion3-devel/distinfo deleted file mode 100644 index 3ad62af47a2..00000000000 --- a/wm/ion3-devel/distinfo +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: distinfo,v 1.10 2007/09/06 10:22:31 ghen Exp $ - -SHA1 (ion-3rc-20070902.tar.gz) = 24762d3677cc64754b4649d24c8fb17aa78156d2 -RMD160 (ion-3rc-20070902.tar.gz) = abca8f424869cc78d8880c869981c796c8e7dd83 -Size (ion-3rc-20070902.tar.gz) = 655566 bytes -SHA1 (patch-aa) = 16c548331f747c1cfbfa94b6241128afffdb10fb -SHA1 (patch-ab) = f16cb96af26a779398fc791b1381b34ec4526794 -SHA1 (patch-ac) = d36125e5e9ad91d1e26e4e54b9ab819d7413354a -SHA1 (patch-ae) = 7a81f82b6d7f1aebd5f4d07cb778392cb61c4f19 -SHA1 (patch-ag) = 9db03d4511e77390f51c917ebcc2f403773ca649 -SHA1 (patch-ah) = b30b29fb383838c9008920dfc0435f7a815f963f -SHA1 (patch-aj) = 08e04586bd0432ea1242ea16d3ab3edf72e34ec1 -SHA1 (patch-ak) = e55342e8bea6a4c6c05a1af2018df466161114b3 -SHA1 (patch-al) = d80745093f26a94d900e4bdddbb5a4c9d9e07191 -SHA1 (patch-am) = 6a55713477b0408ce4700762558116f53da0084e diff --git a/wm/ion3-devel/patches/patch-aa b/wm/ion3-devel/patches/patch-aa deleted file mode 100644 index e7c5702e2fe..00000000000 --- a/wm/ion3-devel/patches/patch-aa +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2007/07/12 13:54:02 joerg Exp $ - ---- 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 tiling.c placement.c split.c split-stdisp.c \ - splitfloat.c panehandle.c ops.c diff --git a/wm/ion3-devel/patches/patch-ab b/wm/ion3-devel/patches/patch-ab deleted file mode 100644 index 84f3fdd153a..00000000000 --- a/wm/ion3-devel/patches/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2007/07/12 13:54:02 joerg Exp $ - ---- 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) -+LIBS += $(LIBTU_LIBS) - - SOURCES = main.c statusbar.c draw.c - diff --git a/wm/ion3-devel/patches/patch-ac b/wm/ion3-devel/patches/patch-ac deleted file mode 100644 index 6818d4828ee..00000000000 --- a/wm/ion3-devel/patches/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2007/08/06 09:52:31 ghen Exp $ - ---- 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_newviolet.lua $(ETCDIR)/look.lua -+ rm -f $(EXDIR)/look.lua -+ ln -s look_newviolet.lua $(EXDIR)/look.lua diff --git a/wm/ion3-devel/patches/patch-ae b/wm/ion3-devel/patches/patch-ae deleted file mode 100644 index 54a5c7972ef..00000000000 --- a/wm/ion3-devel/patches/patch-ae +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ae,v 1.5 2007/07/12 13:54:03 joerg Exp $ - ---- 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 - - ifeq ($(PRELOAD_MODULES),1) diff --git a/wm/ion3-devel/patches/patch-ag b/wm/ion3-devel/patches/patch-ag deleted file mode 100644 index 81f7c03674f..00000000000 --- a/wm/ion3-devel/patches/patch-ag +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ag,v 1.5 2007/07/12 13:54:03 joerg Exp $ - ---- 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 - - ifeq ($(PRELOAD_MODULES),1) -@@ -45,7 +46,7 @@ - -DLCDIR=\"$(LCDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\" - - ifndef PWM_ETCDIR --PWM_ETCDIR = $(ETCDIR) -+PWM_ETCDIR = $(EXDIR) - else - DEFINES += -DPWM_ETCDIR=\"$(PWM_ETCDIR)\" - endif diff --git a/wm/ion3-devel/patches/patch-ah b/wm/ion3-devel/patches/patch-ah deleted file mode 100644 index 18591cc4c7f..00000000000 --- a/wm/ion3-devel/patches/patch-ah +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ah,v 1.3 2007/07/12 13:54:03 joerg Exp $ - ---- 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: -- $(INSTALLDIR) $(ETCDIR) -+ $(INSTALLDIR) $(EXDIR) - for i in $(ETC); do \ -- $(INSTALL) -m $(DATA_MODE) $$i $(ETCDIR); \ -+ $(INSTALL) -m $(DATA_MODE) $$i $(EXDIR); \ - done - - # Dependencies diff --git a/wm/ion3-devel/patches/patch-aj b/wm/ion3-devel/patches/patch-aj deleted file mode 100644 index 7d4cbe6aa2f..00000000000 --- a/wm/ion3-devel/patches/patch-aj +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aj,v 1.2 2007/07/12 13:54:04 joerg Exp $ - ---- 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 -+LIBS += $(INTL_LIBS) - CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE) - - DEFINES += -DETCDIR=\"$(ETCDIR)\" -DSHAREDIR=\"$(SHAREDIR)\" \ diff --git a/wm/ion3-devel/patches/patch-ak b/wm/ion3-devel/patches/patch-ak deleted file mode 100644 index 2e183f3d345..00000000000 --- a/wm/ion3-devel/patches/patch-ak +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ak,v 1.3 2007/08/06 09:52:31 ghen Exp $ - ---- 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) $(C99_SOURCE) - diff --git a/wm/ion3-devel/patches/patch-al b/wm/ion3-devel/patches/patch-al deleted file mode 100644 index 34de5fbe461..00000000000 --- a/wm/ion3-devel/patches/patch-al +++ /dev/null @@ -1,64 +0,0 @@ -$NetBSD: patch-al,v 1.4 2007/07/12 13:54:04 joerg Exp $ - ---- system.mk.orig 2007-07-08 09:37:38.000000000 +0000 -+++ system.mk -@@ -7,7 +7,7 @@ - ## Installation paths - ## - --PREFIX=/usr/local -+EXDIR= ${PREFIX}/share/examples/ion3 - - # 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 - # Some .lua files and ion-* shell scripts - SHAREDIR=$(PREFIX)/share/ion3 - # Manual pages --MANDIR=$(PREFIX)/share/man -+MANDIR=$(PREFIX)/man - # Some documents - DOCDIR=$(PREFIX)/share/doc/ion3 - # Nothing at the moment -@@ -47,7 +47,7 @@ LOCALEDIR=$(PREFIX)/share/locale - #PRELOAD_MODULES=1 - - # Flags to link with libdl. --DL_LIBS=-ldl -+DL_LIBS= ${BUILDLINK_LDADD.dl} - - - ## -@@ -56,7 +56,7 @@ DL_LIBS=-ldl - - # If you have installed Lua 5.1 from the official tarball without changing - # paths, this should do it. --LUA_DIR=/usr/local -+LUA_DIR=${PREFIX} - LUA_LIBS = -L$(LUA_DIR)/lib -llua - LUA_INCLUDES = -I$(LUA_DIR)/include - LUA=$(LUA_DIR)/bin/lua -@@ -114,9 +114,10 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WOR - # On some other systems you may something like this: - #EXTRA_LIBS += -lintl - #EXTRA_INCLUDES += -+EXTRA_LIBS += -lintl - - # clock_gettime for monotonic time --EXTRA_LIBS += -lrt -+EXTRA_LIBS += ${PKGSRC_LIBRT} - - - ## -@@ -131,9 +132,9 @@ WARN= -W -Wimplicit -Wreturn-type -Wswit - -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) - - # The following options are mainly for development use and can be used - # to check that the code seems to conform to some standards. Depending diff --git a/wm/ion3-devel/patches/patch-am b/wm/ion3-devel/patches/patch-am deleted file mode 100644 index 0afea50dbc4..00000000000 --- a/wm/ion3-devel/patches/patch-am +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-am,v 1.2 2007/07/12 13:54:04 joerg Exp $ - ---- 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. - */ - -+#include <locale.h> -+#include <signal.h> - #include <string.h> - #include <unistd.h> - #include <sys/types.h> |