From 0aed1f171a5eb540d1625ec253e706aa08b591ee Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 8 Jan 2012 15:22:14 +0000 Subject: Initial import of notion-3.2011102900: Notion is a tiling, tabbed window manager for the X window system: Tiling: you divide the screen into non-overlapping 'tiles'. Every window occupies one tile, and is maximized to it Tabbing: a tile may contain multiple windows - they will be 'tabbed' Static: most tiled window managers are 'dynamic', meaning they automatically resize and move around tiles as windows appear and disappear. Notion, by contrast, does not automatically change the tiling. You're in control. --- wm/notion/DESCR | 12 +++++ wm/notion/Makefile | 64 +++++++++++++++++++++++++ wm/notion/PLIST | 85 ++++++++++++++++++++++++++++++++++ wm/notion/distinfo | 9 ++++ wm/notion/patches/patch-build_rules.mk | 19 ++++++++ wm/notion/patches/patch-libtu_output.c | 26 +++++++++++ wm/notion/patches/patch-pwm_Makefile | 17 +++++++ wm/notion/patches/patch-system.mk | 84 +++++++++++++++++++++++++++++++++ 8 files changed, 316 insertions(+) create mode 100644 wm/notion/DESCR create mode 100644 wm/notion/Makefile create mode 100644 wm/notion/PLIST create mode 100644 wm/notion/distinfo create mode 100644 wm/notion/patches/patch-build_rules.mk create mode 100644 wm/notion/patches/patch-libtu_output.c create mode 100644 wm/notion/patches/patch-pwm_Makefile create mode 100644 wm/notion/patches/patch-system.mk (limited to 'wm/notion') diff --git a/wm/notion/DESCR b/wm/notion/DESCR new file mode 100644 index 00000000000..3b5c2321b4b --- /dev/null +++ b/wm/notion/DESCR @@ -0,0 +1,12 @@ +Notion is a tiling, tabbed window manager for the X window system: + + Tiling: you divide the screen into non-overlapping 'tiles'. + Every window occupies one tile, and is maximized to it + + Tabbing: a tile may contain multiple windows - they will be + 'tabbed' + + Static: most tiled window managers are 'dynamic', meaning they + automatically resize and move around tiles as windows appear + and disappear. Notion, by contrast, does not automatically + change the tiling. You're in control. diff --git a/wm/notion/Makefile b/wm/notion/Makefile new file mode 100644 index 00000000000..f67758ced24 --- /dev/null +++ b/wm/notion/Makefile @@ -0,0 +1,64 @@ +# $NetBSD: Makefile,v 1.1.1.1 2012/01/08 15:22:14 wiz Exp $ +# + +DISTNAME= notion-3-2011102900-src +PKGNAME= ${DISTNAME:S/3-/3./:S/-src//} +CATEGORIES= wm +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=notion/} +EXTRACT_SUFX= .tar.bz2 + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://notion.sourceforge.net/ +COMMENT= Tiling window manager based on ion3 +LICENSE= ion-license AND gnu-lgpl-v2.1 + +PKG_DESTDIR_SUPPORT= user-destdir + +# notion is based on ion3 +CONFLICTS= ion3-[0-9]* + +WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} +USE_TOOLS+= gmake msgfmt pkg-config +MAKE_FLAGS+= X11_PREFIX=${BUILDLINK_PREFIX.libX11} + +EGDIR= ${PREFIX}/share/examples/notion +EGFILES= cfg_defaults.lua +EGFILES+= cfg_dock.lua +EGFILES+= cfg_kludges.lua +EGFILES+= cfg_layouts.lua +EGFILES+= cfg_menu.lua +EGFILES+= cfg_notion.lua +EGFILES+= cfg_notioncore.lua +EGFILES+= cfg_pwm.lua +EGFILES+= cfg_query.lua +EGFILES+= cfg_sp.lua +EGFILES+= cfg_statusbar.lua +EGFILES+= cfg_tiling.lua +EGFILES+= look.lua +EGFILES+= look_brownsteel.lua +EGFILES+= look_clean.lua +EGFILES+= look_cleanios.lua +EGFILES+= look_cleanviolet.lua +EGFILES+= look_dusky.lua +EGFILES+= look_greenlight.lua +EGFILES+= look_greyviolet.lua +EGFILES+= look_ios.lua +EGFILES+= look_newviolet.lua +EGFILES+= look_simpleblue.lua +EGFILES+= lookcommon_clean.lua +EGFILES+= lookcommon_emboss.lua + +PKG_SYSCONFSUBDIR= notion + +.for f in ${EGFILES} +CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} +.endfor + +.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/dlopen.buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/wm/notion/PLIST b/wm/notion/PLIST new file mode 100644 index 00000000000..0a52497d2f6 --- /dev/null +++ b/wm/notion/PLIST @@ -0,0 +1,85 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2012/01/08 15:22:14 wiz Exp $ +bin/notion +bin/pwm3plus +lib/notion/bin/ion-completefile +lib/notion/bin/ion-statusd +lib/notion/lc/de.lc +lib/notion/lc/ioncore_bindings.lc +lib/notion/lc/ioncore_efbb.lc +lib/notion/lc/ioncore_ext.lc +lib/notion/lc/ioncore_luaext.lc +lib/notion/lc/ioncore_menudb.lc +lib/notion/lc/ioncore_misc.lc +lib/notion/lc/ioncore_quasiact.lc +lib/notion/lc/ioncore_tabnum.lc +lib/notion/lc/ioncore_wd.lc +lib/notion/lc/ioncore_winprops.lc +lib/notion/lc/mod_dock.lc +lib/notion/lc/mod_menu.lc +lib/notion/lc/mod_query.lc +lib/notion/lc/mod_query_chdir.lc +lib/notion/lc/mod_sm.lc +lib/notion/lc/mod_sp.lc +lib/notion/lc/mod_statusbar.lc +lib/notion/lc/mod_tiling.lc +lib/notion/lc/mod_xinerama.lc +lib/notion/lc/mod_xkbevents.lc +lib/notion/lc/mod_xrandr.lc +lib/notion/lc/statusd_date.lc +lib/notion/lc/statusd_load.lc +lib/notion/lc/statusd_mail.lc +lib/notion/mod/de.so +lib/notion/mod/mod_dock.so +lib/notion/mod/mod_menu.so +lib/notion/mod/mod_query.so +lib/notion/mod/mod_sm.so +lib/notion/mod/mod_sp.so +lib/notion/mod/mod_statusbar.so +lib/notion/mod/mod_tiling.so +lib/notion/mod/mod_xinerama.so +lib/notion/mod/mod_xkbevents.so +lib/notion/mod/mod_xrandr.so +man/cs/man1/notion.1 +man/cs/man1/pwm3.1 +man/fi/man1/notion.1 +man/fi/man1/pwm3.1 +man/man1/notion.1 +man/man1/pwm3.1 +share/doc/notion/ChangeLog +share/doc/notion/LICENSE +share/doc/notion/README +share/doc/notion/RELNOTES +share/examples/notion/cfg_defaults.lua +share/examples/notion/cfg_dock.lua +share/examples/notion/cfg_kludges.lua +share/examples/notion/cfg_layouts.lua +share/examples/notion/cfg_menu.lua +share/examples/notion/cfg_notion.lua +share/examples/notion/cfg_notioncore.lua +share/examples/notion/cfg_pwm.lua +share/examples/notion/cfg_query.lua +share/examples/notion/cfg_sp.lua +share/examples/notion/cfg_statusbar.lua +share/examples/notion/cfg_tiling.lua +share/examples/notion/look.lua +share/examples/notion/look_brownsteel.lua +share/examples/notion/look_clean.lua +share/examples/notion/look_cleanios.lua +share/examples/notion/look_cleanviolet.lua +share/examples/notion/look_dusky.lua +share/examples/notion/look_greenlight.lua +share/examples/notion/look_greyviolet.lua +share/examples/notion/look_ios.lua +share/examples/notion/look_newviolet.lua +share/examples/notion/look_simpleblue.lua +share/examples/notion/lookcommon_clean.lua +share/examples/notion/lookcommon_emboss.lua +share/locale/cs/LC_MESSAGES/ion3.mo +share/locale/de/LC_MESSAGES/ion3.mo +share/locale/fi/LC_MESSAGES/ion3.mo +share/locale/fr/LC_MESSAGES/ion3.mo +share/notion/ion-completeman +share/notion/ion-runinxterm +share/notion/welcome.cs.txt +share/notion/welcome.fi.txt +share/notion/welcome.txt diff --git a/wm/notion/distinfo b/wm/notion/distinfo new file mode 100644 index 00000000000..d1ec10a5933 --- /dev/null +++ b/wm/notion/distinfo @@ -0,0 +1,9 @@ +$NetBSD: distinfo,v 1.1.1.1 2012/01/08 15:22:14 wiz Exp $ + +SHA1 (notion-3-2011102900-src.tar.bz2) = e9f76cee087d8deb7cdef36be160ec830289331a +RMD160 (notion-3-2011102900-src.tar.bz2) = afe2b0548a2651d8bb7333761d4842464f7bb2c9 +Size (notion-3-2011102900-src.tar.bz2) = 584767 bytes +SHA1 (patch-build_rules.mk) = f8321cea75a1dfb6187ce5229f85cfea7dc5c9a7 +SHA1 (patch-libtu_output.c) = e9e9e77f0c1ff196fefa887a51f647f0dee7df89 +SHA1 (patch-pwm_Makefile) = e614eb6aea7af2b526392e7b9c17d5be262bf569 +SHA1 (patch-system.mk) = fa439b406cf79b117118991095520380fb95a109 diff --git a/wm/notion/patches/patch-build_rules.mk b/wm/notion/patches/patch-build_rules.mk new file mode 100644 index 00000000000..7d263b68eac --- /dev/null +++ b/wm/notion/patches/patch-build_rules.mk @@ -0,0 +1,19 @@ +$NetBSD: patch-build_rules.mk,v 1.1.1.1 2012/01/08 15:22:14 wiz Exp $ + +Install lua config files to example directory; installed to proper +location via pkgsrc config framework. + +--- build/rules.mk.orig 2011-10-29 18:19:21.000000000 +0000 ++++ build/rules.mk +@@ -220,9 +220,9 @@ lc_install: + done + + etc_install: +- $(INSTALLDIR) $(DESTDIR)$(ETCDIR) ++ $(INSTALLDIR) $(DESTDIR)$(EXAMPLEDIR) + for i in $(ETC); do \ +- $(INSTALL) -m $(DATA_MODE) $$i $(DESTDIR)$(ETCDIR); \ ++ $(INSTALL) -m $(DATA_MODE) $$i $(DESTDIR)$(EXAMPLEDIR); \ + done + + # Dependencies diff --git a/wm/notion/patches/patch-libtu_output.c b/wm/notion/patches/patch-libtu_output.c new file mode 100644 index 00000000000..6f3f04d5973 --- /dev/null +++ b/wm/notion/patches/patch-libtu_output.c @@ -0,0 +1,26 @@ +$NetBSD: patch-libtu_output.c,v 1.1.1.1 2012/01/08 15:22:14 wiz Exp $ + +Do not use snprintf from libtu, modern systems have it. + +--- libtu/output.c.orig 2011-10-29 18:26:56.000000000 +0000 ++++ libtu/output.c +@@ -7,9 +7,6 @@ + * the Clarified Artistic License or the GNU LGPL, version 2.1 or later. + */ + +-#if HAS_SYSTEM_ASPRINTF +-#define _GNU_SOURCE +-#endif + + #include + #include +@@ -22,9 +19,6 @@ + #include "util.h" + #include "private.h" + +-#if !HAS_SYSTEM_ASPRINTF +-#include "snprintf_2.2/snprintf.c" +-#endif + + + static void default_warn_handler(const char *message); diff --git a/wm/notion/patches/patch-pwm_Makefile b/wm/notion/patches/patch-pwm_Makefile new file mode 100644 index 00000000000..63d1dacc600 --- /dev/null +++ b/wm/notion/patches/patch-pwm_Makefile @@ -0,0 +1,17 @@ +$NetBSD: patch-pwm_Makefile,v 1.1.1.1 2012/01/08 15:22:14 wiz Exp $ + +Install config to example directory; will be installed +with pkgsrc config framework. + +--- pwm/Makefile.orig 2011-10-29 18:19:21.000000000 +0000 ++++ pwm/Makefile +@@ -49,7 +49,7 @@ include $(TOPDIR)/build/rules.mk + ###################################### + + _install: executable_install +- $(INSTALLDIR) $(DESTDIR)$(PWM_ETCDIR) ++ $(INSTALLDIR) $(DESTDIR)$(EXAMPLEDIR) + for i in $(ETC); do \ +- $(INSTALL) -m $(DATA_MODE) $$i $(DESTDIR)$(PWM_ETCDIR); \ ++ $(INSTALL) -m $(DATA_MODE) $$i $(DESTDIR)$(EXAMPLEDIR); \ + done diff --git a/wm/notion/patches/patch-system.mk b/wm/notion/patches/patch-system.mk new file mode 100644 index 00000000000..26574b5382a --- /dev/null +++ b/wm/notion/patches/patch-system.mk @@ -0,0 +1,84 @@ +$NetBSD: patch-system.mk,v 1.1.1.1 2012/01/08 15:22:14 wiz Exp $ + +Adapt for pkgsrc. + +--- system.mk.orig 2011-10-29 18:27:06.000000000 +0000 ++++ system.mk +@@ -8,7 +8,8 @@ + + # Installation path prefix. Unless you know what you're doing, the default + # of /usr/local is likely the correct choice. +-PREFIX=/usr/local ++# set by pkgsrc ++#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: +@@ -16,11 +17,12 @@ PREFIX=/usr/local + # Main binaries + BINDIR=$(PREFIX)/bin + # Configuration .lua files ++EXAMPLEDIR=$(PREFIX)/share/examples/notion + ETCDIR=$(PREFIX)/etc/notion + # Some .lua files and ion-* shell scripts + SHAREDIR=$(PREFIX)/share/notion + # Manual pages +-MANDIR=$(PREFIX)/share/man ++MANDIR=$(PREFIX)/man + # Some documents + DOCDIR=$(PREFIX)/share/doc/notion + # Nothing at the moment +@@ -53,7 +55,8 @@ LOCALEDIR=$(PREFIX)/share/locale + + # Flags to link with libdl. Even if PRELOAD_MODULES=1, you may need this + # setting (for e.g. Lua, when not instructed by pkg-config). +-DL_LIBS=-ldl ++# set by pkgsrc ++#DL_LIBS=-ldl + + + ## +@@ -66,8 +69,8 @@ DL_LIBS=-ldl + + # Default to paths and names that should work for a build installed from the + # official Lua 5.1 source tarball. +-LUA_DIR=/usr/local +-LUA_LIBS=-L$(LUA_DIR)/lib -llua ++LUA_DIR=$(PREFIX) ++LUA_LIBS=${LINKER_RPATH_FLAG}$(LUA_DIR)/lib -L$(LUA_DIR)/lib -llua + LUA_INCLUDES = -I$(LUA_DIR)/include + LUA=$(LUA_DIR)/bin/lua + LUAC=$(LUA_DIR)/bin/luac +@@ -100,11 +103,12 @@ endif # LUA_MANUAL + ## + + # Paths +-X11_PREFIX=/usr/X11R6 ++# set by pkgsrc ++#X11_PREFIX=/usr/X11R6 + # SunOS/Solaris + #X11_PREFIX=/usr/openwin + +-X11_LIBS=-L$(X11_PREFIX)/lib -lX11 -lXext ++X11_LIBS=${LINKER_RPATH_FLAG}${X11_PREFIX}/lib -L$(X11_PREFIX)/lib -lX11 -lXext + X11_INCLUDES=-I$(X11_PREFIX)/include + + # XFree86 libraries up to 4.3.0 have a bug that can cause a segfault. +@@ -132,7 +136,7 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WOR + #DEFINES += -DCF_NO_LOCALE -DCF_NO_GETTEXT + + # On some other systems you may need to explicitly link against libintl. +-#EXTRA_LIBS += -lintl ++EXTRA_LIBS += -lintl + # You may also need to give the location of its headers. The following + # should work on Mac OS X (which needs the above option as well) with + # macports. +@@ -146,7 +150,7 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WOR + # You may uncomment this if you know that your system C libary provides + # asprintf and vasprintf. (GNU libc does.) If HAS_SYSTEM_ASPRINTF is not + # defined, an implementation provided in libtu/sprintf_2.2/ is used. +-#HAS_SYSTEM_ASPRINTF=1 ++HAS_SYSTEM_ASPRINTF=1 + + # The following setting is needed with GNU libc for clock_gettime and the + # monotonic clock. Other systems may not need it, or may not provide a -- cgit v1.2.3