Rectify previous mess. Sigh, there are days when one shouldn't do cvs

work!

22 files changed, 33 insertions, 247 deletions

diff --git a/meta-pkgs/windowmaker-desktop/windowmaker-desktop.rh/DESCR b/meta-pkgs/windowmaker-desktop/DESCR
index a3896024105..a3896024105 100644
--- a/meta-pkgs/windowmaker-desktop/windowmaker-desktop.rh/DESCR
+++ b/meta-pkgs/windowmaker-desktop/DESCR
diff --git a/meta-pkgs/windowmaker-desktop/Makefile b/meta-pkgs/windowmaker-desktop/Makefile
index 62315cf32e1..da458393898 100644
--- a/meta-pkgs/windowmaker-desktop/Makefile
+++ b/meta-pkgs/windowmaker-desktop/Makefile
@@ -1,13 +1,35 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/06/13 08:16:47 rh Exp $
+# $NetBSD: Makefile,v 1.2 2002/06/13 08:22:01 rh Exp $
 #
 
-COMMENT=	Collections of other packages
+DISTNAME=	windowmaker-desktop-1.0
+CATEGORIES=	meta-pkgs x11
+MASTER_SITES=	# empty
+DISTFILES=	# empty
 
-SUBDIR+=	edesktop
-SUBDIR+=	fxtv-capture
-SUBDIR+=	netbsd-doc
-SUBDIR+=	netbsd-doc-print
-SUBDIR+=	web-server
-SUBDIR+=	windowmaker-desktop
+MAINTAINER=	jmmv@hispabsd.org
+HOMEPAGE=	http://www.windowmaker.org/
+COMMENT=	provides a desktop based on the WindowMaker wm
 
