Remove wm/openbox2 -- old version of wm/openbox.

No disagreement on pkgsrc-users.

12 files changed, 1 insertions, 304 deletions

diff --git a/wm/Makefile b/wm/Makefile
index c957f7f120f..ce60368a25c 100644
--- a/wm/Makefile
+++ b/wm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2007/04/01 21:15:43 wiz Exp $
+# $NetBSD: Makefile,v 1.89 2007/04/01 21:21:14 wiz Exp $
 #
 
 COMMENT=	X11 window managers, configuration tools, and themes
@@ -52,7 +52,6 @@ SUBDIR+=	novawm
 SUBDIR+=	obconf
 SUBDIR+=	olvwm
 SUBDIR+=	openbox
-SUBDIR+=	openbox2
 SUBDIR+=	oroborox
 SUBDIR+=	oroborus
 SUBDIR+=	pekwm
diff --git a/wm/openbox2/DESCR b/wm/openbox2/DESCR
deleted file mode 100644
index 1a634ec2425..00000000000
--- a/wm/openbox2/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-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.
-
-This is the older 2.x version of openbox; for the current version
-look in the ``openbox'' package.
diff --git a/wm/openbox2/Makefile b/wm/openbox2/Makefile
deleted file mode 100644
index 546dd1769ea..00000000000
--- a/wm/openbox2/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2007/02/26 13:13:03 joerg Exp $
-#
-
-DISTNAME=	openbox-2.2.3
-PKGREVISION=	3
-CATEGORIES=	wm x11
-MASTER_SITES=	http://icculus.org/openbox/releases/
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://icculus.org/openbox/
-COMMENT=	Window manager based on Blackbox (2.x branch)
-
-DEPENDS+=	bsetroot>=0.1nb1:../../wm/bsetroot
-
-USE_LANGUAGES=	c c++
-USE_TOOLS+=	pkg-config
-GNU_CONFIGURE=	YES
-
-CPPFLAGS+=	-DHAVE_STRFTIME=1
-
-BUILDLINK_DEPMETHOD.libXt?=	build
-
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXft/buildlink3.mk"
-.include "../../x11/libXinerama/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/wm/openbox2/PLIST b/wm/openbox2/PLIST
deleted file mode 100644
index 5521271f3c5..00000000000
--- a/wm/openbox2/PLIST
+++ /dev/null
@@ -1,110 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/18 09:55:04 wiz Exp $
-bin/epist
-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
-@dirrm share/openbox
diff --git a/wm/openbox2/distinfo b/wm/openbox2/distinfo
deleted file mode 100644
index 711a57bef18..00000000000
--- a/wm/openbox2/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.3 2006/01/02 22:05:38 joerg Exp $
-
-SHA1 (openbox-2.2.3.tar.gz) = 972b7b62ced97dcdcc05be0038f3c929765f8fde
-RMD160 (openbox-2.2.3.tar.gz) = 160a45583e4241041eff382f86929cc8bb12c803
-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 (patch-ae) = 0e919952cd5209e787807548ca7ce45c5ed03497
-SHA1 (patch-af) = 1d8c1140948568668f509d75f00314d01dcb269c
-SHA1 (patch-ag) = 2aa89df82cebe06e0cf7837b6b62eb089b96ecfd
diff --git a/wm/openbox2/patches/patch-aa b/wm/openbox2/patches/patch-aa
deleted file mode 100644
index 671f194890b..00000000000
--- a/wm/openbox2/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/12/18 09:55:04 wiz Exp $
-
---- doc/Makefile.in.orig	Sun Dec 15 08:03:11 2002
-+++ doc/Makefile.in
-@@ -132,7 +132,7 @@ target_alias = @target_alias@
- 
- 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
diff --git a/wm/openbox2/patches/patch-ab b/wm/openbox2/patches/patch-ab
deleted file mode 100644
index 07dde1a27fb..00000000000
--- a/wm/openbox2/patches/patch-ab
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/12/18 09:55:04 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/openbox2/patches/patch-ac b/wm/openbox2/patches/patch-ac
deleted file mode 100644
index 727dea331cb..00000000000
--- a/wm/openbox2/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2003/12/18 09:55:05 wiz 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/openbox2/patches/patch-ad b/wm/openbox2/patches/patch-ad
deleted file mode 100644
index 55e2479a259..00000000000
--- a/wm/openbox2/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2003/12/18 09:55:05 wiz 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>
- 
diff --git a/wm/openbox2/patches/patch-ae b/wm/openbox2/patches/patch-ae
deleted file mode 100644
index 61237e7e693..00000000000
--- a/wm/openbox2/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/01/02 22:05:38 joerg Exp $
-
---- src/Timer.hh.orig	2006-01-02 21:42:01.000000000 +0000
-+++ src/Timer.hh
-@@ -98,9 +98,9 @@ public:
-   ~_timer_queue(void) {}
- 
-   void release(const _Tp& value) {
--    c.erase(std::remove(c.begin(), c.end(), value), c.end());
-+    this->c.erase(std::remove(this->c.begin(), this->c.end(), value), this->c.end());
-     // after removing the item we need to make the heap again
--    std::make_heap(c.begin(), c.end(), comp);
-+    std::make_heap(this->c.begin(), this->c.end(), this->comp);
-   }
-   bool empty(void) const { return _Base::empty(); }
-   size_t size(void) const { return _Base::size(); }
diff --git a/wm/openbox2/patches/patch-af b/wm/openbox2/patches/patch-af
deleted file mode 100644
index ad3d6099da9..00000000000
--- a/wm/openbox2/patches/patch-af
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-af,v 1.1 2006/01/02 22:05:38 joerg Exp $
-
---- util/epist/window.cc.orig	2006-01-02 21:54:28.000000000 +0000
-+++ util/epist/window.cc
-@@ -166,9 +166,12 @@ void XWindow::updateState() {
- 
- 
- void XWindow::updateDesktop() {
-+  unsigned long tmp_desktop = _desktop;
-   if (! _xatom->getValue(_window, XAtom::net_wm_desktop, XAtom::cardinal,
--                         static_cast<unsigned long>(_desktop)))
-+                         tmp_desktop))
-     _desktop = 0;
-+  else
-+    _desktop = tmp_desktop;
- }
- 
- 
diff --git a/wm/openbox2/patches/patch-ag b/wm/openbox2/patches/patch-ag
deleted file mode 100644
index 48ed38fae9e..00000000000
--- a/wm/openbox2/patches/patch-ag
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/01/02 22:05:38 joerg Exp $
-
---- util/epist/screen.cc.orig	2006-01-02 21:58:13.000000000 +0000
-+++ util/epist/screen.cc
-@@ -435,19 +435,27 @@ void screen::updateEverything() {
- void screen::updateNumDesktops() {
-   assert(_managed);
- 
-+  unsigned long tmp_num_desktops = _num_desktops;
-+
-   if (! _xatom->getValue(_root, XAtom::net_number_of_desktops, XAtom::cardinal,
--                         (unsigned long)_num_desktops))
-+                         tmp_num_desktops))
-     _num_desktops = 1;  // assume that there is at least 1 desktop!
-+  else
-+    _num_desktops = tmp_num_desktops;
- }
- 
- 
- void screen::updateActiveDesktop() {
-   assert(_managed);
- 
-+  unsigned long tmp_active_desktop = _active_desktop;
-+
-   if (! _xatom->getValue(_root, XAtom::net_current_desktop, XAtom::cardinal,
--                         (unsigned long)_active_desktop))
-+                         tmp_active_desktop))
-     _active_desktop = 0;  // there must be at least one desktop, and it must
-                           // be the current one
-+  else
-+    _active_desktop = tmp_active_desktop;
- }
- 
-