-clean up (match Makefile.template)

-add USE_X11 where forgotten
2001-03-09 14:28:45 +00:00 · 2001-03-09 14:28:45 +00:00 · 61ec94c7f6
commit 61ec94c7f6
parent 8a790be23e
42 changed files with 580 additions and 494 deletions
--- a/astro/wmglobe/Makefile
+++ b/astro/wmglobe/Makefile
@ -1,25 +1,27 @@
-# $OpenBSD: Makefile,v 1.3 2001/02/01 17:34:25 wilfried Exp $
+# $OpenBSD: Makefile,v 1.4 2001/03/09 14:28:45 wilfried Exp $

-DISTNAME=	wmglobe-1.1.alpha
-PKGNAME=	wmglobe-1.1a
-CATEGORIES=	astro x11 x11/windowmaker
-NEED_VERSION=	1.340
-HOMEPAGE=	http://perso.linuxfr.org/jdumont/wmg/
-MASTER_SITES=	${HOMEPAGE}
+DISTNAME=		wmglobe-1.1.alpha
+PKGNAME=		wmglobe-1.1a
+CATEGORIES=		astro x11 x11/windowmaker
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+HOMEPAGE=		http://perso.linuxfr.org/jdumont/wmg/
+
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-LIB_DEPENDS=	jpeg.62::graphics/jpeg \
-		tiff.35::graphics/tiff \
-		png.1::graphics/png \
-		gif.4::graphics/giflib \
-		wraster.2::x11/windowmaker
+MASTER_SITES=		${HOMEPAGE}

-USE_X11=	Yes
+LIB_DEPENDS=		jpeg.62::graphics/jpeg \
+			tiff.35::graphics/tiff \
+			png.1::graphics/png \
+			gif.4::graphics/giflib \
+			wraster.2::x11/windowmaker
+
+USE_X11=		Yes

 .include <bsd.port.mk>
--- a/astro/wmmoonclock/Makefile
+++ b/astro/wmmoonclock/Makefile
@ -1,20 +1,23 @@
-# $OpenBSD: Makefile,v 1.5 2001/02/01 17:34:25 wilfried Exp $
+# $OpenBSD: Makefile,v 1.6 2001/03/09 14:28:46 wilfried Exp $

-DISTNAME=	wmMoonClock-1.27
-PKGNAME=	${DISTNAME:L}
-CATEGORIES=	astro x11 x11/windowmaker
-NEED_VERSION=	1.336
-MASTER_SITES=	http://nis-www.lanl.gov/~mgh/WindowMaker/
-HOMEPAGE=	http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
+DISTNAME=		wmMoonClock-1.27
+PKGNAME=		${DISTNAME:L}
+CATEGORIES=		astro x11 x11/windowmaker
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+HOMEPAGE=		http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
+
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-USE_X11=	Yes
-WRKSRC=	${WRKDIST}/Src
+MASTER_SITES=		http://nis-www.lanl.gov/~mgh/WindowMaker/
+
+USE_X11=		Yes
+
+WRKSRC=			${WRKDIST}/Src

 .include <bsd.port.mk>
--- a/astro/wmspaceweather/Makefile
+++ b/astro/wmspaceweather/Makefile
@ -1,23 +1,26 @@
-# $OpenBSD: Makefile,v 1.4 2001/02/01 17:34:25 wilfried Exp $
+# $OpenBSD: Makefile,v 1.5 2001/03/09 14:28:46 wilfried Exp $

-DISTNAME=	wmSpaceWeather-1.04
-PKGNAME=	${DISTNAME:L}
-CATEGORIES=	astro x11 x11/windowmaker
-NEED_VERSION=	1.348
-MASTER_SITES=	http://nis-www.lanl.gov/~mgh/WindowMaker/
-HOMEPAGE=	http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
+DISTNAME=		wmSpaceWeather-1.04
+PKGNAME=		${DISTNAME:L}
+CATEGORIES=		astro x11 x11/windowmaker
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+HOMEPAGE=		http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
+
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-RUN_DEPENDS=	wget::net/wget
+MASTER_SITES=		http://nis-www.lanl.gov/~mgh/WindowMaker/

-USE_X11=	Yes
-WRKSRC=	${WRKDIST}/wmSpaceWeather
+RUN_DEPENDS=		wget::net/wget
+
+USE_X11=		Yes
+
+WRKSRC=			${WRKDIST}/wmSpaceWeather

 post-extract:
 	@cd ${WRKSRC}; make clean
--- a/astro/wmsun/Makefile
+++ b/astro/wmsun/Makefile
@ -1,21 +1,24 @@
-# $OpenBSD: Makefile,v 1.4 2001/02/01 17:34:25 wilfried Exp $
+# $OpenBSD: Makefile,v 1.5 2001/03/09 14:28:46 wilfried Exp $

-DISTNAME=	wmSun-1.03
-PKGNAME=	${DISTNAME:L}
-CATEGORIES=	astro x11 x11/windowmaker
-NEED_VERSION=	1.348
-MASTER_SITES=	http://nis-www.lanl.gov/~mgh/WindowMaker/
-HOMEPAGE=	http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
+DISTNAME=		wmSun-1.03
+PKGNAME=		${DISTNAME:L}
+CATEGORIES=		astro x11 x11/windowmaker
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+HOMEPAGE=		http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
+
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-USE_X11=	Yes
-WRKSRC=	${WRKDIST}/wmSun
+MASTER_SITES=		http://nis-www.lanl.gov/~mgh/WindowMaker/
+
+USE_X11=		Yes
+
+WRKSRC=			${WRKDIST}/wmSun

 post-extract:
 	@cd ${WRKSRC}; make clean
--- a/audio/ascd/Makefile
+++ b/audio/ascd/Makefile
@ -1,27 +1,27 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2001/02/06 11:52:43 wilfried Exp $
+# $OpenBSD: Makefile,v 1.2 2001/03/09 14:28:46 wilfried Exp $
 # $FreeBSD: ports/audio/ascd/Makefile,v 1.17 2000/09/25 12:21:17 asami Exp $

-DISTNAME=	ascd-0.13.2
-CATEGORIES=	audio x11 x11/windowmaker
-NEED_VERSION=	1.340
-HOMEPAGE=	http://worldserver.oleane.com/rsn/ascd-en.html
-MASTER_SITES=	http://worldserver.oleane.com/rsn/Archives/
-DISTFILES=      ${DISTNAME}-src.tgz ${DATAFILES}
+DISTNAME=		ascd-0.13.2
+CATEGORIES=		audio x11 x11/windowmaker
+NEED_VERSION=		1.340

-DATAFILES=      ascd-0.13pr6-themes.tgz
-THEMESDIR=      ascd-0.13pr6-themes
+HOMEPAGE=		http://worldserver.oleane.com/rsn/ascd-en.html

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-LIB_DEPENDS=    workman.1::audio/libworkman
+MASTER_SITES=		http://worldserver.oleane.com/rsn/Archives/
+DISTFILES=		${DISTNAME}-src.tgz ${DATAFILES}
+DATAFILES=		ascd-0.13pr6-themes.tgz

+LIB_DEPENDS=		workman.1::audio/libworkman
+
+USE_X11=		Yes
 CONFIGURE_STYLE=	imake
-USE_X11=	Yes

 post-extract:
 	@rm -rf ${WRKSRC}/workman
--- a/audio/libworkman/Makefile
+++ b/audio/libworkman/Makefile
@ -1,20 +1,24 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2001/02/06 11:50:20 wilfried Exp $
+# $OpenBSD: Makefile,v 1.2 2001/03/09 14:28:47 wilfried Exp $

