diff options
author | wiz <wiz@pkgsrc.org> | 2014-05-09 16:20:24 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2014-05-09 16:20:24 +0000 |
commit | 8fd72994844be2bd3b38eda7e2a6b789d90ad758 (patch) | |
tree | c91a36ca270fe40c2e1de0c2c4306f58b6224ef6 /wm | |
parent | 698d1c931053abd286c89ee1f1691284131859aa (diff) | |
download | pkgsrc-8fd72994844be2bd3b38eda7e2a6b789d90ad758.tar.gz |
Update to 20140109.
Changes not found, but notionflux now has a man page, and the
support scripts were reorganized.
Diffstat (limited to 'wm')
-rw-r--r-- | wm/notion/Makefile | 9 | ||||
-rw-r--r-- | wm/notion/PLIST | 67 | ||||
-rw-r--r-- | wm/notion/distinfo | 10 | ||||
-rw-r--r-- | wm/notion/patches/patch-system-autodetect.mk | 70 |
4 files changed, 49 insertions, 107 deletions
diff --git a/wm/notion/Makefile b/wm/notion/Makefile index 7493ddecaea..9c3a486233c 100644 --- a/wm/notion/Makefile +++ b/wm/notion/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.15 2014/05/03 13:01:25 alnsn Exp $ +# $NetBSD: Makefile,v 1.16 2014/05/09 16:20:24 wiz Exp $ -DISTNAME= notion-3-2013030200-src +DISTNAME= notion-3-2014010900-src PKGNAME= ${DISTNAME:S/3-/3./:S/-src//} -PKGREVISION= 2 CATEGORIES= wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=notion/} EXTRACT_SUFX= .tar.bz2 @@ -19,7 +18,11 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} USE_LANGUAGES= c99 USE_TOOLS+= gmake msgfmt pax pkg-config +MAKE_FLAGS+= PREFIX=${PREFIX} +MAKE_FLAGS+= EXAMPLEDIR=${PREFIX}/share/examples/notion +MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR} MAKE_FLAGS+= X11_PREFIX=${BUILDLINK_PREFIX.libX11} +MAKE_FLAGS+= X11_LIBS="${COMPILER_RPATH_FLAG}${X11_PREFIX}/lib -L$(X11_PREFIX)/lib -lX11 -lXext" MAKE_FLAGS+= LUA_INTERPRETER=${LUA_INTERPRETER} MAKE_FLAGS+= LUA_COMPILER=${LUA_COMPILER} diff --git a/wm/notion/PLIST b/wm/notion/PLIST index e5f5678331f..d778bf0fe26 100644 --- a/wm/notion/PLIST +++ b/wm/notion/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2013/07/05 14:27:56 wiz Exp $ +@comment $NetBSD: PLIST,v 1.5 2014/05/09 16:20:24 wiz Exp $ bin/notion bin/notionflux lib/notion/bin/ion-completefile @@ -44,6 +44,7 @@ lib/notion/mod/mod_xrandr.so man/cs/man1/notion.1 man/fi/man1/notion.1 man/man1/notion.1 +man/man1/notionflux.1 share/doc/notion/ChangeLog share/doc/notion/LICENSE share/doc/notion/README @@ -60,7 +61,6 @@ share/examples/notion/cfg_sp.lua share/examples/notion/cfg_statusbar.lua share/examples/notion/cfg_tiling.lua share/examples/notion/cfg_xrandr.lua -share/examples/notion/contrib/LICENSE share/examples/notion/contrib/README share/examples/notion/contrib/create_gitindex.sh share/examples/notion/contrib/index.html @@ -70,43 +70,44 @@ share/examples/notion/contrib/keybindings/cfg_mouse.lua share/examples/notion/contrib/keybindings/dans_bindings.lua share/examples/notion/contrib/keybindings/emacs_bindings.lua share/examples/notion/contrib/keybindings/vim_bindings.lua -share/examples/notion/contrib/scripts/adapt_menus.lua -share/examples/notion/contrib/scripts/alt_resize.lua share/examples/notion/contrib/scripts/app.lua share/examples/notion/contrib/scripts/autoprop.lua -share/examples/notion/contrib/scripts/bindsearch.lua share/examples/notion/contrib/scripts/bookmarks.lua share/examples/notion/contrib/scripts/cfg_dock2.lua -share/examples/notion/contrib/scripts/closeorkill.lua share/examples/notion/contrib/scripts/collapse.lua -share/examples/notion/contrib/scripts/ctrl_statusbar.lua -share/examples/notion/contrib/scripts/cwin_sp.lua -share/examples/notion/contrib/scripts/display_by_tag.lua -share/examples/notion/contrib/scripts/document_menus.lua -share/examples/notion/contrib/scripts/enumerate.lua -share/examples/notion/contrib/scripts/environment_placement_hook.lua share/examples/notion/contrib/scripts/exec_show.lua share/examples/notion/contrib/scripts/float-sb.lua -share/examples/notion/contrib/scripts/frame_client_menu.lua -share/examples/notion/contrib/scripts/go_frame_or_desk.lua -share/examples/notion/contrib/scripts/goto_multihead.lua -share/examples/notion/contrib/scripts/heuristics.lua -share/examples/notion/contrib/scripts/histcompl.lua +share/examples/notion/contrib/scripts/goto_by_tag.lua +share/examples/notion/contrib/scripts/legacy/adapt_menus.lua +share/examples/notion/contrib/scripts/legacy/alt_resize.lua +share/examples/notion/contrib/scripts/legacy/bindsearch.lua +share/examples/notion/contrib/scripts/legacy/closeorkill.lua +share/examples/notion/contrib/scripts/legacy/ctrl_statusbar.lua +share/examples/notion/contrib/scripts/legacy/cwin_sp.lua +share/examples/notion/contrib/scripts/legacy/document_menus.lua +share/examples/notion/contrib/scripts/legacy/enumerate.lua +share/examples/notion/contrib/scripts/legacy/environment_placement_hook.lua +share/examples/notion/contrib/scripts/legacy/frame_client_menu.lua +share/examples/notion/contrib/scripts/legacy/go_frame_or_desk.lua +share/examples/notion/contrib/scripts/legacy/goto_multihead.lua +share/examples/notion/contrib/scripts/legacy/heuristics.lua +share/examples/notion/contrib/scripts/legacy/histcompl.lua +share/examples/notion/contrib/scripts/legacy/named_floating_groupws.lua +share/examples/notion/contrib/scripts/legacy/nest_ws.lua +share/examples/notion/contrib/scripts/legacy/nextact.lua +share/examples/notion/contrib/scripts/legacy/notifybox.lua +share/examples/notion/contrib/scripts/legacy/rotate_statusbar.lua +share/examples/notion/contrib/scripts/legacy/xinerama_switcher.lua share/examples/notion/contrib/scripts/lock_frame.lua share/examples/notion/contrib/scripts/min_tabs.lua share/examples/notion/contrib/scripts/move_current.lua share/examples/notion/contrib/scripts/mp.lua share/examples/notion/contrib/scripts/mpd.lua -share/examples/notion/contrib/scripts/named_floating_groupws.lua share/examples/notion/contrib/scripts/named_scratchpad.lua -share/examples/notion/contrib/scripts/nest_ws.lua share/examples/notion/contrib/scripts/net_client_list.lua -share/examples/notion/contrib/scripts/nextact.lua -share/examples/notion/contrib/scripts/notifybox.lua share/examples/notion/contrib/scripts/nowarp_scratchpad.lua share/examples/notion/contrib/scripts/panel.lua share/examples/notion/contrib/scripts/query_url.lua -share/examples/notion/contrib/scripts/rotate_statusbar.lua share/examples/notion/contrib/scripts/rss_feed.lua share/examples/notion/contrib/scripts/rss_feed_hh.lua share/examples/notion/contrib/scripts/schedule.lua @@ -117,18 +118,24 @@ share/examples/notion/contrib/scripts/stock.lua share/examples/notion/contrib/scripts/switch_bindings.lua share/examples/notion/contrib/scripts/tabmenu.lua share/examples/notion/contrib/scripts/weather.lua -share/examples/notion/contrib/scripts/xinerama_switcher.lua +share/examples/notion/contrib/scripts/wrap_workspace_or_screen.lua share/examples/notion/contrib/scripts/xkbion.lua share/examples/notion/contrib/scripts/zoom.lua +share/examples/notion/contrib/statusbar/legacy/statusbar_workspace.lua share/examples/notion/contrib/statusbar/statusbar_act.lua share/examples/notion/contrib/statusbar/statusbar_external.lua share/examples/notion/contrib/statusbar/statusbar_fname.lua -share/examples/notion/contrib/statusbar/statusbar_workspace.lua share/examples/notion/contrib/statusbar/statusbar_wsname.lua +share/examples/notion/contrib/statusd/legacy/statusd_apm.lua +share/examples/notion/contrib/statusd/legacy/statusd_apm2.lua +share/examples/notion/contrib/statusd/legacy/statusd_batt.lua +share/examples/notion/contrib/statusd/legacy/statusd_iface.lua +share/examples/notion/contrib/statusd/legacy/statusd_info.lua +share/examples/notion/contrib/statusd/legacy/statusd_linuxbatt.lua +share/examples/notion/contrib/statusd/legacy/statusd_mcpu.lua +share/examples/notion/contrib/statusd/legacy/statusd_sysmon.lua +share/examples/notion/contrib/statusd/legacy/statusd_volume2.lua share/examples/notion/contrib/statusd/statusd_amarok.lua -share/examples/notion/contrib/statusd/statusd_apm.lua -share/examples/notion/contrib/statusd/statusd_apm2.lua -share/examples/notion/contrib/statusd/statusd_batt.lua share/examples/notion/contrib/statusd/statusd_binclock.lua share/examples/notion/contrib/statusd/statusd_bitcoin.lua share/examples/notion/contrib/statusd/statusd_bsdbatt.lua @@ -141,14 +148,10 @@ share/examples/notion/contrib/statusd/statusd_drives.lua share/examples/notion/contrib/statusd/statusd_exec.lua share/examples/notion/contrib/statusd/statusd_flashing.lua share/examples/notion/contrib/statusd/statusd_fortune.lua -share/examples/notion/contrib/statusd/statusd_iface.lua share/examples/notion/contrib/statusd/statusd_inetaddr.lua -share/examples/notion/contrib/statusd/statusd_info.lua share/examples/notion/contrib/statusd/statusd_iwinfo.lua share/examples/notion/contrib/statusd/statusd_laptopstatus.lua -share/examples/notion/contrib/statusd/statusd_linuxbatt.lua share/examples/notion/contrib/statusd/statusd_maildir.lua -share/examples/notion/contrib/statusd/statusd_mcpu.lua share/examples/notion/contrib/statusd/statusd_mem.lua share/examples/notion/contrib/statusd/statusd_meminfo.lua share/examples/notion/contrib/statusd/statusd_moc.lua @@ -161,12 +164,10 @@ share/examples/notion/contrib/statusd/statusd_nginfo.lua share/examples/notion/contrib/statusd/statusd_nmaild.lua share/examples/notion/contrib/statusd/statusd_orpheus.lua share/examples/notion/contrib/statusd/statusd_pytone.lua -share/examples/notion/contrib/statusd/statusd_sysmon.lua share/examples/notion/contrib/statusd/statusd_ticker.lua share/examples/notion/contrib/statusd/statusd_uname.lua share/examples/notion/contrib/statusd/statusd_uptime.lua share/examples/notion/contrib/statusd/statusd_volume.lua -share/examples/notion/contrib/statusd/statusd_volume2.lua share/examples/notion/contrib/statusd/statusd_weather.lua share/examples/notion/contrib/statusd/statusd_xmms.lua share/examples/notion/contrib/statusd/statusd_xmms2.lua diff --git a/wm/notion/distinfo b/wm/notion/distinfo index 3f7562aaa19..f2ed8dd1201 100644 --- a/wm/notion/distinfo +++ b/wm/notion/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.6 2014/05/03 13:01:25 alnsn Exp $ +$NetBSD: distinfo,v 1.7 2014/05/09 16:20:24 wiz Exp $ -SHA1 (notion-3-2013030200-src.tar.bz2) = 1c5d0cf140d1681a99c0fccbd8979846076d5dca -RMD160 (notion-3-2013030200-src.tar.bz2) = 5330bcd7743b5756faf552912a1c10d481e50e1a -Size (notion-3-2013030200-src.tar.bz2) = 625211 bytes +SHA1 (notion-3-2014010900-src.tar.bz2) = 10d9d8fcd2bc33a07e556f46170de6e5d78b197e +RMD160 (notion-3-2014010900-src.tar.bz2) = 2b061bb40320c8df6739d26b78c48b5c8f6a4154 +Size (notion-3-2014010900-src.tar.bz2) = 623050 bytes SHA1 (patch-build_rules.mk) = f8321cea75a1dfb6187ce5229f85cfea7dc5c9a7 SHA1 (patch-libtu_output.c) = e9e9e77f0c1ff196fefa887a51f647f0dee7df89 SHA1 (patch-mod__xrandr_Makefile) = 9299bebbd6a1f043a4095abfa19c917e4229456f -SHA1 (patch-system-autodetect.mk) = 2cdaa0401ceccbf791aa4a52716762a3e43cce5f +SHA1 (patch-system-autodetect.mk) = 60bd996294b30171cd893e62078ca8eada24c202 diff --git a/wm/notion/patches/patch-system-autodetect.mk b/wm/notion/patches/patch-system-autodetect.mk index ca4452765a2..ef50032ba4a 100644 --- a/wm/notion/patches/patch-system-autodetect.mk +++ b/wm/notion/patches/patch-system-autodetect.mk @@ -1,33 +1,10 @@ -$NetBSD: patch-system-autodetect.mk,v 1.3 2014/05/03 13:01:25 alnsn Exp $ +$NetBSD: patch-system-autodetect.mk,v 1.4 2014/05/09 16:20:24 wiz Exp $ Adapt for pkgsrc. ---- system-autodetect.mk.orig 2013-03-02 21:02:30.000000000 +0000 +--- system-autodetect.mk.orig 2014-01-09 19:02:16.000000000 +0000 +++ system-autodetect.mk -@@ -9,7 +9,7 @@ - # Installation path prefix. Unless you know what you're doing, the default - # of /usr/local is likely the correct choice. - #DIST: PREFIX=/usr/local --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: -@@ -17,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 -@@ -54,7 +55,8 @@ LOCALEDIR=$(PREFIX)/share/locale +@@ -63,7 +63,8 @@ endif # 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). @@ -37,46 +14,7 @@ Adapt for pkgsrc. ## -@@ -63,18 +65,14 @@ DL_LIBS=-ldl - - # To skip auto-detection of lua uncomment this and edit the variables below to - # suit your installation of lua. --#LUA_MANUAL=1 -+LUA_MANUAL=1 - - # 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_INCLUDES = -I$(LUA_DIR)/include -- --ifneq ($(shell which lua),) --LUA=$(LUA_DIR)/bin/lua --LUAC=$(LUA_DIR)/bin/luac --endif -+LUA_LIBS=`pkg-config --libs lua` -+LUA_INCLUDES=`pkg-config --cflags lua` -+LUA=$(LUA_INTERPRETER) -+LUAC=$(LUA_COMPILER) - - # Attempt to autodect lua using pkg-config. - -@@ -132,11 +130,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=${COMPILER_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. -@@ -164,7 +163,7 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WOR +@@ -109,7 +110,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. |