-.include "../mk/bsd.pkg.subdir.mk"
+DEPENDS+=	windowmaker>=0.80.0:../../wm/windowmaker
+DEPENDS+=	wterm-[0-9]*:../../x11/wterm
+DEPENDS+=	wmextra-[0-9]*:../../wm/wmextra
+DEPENDS+=	wmthemes-[0-9]*:../../wm/wmthemes
+DEPENDS+=	wmakerconf-[0-9]*:../../wm/wmakerconf
+DEPENDS+=	asclock-[0-9]*:../../time/asclock
+DEPENDS+=	wmcpuload-[0-9]*:../../sysutils/wmcpuload
+DEPENDS+=	wmmail-[0-9]*:../../mail/wmmail
+DEPENDS+=	wmnet-[0-9]*:../../net/wmnet
+DEPENDS+=	wmWeather-[0-9]*:../../x11/wmweather
+DEPENDS+=	wmMoonClock-[0-9]*:../../time/wmmoonclock
+DEPENDS+=	wmmixer-[0-9]*:../../audio/wmmixer
+
+USE_X11=	yes
+EXTRACT_ONLY=	# empty
+NO_CHECKSUM=	yes
+NO_PATCH=	yes
+NO_CONFIGURE=	yes
+NO_BUILD=	yes
+
+do-install:	# empty
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/windowmaker-desktop/PLIST b/meta-pkgs/windowmaker-desktop/PLIST
new file mode 100644
index 00000000000..61c9f5613d4
--- /dev/null
+++ b/meta-pkgs/windowmaker-desktop/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2002/06/13 08:22:01 rh Exp $
+@comment this plist intentionally left empty
diff --git a/meta-pkgs/windowmaker-desktop/edesktop/DESCR b/meta-pkgs/windowmaker-desktop/edesktop/DESCR
deleted file mode 100644
index 716836f53ad..00000000000
--- a/meta-pkgs/windowmaker-desktop/edesktop/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-The Edesktop meta-package provides a number of components for an
-Enlighenment based desktop, using other components of the NetBSD packages
-collection.
-
-This package does not contain anything by itself -- it is a
-"meta-package" that depends on other packages.  Its sole purpose is
-to require dependencies so users can install this package only and
-have all the other packages pulled in by the port/package dependency
-mechanism.
diff --git a/meta-pkgs/windowmaker-desktop/edesktop/Makefile b/meta-pkgs/windowmaker-desktop/edesktop/Makefile
deleted file mode 100644
index c377c4f8c25..00000000000
--- a/meta-pkgs/windowmaker-desktop/edesktop/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/06/13 08:16:48 rh Exp $
-#
-
-DISTNAME=	edesktop-1.0
-PKGREVISION=	1
-CATEGORIES=	meta-pkgs x11
-MASTER_SITES=	# empty
-DISTFILES=	# empty
-
-MAINTAINER=	root@garbled.net
-COMMENT=	provides a nearly complete E desktop
-
-DEPENDS+=	enlightenment>=0.16.2:../../wm/enlightenment
-DEPENDS+=	eterm-[0-9]*:../../x11/eterm
-DEPENDS+=	ethemes-[0-9]*:../../wm/ethemes
-DEPENDS+=	rxvt-[0-9]*:../../x11/rxvt
-DEPENDS+=	mutt-[0-9]*:../../mail/mutt
-DEPENDS+=	econf-[0-9]*:../../wm/econf
-DEPENDS+=	xv-[0-9]*:../../graphics/xv
-DEPENDS+=	ee-[0-9]*:../../graphics/ee
-DEPENDS+=	gimp-[0-9]*:../../graphics/gimp
-DEPENDS+=	xpaint-[0-9]*:../../graphics/xpaint
-DEPENDS+=	xfig-[0-9]*:../../graphics/xfig
-DEPENDS+=	emacs-[0-9]*:../../editors/emacs
-DEPENDS+=	jed-[0-9]*:../../editors/jed
-
-USE_X11=	yes
-EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	yes
-NO_PATCH=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-
-do-install:	# empty
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/windowmaker-desktop/edesktop/PLIST b/meta-pkgs/windowmaker-desktop/edesktop/PLIST
deleted file mode 100644
index 4d0bb32dc6f..00000000000
--- a/meta-pkgs/windowmaker-desktop/edesktop/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/13 08:16:48 rh Exp $
-@comment this plist intentionally left empty
diff --git a/meta-pkgs/windowmaker-desktop/fxtv-capture/DESCR b/meta-pkgs/windowmaker-desktop/fxtv-capture/DESCR
deleted file mode 100644
index 9ff6f4099f3..00000000000
--- a/meta-pkgs/windowmaker-desktop/fxtv-capture/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Meta-package that includes all packages needed for capturing video
-with bktr(4).
diff --git a/meta-pkgs/windowmaker-desktop/fxtv-capture/Makefile b/meta-pkgs/windowmaker-desktop/fxtv-capture/Makefile
deleted file mode 100644
index c1d0f23ad32..00000000000
--- a/meta-pkgs/windowmaker-desktop/fxtv-capture/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/06/13 08:16:48 rh Exp $
-#
-
-DISTNAME=	fxtv-capture-1.0
-CATEGORIES=	meta-pkgs
-MASTER_SITES=	# empty
-DISTFILES=	# empty
-
-MAINTAINER=	wiz@netbsd.org
-COMMENT=	meta-pkg including all pkgs to capture video with bktr(4)
-
-DEPENDS+=	sox>=12.17.1:../../audio/sox
-DEPENDS+=	mpegaudio>=3.9:../../audio/mpegaudio
-DEPENDS+=	fxtv>=1.03nb1:../../graphics/fxtv
-DEPENDS+=	mpeg_encode-*:../../graphics/mpeg_encode
-DEPENDS+=	mplex>=1.1:../../graphics/mplex
-
-EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	yes
-NO_PATCH=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-
-do-install:	# empty
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/windowmaker-desktop/fxtv-capture/PLIST b/meta-pkgs/windowmaker-desktop/fxtv-capture/PLIST
deleted file mode 100644
index 36a841829c0..00000000000
--- a/meta-pkgs/windowmaker-desktop/fxtv-capture/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/13 08:16:48 rh Exp $
diff --git a/meta-pkgs/windowmaker-desktop/netbsd-doc-print/DESCR b/meta-pkgs/windowmaker-desktop/netbsd-doc-print/DESCR
deleted file mode 100644
index 6dbed15bd65..00000000000
--- a/meta-pkgs/windowmaker-desktop/netbsd-doc-print/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Meta-package that includes all packages needed for the NetBSD
-Documentation project to convert SGML/DocBook to PDF/PS.
-
-Excluded from netbsd-doc into a seperate package because it wants
-teTeX, which is rather large in size. 
-
-Nevertheless you'll need external PostScript and PDF previewers,
-e.g. Acrobat Reader, xpdf, gv, etc.
diff --git a/meta-pkgs/windowmaker-desktop/netbsd-doc-print/MESSAGE b/meta-pkgs/windowmaker-desktop/netbsd-doc-print/MESSAGE
deleted file mode 100644
index 0adcd3d309e..00000000000
--- a/meta-pkgs/windowmaker-desktop/netbsd-doc-print/MESSAGE
+++ /dev/null
@@ -1,10 +0,0 @@
-======================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2002/06/13 08:16:48 rh Exp $
-
-You will want to install PDF and PostScript previewers, such as
- * acroread
- * xpdf
- * gv
-To view the generated PDF and PostScript output.
-
-======================================================================
diff --git a/meta-pkgs/windowmaker-desktop/netbsd-doc-print/Makefile b/meta-pkgs/windowmaker-desktop/netbsd-doc-print/Makefile
deleted file mode 100644
index 4075f40e565..00000000000
--- a/meta-pkgs/windowmaker-desktop/netbsd-doc-print/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/06/13 08:16:48 rh Exp $
-#
-
-DISTNAME=	netbsd-doc-print-1.1
-PKGREVISION=	1
-CATEGORIES=	meta-pkgs
-MASTER_SITES=	# empty
-DISTFILES=	# empty
-
-MAINTAINER=	hubertf@netbsd.org
-COMMENT=	Meta-pkg including all pkgs to convert SGML->PDF/PS
-
-DEPENDS+=	tex-jadetex>=2.20nb1:../../print/tex-jadetex
-DEPENDS+=	ghostscript-[0-9]*:../../print/ghostscript
-DEPENDS+=	netbsd-doc-1.2:../netbsd-doc
-
-EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	yes
-NO_PATCH=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-
-do-install:	# empty
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/windowmaker-desktop/netbsd-doc-print/PLIST b/meta-pkgs/windowmaker-desktop/netbsd-doc-print/PLIST
deleted file mode 100644
index 36a841829c0..00000000000
--- a/meta-pkgs/windowmaker-desktop/netbsd-doc-print/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/13 08:16:48 rh Exp $
diff --git a/meta-pkgs/windowmaker-desktop/netbsd-doc/DESCR b/meta-pkgs/windowmaker-desktop/netbsd-doc/DESCR
deleted file mode 100644
index 82bd8f48bd4..00000000000
--- a/meta-pkgs/windowmaker-desktop/netbsd-doc/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-Meta-package that includes all packages needed for the NetBSD
-Documentation project to convert SGML/DocBook to HTML.
-
-A separate web browser is strongly recommended.
-
-Set the SGML_CATALOG_FILES env variable to a colon-separated list
-of catalog files:
-
-setenv SGML_CATALOG_FILES `find /usr/pkg/share/sgml -name catalog | tr '\012' :`
diff --git a/meta-pkgs/windowmaker-desktop/netbsd-doc/MESSAGE b/meta-pkgs/windowmaker-desktop/netbsd-doc/MESSAGE
deleted file mode 100644
index 3d345299784..00000000000
--- a/meta-pkgs/windowmaker-desktop/netbsd-doc/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-======================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2002/06/13 08:16:48 rh Exp $
-
-You will also need a HTML-viewer to view the produced results
-from the SGML->HTML conversion. Please install either lynx,
-links or netscape or any other web browser of your choice 
-manually.
-
-======================================================================
diff --git a/meta-pkgs/windowmaker-desktop/netbsd-doc/Makefile b/meta-pkgs/windowmaker-desktop/netbsd-doc/Makefile
deleted file mode 100644
index a14c24009ea..00000000000
--- a/meta-pkgs/windowmaker-desktop/netbsd-doc/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/06/13 08:16:48 rh Exp $
-#
-
-DISTNAME=	netbsd-doc-1.2
-CATEGORIES=	meta-pkgs
-MASTER_SITES=	# empty
-DISTFILES=	# empty
-
-MAINTAINER=	hubertf@netbsd.org
-COMMENT=	Meta-pkg including all pkgs to convert SGML->HTML
-
-DEPENDS+=	opensp>=1.4:../../textproc/opensp
-DEPENDS+=	jade>=1.2.1nb3:../../textproc/jade
-DEPENDS+=	docbook>=4.0:../../textproc/docbook
-DEPENDS+=	iso8879-1986:../../textproc/iso8879
-DEPENDS+=	iso12083-1993:../../textproc/iso12083
-DEPENDS+=	dsssl-docbook-modular>=1.54:../../textproc/dsssl-docbook-modular
-DEPENDS+=	html>=4.0:../../textproc/html
-
-EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	yes
-NO_PATCH=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-
-do-install:	# empty
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/windowmaker-desktop/netbsd-doc/PLIST b/meta-pkgs/windowmaker-desktop/netbsd-doc/PLIST
deleted file mode 100644
index 36a841829c0..00000000000
--- a/meta-pkgs/windowmaker-desktop/netbsd-doc/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/13 08:16:48 rh Exp $
diff --git a/meta-pkgs/windowmaker-desktop/web-server/DESCR b/meta-pkgs/windowmaker-desktop/web-server/DESCR
deleted file mode 100644
index d24c22147cb..00000000000
--- a/meta-pkgs/windowmaker-desktop/web-server/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-The web-server meta-package provides all the elements of a webserver,
-using other components of the NetBSD packages collection.
-
-This package does not contain anything by itself -- it is a
-"meta-package" that depends on other packages.  Its sole purpose is
-to require dependencies so users can install this package only and
-have all the other packages pulled in by the port/package dependency
-mechanism.
diff --git a/meta-pkgs/windowmaker-desktop/web-server/Makefile b/meta-pkgs/windowmaker-desktop/web-server/Makefile
deleted file mode 100644
index f2e916c4eea..00000000000
--- a/meta-pkgs/windowmaker-desktop/web-server/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/06/13 08:16:48 rh Exp $
-#
-
-DISTNAME=	web-server-1.1
-CATEGORIES=	meta-pkgs www
-MASTER_SITES=	# empty
-DISTFILES=	# empty
-
-MAINTAINER=	packages@netbsd.org
-COMMENT=	provides some useful tools for a web server
-
-DEPENDS+=	apache-1.3.*:../../www/apache
-DEPENDS+=	lynx>=2.8.2:../../www/lynx
-DEPENDS+=	glimpse>=4.1:../../textproc/glimpse
-
-EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	yes
-NO_PATCH=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-
-do-install:	# empty
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/windowmaker-desktop/web-server/PLIST b/meta-pkgs/windowmaker-desktop/web-server/PLIST
deleted file mode 100644
index 4d0bb32dc6f..00000000000
--- a/meta-pkgs/windowmaker-desktop/web-server/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/13 08:16:48 rh Exp $
-@comment this plist intentionally left empty
diff --git a/meta-pkgs/windowmaker-desktop/windowmaker-desktop.rh/Makefile b/meta-pkgs/windowmaker-desktop/windowmaker-desktop.rh/Makefile
deleted file mode 100644
index 7c52cdc6a53..00000000000
--- a/meta-pkgs/windowmaker-desktop/windowmaker-desktop.rh/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/06/13 08:16:48 rh Exp $
-#
-
-DISTNAME=	windowmaker-desktop-1.0
-CATEGORIES=	meta-pkgs x11
-MASTER_SITES=	# empty
-DISTFILES=	# empty
-
-MAINTAINER=	jmmv@hispabsd.org
-HOMEPAGE=	http://www.windowmaker.org/
-COMMENT=	provides a desktop based on the WindowMaker wm
-
-DEPENDS+=	windowmaker>=0.80.0:../../wm/windowmaker
-DEPENDS+=	wterm-[0-9]*:../../x11/wterm
-DEPENDS+=	wmextra-[0-9]*:../../wm/wmextra
-DEPENDS+=	wmthemes-[0-9]*:../../wm/wmthemes
-DEPENDS+=	wmakerconf-[0-9]*:../../wm/wmakerconf
-DEPENDS+=	asclock-[0-9]*:../../time/asclock
-DEPENDS+=	wmcpuload-[0-9]*:../../sysutils/wmcpuload
-DEPENDS+=	wmmail-[0-9]*:../../mail/wmmail
-DEPENDS+=	wmnet-[0-9]*:../../net/wmnet
-DEPENDS+=	wmWeather-[0-9]*:../../x11/wmweather
-DEPENDS+=	wmMoonClock-[0-9]*:../../time/wmmoonclock
-DEPENDS+=	wmmixer-[0-9]*:../../audio/wmmixer
-
-USE_X11=	yes
-EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	yes
-NO_PATCH=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-
-do-install:	# empty
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/windowmaker-desktop/windowmaker-desktop.rh/PLIST b/meta-pkgs/windowmaker-desktop/windowmaker-desktop.rh/PLIST
deleted file mode 100644
index 4d0bb32dc6f..00000000000
--- a/meta-pkgs/windowmaker-desktop/windowmaker-desktop.rh/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/13 08:16:48 rh Exp $
-@comment this plist intentionally left empty