-DISTNAME=	libworkman-1999-06-20
-PKGNAME=	libworkman-1.4
-CATEGORIES=	audio
-NEED_VERSION=	1.340
-HOMEPAGE=	http://studserver.uni-dortmund.de/~su0922/WorkMan/
-MASTER_SITES=	ftp://ftp.midwinter.com/WorkMan/SNAPSHOTS/
+DISTNAME=		libworkman-1999-06-20
+PKGNAME=		libworkman-1.4
+CATEGORIES=		audio
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+HOMEPAGE=		http://studserver.uni-dortmund.de/~su0922/WorkMan/
+
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

+MASTER_SITES=		ftp://ftp.midwinter.com/WorkMan/SNAPSHOTS/
+
+USE_X11=		Yes
 CONFIGURE_STYLE=	imake
-WRKDIST=	${WRKDIR}/libworkman
+
+WRKDIST=		${WRKDIR}/libworkman

 .include <bsd.port.mk>
--- a/audio/mixer.app/Makefile
+++ b/audio/mixer.app/Makefile
@ -1,23 +1,25 @@
-# $OpenBSD: Makefile,v 1.2 2001/02/06 12:00:22 wilfried Exp $
+# $OpenBSD: Makefile,v 1.3 2001/03/09 14:28:47 wilfried Exp $

-DISTNAME=	Mixer.app-1.5.0
-PKGNAME=	${DISTNAME:L}
-CATEGORIES=	audio x11 x11/windowmaker
-NEED_VERSION=	1.340
-HOMEPAGE=	http://www.fukt.hk-r.se/~per/mixer/
-MASTER_SITES=	${HOMEPAGE}
+DISTNAME=		Mixer.app-1.5.0
+PKGNAME=		${DISTNAME:L}
+CATEGORIES=		audio x11 x11/windowmaker
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+HOMEPAGE=		http://www.fukt.hk-r.se/~per/mixer/
+
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-CONFIGURE_STYLE=	imake noman
-USE_X11=	Yes
+MASTER_SITES=		${HOMEPAGE}

-MAKE_FLAGS=	CC=g++
+MAKE_FLAGS=		CC=g++
+
+USE_X11=		Yes
+CONFIGURE_STYLE=	imake noman

 do-install:
 	${INSTALL_PROGRAM_DIR} ${PREFIX}/GNUstep/Apps/Mixer.app
--- a/audio/wmmixer/Makefile
+++ b/audio/wmmixer/Makefile
@ -1,28 +1,29 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2001/02/06 11:54:54 wilfried Exp $
+# $OpenBSD: Makefile,v 1.2 2001/03/09 14:28:47 wilfried Exp $

-PKGNAME=	wmmixer-1.0b1
-DISTNAME=	wmmixer-1.0-beta1
-EXTRACT_SUFX=	.tgz
-CATEGORIES=	audio x11 x11/windowmaker
-NEED_VERSION=	1.340
-HOMEPAGE=	http://www.geocities.com/SiliconValley/Vista/2471/wmmixer.html
-MASTER_SITES=	http://www.geocities.com/SiliconValley/Vista/2471/files/
+DISTNAME=		wmmixer-1.0-beta1
+PKGNAME=		wmmixer-1.0b1
+CATEGORIES=		audio x11 x11/windowmaker
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+HOMEPAGE=		http://www.geocities.com/SiliconValley/Vista/2471/wmmixer.html
+
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

+MASTER_SITES=		http://www.geocities.com/SiliconValley/Vista/2471/files/
+EXTRACT_SUFX=		.tgz
+
+USE_X11=		Yes
 CONFIGURE_STYLE=	imake
-USE_X11=	Yes

 WRKDIST=		${WRKDIR}/wmmixer

-SAMPLE_DIR=	${PREFIX}/share/examples/wmmixer
-
-SUBST_VARS+=	SAMPLE_DIR
+SAMPLE_DIR=		${PREFIX}/share/examples/wmmixer
+SUBST_VARS+=		SAMPLE_DIR

 do-install:
 	${INSTALL_PROGRAM} ${WRKBUILD}/wmmixer ${PREFIX}/bin
--- a/audio/wmmp3/Makefile
+++ b/audio/wmmp3/Makefile
@ -1,28 +1,28 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2001/02/06 11:56:54 wilfried Exp $
+# $OpenBSD: Makefile,v 1.2 2001/03/09 14:28:47 wilfried Exp $

-DISTNAME=	wmmp3-0.12
-CATEGORIES=	audio x11 x11/windowmaker
-NEED_VERSION=	1.340
-HOMEPAGE=	http://www.dotfiles.com/software/wmmp3/
-MASTER_SITES= 	${HOMEPAGE}
+DISTNAME=		wmmp3-0.12
+CATEGORIES=		audio x11 x11/windowmaker
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+HOMEPAGE=		http://www.dotfiles.com/software/wmmp3/
+
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-RUN_DEPENDS=	mpg123::audio/mpg123
+MASTER_SITES=		${HOMEPAGE}

+RUN_DEPENDS=		mpg123::audio/mpg123
+
+SEPARATE_BUILD=		concurrent
+USE_X11=		Yes
 CONFIGURE_STYLE=	gnu
-USE_X11=	Yes

-SAMPLE_DIR=	${PREFIX}/share/examples/wmmp3
-
-SUBST_VARS+=	SAMPLE_DIR
-
-SEPARATE_BUILD=	concurrent
+SAMPLE_DIR=		${PREFIX}/share/examples/wmmp3
+SUBST_VARS+=		SAMPLE_DIR

 do-install:
 	${INSTALL_PROGRAM} ${WRKBUILD}/wmmp3 ${PREFIX}/bin
--- a/audio/wsoundprefs/Makefile
+++ b/audio/wsoundprefs/Makefile
@ -1,31 +1,33 @@
-# $OpenBSD: Makefile,v 1.5 2001/02/01 17:34:25 wilfried Exp $
+# $OpenBSD: Makefile,v 1.6 2001/03/09 14:28:47 wilfried Exp $

-DISTNAME=	WSoundPrefs-1.1.1
-PKGNAME=	${DISTNAME:L}
-CATEGORIES=	audio
-NEED_VERSION=	1.336
-MASTER_SITES=	ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
-HOMEPAGE=	http://shadowmere.student.utwente.nl/
+DISTNAME=		WSoundPrefs-1.1.1
+PKGNAME=		${DISTNAME:L}
+CATEGORIES=		audio
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+HOMEPAGE=		http://shadowmere.student.utwente.nl/

-LIB_DEPENDS=	PropList.2::devel/libproplist \
-		wsound::audio/wsoundserver \
-		audiofile::devel/libaudiofile \
-		tiff.35::graphics/tiff \
-		png.1::graphics/png \
-		jpeg.62::graphics/jpeg \
-		gif.4::graphics/giflib \
-		wraster.2::x11/windowmaker
-RUN_DEPENDS=	wsoundserver::audio/wsoundserver
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-USE_X11=	Yes
-CONFIGURE_STYLE= imake noman
+MASTER_SITES=		ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
+
+RUN_DEPENDS=		wsoundserver::audio/wsoundserver
+LIB_DEPENDS=		PropList.2::devel/libproplist \
+			wsound::audio/wsoundserver \
+			audiofile::devel/libaudiofile \
+			tiff.35::graphics/tiff \
+			png.1::graphics/png \
+			jpeg.62::graphics/jpeg \
+			gif.4::graphics/giflib \
+			wraster.2::x11/windowmaker
+
+USE_X11=		Yes
+CONFIGURE_STYLE=	imake noman

 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wsoundprefs
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@ -1,37 +1,39 @@
-# $OpenBSD: Makefile,v 1.8 2001/02/27 07:49:05 avsm Exp $
+# $OpenBSD: Makefile,v 1.9 2001/03/09 14:28:47 wilfried Exp $

