Update to 3.0 (really, only move contents of openbox3 dir here).

4 files changed, 18 insertions, 71 deletions

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>
-