Reimport openbox-2* as openbox2 package; openbox package will

be replaced by openbox-3*.

8 files changed, 219 insertions, 0 deletions

diff --git a/wm/openbox2/DESCR b/wm/openbox2/DESCR
new file mode 100644
index 00000000000..695c4691e99
--- /dev/null
+++ b/wm/openbox2/DESCR
@@ -0,0 +1,5 @@
+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.
diff --git a/wm/openbox2/Makefile b/wm/openbox2/Makefile
new file mode 100644
index 00000000000..51222bfcbcd
--- /dev/null
+++ b/wm/openbox2/Makefile
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile,v 1.1.1.1 2003/12/18 09:55:04 wiz Exp $
+#
+
+DISTNAME=	openbox-2.2.3
+CATEGORIES=	wm x11
+MASTER_SITES=	http://icculus.org/openbox/releases/
+
+MAINTAINER=	xtraeme@NetBSD.org
+HOMEPAGE=	http://icculus.org/openbox/
+COMMENT=	Window manager based on Blackbox
+
+DEPENDS=	bsetroot>=0.1nb1:../../wm/bsetroot
+
+USE_BUILDLINK2=	YES
+USE_X11=	YES
+GNU_CONFIGURE=	YES
+
+CPPFLAGS+=	-DHAVE_STRFTIME=1
+
+.include "../../devel/pkgconfig/buildlink2.mk"
+.include "../../fonts/Xft2/buildlink2.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/wm/openbox2/PLIST b/wm/openbox2/PLIST
new file mode 100644
index 00000000000..5521271f3c5
--- /dev/null
+++ b/wm/openbox2/PLIST
@@ -0,0 +1,110 @@
+@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
new file mode 100644
index 00000000000..9c0166da7c6
--- /dev/null
+++ b/wm/openbox2/distinfo
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.1.1.1 2003/12/18 09:55:04 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
diff --git a/wm/openbox2/patches/patch-aa b/wm/openbox2/patches/patch-aa
new file mode 100644
index 00000000000..671f194890b
--- /dev/null
+++ b/wm/openbox2/patches/patch-aa
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..07dde1a27fb
--- /dev/null
+++ b/wm/openbox2/patches/patch-ab
@@ -0,0 +1,36 @@
+$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
new file mode 100644
index 00000000000..727dea331cb
--- /dev/null
+++ b/wm/openbox2/patches/patch-ac
@@ -0,0 +1,12 @@
+$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
new file mode 100644
index 00000000000..55e2479a259
--- /dev/null
+++ b/wm/openbox2/patches/patch-ad
@@ -0,0 +1,12 @@
+$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>
+