-DISTNAME=	WSoundServer-0.4.0
-PKGNAME=	${DISTNAME:L}
-CATEGORIES=	audio
-NEED_VERSION=	1.336
-MASTER_SITES=	ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
-HOMEPAGE=	http://shadowmere.student.utwente.nl/
+DISTNAME=		WSoundServer-0.4.0
+PKGNAME=		${DISTNAME:L}
+CATEGORIES=		audio
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+HOMEPAGE=		http://shadowmere.student.utwente.nl/
+
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-LIB_DEPENDS=	wraster.2::x11/windowmaker \
-		PropList.2::devel/libproplist \
-		audiofile::devel/libaudiofile \
-		dockapp::devel/libdockapp
-RUN_DEPENDS=	wmaker::x11/windowmaker
+MASTER_SITES=		ftp://shadowmere.student.utwente.nl/pub/WindowMaker/

-USE_X11=	Yes
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS= ${CONFIGURE_SHARED} --enable-static
+RUN_DEPENDS=		wmaker::x11/windowmaker
+LIB_DEPENDS=		wraster.2::x11/windowmaker \
+			PropList.2::devel/libproplist \
+			audiofile::devel/libaudiofile \
+			dockapp::devel/libdockapp

-FLAVORS=	esd
+USE_X11=		Yes
+CONFIGURE_STYLE=	gnu
+CONFIGURE_ARGS+=	${CONFIGURE_SHARED} --enable-static
+
+FLAVORS=		esd
 FLAVOR?=

-.if ${FLAVOR:L} == "esd"
-LIB_DEPENDS+= esd::audio/esound
-CONFIGURE_ARGS+= --enable-esd
+.if ${FLAVOR:L:Mesd}
+LIB_DEPENDS+=		esd::audio/esound
+CONFIGURE_ARGS+=	--enable-esd
 .else
-CONFIGURE_ARGS+= --disable-esd
+CONFIGURE_ARGS+=	--disable-esd
 .endif

 post-patch:
--- a/devel/libdockapp/Makefile
+++ b/devel/libdockapp/Makefile
@ -1,22 +1,24 @@
-# $OpenBSD: Makefile,v 1.3 2001/02/01 17:34:26 wilfried Exp $
+# $OpenBSD: Makefile,v 1.4 2001/03/09 14:28:48 wilfried Exp $

-DISTNAME=	libdockapp-0.4.0
-CATEGORIES=	devel
-NEED_VERSION=	1.336
-MASTER_SITES=	ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
-HOMEPAGE=	http://shadowmere.student.utwente.nl/
+DISTNAME=		libdockapp-0.4.0
+CATEGORIES=		devel
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+HOMEPAGE=		http://shadowmere.student.utwente.nl/
+
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} --enable-static
+MASTER_SITES=		ftp://shadowmere.student.utwente.nl/pub/WindowMaker/

-SEPARATE_BUILD=	concurrent
+USE_X11=		Yes
+SEPARATE_BUILD=		concurrent
+CONFIGURE_STYLE=	gnu
+CONFIGURE_ARGS+=	${CONFIGURE_SHARED} --enable-static

 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libdockapp
--- a/games/speyes/Makefile
+++ b/games/speyes/Makefile
@ -1,19 +1,21 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2001/02/07 08:30:33 wilfried Exp $
+# $OpenBSD: Makefile,v 1.2 2001/03/09 14:28:48 wilfried Exp $

-DISTNAME=	speyes-1.2.0
-CATEGORIES=	games x11 x11/windowmaker
-NEED_VERSION=	1.340
-HOMEPAGE=	http://www.halcyon.com/amalmin/speyes/speyes.html
-MASTER_SITES=	http://www.halcyon.com/amalmin/speyes/
+DISTNAME=		speyes-1.2.0
+CATEGORIES=		games x11 x11/windowmaker
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+HOMEPAGE=		http://www.halcyon.com/amalmin/speyes/speyes.html
+
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-USE_X11=	Yes
+MASTER_SITES=		http://www.halcyon.com/amalmin/speyes/
+
+USE_X11=		Yes
 CONFIGURE_STYLE=	imake noman

 .include <bsd.port.mk>
--- a/games/wmeyes/Makefile
+++ b/games/wmeyes/Makefile
@ -1,23 +1,25 @@
-# $OpenBSD: Makefile,v 1.4 2001/02/01 17:34:26 wilfried Exp $
+# $OpenBSD: Makefile,v 1.5 2001/03/09 14:28:48 wilfried Exp $

-DISTNAME=	wmeyes
-PKGNAME=	${DISTNAME}-0.0
-CATEGORIES=	games x11 x11/windowmaker
-NEED_VERSION=	1.340
-MASTER_SITES=	http://home.istar.ca/~jenora/
-EXTRACT_SUFX=	.tgz
-HOMEPAGE=	http://home.istar.ca/~jenora/wmeyes.html
+DISTNAME=		wmeyes
+PKGNAME=		${DISTNAME}-0.0
+CATEGORIES=		games x11 x11/windowmaker
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+HOMEPAGE=		http://home.istar.ca/~jenora/wmeyes.html
+
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	"no license"
 PERMIT_PACKAGE_FTP=	"no license"
 PERMIT_DISTFILES_CDROM=	"no license"
 PERMIT_DISTFILES_FTP=	"no license"

-WRKDIST=	${WRKDIR}
+MASTER_SITES=		http://home.istar.ca/~jenora/
+EXTRACT_SUFX=		.tgz

-USE_X11=	Yes
+USE_X11=		Yes
 CONFIGURE_STYLE=	imake noman

+WRKDIST=		${WRKDIR}
+
 .include <bsd.port.mk>
--- a/games/wmminichess/Makefile
+++ b/games/wmminichess/Makefile
@ -1,23 +1,26 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2001/02/09 12:58:07 wilfried Exp $
+# $OpenBSD: Makefile,v 1.2 2001/03/09 14:28:48 wilfried Exp $

-DISTNAME=	miniCHESS-0.8
-PKGNAME=	wm${DISTNAME:L}
-CATEGORIES=	games x11 x11/windowmaker
-NEED_VERSION=	1.340
-HOMEPAGE=	http://www.electricrain.com/edavis/miniCHESS/
-MASTER_SITES=	${HOMEPAGE}
+DISTNAME=		miniCHESS-0.8
+PKGNAME=		wm${DISTNAME:L}
+CATEGORIES=		games x11 x11/windowmaker
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+HOMEPAGE=		http://www.electricrain.com/edavis/miniCHESS/
+
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-RUN_DEPENDS=	gnuchessx::games/gnuchess
+MASTER_SITES=		${HOMEPAGE}

-USE_X11=	Yes
-ALL_TARGET=	minichess
+RUN_DEPENDS=		gnuchessx::games/gnuchess
+
+USE_X11=		Yes
+
+ALL_TARGET=		minichess

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/minichess ${PREFIX}/bin
--- a/games/wmtictactoe/Makefile
+++ b/games/wmtictactoe/Makefile
@ -1,22 +1,24 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2001/02/09 13:02:37 wilfried Exp $
+# $OpenBSD: Makefile,v 1.2 2001/03/09 14:28:48 wilfried Exp $

