Add new category wm for window managers, and move lots of package from

x11 here. Only changes are: `wm' in category added and some paths fixed.

8 files changed, 338 insertions, 0 deletions

diff --git a/wm/fvwm2/Makefile b/wm/fvwm2/Makefile
new file mode 100644
index 00000000000..a827d6dd998
--- /dev/null
+++ b/wm/fvwm2/Makefile
@@ -0,0 +1,57 @@
+# $NetBSD: Makefile,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+# FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
+#
+
+DISTNAME=	fvwm-2.2.2
+PKGNAME=	${DISTNAME:S/fvwm/fvwm2/}
+CATEGORIES=	x11 wm
+MASTER_SITES=	ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/ \
+		ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/sources/2.0.x/ \
+		ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/fvwm-users-jp/kits/ \
+		ftp://ftp.TokyoNet.AD.JP/pub/X/fvwm/sources/2.0.x/ \
+		ftp://ftp.TokyoNet.AD.JP/pub/X/fvwm/fvwm-users-jp/kits/
+
+MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	http://www.fvwm.org/
+
+DEPENDS+=	xpmroot-2.*:../../x11/xpmroot
+DEPENDS+=	readline-*:../../devel/readline
+DEPENDS+=	rplay-3.*:../../audio/rplay
+
+CONFLICTS=	fvwm-2.*
+
+USE_X11BASE=	yes
+GNU_CONFIGURE=	yes
+
+EVAL_PREFIX+=		XPMDIR=xpm
+CONFIGURE_ARGS+=	--enable-extras
+CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/lib/X11/fvwm2
+CONFIGURE_ARGS+=	--libexecdir=${PREFIX}/lib/X11
+CONFIGURE_ARGS+=	--with-xpm-includes=${XPMDIR}/include
+CONFIGURE_ARGS+=	--with-readline-includes=${LOCALBASE}/include
+CONFIGURE_ARGS+=	--with-rplay-includes=${LOCALBASE}/include
+CONFIGURE_ARGS+=	--with-iconpath=${PREFIX}/lib/X11/fvwm2/pixmaps:${X11ROOT}/include/bitmaps:${X11ROOT}/include/pixmaps
+
+post-install:
+	@${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fvwm2/pixmaps
+	${INSTALL_DATA} \
+		${WRKSRC}/icons/*.xpm \
+		${WRKSRC}/icons/*.xbm \
+		${WRKSRC}/icons/*.bitmap \
+		${WRKSRC}/icons/*.icon \
+		${PREFIX}/lib/X11/fvwm2/pixmaps
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fvwm2
+	${INSTALL_DATA} \
+		${WRKSRC}/sample.fvwmrc/decor_examples \
+		${WRKSRC}/sample.fvwmrc/system.fvwm2rc-sample-* \
+		${PREFIX}/lib/X11/fvwm2
+	${INSTALL_DATA} \
+		${WRKSRC}/sample.fvwmrc/system.fvwm2rc \
+		${PREFIX}/lib/X11/fvwm2/system.fvwm2rc.example
+	if [ ! -f ${PREFIX}/lib/X11/fvwm2/system.fvwm2rc ]; then \
+		${INSTALL_DATA} \
+			${PREFIX}/lib/X11/fvwm2/system.fvwm2rc.example \
+			${PREFIX}/lib/X11/fvwm2/system.fvwm2rc ; \
+	fi
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/wm/fvwm2/files/md5 b/wm/fvwm2/files/md5
new file mode 100644
index 00000000000..c7e2af2baf5
--- /dev/null
+++ b/wm/fvwm2/files/md5
@@ -0,0 +1,3 @@
+$NetBSD: md5,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+
+MD5 (fvwm-2.2.2.tar.gz) = 684c5100084c5958ca2cb74780e615d9
diff --git a/wm/fvwm2/files/patch-sum b/wm/fvwm2/files/patch-sum
new file mode 100644
index 00000000000..4b196a429a0
--- /dev/null
+++ b/wm/fvwm2/files/patch-sum
@@ -0,0 +1,4 @@
+$NetBSD: patch-sum,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+
+MD5 (patch-aa) = 601bb4f219e3edb6bbefb9fa2c48a325
+MD5 (patch-ab) = c569152c6ad5a643ca4491d10236f084
diff --git a/wm/fvwm2/patches/patch-aa b/wm/fvwm2/patches/patch-aa
new file mode 100644
index 00000000000..076b9fa8fbe
--- /dev/null
+++ b/wm/fvwm2/patches/patch-aa
@@ -0,0 +1,18 @@
+$NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+
+--- utils/Makefile.in.orig	Wed Jan 20 06:29:27 1999
++++ utils/Makefile.in	Mon Feb 22 03:54:05 1999
+@@ -83,10 +83,10 @@
+ xpm_CFLAGS = @xpm_CFLAGS@
+ xpm_LIBS = @xpm_LIBS@
+ 
+-bin_PROGRAMS = @XPMROOT@
+-EXTRA_PROGRAMS = xpmroot
++#bin_PROGRAMS = @XPMROOT@
++#EXTRA_PROGRAMS = xpmroot
+ 
+-man_MANS = xpmroot.1
++#man_MANS = xpmroot.1
+ EXTRA_DIST = BuildXLockMenu fvwmrc_convert quantize_pixmaps $(man_MANS)
+ 
+ LDADD = -L$(top_builddir)/libs -lfvwm $(xpm_LIBS) 	$(X_LIBS) $(X_PRE_LIBS) -lXext -lX11 $(X_EXTRA_LIBS)
diff --git a/wm/fvwm2/patches/patch-ab b/wm/fvwm2/patches/patch-ab
new file mode 100644
index 00000000000..1adb30c65c9
--- /dev/null
+++ b/wm/fvwm2/patches/patch-ab
@@ -0,0 +1,31 @@
+$NetBSD: patch-ab,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+
+--- ./configure.orig	Fri May 28 17:15:29 1999
++++ ./configure	Wed Feb  2 03:39:39 2000
+@@ -654,7 +654,7 @@
+ # It thinks the first close brace ends the variable substitution.
+ test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+ 
+-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM:S/-s//g}'
+ 
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+@@ -743,7 +743,7 @@
+ fi
+ 
+ 
+-PACKAGE=fvwm
++PACKAGE=fvwm2
+ 
+ VERSION=2.2.2
+ 
+@@ -2984,7 +2984,7 @@
+ # It thinks the first close brace ends the variable substitution.
+ test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+ 
+-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM:S/-s//g}'
+ 
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
diff --git a/wm/fvwm2/pkg/COMMENT b/wm/fvwm2/pkg/COMMENT
new file mode 100644
index 00000000000..65ffabb66fc
--- /dev/null
+++ b/wm/fvwm2/pkg/COMMENT
@@ -0,0 +1 @@
+Newer version of X11 Virtual window manager
diff --git a/wm/fvwm2/pkg/DESCR b/wm/fvwm2/pkg/DESCR
new file mode 100644
index 00000000000..3e859e68de6
--- /dev/null
+++ b/wm/fvwm2/pkg/DESCR
@@ -0,0 +1,11 @@
+Fvwm is a very famous window manager for X, which provides a
+virtual/multiple disjoint desktop, a 3-D look for windows decorations,
+shaped/color icons. It gives a very good emulation of mwm. A nice
+button-bar can be used to provide convenient access to frequently used
+functions or programs.
+
+This package uses fvwm-users-jp-kits also, to add internationalized
+feature (based on X itself) to fvwm and its modules.
+
+With this package, you may use fonts of your own language, display
+characters in everywhere in fvwm, and have fun ;-)
diff --git a/wm/fvwm2/pkg/PLIST b/wm/fvwm2/pkg/PLIST
new file mode 100644
index 00000000000..1ffab3e0b4e
--- /dev/null
+++ b/wm/fvwm2/pkg/PLIST
@@ -0,0 +1,213 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+bin/fvwm2
+bin/FvwmCommand
+lib/X11/fvwm2/decor_examples
+lib/X11/fvwm2/system.fvwm2rc-sample-1
+lib/X11/fvwm2/system.fvwm2rc-sample-2
+@unexec if diff >/dev/null %D/lib/X11/fvwm2/system.fvwm2rc.example %D/lib/X11/fvwm2/system.fvwm2rc ; then rm %D/lib/X11/fvwm2/system.fvwm2rc ; fi
+lib/X11/fvwm2/system.fvwm2rc.example
+@exec if [ ! -f %D/lib/X11/fvwm2/system.fvwm2rc ]; then echo "Installing system.fvwm2rc in %D/lib/X11/fvwm2" ; /usr/bin/install -c -o root -g wheel -m 0644 %D/lib/X11/fvwm2/system.fvwm2rc.example %D/lib/X11/fvwm2/system.fvwm2rc; fi
+lib/X11/fvwm2/pixmaps/Jlock.xpm
+lib/X11/fvwm2/pixmaps/Monitor.xpm
+lib/X11/fvwm2/pixmaps/button-close.xpm
+lib/X11/fvwm2/pixmaps/button-horiz.xpm
+lib/X11/fvwm2/pixmaps/button-max.xpm
+lib/X11/fvwm2/pixmaps/button-vert.xpm
+lib/X11/fvwm2/pixmaps/button.xpm
+lib/X11/fvwm2/pixmaps/side.fvwm2.xpm
+lib/X11/fvwm2/pixmaps/Jnews.xpm
+lib/X11/fvwm2/pixmaps/Jrecycle.xpm
+lib/X11/fvwm2/pixmaps/Jxlock.xpm
+lib/X11/fvwm2/pixmaps/Mosaic.xpm
+lib/X11/fvwm2/pixmaps/arrdown2.xpm
+lib/X11/fvwm2/pixmaps/arrows2.xpm
+lib/X11/fvwm2/pixmaps/arrup2.xpm
+lib/X11/fvwm2/pixmaps/bomb.xpm
+lib/X11/fvwm2/pixmaps/ccode.icon
+lib/X11/fvwm2/pixmaps/clamp.xpm
+lib/X11/fvwm2/pixmaps/colormap.xpm
+lib/X11/fvwm2/pixmaps/datebook.xpm
+lib/X11/fvwm2/pixmaps/default.xbm
+lib/X11/fvwm2/pixmaps/desk.xpm
+lib/X11/fvwm2/pixmaps/dialog_box.xpm
+lib/X11/fvwm2/pixmaps/doomface.xpm
+lib/X11/fvwm2/pixmaps/editres.xpm
+lib/X11/fvwm2/pixmaps/eps.xpm
+lib/X11/fvwm2/pixmaps/exit.xpm
+lib/X11/fvwm2/pixmaps/flow_chart.xpm
+lib/X11/fvwm2/pixmaps/folder2.xpm
+lib/X11/fvwm2/pixmaps/folders.xpm
+lib/X11/fvwm2/pixmaps/fvwm.bitmap
+lib/X11/fvwm2/pixmaps/fvwm.xpm
+lib/X11/fvwm2/pixmaps/fvwm2.xpm
+lib/X11/fvwm2/pixmaps/fvwm2_big.xpm
+lib/X11/fvwm2/pixmaps/fvwm3.xpm
+lib/X11/fvwm2/pixmaps/gnu-animal.xpm
+lib/X11/fvwm2/pixmaps/graphs.xpm
+lib/X11/fvwm2/pixmaps/hcode.icon
+lib/X11/fvwm2/pixmaps/jball.xpm
+lib/X11/fvwm2/pixmaps/jbomb.xpm
+lib/X11/fvwm2/pixmaps/jbook1.xpm
+lib/X11/fvwm2/pixmaps/jbook2.xpm
+lib/X11/fvwm2/pixmaps/jcalc.xpm
+lib/X11/fvwm2/pixmaps/jclock.xpm
+lib/X11/fvwm2/pixmaps/jf.xpm
+lib/X11/fvwm2/pixmaps/jgraph.xpm
+lib/X11/fvwm2/pixmaps/jline.xpm
+lib/X11/fvwm2/pixmaps/jlower.xpm
+lib/X11/fvwm2/pixmaps/jmag.xpm
+lib/X11/fvwm2/pixmaps/jmail.xpm
+lib/X11/fvwm2/pixmaps/jmove.xpm
+lib/X11/fvwm2/pixmaps/jpaint.xpm
+lib/X11/fvwm2/pixmaps/jraise.xpm
+lib/X11/fvwm2/pixmaps/jresize.xpm
+lib/X11/fvwm2/pixmaps/jterm.xpm
+lib/X11/fvwm2/pixmaps/jwindow.xpm
+lib/X11/fvwm2/pixmaps/jx.xpm
+lib/X11/fvwm2/pixmaps/mag_glass.xpm
+lib/X11/fvwm2/pixmaps/mail1.xpm
+lib/X11/fvwm2/pixmaps/mail2.xpm
+lib/X11/fvwm2/pixmaps/map.xpm
+lib/X11/fvwm2/pixmaps/math4.xpm
+lib/X11/fvwm2/pixmaps/mini.audiovol.xpm
+lib/X11/fvwm2/pixmaps/mini.blah.xpm
+lib/X11/fvwm2/pixmaps/mini.bomb.xpm
+lib/X11/fvwm2/pixmaps/mini.checkmark.xpm
+lib/X11/fvwm2/pixmaps/mini.cut.xpm
+lib/X11/fvwm2/pixmaps/mini.destroy.xpm
+lib/X11/fvwm2/pixmaps/mini.excl.xpm
+lib/X11/fvwm2/pixmaps/mini.exit.xpm
+lib/X11/fvwm2/pixmaps/mini.eye.xpm
+lib/X11/fvwm2/pixmaps/mini.fvwm.xpm
+lib/X11/fvwm2/pixmaps/mini.iconify.xpm
+lib/X11/fvwm2/pixmaps/mini.letter.xpm
+lib/X11/fvwm2/pixmaps/mini.lower.xpm
+lib/X11/fvwm2/pixmaps/mini.maximize-horiz.xpm
+lib/X11/fvwm2/pixmaps/ps.xpm
+lib/X11/fvwm2/pixmaps/mini.maximize-vert.xpm
+lib/X11/fvwm2/pixmaps/mini.maximize.xpm
+lib/X11/fvwm2/pixmaps/mini.maximize2.xpm
+lib/X11/fvwm2/pixmaps/mini.move.xpm
+lib/X11/fvwm2/pixmaps/mini.netscape.xpm
+lib/X11/fvwm2/pixmaps/mini.rainbow.xpm
+lib/X11/fvwm2/pixmaps/mini.raise.xpm
+lib/X11/fvwm2/pixmaps/mini.refresh.xpm
+lib/X11/fvwm2/pixmaps/mini.resize.xpm
+lib/X11/fvwm2/pixmaps/mini.resize2.xpm
+lib/X11/fvwm2/pixmaps/mini.stick.xpm
+lib/X11/fvwm2/pixmaps/mini.stick2.xpm
+lib/X11/fvwm2/pixmaps/mini.stickpressed.xpm
+lib/X11/fvwm2/pixmaps/mini.winXX-close.xpm
+lib/X11/fvwm2/pixmaps/mini.winXX-maximize.xpm
+lib/X11/fvwm2/pixmaps/mini.winXX-minimize.xpm
+lib/X11/fvwm2/pixmaps/mini.xarchie.xpm
+lib/X11/fvwm2/pixmaps/mini.xbiff.xpm
+lib/X11/fvwm2/pixmaps/mini.xboing.xpm
+lib/X11/fvwm2/pixmaps/mini.xlock.xpm
+lib/X11/fvwm2/pixmaps/mini.xmag.xpm
+lib/X11/fvwm2/pixmaps/mini.xman.xpm
+lib/X11/fvwm2/pixmaps/mini.xpaint.xpm
+lib/X11/fvwm2/pixmaps/mini.xpm
+lib/X11/fvwm2/pixmaps/mini.xterm.xpm
+lib/X11/fvwm2/pixmaps/mini.zircon.xpm
+lib/X11/fvwm2/pixmaps/ocode.icon
+lib/X11/fvwm2/pixmaps/page.xpm
+lib/X11/fvwm2/pixmaps/page2.xpm
+lib/X11/fvwm2/pixmaps/prog.icon
+lib/X11/fvwm2/pixmaps/question.xpm
+lib/X11/fvwm2/pixmaps/rbomb.xpm
+lib/X11/fvwm2/pixmaps/rcalc.xpm
+lib/X11/fvwm2/pixmaps/rterm.xpm
+lib/X11/fvwm2/pixmaps/term.xpm
+lib/X11/fvwm2/pixmaps/tiff2.xpm
+lib/X11/fvwm2/pixmaps/toolbox.xpm
+lib/X11/fvwm2/pixmaps/unknown1.xpm
+lib/X11/fvwm2/pixmaps/wierd_page3.xpm
+lib/X11/fvwm2/pixmaps/word_processor.xpm
+lib/X11/fvwm2/pixmaps/world.xpm
+lib/X11/fvwm2/pixmaps/xcalc.xpm
+lib/X11/fvwm2/pixmaps/xemacs.xpm
+lib/X11/fvwm2/pixmaps/xlock.xpm
+lib/X11/fvwm2/pixmaps/xman.xpm
+lib/X11/fvwm2/pixmaps/xpaint.xpm
+lib/X11/fvwm2/pixmaps/xterm-axp.xpm
+lib/X11/fvwm2/pixmaps/xterm-blank.xpm
+lib/X11/fvwm2/pixmaps/xterm-dec.xpm
+lib/X11/fvwm2/pixmaps/xterm-linux.xpm
+lib/X11/fvwm2/pixmaps/xterm-sgi.xpm
+lib/X11/fvwm2/pixmaps/xterm-sol.xpm
+lib/X11/fvwm2/pixmaps/xterm-sun.xpm
+lib/X11/fvwm2/pixmaps/xterm.xpm
+lib/X11/fvwm2/pixmaps/xv.xpm
+lib/X11/fvwm2/pixmaps/xv2.xpm
+lib/X11/fvwm2/pixmaps/mini.directory.xpm
+lib/X11/fvwm2/pixmaps/mini.dirlink.xpm
+lib/X11/fvwm2/pixmaps/mini.file.xpm
+lib/X11/fvwm2/pixmaps/mini.filelink.xpm
+lib/X11/fvwm2/pixmaps/xterm-bsd.xpm
+lib/X11/fvwm2/2.2.2/FvwmAnimate
+lib/X11/fvwm2/2.2.2/FvwmAudio
+lib/X11/fvwm2/2.2.2/FvwmAuto
+lib/X11/fvwm2/2.2.2/FvwmBacker
+lib/X11/fvwm2/2.2.2/FvwmBanner
+lib/X11/fvwm2/2.2.2/FvwmButtons
+lib/X11/fvwm2/2.2.2/FvwmCpp
+lib/X11/fvwm2/2.2.2/FvwmEvent
+lib/X11/fvwm2/2.2.2/FvwmForm
+lib/X11/fvwm2/2.2.2/FvwmIconBox
+lib/X11/fvwm2/2.2.2/FvwmIconMan
+lib/X11/fvwm2/2.2.2/FvwmIdent
+lib/X11/fvwm2/2.2.2/FvwmM4
+lib/X11/fvwm2/2.2.2/FvwmPager
+lib/X11/fvwm2/2.2.2/FvwmRearrange
+lib/X11/fvwm2/2.2.2/FvwmCascade
+lib/X11/fvwm2/2.2.2/FvwmTile
+lib/X11/fvwm2/2.2.2/FvwmSave
+lib/X11/fvwm2/2.2.2/FvwmSaveDesk
+lib/X11/fvwm2/2.2.2/FvwmScroll
+lib/X11/fvwm2/2.2.2/FvwmTalk
+lib/X11/fvwm2/2.2.2/FvwmWinList
+lib/X11/fvwm2/2.2.2/FvwmCommandS
+lib/X11/fvwm2/2.2.2/FvwmConfig
+lib/X11/fvwm2/2.2.2/FvwmConsole
+lib/X11/fvwm2/2.2.2/FvwmConsoleC
+lib/X11/fvwm2/2.2.2/FvwmConsoleC.pl
+lib/X11/fvwm2/2.2.2/FvwmDebug
+lib/X11/fvwm2/2.2.2/FvwmGoodStuff
+lib/X11/fvwm2/2.2.2/FvwmPipe
+lib/X11/fvwm2/2.2.2/FvwmScript
+lib/X11/fvwm2/2.2.2/FvwmTaskBar
+lib/X11/fvwm2/2.2.2/FvwmWharf
+@dirrm lib/X11/fvwm2/2.2.2
+@dirrm lib/X11/fvwm2/pixmaps
+@dirrm lib/X11/fvwm2
+man/man1/fvwm2.1
+man/man1/FvwmAnimate.1
+man/man1/FvwmAudio.1
+man/man1/FvwmAuto.1
+man/man1/FvwmBacker.1
+man/man1/FvwmBanner.1
+man/man1/FvwmButtons.1
+man/man1/FvwmCpp.1
+man/man1/FvwmEvent.1
+man/man1/FvwmForm.1
+man/man1/FvwmIconBox.1
+man/man1/FvwmIconMan.1
+man/man1/FvwmIdent.1
+man/man1/FvwmM4.1
+man/man1/FvwmPager.1
+man/man1/FvwmSave.1
+man/man1/FvwmRearrange.1
+man/man1/FvwmSaveDesk.1
+man/man1/FvwmScroll.1
+man/man1/FvwmTalk.1
+man/man1/FvwmWinList.1
+man/man1/FvwmCommand.1
+man/man1/FvwmConfig.1
+man/man1/FvwmConsole.1
+man/man1/FvwmConsoleC.pl.1
+man/man1/FvwmDebug.1
+man/man1/FvwmGoodStuff.1
+man/man1/FvwmScript.1
+man/man1/FvwmTaskBar.1
+man/man1/FvwmWharf.1