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.

10 files changed, 212 insertions, 0 deletions

diff --git a/wm/fvwm1/Makefile b/wm/fvwm1/Makefile
new file mode 100644
index 00000000000..5eae87ccdc3
--- /dev/null
+++ b/wm/fvwm1/Makefile
@@ -0,0 +1,44 @@
+# $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-1.24r
+PKGNAME=	${DISTNAME:S/fvwm/fvwm1/}
+CATEGORIES=	x11 wm
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+
+MAINTAINER=	cjs@netbsd.org
+HOMEPAGE=	http://www.hpc.uh.edu/fvwm/
+
+DEPENDS=	xpmroot-2.*:../../x11/xpmroot
+
+CONFLICTS=	fvwm-1.*
+
+NO_SRC_ON_FTP=	Already in MASTER_SITE_LOCAL
+
+USE_IMAKE=	yes
+# drop -a because we have no `depends' target
+XMKMF=		${SH} -c "xmkmf && ${MAKE} Makefiles"
+
+post-extract:
+	cd ${WRKSRC}/modules; \
+	for FILE in Fvwm*/Imakefile; do \
+	    ${MV} $${FILE} $${FILE}.orig; \
+	    ${SED} -e 's/ComplexProgramTarget/ComplexProgramTargetNoMan/' \
+	           -e 's@#ifdef AlphaArchitecture@#if defined(AlphaArchitecture) \&\& !defined(NetBSDArchitecture)@' \
+		<$${FILE}.orig >$${FILE}; \
+	done
+	${MV} ${WRKSRC}/modules/GoodStuff/Imakefile ${WRKSRC}/modules/GoodStuff/Imakefile.orig
+	${SED} -e 's@#ifdef AlphaArchitecture@#if defined(AlphaArchitecture) \&\& !defined(NetBSDArchitecture)@' \
+		<${WRKSRC}/modules/GoodStuff/Imakefile.orig >${WRKSRC}/modules/GoodStuff/Imakefile
+
+post-install:
+	@${MKDIR} ${PREFIX}/lib/X11/fvwm/pixmaps
+	@${MKDIR} ${PREFIX}/lib/X11/fvwm/bitmaps
+	${INSTALL_DATA} ${WRKSRC}/fvwm_icons/*.xpm \
+		${PREFIX}/lib/X11/fvwm/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/fvwm_icons/*.xbm \
+		${WRKSRC}/fvwm_icons/*.bitmap ${WRKSRC}/fvwm_icons/*.icon \
+		${PREFIX}/lib/X11/fvwm/bitmaps
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/wm/fvwm1/files/md5 b/wm/fvwm1/files/md5
new file mode 100644
index 00000000000..6b063526efb
--- /dev/null
+++ b/wm/fvwm1/files/md5
@@ -0,0 +1,3 @@
+$NetBSD: md5,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+
+MD5 (fvwm-1.24r.tar.gz) = 875733e77e285566197f4b50746aefc6
diff --git a/wm/fvwm1/files/patch-sum b/wm/fvwm1/files/patch-sum
new file mode 100644
index 00000000000..6ce3cd82dab
--- /dev/null
+++ b/wm/fvwm1/files/patch-sum
@@ -0,0 +1,6 @@
+$NetBSD: patch-sum,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+
+MD5 (patch-aa) = f19a65537575f788c94520596b36d579
+MD5 (patch-ab) = 2bd085810ebf27f8b2f1bdceb92dd468
+MD5 (patch-ac) = 4e3a15d3ee7aa37909587a0d2ceab9b2
+MD5 (patch-ad) = 441cea0a4908092eb812e4843d3f8b52
diff --git a/wm/fvwm1/patches/patch-aa b/wm/fvwm1/patches/patch-aa
new file mode 100644
index 00000000000..9c1967868e2
--- /dev/null
+++ b/wm/fvwm1/patches/patch-aa
@@ -0,0 +1,35 @@
+$NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+
+--- configure.h~	Mon Nov 28 13:08:47 1994
++++ configure.h	Mon Mar 16 21:44:31 1998
+@@ -1,7 +1,7 @@
+-#define FVWMDIR     "/usr/lib/X11/fvwm"
++#define FVWMDIR     "/usr/X11R6/lib/X11/fvwm"
+ /* #define FVWMDIR        "/local/homes/dsp/nation/modules"*/
+-#define FVWM_ICONDIR   "/usr/include/X11/bitmaps:/usr/include/X11/pixmaps"
+-#define FVWMRC         "/usr/lib/X11/fvwm/system.fvwmrc"
++#define FVWM_ICONDIR   "/usr/X11R6/include/X11/bitmaps:/usr/X11R6/include/X11/pixmaps"
++#define FVWMRC         "/usr/X11R6/lib/X11/fvwm/system.fvwmrc"
+ 
+ /* Imake command needed to put modules in desired target location */
+ /* Use the second version if it causes grief */
+@@ -14,8 +14,8 @@
+  * If you want to install it in a different directory, uncomment and
+  * edit the first line */
+ /* #define FVWM_BIN_DIR BINDIR=/local/homes/dsp/nation/bin/4.1.3*/
+-#define FVWM_BIN_DIR BINDIR=/usr/bin/X11
+-/*#define FVWM_BIN_DIR*/
++/* #define FVWM_BIN_DIR BINDIR=/usr/bin/X11 */
++#define FVWM_BIN_DIR
+ 
+ /* Compiler over-ride for Imakefiles */
+ /* Leave it as shown to get your default compiler */
+@@ -57,7 +57,7 @@
+  ***************************************************************************/
+ #define XPM                      
+ /*  linker flags needed to locate and link in the Xpm library, if you use it */
+-#define XPMLIBRARY -L/usr/lib/X11 -lXpm
++#define XPMLIBRARY -L/usr/X11R6/lib -lXpm
+ 
+ /***************************************************************************
+  *#define M4
diff --git a/wm/fvwm1/patches/patch-ab b/wm/fvwm1/patches/patch-ab
new file mode 100644
index 00000000000..a59a26bee41
--- /dev/null
+++ b/wm/fvwm1/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+
+--- Imakefile.orig	Fri Dec  2 20:04:20 1994
++++ Imakefile	Wed Mar 25 00:36:03 1998
+@@ -28,7 +28,7 @@
+           modules/FvwmWinList
+ 
+ #ifdef XPM
+-XPMSUBDIRS = xpmroot modules/FvwmBanner 
++XPMSUBDIRS = modules/FvwmBanner 
+ #endif
+ 
+ SUBDIRS = $(ALLSUBDIRS) $(XPMSUBDIRS) $(SHAPESUBDIRS)
diff --git a/wm/fvwm1/patches/patch-ac b/wm/fvwm1/patches/patch-ac
new file mode 100644
index 00000000000..2a16e935c4c
--- /dev/null
+++ b/wm/fvwm1/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+--- fvwm/alpha_header.h.orig	Wed Sep 16 08:30:50 1998
++++ fvwm/alpha_header.h	Wed Sep 16 08:31:22 1998
+@@ -11,8 +11,9 @@
+ #ifdef __GNUC__
+ extern size_t strlen(char *);
+ #endif
+-
++/*
+ extern int bzero(char *, int);
+ extern int gethostname (char *, int);
++*/
+ /**************************************************************************/
+ 
diff --git a/wm/fvwm1/patches/patch-ad b/wm/fvwm1/patches/patch-ad
new file mode 100644
index 00000000000..1e0241cc5a5
--- /dev/null
+++ b/wm/fvwm1/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+--- fvwm/Imakefile.orig	Wed Sep 16 08:37:29 1998
++++ fvwm/Imakefile	Wed Sep 16 08:38:08 1998
+@@ -16,7 +16,7 @@
+ 
+ DEPLIBS = $(DEPXLIB) ../libs/libfvwmlib.a
+ 
+-#ifdef AlphaArchitecture
++#if defined(AlphaArchitecture) && !defined(NetBSDArchitecture)
+ LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -ldnet_stub -L../libs -lfvwmlib
+ #else 
+ #ifdef HPArchitecture
diff --git a/wm/fvwm1/pkg/COMMENT b/wm/fvwm1/pkg/COMMENT
new file mode 100644
index 00000000000..af5e47f1228
--- /dev/null
+++ b/wm/fvwm1/pkg/COMMENT
@@ -0,0 +1 @@
+Virtual window manager for X
diff --git a/wm/fvwm1/pkg/DESCR b/wm/fvwm1/pkg/DESCR
new file mode 100644
index 00000000000..abfbfc2c78c
--- /dev/null
+++ b/wm/fvwm1/pkg/DESCR
@@ -0,0 +1,13 @@
+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 is the older, smaller version of fvwm; it uses not much more
+than half the memory of version 2.
+
+IMPORTANT NOTE: This package and fvwm2 share a few files, in
+particular the xpmroot program and the manual pages for the modules.
+Don't install both at the same time, or be prepared to lose slightly
+if you do and then uninstall one.
diff --git a/wm/fvwm1/pkg/PLIST b/wm/fvwm1/pkg/PLIST
new file mode 100644
index 00000000000..071cdfcac7e
--- /dev/null
+++ b/wm/fvwm1/pkg/PLIST
@@ -0,0 +1,71 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+bin/fvwm
+lib/X11/fvwm/FvwmPager
+lib/X11/fvwm/system.fvwmrc
+lib/X11/fvwm/GoodStuff
+lib/X11/fvwm/FvwmIdent
+lib/X11/fvwm/FvwmDebug
+lib/X11/fvwm/FvwmBacker
+lib/X11/fvwm/FvwmClean
+lib/X11/fvwm/FvwmAudio
+lib/X11/fvwm/FvwmScroll
+lib/X11/fvwm/FvwmIconBox
+lib/X11/fvwm/FvwmSave
+lib/X11/fvwm/FvwmSaveDesk
+lib/X11/fvwm/FvwmAuto
+lib/X11/fvwm/FvwmWinList
+lib/X11/fvwm/FvwmBanner
+lib/X11/fvwm/pixmaps/arrdown2.xpm
+lib/X11/fvwm/pixmaps/arrows2.xpm
+lib/X11/fvwm/pixmaps/arrup2.xpm
+lib/X11/fvwm/pixmaps/bomb.xpm
+lib/X11/fvwm/bitmaps/ccode.icon
+lib/X11/fvwm/pixmaps/clamp.xpm
+lib/X11/fvwm/pixmaps/datebook.xpm
+lib/X11/fvwm/bitmaps/default.xbm
+lib/X11/fvwm/pixmaps/desk.xpm
+lib/X11/fvwm/pixmaps/dialog_box.xpm
+lib/X11/fvwm/pixmaps/editres.xpm
+lib/X11/fvwm/pixmaps/eps.xpm
+lib/X11/fvwm/pixmaps/flow_chart.xpm
+lib/X11/fvwm/pixmaps/folder2.xpm
+lib/X11/fvwm/pixmaps/folders.xpm
+lib/X11/fvwm/bitmaps/fvwm.bitmap
+lib/X11/fvwm/pixmaps/fvwm.xpm
+lib/X11/fvwm/pixmaps/fvwm2.xpm
+lib/X11/fvwm/pixmaps/graphs.xpm
+lib/X11/fvwm/bitmaps/hcode.icon
+lib/X11/fvwm/pixmaps/mag_glass.xpm
+lib/X11/fvwm/pixmaps/mail1.xpm
+lib/X11/fvwm/pixmaps/mail2.xpm
+lib/X11/fvwm/pixmaps/map.xpm
+lib/X11/fvwm/pixmaps/math4.xpm
+lib/X11/fvwm/bitmaps/ocode.icon
+lib/X11/fvwm/pixmaps/page.xpm
+lib/X11/fvwm/pixmaps/page2.xpm
+lib/X11/fvwm/bitmaps/prog.icon
+lib/X11/fvwm/pixmaps/ps.xpm
+lib/X11/fvwm/pixmaps/question.xpm
+lib/X11/fvwm/pixmaps/rbomb.xpm
+lib/X11/fvwm/pixmaps/rcalc.xpm
+lib/X11/fvwm/pixmaps/rterm.xpm
+lib/X11/fvwm/pixmaps/term.xpm
+lib/X11/fvwm/pixmaps/tiff2.xpm
+lib/X11/fvwm/pixmaps/toolbox.xpm
+lib/X11/fvwm/pixmaps/unknown1.xpm
+lib/X11/fvwm/pixmaps/wierd_page3.xpm
+lib/X11/fvwm/pixmaps/word_processor.xpm
+lib/X11/fvwm/pixmaps/xcalc.xpm
+lib/X11/fvwm/pixmaps/xman.xpm
+lib/X11/fvwm/pixmaps/xterm-axp.xpm
+lib/X11/fvwm/pixmaps/xterm-blank.xpm
+lib/X11/fvwm/pixmaps/xterm-dec.xpm
+lib/X11/fvwm/pixmaps/xterm-sgi.xpm
+lib/X11/fvwm/pixmaps/xterm-sol.xpm
+lib/X11/fvwm/pixmaps/xterm-sun.xpm
+lib/X11/fvwm/pixmaps/xterm.xpm
+man/cat1/GoodStuff.0
+man/cat1/fvwm.0
+@dirrm lib/X11/fvwm/pixmaps
+@dirrm lib/X11/fvwm/bitmaps
+@dirrm lib/X11/fvwm