-PKGNAME=	wmtictactoe-1.1.1
-DISTNAME=	wmtictactoe-1.1-1
-CATEGORIES=	games x11 x11/windowmaker
-NEED_VERSION=	1.340
-HOMEPAGE=	http://atlas.ucpel.tche.br/~acamargo/wmtictactoe.html
-MASTER_SITES=	http://atlas.ucpel.tche.br/~acamargo/
+DISTNAME=		wmtictactoe-1.1-1
+PKGNAME=		wmtictactoe-1.1.1
+CATEGORIES=		games x11 x11/windowmaker
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+HOMEPAGE=		http://atlas.ucpel.tche.br/~acamargo/wmtictactoe.html
+
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-USE_X11=	Yes
+MASTER_SITES=		http://atlas.ucpel.tche.br/~acamargo/

-WRKDIST=	${WRKDIR}/wmtictactoe.app
-WRKSRC=		${WRKDIST}/wmtictactoe
+USE_X11=		Yes
+
+WRKDIST=		${WRKDIR}/wmtictactoe.app
+WRKSRC=			${WRKDIST}/wmtictactoe

 .include <bsd.port.mk>
--- a/games/wmtimebomb/Makefile
+++ b/games/wmtimebomb/Makefile
@ -1,40 +1,42 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2001/02/09 13:06:24 wilfried Exp $
+# $OpenBSD: Makefile,v 1.2 2001/03/09 14:28:49 wilfried Exp $

-PKGNAME=	wmtimebomb-0.2.0
-DISTNAME=	wmtimebomb.20
-CATEGORIES=	games x11 x11/windowmaker
-NEED_VERSION=	1.340
-HOMEPAGE=	http://www.maliwan.org/wmtimebomb.shtml
-MASTER_SITES=	ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/mharo/ \
-		ftp://ftp.jp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/mharo/
+DISTNAME=		wmtimebomb.20
+PKGNAME=		wmtimebomb-0.2.0
+CATEGORIES=		games x11 x11/windowmaker
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+HOMEPAGE=		http://www.maliwan.org/wmtimebomb.shtml

-LIB_DEPENDS=	wraster.2::x11/windowmaker \
-		PropList.2::devel/libproplist \
-		jpeg.62::graphics/jpeg \
-		tiff.35::graphics/tiff \
-		png.1::graphics/png \
-		gif.4::graphics/giflib
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-FLAVORS=	8bpp
-FLAVOR?=
+MASTER_SITES=		ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/mharo/ \
+			ftp://ftp.jp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/mharo/

-USE_X11=	Yes
+LIB_DEPENDS=		wraster.2::x11/windowmaker \
+			PropList.2::devel/libproplist \
+			jpeg.62::graphics/jpeg \
+			tiff.35::graphics/tiff \
+			png.1::graphics/png \
+			gif.4::graphics/giflib
+
+USE_X11=		Yes
 CONFIGURE_STYLE=	imake

-WRKDIST=	${WRKDIR}/wmtimebomb.app
+FLAVORS=		8bpp
+FLAVOR?=

-SAMPLE_DIR=	${PREFIX}/share/examples/wmtimebomb
-SUBST_VARS+=	SAMPLE_DIR
+WRKDIST=		${WRKDIR}/wmtimebomb.app
+
+SAMPLE_DIR=		${PREFIX}/share/examples/wmtimebomb
+SUBST_VARS+=		SAMPLE_DIR

 pre-configure:
-.if ${FLAVOR:L} == "8bpp"
+.if ${FLAVOR:L:M8pp}
 	cd ${WRKSRC} && \
 		rm XPM && ln -s XPM.lo XPM
 .else
--- a/graphics/wmgrabimage/Makefile
+++ b/graphics/wmgrabimage/Makefile
@ -1,25 +1,27 @@
-# $OpenBSD: Makefile,v 1.4 2001/02/01 17:34:26 wilfried Exp $
+# $OpenBSD: Makefile,v 1.5 2001/03/09 14:28:49 wilfried Exp $

-DISTNAME=	wmGrabImage-0.70
-PKGNAME=	${DISTNAME:L}
-CATEGORIES=    	graphics x11 x11/windowmaker
-NEED_VERSION=	1.336
-HOMEPAGE=	http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
+DISTNAME=		wmGrabImage-0.70
+PKGNAME=		${DISTNAME:L}
+CATEGORIES=		graphics x11 x11/windowmaker
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+HOMEPAGE=		http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
+
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-MASTER_SITES=	http://nis-www.lanl.gov/~mgh/WindowMaker/
+MASTER_SITES=		http://nis-www.lanl.gov/~mgh/WindowMaker/

-RUN_DEPENDS=	convert::graphics/ImageMagick \
-		xv::graphics/xv \
-		wget::net/wget
+RUN_DEPENDS=		convert::graphics/ImageMagick \
+			xv::graphics/xv \
+			wget::net/wget

-USE_X11=	Yes
-WRKSRC=	${WRKDIST}/wmGrabImage
+USE_X11=		Yes
+
+WRKSRC=			${WRKDIST}/wmGrabImage

 .include <bsd.port.mk>
--- a/graphics/wmicons/Makefile
+++ b/graphics/wmicons/Makefile
@ -1,27 +1,28 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2001/02/13 18:51:18 wilfried Exp $
+# $OpenBSD: Makefile,v 1.2 2001/03/09 14:28:49 wilfried Exp $

-DISTNAME=	wmicons-1.0
-CATEGORIES=	graphics x11 x11/windowmaker
-NEED_VERSION=	1.340
-MASTER_SITES=	${MASTER_SITE_WINDOWMAKER}
-MASTER_SITE_SUBDIR=contrib/icons/ 
-DISTFILES=	DWiconpack1.tar.gz DWiconpack2.tar.gz IconFest-1.2.tgz \
-		NeXT_XEmacs_tar.gz wm_icons_png.tar.gz wm_icons_tif.tar.gz
-DIST_SUBDIR=	wmicons
+DISTNAME=		wmicons-1.0
+CATEGORIES=		graphics x11 x11/windowmaker
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-RUN_DEPENDS=	wmaker::x11/windowmaker
+MASTER_SITES=		${MASTER_SITE_WINDOWMAKER}
+DISTFILES=		DWiconpack1.tar.gz DWiconpack2.tar.gz IconFest-1.2.tgz \
+			NeXT_XEmacs_tar.gz wm_icons_png.tar.gz wm_icons_tif.tar.gz

-NO_BUILD=	Yes
+DIST_SUBDIR=		wmicons

-WMICONDIR=	${PREFIX}/share/WindowMaker/Pixmaps
-WMDOCDIR=	${PREFIX}/share/doc/wmicons
+RUN_DEPENDS=		wmaker::x11/windowmaker
+
+NO_BUILD=		Yes
+
+WMICONDIR=		${PREFIX}/share/WindowMaker/Pixmaps
+WMDOCDIR=		${PREFIX}/share/doc/wmicons

 do-install:
 	${INSTALL_DATA_DIR} ${WMDOCDIR} ${WMICONDIR}
--- a/graphics/wmphoto/Makefile
+++ b/graphics/wmphoto/Makefile
@ -1,22 +1,25 @@
-# $OpenBSD: Makefile,v 1.3 2001/02/01 17:34:26 wilfried Exp $
+# $OpenBSD: Makefile,v 1.4 2001/03/09 14:28:49 wilfried Exp $

-DISTNAME=	wmphoto-0.3a
-CATEGORIES=    	graphics x11 x11/windowmaker
-NEED_VERSION=	1.340
-HOMEPAGE=	http://www.dcc.uchile.cl/~amartoq/wmphoto/
-MASTER_SITES=	${HOMEPAGE}
+DISTNAME=		wmphoto-0.3a
+CATEGORIES=		graphics x11 x11/windowmaker
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+HOMEPAGE=		http://www.dcc.uchile.cl/~amartoq/wmphoto/
+
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-RUN_DEPENDS=	convert::graphics/ImageMagick
+MASTER_SITES=		${HOMEPAGE}

