diff options
author | wiz <wiz> | 2003-12-18 09:57:27 +0000 |
---|---|---|
committer | wiz <wiz> | 2003-12-18 09:57:27 +0000 |
commit | a24cb63f884cfe8e4bace175baf37d528ad544c7 (patch) | |
tree | 274fe35548f156bcaf92ee7dcb04767d84fc5ba6 /wm | |
parent | 91a19a5e0105182839934f544426abe689cec8a0 (diff) | |
download | pkgsrc-a24cb63f884cfe8e4bace175baf37d528ad544c7.tar.gz |
Update to 3.0 (really, only move contents of openbox3 dir here).
Diffstat (limited to 'wm')
-rw-r--r-- | wm/openbox/DESCR | 13 | ||||
-rw-r--r-- | wm/openbox/MESSAGE | 20 | ||||
-rw-r--r-- | wm/openbox/Makefile | 29 | ||||
-rw-r--r-- | wm/openbox/PLIST | 175 | ||||
-rw-r--r-- | wm/openbox/buildlink2.mk | 31 | ||||
-rw-r--r-- | wm/openbox/distinfo | 11 | ||||
-rw-r--r-- | wm/openbox/patches/patch-aa | 29 | ||||
-rw-r--r-- | wm/openbox/patches/patch-ab | 36 | ||||
-rw-r--r-- | wm/openbox/patches/patch-ac | 12 | ||||
-rw-r--r-- | wm/openbox/patches/patch-ad | 12 |
10 files changed, 167 insertions, 201 deletions
diff --git a/wm/openbox/DESCR b/wm/openbox/DESCR index 695c4691e99..80de380b0b3 100644 --- a/wm/openbox/DESCR +++ b/wm/openbox/DESCR @@ -1,5 +1,8 @@ -Openbox is a window manager for the X11 windowing system. It currently runs -on a large list of platforms. It was originally based on Blackbox and -currently remains very similar, even using Blackbox styles (with available -extensions) for its themeing and is written entirely in C++ and maintains no -dependencies on any libraries other than X11. +Openbox is a standards compliant, fast, light-weight, extensible window +manager. + +Openbox works with your applications, and makes your desktop easier to +manage. This is because the approach to its development was the opposite +of what seems to be the general case for window managers. Openbox was +written first to comply with standards and to work properly. Only when +that was in place did the team turn to the visual interface. diff --git a/wm/openbox/MESSAGE b/wm/openbox/MESSAGE new file mode 100644 index 00000000000..816ed3280fc --- /dev/null +++ b/wm/openbox/MESSAGE @@ -0,0 +1,20 @@ +=========================================================================== +$NetBSD: MESSAGE,v 1.1 2003/12/18 09:57:27 wiz Exp $ + +There are no default system-wide configuration files for this package. + +Examples of configuration files can be found in +${PREFIX}/share/examples/openbox/ + +Copy rc.xml and menu.xml to the desired location. This path must include a +directory named openbox. For example: /usr/pkg/etc/openbox. Then set the +environment variable XDG_CONFIG_DIRS in your shell's configuration files. +If /usr/pkg/etc/openbox is where you want the openbox configuration files +to go, then you would set XDG_CONFIG_DIRS to /usr/pkg/etc. + +See http://www.freedesktop.org/standards/basedir-spec/basedir-spec-0.6.html +for more information. + +If you are not concerned with system-wide configuration, install wip/obconf +and run it before you start openbox for the first time. +=========================================================================== diff --git a/wm/openbox/Makefile b/wm/openbox/Makefile index b31308a1bf7..38fe704572e 100644 --- a/wm/openbox/Makefile +++ b/wm/openbox/Makefile @@ -1,23 +1,32 @@ -# $NetBSD: Makefile,v 1.8 2003/09/26 22:05:14 wiz Exp $ -# +# $NetBSD: Makefile,v 1.9 2003/12/18 09:57:27 wiz Exp $ -DISTNAME= openbox-2.2.3 +DISTNAME= openbox-3.0 CATEGORIES= wm x11 MASTER_SITES= http://icculus.org/openbox/releases/ -MAINTAINER= xtraeme@NetBSD.org +MAINTAINER= snj@pobox.com HOMEPAGE= http://icculus.org/openbox/ -COMMENT= Window manager based on Blackbox +COMMENT= Standards compliant, light-weight and extensible window manager -DEPENDS= bsetroot>=0.1nb1:../../wm/bsetroot +BUILD_USES_MSGFMT= YES +DEPENDS+= gnome2-dirs>=1.2:../../misc/gnome2-dirs +DEPENDS+= vera-ttf>=1.10:../../fonts/vera-ttf -USE_BUILDLINK2= YES -USE_X11= YES -GNU_CONFIGURE= YES +GNU_CONFIGURE= YES +USE_BUILDLINK2= YES +USE_LIBTOOL= YES +USE_PKGLOCALEDIR= YES +USE_X11= YES -CPPFLAGS+= -DHAVE_STRFTIME=1 +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +PKGCONFIG_OVERRIDE= ${WRKSRC}/parser/obparser-3.0.pc.in +PKGCONFIG_OVERRIDE+= ${WRKSRC}/render/obrender-3.0.pc.in +.include "../../converters/libiconv/buildlink2.mk" +.include "../../devel/glib2/buildlink2.mk" .include "../../devel/pkgconfig/buildlink2.mk" .include "../../fonts/Xft2/buildlink2.mk" +.include "../../textproc/libxml2/buildlink2.mk" +.include "../../x11/startup-notification/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/openbox/PLIST b/wm/openbox/PLIST index 413cebb2555..bc9c21e5d91 100644 --- a/wm/openbox/PLIST +++ b/wm/openbox/PLIST @@ -1,110 +1,69 @@ -@comment $NetBSD: PLIST,v 1.2 2002/12/26 01:48:32 wiz Exp $ -bin/epist +@comment $NetBSD: PLIST,v 1.3 2003/12/18 09:57:27 wiz Exp $ +bin/gnome-panel-control +bin/kdetrayproxy bin/openbox -man/man1/epist.1 -man/man1/openbox.1 -man/man5/epistrc.5 -share/openbox/buttons/close.xbm -share/openbox/buttons/fieron-bullet.xbm -share/openbox/buttons/fieron-bulletl.xbm -share/openbox/buttons/fieron-close.xbm -share/openbox/buttons/fieron-icon.xbm -share/openbox/buttons/fieron-max.xbm -share/openbox/buttons/fieron-stick.xbm -share/openbox/buttons/icon.xbm -share/openbox/buttons/max.xbm -share/openbox/buttons/stick.xbm -share/openbox/epistrc -share/openbox/menu -share/openbox/nls/C/openbox.cat -share/openbox/nls/POSIX -share/openbox/nls/US_ASCII -share/openbox/nls/da_DK/openbox.cat -share/openbox/nls/de -share/openbox/nls/de_DE/openbox.cat -share/openbox/nls/en -share/openbox/nls/en_GB -share/openbox/nls/en_US -share/openbox/nls/es -share/openbox/nls/es_AR/openbox.cat -share/openbox/nls/es_ES/openbox.cat -share/openbox/nls/et_ET/openbox.cat -share/openbox/nls/fr -share/openbox/nls/fr_FR/openbox.cat -share/openbox/nls/hu_HU/openbox.cat -share/openbox/nls/it -share/openbox/nls/it_IT/openbox.cat -share/openbox/nls/ja_JP/openbox.cat -share/openbox/nls/ko -share/openbox/nls/ko_KO/openbox.cat -share/openbox/nls/nl -share/openbox/nls/nl_NL/openbox.cat -share/openbox/nls/no -share/openbox/nls/no_NO/openbox.cat -share/openbox/nls/pl -share/openbox/nls/pl_PL/openbox.cat -share/openbox/nls/pt -share/openbox/nls/pt_BR/openbox.cat -share/openbox/nls/ro -share/openbox/nls/ro_RO/openbox.cat -share/openbox/nls/ru_RU/openbox.cat -share/openbox/nls/sl_SI/openbox.cat -share/openbox/nls/sv_SE/openbox.cat -share/openbox/nls/tr_TR/openbox.cat -share/openbox/nls/uk_UA/openbox.cat -share/openbox/nls/zh_CN/openbox.cat -share/openbox/nls/zh_TW/openbox.cat -share/openbox/styles/artwiz -share/openbox/styles/bbs -share/openbox/styles/bluebox -share/openbox/styles/cthulhain -share/openbox/styles/deep -share/openbox/styles/fieron -share/openbox/styles/fieron2 -share/openbox/styles/flux -share/openbox/styles/frobozz -share/openbox/styles/frobust -share/openbox/styles/mbdtex -share/openbox/styles/miklos -share/openbox/styles/nyz -share/openbox/styles/nyzclone -share/openbox/styles/ob20 -share/openbox/styles/operation -share/openbox/styles/outcomes -share/openbox/styles/paper -share/openbox/styles/purplehaaze -share/openbox/styles/shade -share/openbox/styles/steelblue -share/openbox/styles/steelblue2 -share/openbox/styles/steelblue3 -share/openbox/styles/the_orange -share/openbox/styles/trisb -share/openbox/styles/twice -share/openbox/styles/warp-xp -@dirrm share/openbox/styles -@dirrm share/openbox/nls/zh_TW -@dirrm share/openbox/nls/zh_CN -@dirrm share/openbox/nls/uk_UA -@dirrm share/openbox/nls/tr_TR -@dirrm share/openbox/nls/sv_SE -@dirrm share/openbox/nls/sl_SI -@dirrm share/openbox/nls/ru_RU -@dirrm share/openbox/nls/ro_RO -@dirrm share/openbox/nls/pt_BR -@dirrm share/openbox/nls/pl_PL -@dirrm share/openbox/nls/no_NO -@dirrm share/openbox/nls/nl_NL -@dirrm share/openbox/nls/ko_KO -@dirrm share/openbox/nls/ja_JP -@dirrm share/openbox/nls/it_IT -@dirrm share/openbox/nls/hu_HU -@dirrm share/openbox/nls/fr_FR -@dirrm share/openbox/nls/et_ET -@dirrm share/openbox/nls/es_ES -@dirrm share/openbox/nls/es_AR -@dirrm share/openbox/nls/de_DE -@dirrm share/openbox/nls/da_DK -@dirrm share/openbox/nls/C -@dirrm share/openbox/nls -@dirrm share/openbox/buttons +include/openbox/${PKGVERSION}/openbox/parse.h +include/openbox/${PKGVERSION}/openbox/render.h +include/openbox/${PKGVERSION}/openbox/theme.h +include/openbox/${PKGVERSION}/openbox/version.h +lib/libobparser.a +lib/libobparser.la +lib/libobparser.so +lib/libobparser.so.2 +lib/libobparser.so.2.0 +lib/libobrender.a +lib/libobrender.la +lib/libobrender.so +lib/libobrender.so.2 +lib/libobrender.so.2.0 +lib/pkgconfig/obparser-${PKGVERSION}.pc +lib/pkgconfig/obrender-${PKGVERSION}.pc +share/gnome/wm-properties/openbox.desktop +${PKGLOCALEDIR}/locale/en@boldquot/LC_MESSAGES/openbox.mo +${PKGLOCALEDIR}/locale/en@quot/LC_MESSAGES/openbox.mo +share/examples/openbox/menu.xml +share/examples/openbox/rc.xml +share/openbox/menu.xsd +share/openbox/rc.xsd +share/openbox/themeupdate.py +share/pixmaps/openbox.png +share/themes/Allegro/openbox-3/bullet.xbm +share/themes/Allegro/openbox-3/themerc +share/themes/Artwiz/openbox-3/themerc +share/themes/Blah41/openbox-3/themerc +share/themes/Om4Ob/openbox-3/close.xbm +share/themes/Om4Ob/openbox-3/close_hover.xbm +share/themes/Om4Ob/openbox-3/desk.xbm +share/themes/Om4Ob/openbox-3/desk_hover.xbm +share/themes/Om4Ob/openbox-3/desk_toggled.xbm +share/themes/Om4Ob/openbox-3/iconify.xbm +share/themes/Om4Ob/openbox-3/iconify_hover.xbm +share/themes/Om4Ob/openbox-3/iconify_pressed.xbm +share/themes/Om4Ob/openbox-3/max.xbm +share/themes/Om4Ob/openbox-3/max_disabled.xbm +share/themes/Om4Ob/openbox-3/max_hover.xbm +share/themes/Om4Ob/openbox-3/max_pressed.xbm +share/themes/Om4Ob/openbox-3/max_toggled.xbm +share/themes/Om4Ob/openbox-3/shade.xbm +share/themes/Om4Ob/openbox-3/shade_disabled.xbm +share/themes/Om4Ob/openbox-3/shade_hover.xbm +share/themes/Om4Ob/openbox-3/shade_toggled.xbm +share/themes/Om4Ob/openbox-3/themerc +share/themes/TheBear/openbox-3/themerc +@dirrm share/examples/openbox +@dirrm share/themes/TheBear/openbox-3 +@unexec ${RMDIR} %D/share/themes/TheBear 2>/dev/null || ${TRUE} +@dirrm share/themes/Om4Ob/openbox-3 +@unexec ${RMDIR} %D/share/themes/Om4Ob 2>/dev/null || ${TRUE} +@dirrm share/themes/Blah41/openbox-3 +@unexec ${RMDIR} %D/share/themes/Blah41 2>/dev/null || ${TRUE} +@dirrm share/themes/Artwiz/openbox-3 +@unexec ${RMDIR} %D/share/themes/Artwiz 2>/dev/null || ${TRUE} +@dirrm share/themes/Allegro/openbox-3 +@unexec ${RMDIR} %D/share/themes/Allegro 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/share/themes 2>/dev/null || ${TRUE} @dirrm share/openbox +@comment in gnome2-dirs: @dirrm share/gnome/wm-properties +@dirrm include/openbox/${PKGVERSION}/openbox +@dirrm include/openbox/${PKGVERSION} +@dirrm include/openbox diff --git a/wm/openbox/buildlink2.mk b/wm/openbox/buildlink2.mk new file mode 100644 index 00000000000..d8b58e65e6d --- /dev/null +++ b/wm/openbox/buildlink2.mk @@ -0,0 +1,31 @@ +# $NetBSD: buildlink2.mk,v 1.1 2003/12/18 09:57:27 wiz Exp $ +# +# This Makefile fragment is included by packages that use openbox. +# +# This file was created automatically using createbuildlink 2.8. +# + +.if !defined(OPENBOX_BUILDLINK2_MK) +OPENBOX_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= openbox +BUILDLINK_DEPENDS.openbox?= openbox>=3.0 +BUILDLINK_PKGSRCDIR.openbox?= ../../wm/openbox3 + +EVAL_PREFIX+= BUILDLINK_PREFIX.openbox=openbox +BUILDLINK_PREFIX.openbox_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.openbox+= include/openbox/3.0/openbox/*.h +BUILDLINK_FILES.openbox+= lib/libobparser.* +BUILDLINK_FILES.openbox+= lib/libobrender.* + +.include "../../converters/libiconv/buildlink2.mk" +.include "../../devel/glib2/buildlink2.mk" +.include "../../fonts/Xft2/buildlink2.mk" +.include "../../textproc/libxml2/buildlink2.mk" +.include "../../x11/startup-notification/buildlink2.mk" + +BUILDLINK_TARGETS+= openbox-buildlink + +openbox-buildlink: _BUILDLINK_USE + +.endif # OPENBOX_BUILDLINK2_MK diff --git a/wm/openbox/distinfo b/wm/openbox/distinfo index 9b814da2ae8..eb28b7325e9 100644 --- a/wm/openbox/distinfo +++ b/wm/openbox/distinfo @@ -1,8 +1,5 @@ -$NetBSD: distinfo,v 1.3 2003/09/07 01:52:14 jschauma Exp $ +$NetBSD: distinfo,v 1.4 2003/12/18 09:57:27 wiz Exp $ -SHA1 (openbox-2.2.3.tar.gz) = 972b7b62ced97dcdcc05be0038f3c929765f8fde -Size (openbox-2.2.3.tar.gz) = 484100 bytes -SHA1 (patch-aa) = 0e52e4bd1c8b0d053b9b7734871aeb924b89f82a -SHA1 (patch-ab) = 210b3cb925b7a0b1441c4dfa87760a9c97bb249c -SHA1 (patch-ac) = f7b406216366e5f177ac8dc8516dd0c6066bc01f -SHA1 (patch-ad) = e651f30ad0ab1843807c33bff474f8b5ee66d68d +SHA1 (openbox-3.0.tar.gz) = 5156e3b53f8707511b5921bc3f0180ef8b3c215b +Size (openbox-3.0.tar.gz) = 549264 bytes +SHA1 (patch-aa) = 41cc531d21ac23814d33b20ec754784396fe2b05 diff --git a/wm/openbox/patches/patch-aa b/wm/openbox/patches/patch-aa index 97d386436fc..6be57cf213e 100644 --- a/wm/openbox/patches/patch-aa +++ b/wm/openbox/patches/patch-aa @@ -1,13 +1,20 @@ -$NetBSD: patch-aa,v 1.2 2002/12/26 01:48:33 wiz Exp $ +$NetBSD: patch-aa,v 1.3 2003/12/18 09:57:27 wiz Exp $ ---- doc/Makefile.in.orig Sun Dec 15 08:03:11 2002 -+++ doc/Makefile.in -@@ -132,7 +132,7 @@ target_alias = @target_alias@ +--- Makefile.in.orig 2003-10-27 12:47:51.000000000 -0800 ++++ Makefile.in 2003-11-11 14:29:45.000000000 -0800 +@@ -2725,12 +2725,12 @@ + nodist_rcDATA_INSTALL = $(INSTALL_DATA) + install-nodist_rcDATA: $(nodist_rc_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(rcdir) ++ $(mkinstalldirs) $(datadir)/examples/openbox + @list='$(nodist_rc_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(nodist_rcDATA_INSTALL) $$d$$p $(DESTDIR)$(rcdir)/$$f"; \ +- $(nodist_rcDATA_INSTALL) $$d$$p $(DESTDIR)$(rcdir)/$$f; \ ++ echo " $(nodist_rcDATA_INSTALL) $$d$$p $(datadir)/examples/openbox/$$f"; \ ++ $(nodist_rcDATA_INSTALL) $$d$$p $(datadir)/examples/openbox/$$f; \ + done - CLEANFILES = openbox.1 - MAINTAINERCLEANFILES = Makefile.in --man_MANS = openbox.1 bsetroot.1 bsetbg.1 $(XFTMAN) -+man_MANS = openbox.1 $(XFTMAN) - SUBDIRS = - - DEFAULT_MENU = $(pkgdatadir)/menu + uninstall-nodist_rcDATA: diff --git a/wm/openbox/patches/patch-ab b/wm/openbox/patches/patch-ab deleted file mode 100644 index ccbd82fcbf1..00000000000 --- a/wm/openbox/patches/patch-ab +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2002/12/26 01:48:33 wiz Exp $ - ---- util/Makefile.in.orig Sun Dec 15 08:03:15 2002 -+++ util/Makefile.in -@@ -130,14 +130,13 @@ sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - - SUBDIRS = epist --bin_SCRIPTS = bsetbg - - @XFT2_FALSE@@XFT_TRUE@TMP_PROGS = xftlsfonts - @XFT2_FALSE@@XFT_TRUE@xftlsfonts_SOURCES = xftlsfonts.cc - @XFT2_FALSE@@XFT_TRUE@xftlsfonts_CPPFLAGS = @CPPFLAGS@ @DEBUG@ @XFT_CFLAGS@ - @XFT2_FALSE@@XFT_TRUE@xftlsfonts_LDFLAGS = @XFT_LIBS@ - --bin_PROGRAMS = bsetroot $(TMP_PROGS) -+bin_PROGRAMS = $(TMP_PROGS) - - bsetroot_SOURCES = bsetroot.cc - bsetroot_LDADD = ../src/BaseDisplay.o ../src/Color.o ../src/GCCache.o ../src/Texture.o ../src/Timer.o ../src/Image.o ../src/ImageControl.o ../src/i18n.o ../src/Util.o -@@ -149,11 +148,11 @@ subdir = util - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = --@XFT2_FALSE@@XFT_TRUE@bin_PROGRAMS = bsetroot$(EXEEXT) \ -+@XFT2_FALSE@@XFT_TRUE@bin_PROGRAMS = \ - @XFT2_FALSE@@XFT_TRUE@ xftlsfonts$(EXEEXT) --@XFT2_FALSE@@XFT_FALSE@bin_PROGRAMS = bsetroot$(EXEEXT) --@XFT2_TRUE@@XFT_TRUE@bin_PROGRAMS = bsetroot$(EXEEXT) --@XFT2_TRUE@@XFT_FALSE@bin_PROGRAMS = bsetroot$(EXEEXT) -+@XFT2_FALSE@@XFT_FALSE@bin_PROGRAMS = -+@XFT2_TRUE@@XFT_TRUE@bin_PROGRAMS = -+@XFT2_TRUE@@XFT_FALSE@bin_PROGRAMS = - PROGRAMS = $(bin_PROGRAMS) - - am_bsetroot_OBJECTS = bsetroot.$(OBJEXT) diff --git a/wm/openbox/patches/patch-ac b/wm/openbox/patches/patch-ac deleted file mode 100644 index ea025783f73..00000000000 --- a/wm/openbox/patches/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2003/09/07 01:52:15 jschauma Exp $ - ---- src/Configuration.cc.orig 2003-09-06 21:32:27.000000000 -0400 -+++ src/Configuration.cc 2003-09-06 21:32:50.000000000 -0400 -@@ -34,6 +34,7 @@ - #include "Util.hh" - - #include <algorithm> -+#include <assert.h> - - using std::string; - diff --git a/wm/openbox/patches/patch-ad b/wm/openbox/patches/patch-ad deleted file mode 100644 index 94dcb78895d..00000000000 --- a/wm/openbox/patches/patch-ad +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2003/09/07 01:52:15 jschauma Exp $ - ---- util/epist/epist.hh.orig 2003-09-06 21:34:28.000000000 -0400 -+++ util/epist/epist.hh 2003-09-06 21:34:37.000000000 -0400 -@@ -27,6 +27,7 @@ - #include <X11/Xlib.h> - } - -+#include <assert.h> - #include <string> - #include <map> - |