-USE_X11=	Yes
-WRKSRC=		${WRKDIST}/wmphoto
+RUN_DEPENDS=		convert::graphics/ImageMagick
+
+USE_X11=		Yes
+
+WRKSRC=			${WRKDIST}/wmphoto

 do-install:
 	${INSTALL_PROGRAM} ${WRKBUILD}/wmphoto ${PREFIX}/bin
--- a/mail/wmpop3/Makefile
+++ b/mail/wmpop3/Makefile
@ -1,27 +1,30 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2001/02/14 15:45:19 wilfried Exp $
+# $OpenBSD: Makefile,v 1.2 2001/03/09 14:28:49 wilfried Exp $

-DISTNAME=	WMPop3-0.5.6a
-PKGNAME=	${DISTNAME:L}
-CATEGORIES=	mail x11/windowmaker
-NEED_VERSION=	1.340
-HOMEPAGE=	http://www.cs.mun.ca/~scotth/
-MASTER_SITES=	${HOMEPAGE}download/
+DISTNAME=		WMPop3-0.5.6a
+PKGNAME=		${DISTNAME:L}
+CATEGORIES=		mail x11/windowmaker
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+HOMEPAGE=		http://www.cs.mun.ca/~scotth/
+
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-USE_X11=	Yes
-WRKDIST=	${WRKDIR}/${PKGNAME}
-WRKBUILD=	${WRKDIST}/wmpop3
+MASTER_SITES=		${HOMEPAGE}download/
+
+USE_X11=		Yes
+
+WRKDIST=		${WRKDIR}/${PKGNAME}
+WRKSRC=			${WRKDIST}/wmpop3

 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/wmpop3/wmpop3 ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKBUILD}/wmpop3 ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/wmpop3
-	${INSTALL_DATA} ${WRKSRC}/wmpop3/wmpop3rc ${PREFIX}/share/examples/wmpop3
+	${INSTALL_DATA} ${WRKBUILD}/wmpop3rc ${PREFIX}/share/examples/wmpop3
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wmpop3
 	${INSTALL_DATA} ${WRKDIR}/${PKGNAME}/README ${PREFIX}/share/doc/wmpop3

--- a/math/wmcalc/Makefile
+++ b/math/wmcalc/Makefile
@ -1,24 +1,24 @@
-# $OpenBSD: Makefile,v 1.4 2001/02/01 17:34:27 wilfried Exp $
+# $OpenBSD: Makefile,v 1.5 2001/03/09 14:28:50 wilfried Exp $

-DISTNAME=	wmcalc-0.3
-CATEGORIES=	math x11 x11/windowmaker
-NEED_VERSION=	1.340
-HOMEPAGE=	http://members.access1.net/ehflora/
+DISTNAME=		wmcalc-0.3
+CATEGORIES=		math x11 x11/windowmaker
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+HOMEPAGE=		http://members.access1.net/ehflora/
+
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-MASTER_SITES=	${HOMEPAGE}wmcalc/
+MASTER_SITES=		${HOMEPAGE}wmcalc/

-SAMPLE_DIR=	${PREFIX}/share/examples/wmcalc
+USE_X11=		Yes

-SUBST_VARS+=	SAMPLE_DIR
-
-USE_X11=	Yes
+SAMPLE_DIR=		${PREFIX}/share/examples/wmcalc
+SUBST_VARS+=		SAMPLE_DIR

 do-install:
 	${INSTALL_PROGRAM} ${WRKBUILD}/wmcalc ${PREFIX}/bin
--- a/misc/wmnetscapekiller/Makefile
+++ b/misc/wmnetscapekiller/Makefile
@ -1,22 +1,23 @@
-# $OpenBSD: Makefile,v 1.4 2001/02/01 17:34:27 wilfried Exp $
+# $OpenBSD: Makefile,v 1.5 2001/03/09 14:28:50 wilfried Exp $

-DISTNAME=	wmNetscapeKiller-0.3
-PKGNAME=	${DISTNAME:L}
-CATEGORIES=	misc x11 x11/windowmaker
-NEED_VERSION=	1.340
-HOMEPAGE=	http://pblumo.free.fr/wmNetscapeKiller/
+DISTNAME=		wmNetscapeKiller-0.3
+PKGNAME=		${DISTNAME:L}
+CATEGORIES=		misc x11 x11/windowmaker
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+HOMEPAGE=		http://pblumo.free.fr/wmNetscapeKiller/
+
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-MASTER_SITES=	${HOMEPAGE}wmNetscapeKiller-0.3/
+MASTER_SITES=		${HOMEPAGE}wmNetscapeKiller-0.3/

-RUN_DEPENDS=	skill::sysutils/skill
+RUN_DEPENDS=		skill::sysutils/skill

-USE_X11=	Yes
+USE_X11=		Yes

 .include <bsd.port.mk>
--- a/misc/wmtimer/Makefile
+++ b/misc/wmtimer/Makefile
@ -1,29 +1,31 @@
-# $OpenBSD: Makefile,v 1.4 2001/02/01 17:34:27 wilfried Exp $
+# $OpenBSD: Makefile,v 1.5 2001/03/09 14:28:50 wilfried Exp $

-DISTNAME=	wmtimer-2.2
-CATEGORIES=	misc x11 x11/windowmaker
-NEED_VERSION=	1.340
-HOMEPAGE=	http://www.dwave.net/~jking/wmtimer/
+DISTNAME=		wmtimer-2.2
+CATEGORIES=		misc x11 x11/windowmaker
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+HOMEPAGE=		http://www.dwave.net/~jking/wmtimer/
+
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-MASTER_SITES=	${HOMEPAGE}
+MASTER_SITES=		${HOMEPAGE}

-FLAVORS=	gold
+LIB_DEPENDS=		gtk.1::x11/gtk+
+
+USE_X11=		Yes
+
+FLAVORS=		gold
 FLAVOR?=

-LIB_DEPENDS=	gtk.1.2::x11/gtk+
-
-USE_X11=	Yes
-WRKSRC=		${WRKDIST}/wmtimer
+WRKSRC=			${WRKDIST}/wmtimer

 do-configure:
-.if ${FLAVOR:L} == "gold"
+.if ${FLAVOR:L:Mgold}
 	@cd ${WRKSRC} && \
 		ln -sf wmtimer-gold.xpm wmtimer.xpm
 .else
--- a/net/p5-Net-DNS/Makefile
+++ b/net/p5-Net-DNS/Makefile
@ -1,21 +1,22 @@
-# $OpenBSD: Makefile,v 1.2 2001/02/01 17:34:27 wilfried Exp $
+# $OpenBSD: Makefile,v 1.3 2001/03/09 14:28:50 wilfried Exp $

-DISTNAME=	Net-DNS-0.12
-PKGNAME=	p5-${DISTNAME}
-CATEGORIES=	net perl5
-NEED_VERSION=	1.348
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Net
+DISTNAME=		Net-DNS-0.12
+PKGNAME=		p5-${DISTNAME}
+CATEGORIES=		net perl5
+NEED_VERSION=		1.340

-HOMEPAGE=	http://www.fuhr.org/~mfuhr/perldns/
+HOMEPAGE=		http://www.fuhr.org/~mfuhr/perldns/

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-CONFIGURE_STYLE= perl
+MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	Net
+
+CONFIGURE_STYLE=	perl

 .include <bsd.port.mk>
--- a/sysutils/wmapm/Makefile
+++ b/sysutils/wmapm/Makefile
@ -1,20 +1,24 @@
-# $OpenBSD: Makefile,v 1.4 2001/02/01 17:34:27 wilfried Exp $
+# $OpenBSD: Makefile,v 1.5 2001/03/09 14:28:51 wilfried Exp $

-DISTNAME=	wmapm-3.1
-CATEGORIES=	sysutils x11 x11/windowmaker
-NEED_VERSION=	1.340
-MASTER_SITES=	http://nis-www.lanl.gov/~mgh/WindowMaker/
-HOMEPAGE=	http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS=		i386

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+DISTNAME=		wmapm-3.1
+CATEGORIES=		sysutils x11 x11/windowmaker
+NEED_VERSION=		1.340
+
+HOMEPAGE=		http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
+
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-USE_X11=	Yes
-WRKSRC=	${WRKDIST}/wmapm
+MASTER_SITES=		http://nis-www.lanl.gov/~mgh/WindowMaker/
+
+USE_X11=		Yes
+
+WRKSRC=			${WRKDIST}/wmapm

 .include <bsd.port.mk>
--- a/sysutils/wmcube/Makefile
+++ b/sysutils/wmcube/Makefile
@ -1,28 +1,30 @@
-# $OpenBSD: Makefile,v 1.4 2001/02/01 17:34:28 wilfried Exp $
+# $OpenBSD: Makefile,v 1.5 2001/03/09 14:28:51 wilfried Exp $

-DISTNAME=	wmcube-0.98
-CATEGORIES=	sysutils x11 x11/windowmaker
-NEED_VERSION=	1.340
-MASTER_SITES=	http://boombox.campus.luth.se/files/
-HOMEPAGE=	http://boombox.campus.luth.se/projects.php
+DISTNAME=		wmcube-0.98
+CATEGORIES=		sysutils x11 x11/windowmaker
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+HOMEPAGE=		http://boombox.campus.luth.se/projects.php
+
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-USE_X11=	Yes
-WRKDIST=	${WRKDIR}/wmcube
-WRKSRC=		${WRKDIST}/wmcube
+MASTER_SITES=		http://boombox.campus.luth.se/files/

-MAKE_FILE=	Makefile.OPENBSD
+USE_X11=		Yes

-BINGRP=		kmem
-BINMODE=	2555
+MAKE_FILE=		Makefile.OPENBSD
+WRKDIST=		${WRKDIR}/wmcube
+WRKSRC=			${WRKDIST}/wmcube

-3D_OBJECTS=	${PREFIX}/share/wmcube
+BINGRP=			kmem
+BINMODE=		2555
+
+3D_OBJECTS=		${PREFIX}/share/wmcube

 post-install:
 	${INSTALL_DATA_DIR} ${3D_OBJECTS}
--- a/x11/asfiles/Makefile
+++ b/x11/asfiles/Makefile
@ -1,24 +1,26 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2001/03/07 15:47:04 wilfried Exp $
+# $OpenBSD: Makefile,v 1.2 2001/03/09 14:28:52 wilfried Exp $

-DISTNAME=	ASFiles-1.0
-PKGNAME=	${DISTNAME:L}
-CATEGORIES=	x11 x11/windowmaker
-NEED_VERSION=	1.340
-MASTER_SITES=	${MASTER_SITE_AFTERSTEP}
-MASTER_SITE_SUBDIR=	apps/ASFiles
+DISTNAME=		ASFiles-1.0
+PKGNAME=		${DISTNAME:L}
+CATEGORIES=		x11 x11/windowmaker
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
-
-LIB_DEPENDS=	Dnd::x11/libdnd
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-USE_X11=	Yes
+MASTER_SITES=		${MASTER_SITE_AFTERSTEP}
+MASTER_SITE_SUBDIR=	apps/ASFiles
+
+LIB_DEPENDS=		Dnd::x11/libdnd
+
+FAKE_FLAGS=		NORMAL_INSTALL=""
+
+USE_X11=		Yes
 CONFIGURE_STYLE=	gnu
-FAKE_FLAGS=	NORMAL_INSTALL=""

 post-configure:
 .for d in . src src/bitmaps src/pixmaps src/external src/regexp pixmaps bitmaps
--- a/x11/astime/Makefile
+++ b/x11/astime/Makefile
@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2001/03/09 08:40:13 wilfried Exp $
+# $OpenBSD: Makefile,v 1.2 2001/03/09 14:28:52 wilfried Exp $

 DISTNAME=		astime-2.8
-CATEGORIES=     	x11 x11/windowmaker
+CATEGORIES=		x11 x11/windowmaker
 NEED_VERSION=		1.359

 HOMEPAGE=		http://www.tigr.net/afterstep/as-apps/
@ -15,6 +15,7 @@ PERMIT_DISTFILES_FTP=	Yes

 MASTER_SITES=		http://www.tigr.net/afterstep/download/astime/

+USE_X11=		Yes
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		--disable-jpeg

--- a/x11/libdnd/Makefile
+++ b/x11/libdnd/Makefile
@ -1,27 +1,28 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2001/03/07 15:43:32 wilfried Exp $
+# $OpenBSD: Makefile,v 1.2 2001/03/09 14:28:52 wilfried Exp $

-PKGNAME=	libdnd-1.1
-DISTNAME=	dnd.1.1
-EXTRACT_SUFX=	.tgz
-CATEGORIES=	x11 devel
-NEED_VERSION=	1.340
-MASTER_SITES=	http://leb.net/OffiX/
+DISTNAME=		dnd.1.1
+PKGNAME=		libdnd-1.1
+CATEGORIES=		x11 devel
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-USE_X11=	Yes
+MASTER_SITES=		http://leb.net/OffiX/
+EXTRACT_SUFX=		.tgz
+
+USE_X11=		Yes
 CONFIGURE_STYLE=	gnu

-WRKDIST=	${WRKDIR}/DND
-WRKSRC=	${WRKDIST}/DNDlib
+WRKDIST=		${WRKDIR}/DND
+WRKSRC=			${WRKDIST}/DNDlib

 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libdnd
-	${INSTALL_DATA} ${WRKDIR}/DND/DNDdoc/* ${PREFIX}/share/doc/libdnd
+	${INSTALL_DATA} ${WRKDIST}/DNDdoc/* ${PREFIX}/share/doc/libdnd

 .include <bsd.port.mk>
--- a/x11/windowmaker-extra/Makefile
+++ b/x11/windowmaker-extra/Makefile
@ -1,24 +1,27 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2001/02/15 18:02:14 wilfried Exp $
+# $OpenBSD: Makefile,v 1.2 2001/03/09 14:28:52 wilfried Exp $

-DISTNAME=	WindowMaker-extra-0.1
-PKGNAME=	${DISTNAME:L}
-CATEGORIES=	x11 x11/windowmaker
-NEED_VERSION=	1.340
-HOMEPAGE=	http://www.windowmaker.org/
-MASTER_SITES=	${MASTER_SITE_WINDOWMAKER}
-MASTER_SITE_SUBDIR= beta/srcs
+DISTNAME=		WindowMaker-extra-0.1
+PKGNAME=		${DISTNAME:L}
+CATEGORIES=		x11 x11/windowmaker
+NEED_VERSION=		1.340

-RUN_DEPENDS=	wmaker::x11/windowmaker
+HOMEPAGE=		http://www.windowmaker.org/

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

-PERMIT_PACKAGE_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
-PERMIT_DISTFILES_FTP=	Yes
+PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes

-NO_BUILD=	Yes
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS=	--prefix="${PREFIX}"
+MASTER_SITES=		${MASTER_SITE_WINDOWMAKER}
+MASTER_SITE_SUBDIR=	beta/srcs
+
+RUN_DEPENDS=		wmaker::x11/windowmaker
+
+CONFIGURE_STYLE=	gnu
+CONFIGURE_ARGS=		--prefix="${PREFIX}"
+
+NO_BUILD=		Yes

 .include <bsd.port.mk>
--- a/x11/windowmaker/Makefile
+++ b/x11/windowmaker/Makefile
@ -1,32 +1,36 @@
-# $OpenBSD: Makefile,v 1.36 2001/02/15 17:57:54 wilfried Exp $
+# $OpenBSD: Makefile,v 1.37 2001/03/09 14:28:52 wilfried Exp $

-DISTNAME=	WindowMaker-0.64.0
-PKGNAME=	${DISTNAME:L}
-CATEGORIES=	x11 x11/windowmaker
-NEED_VERSION=	1.340
-HOMEPAGE=	http://www.windowmaker.org/
-MASTER_SITES=	${MASTER_SITE_WINDOWMAKER}
-MASTER_SITE_SUBDIR= beta/srcs
+DISTNAME=		WindowMaker-0.64.0
+PKGNAME=		${DISTNAME:L}
+CATEGORIES=		x11 x11/windowmaker
+NEED_VERSION=		1.340

-LIB_DEPENDS=	PropList.2::devel/libproplist \
-		jpeg.62::graphics/jpeg \
-		tiff.35::graphics/tiff \
-		png.1::graphics/png \
-		gif.4.1::graphics/giflib
+HOMEPAGE=		http://www.windowmaker.org/

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

-PERMIT_PACKAGE_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
-PERMIT_DISTFILES_FTP=	Yes
+PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes

-SYSCONFDIR=	${PREFIX}/share/WindowMaker/Defaults
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
-		--enable-static \
-		--disable-debug \
-		--with-pixmapdir="${PREFIX}/share/WindowMaker/Pixmaps"
+MASTER_SITES=		${MASTER_SITE_WINDOWMAKER}
+MASTER_SITE_SUBDIR=	beta/srcs
+
+LIB_DEPENDS=		PropList.2::devel/libproplist \
+			jpeg.62::graphics/jpeg \
+			tiff.35::graphics/tiff \
+			png.1::graphics/png \
+			gif.4.1::graphics/giflib
+
+USE_X11=		Yes
+CONFIGURE_STYLE=	gnu
+CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
+			--enable-static \
+			--disable-debug \
+			--with-pixmapdir="${PREFIX}/share/WindowMaker/Pixmaps"
+
+SYSCONFDIR=		${PREFIX}/share/WindowMaker/Defaults

 post-patch:
 	@perl -pi -e "s|%%PREFIX%%|${PREFIX}|g" \
--- a/x11/wmbutton/Makefile
+++ b/x11/wmbutton/Makefile
@ -1,24 +1,24 @@
-# $OpenBSD: Makefile,v 1.3 2001/02/01 17:34:28 wilfried Exp $
+# $OpenBSD: Makefile,v 1.4 2001/03/09 14:28:52 wilfried Exp $

-DISTNAME=	wmbutton-0.4
-CATEGORIES=	x11 x11/windowmaker
-NEED_VERSION=	1.340
-HOMEPAGE=	http://members.access1.net/ehflora/
+DISTNAME=		wmbutton-0.4
+CATEGORIES=		x11 x11/windowmaker
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+HOMEPAGE=		http://members.access1.net/ehflora/
+
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-MASTER_SITES=	${HOMEPAGE}wmbutton/
+MASTER_SITES=		${HOMEPAGE}wmbutton/

-SAMPLE_DIR=	${PREFIX}/share/examples/wmbutton
+USE_X11=		Yes

-SUBST_VARS+=	SAMPLE_DIR
-
-USE_X11=	Yes
+SAMPLE_DIR=		${PREFIX}/share/examples/wmbutton
+SUBST_VARS+=		SAMPLE_DIR

 do-install:
 	${INSTALL_PROGRAM} ${WRKBUILD}/wmbutton ${PREFIX}/bin
--- a/x11/wmcalclock/Makefile
+++ b/x11/wmcalclock/Makefile
@ -1,21 +1,23 @@
-# $OpenBSD: Makefile,v 1.5 2001/02/01 17:34:29 wilfried Exp $
+# $OpenBSD: Makefile,v 1.6 2001/03/09 14:28:53 wilfried Exp $

-DISTNAME=	wmCalClock-1.25
-PKGNAME=	${DISTNAME:L}
-CATEGORIES=	x11 x11/windowmaker
-NEED_VERSION=	1.336
-MASTER_SITES=	http://nis-www.lanl.gov/~mgh/WindowMaker/
-HOMEPAGE=	http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
+DISTNAME=		wmCalClock-1.25
+PKGNAME=		${DISTNAME:L}
+CATEGORIES=		x11 x11/windowmaker
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+HOMEPAGE=		http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
+
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-USE_X11=	Yes
+MASTER_SITES=		http://nis-www.lanl.gov/~mgh/WindowMaker/

-WRKSRC=	${WRKDIST}/Src
+USE_X11=		Yes
+
+WRKSRC=			${WRKDIST}/Src

 .include <bsd.port.mk>
--- a/x11/wmdate/Makefile
+++ b/x11/wmdate/Makefile
@ -1,22 +1,24 @@
-# $OpenBSD: Makefile,v 1.4 2001/02/26 04:51:09 avsm Exp $
+# $OpenBSD: Makefile,v 1.5 2001/03/09 14:28:53 wilfried Exp $

-DISTNAME=	wmdate-0.7
-CATEGORIES=	x11 x11/windowmaker
-NEED_VERSION=	1.340
-HOMEPAGE=	http://wit401310.student.utwente.nl/~dalroi/apps/wmdate.php
-MASTER_SITES=	http://wit401310.student.utwente.nl/~dalroi/apps/apps/
+DISTNAME=		wmdate-0.7
+CATEGORIES=		x11 x11/windowmaker
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+HOMEPAGE=		http://wit401310.student.utwente.nl/~dalroi/apps/wmdate.php
+
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-LIB_DEPENDS=	dockapp::devel/libdockapp
+MASTER_SITES=		http://wit401310.student.utwente.nl/~dalroi/apps/apps/

-USE_X11=	Yes
-CONFIGURE_STYLE= imake noman
+LIB_DEPENDS=		dockapp::devel/libdockapp
+
+USE_X11=		Yes
+CONFIGURE_STYLE=	imake noman

 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wmdate
--- a/x11/wminfo/Makefile
+++ b/x11/wminfo/Makefile
@ -1,20 +1,23 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2001/02/01 16:14:22 wilfried Exp $
+# $OpenBSD: Makefile,v 1.2 2001/03/09 14:28:53 wilfried Exp $

-DISTNAME=	wminfo-1.51
-CATEGORIES=	x11 x11/windowmaker
-NEED_VERSION=	1.340
-MASTER_SITES=	http://boombox.campus.luth.se/files/
-HOMEPAGE=	http://boombox.campus.luth.se/projects.php
+DISTNAME=		wminfo-1.51
+CATEGORIES=		x11 x11/windowmaker
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+HOMEPAGE=		http://boombox.campus.luth.se/projects.php
+
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-USE_X11=	Yes
-WRKDIST=	${WRKDIR}/wminfo
-WRKSRC=		${WRKDIST}/wminfo
+MASTER_SITES=		http://boombox.campus.luth.se/files/
+
+USE_X11=		Yes
+
+WRKDIST=		${WRKDIR}/wminfo
+WRKSRC=			${WRKDIST}/wminfo

 .include <bsd.port.mk>
--- a/x11/wmitime/Makefile
+++ b/x11/wmitime/Makefile
@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2001/03/09 08:41:52 wilfried Exp $
+# $OpenBSD: Makefile,v 1.2 2001/03/09 14:28:53 wilfried Exp $

 DISTNAME=		wmitime-0.3
-CATEGORIES=     	x11 x11/windowmaker
+CATEGORIES=		x11 x11/windowmaker
 NEED_VERSION=		1.359

 HOMEPAGE=		http://www.neotokyo.org/illusion/
@ -13,9 +13,12 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-MASTER_SITES=		${HOMEPAGE}/downloads/
+MASTER_SITES=		${HOMEPAGE}downloads/

-WRKDIST=		${WRKDIR}/wmitime/wmitime
+USE_X11=		Yes
+
+WRKDIST=		${WRKDIR}/wmitime
+WRKSRC=			${WRKDIST}/wmitime

 do-install:
 	${INSTALL_PROGRAM} ${WRKBUILD}/wmitime ${PREFIX}/bin
--- a/x11/wmpinboard/Makefile
+++ b/x11/wmpinboard/Makefile
@ -1,18 +1,20 @@
-# $OpenBSD: Makefile,v 1.3 2001/02/01 17:34:29 wilfried Exp $
+# $OpenBSD: Makefile,v 1.4 2001/03/09 14:28:53 wilfried Exp $

-DISTNAME=	wmpinboard-1.0
-CATEGORIES=	x11 x11/windowmaker
-NEED_VERSION=	1.340
-HOMEPAGE=	http://www.tu-ilmenau.de/~gomar/stuff/wmpinboard/
-MASTER_SITES=	${HOMEPAGE}
+DISTNAME=		wmpinboard-1.0
+CATEGORIES=		x11 x11/windowmaker
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+HOMEPAGE=		http://www.tu-ilmenau.de/~gomar/stuff/wmpinboard/
+
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

+MASTER_SITES=		${HOMEPAGE}
+
 SEPARATE_BUILD=		concurrent
 USE_X11=		Yes
 CONFIGURE_STYLE=	gnu
--- a/x11/wmthemeinstall/Makefile
+++ b/x11/wmthemeinstall/Makefile
@ -1,27 +1,29 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2001/02/09 12:37:15 wilfried Exp $
+# $OpenBSD: Makefile,v 1.2 2001/03/09 14:28:54 wilfried Exp $
 # $FreeBSD: ports/x11-wm/wmthemeinstall/Makefile,v 1.5 2000/10/05 06:42:57 reg Exp $

-DISTNAME=	wmthemeinstall-0.62
-CATEGORIES=	x11 x11/windowmaker
-NEED_VERSION=	1.340
-HOMEPAGE=	http://hellblazer.dhis.org/projects/wmthemeinstall/
-MASTER_SITES=	ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/will/ \
-		ftp://ftp.jp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/will/
+DISTNAME=		wmthemeinstall-0.62
+CATEGORIES=		x11 x11/windowmaker
+NEED_VERSION=		1.340

-LIB_DEPENDS=	gtk.1::x11/gtk+
-RUN_DEPENDS=	wmaker::x11/windowmaker
+HOMEPAGE=		http://hellblazer.dhis.org/projects/wmthemeinstall/

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

-PERMIT_PACKAGE_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
-PERMIT_DISTFILES_FTP=	Yes
+PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes

-USE_GMAKE=	Yes
+MASTER_SITES=		ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/will/ \
+			ftp://ftp.jp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/will/
+
+RUN_DEPENDS=		wmaker::x11/windowmaker
+LIB_DEPENDS=		gtk.1::x11/gtk+
+
+SEPARATE_BUILD=		concurrent
+USE_X11=		Yes
+USE_GMAKE=		Yes
 CONFIGURE_STYLE=	gnu
-SEPARATE_BUILD=	concurrent
-USE_X11=	Yes

 pre-build:
 	@perl -pi -e "s:/usr/local:${PREFIX}:g" ${WRKSRC}/wmOptions.c
--- a/x11/wmtz/Makefile
+++ b/x11/wmtz/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2001/03/09 08:43:38 wilfried Exp $
+# $OpenBSD: Makefile,v 1.2 2001/03/09 14:28:54 wilfried Exp $

 DISTNAME=		wmtz-0.6
 CATEGORIES=     	x11 x11/windowmaker
@ -15,6 +15,8 @@ PERMIT_DISTFILES_FTP=	Yes

 MASTER_SITES=		${HOMEPAGE}

+USE_X11=		Yes
+
 WRKSRC=			${WRKDIST}/wmtz

 do-install:
--- a/x11/wmweather/Makefile
+++ b/x11/wmweather/Makefile
@ -1,22 +1,25 @@
-# $OpenBSD: Makefile,v 1.4 2001/02/01 17:34:29 wilfried Exp $
+# $OpenBSD: Makefile,v 1.5 2001/03/09 14:28:54 wilfried Exp $

-DISTNAME=	wmWeather-1.31
-PKGNAME=	${DISTNAME:L}
-CATEGORIES=	x11 x11/windowmaker
-NEED_VERSION=	1.348
-MASTER_SITES=	http://nis-www.lanl.gov/~mgh/WindowMaker/
-HOMEPAGE=	http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
+DISTNAME=		wmWeather-1.31
+PKGNAME=		${DISTNAME:L}
+CATEGORIES=		x11 x11/windowmaker
+NEED_VERSION=		1.340

-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+HOMEPAGE=		http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
+
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-RUN_DEPENDS=	wget::net/wget
+MASTER_SITES=		http://nis-www.lanl.gov/~mgh/WindowMaker/

-USE_X11=	Yes
-WRKSRC=	${WRKDIST}/Src
+RUN_DEPENDS=		wget::net/wget
+
+USE_X11=		Yes
+
+WRKSRC=			${WRKDIST}/Src

 .include <bsd.port.mk>
--- a/x11/wterm/Makefile
+++ b/x11/wterm/Makefile
@ -1,29 +1,31 @@
-# $OpenBSD: Makefile,v 1.16 2001/02/16 07:38:56 wilfried Exp $
+# $OpenBSD: Makefile,v 1.17 2001/03/09 14:28:54 wilfried Exp $

-DISTNAME=	wterm-6.2.6
-CATEGORIES=	x11
-NEED_VERSION=	1.336
-MASTER_SITES=	ftp://ftp.kddlabs.co.jp/X11/acontrib/wterm/ \
-		ftp://ftp.riken.go.jp/pub/X11/acontrib/wterm/
+DISTNAME=		wterm-6.2.6
+CATEGORIES=		x11
+NEED_VERSION=		1.340

-BUILD_DEPENDS=	wmaker::x11/windowmaker
-RUN_DEPENDS=	wmaker::x11/windowmaker
-
-MAINTAINER=	Peter Stromberg <wilfried@openbsd.org>
+MAINTAINER=		Peter Stromberg <wilfried@openbsd.org>

 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes

-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+=--enable-utmp --enable-wtmp \
-		--with-xpm --enable-xpm-background --enable-transparency \
-		--enable-xgetdefault --enable-ttygid
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+MASTER_SITES=		ftp://ftp.kddlabs.co.jp/X11/acontrib/wterm/ \
+			ftp://ftp.riken.go.jp/pub/X11/acontrib/wterm/
+
+BUILD_DEPENDS=		wmaker::x11/windowmaker
+RUN_DEPENDS=		wmaker::x11/windowmaker
+
+USE_X11=		Yes
+CONFIGURE_STYLE=	gnu
+CONFIGURE_ARGS+=	--enable-utmp --enable-wtmp \
+			--with-xpm --enable-xpm-background --enable-transparency \
+			--enable-xgetdefault --enable-ttygid
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
+			LDFLAGS="-L${LOCALBASE}/lib"

 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/wterm ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKBUILD}/src/wterm ${PREFIX}/bin

 .include <bsd.port.mk>