diff --git a/www/jssi/Makefile b/www/jssi/Makefile
index 67acb45d429b..a82ae5d4c2ed 100644
--- a/www/jssi/Makefile
+++ b/www/jssi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/09/22 14:44:03 jwise Exp $
+# $NetBSD: Makefile,v 1.23 2005/09/28 12:26:54 rillig Exp $
 
 DISTNAME=	ApacheJSSI-1.1.2
 PKGNAME=	jssi-1.1.2
@@ -16,8 +16,8 @@ WRKSRC=		${WRKDIR}/ApacheJSSI-1.1.2/src/java
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_TOOLS+=		gmake
-NO_CONFIGURE=
+USE_TOOLS+=	gmake
+NO_CONFIGURE=	yes
 MAKE_ENV+=	CLASSPATH=${CLASSPATH}
 
 post-build:
@@ -28,7 +28,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/ApacheJSSI.jar ${PREFIX}/lib/java/ApacheJSSI.jar
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/jssi
 	cd ${WRKSRC}/../../docs && ${PAX} -rw -pp . ${PREFIX}/share/doc/java/jssi
-	rm -f ${WRKSRC}/../../docs/*.orig
+	${RM} -f ${WRKSRC}/../../docs/*.orig
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index 2a5a9fefa948..c1af107f8775 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/09/04 06:37:05 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2005/09/28 12:27:52 rillig Exp $
 
 DISTNAME=	lighttpd-1.4.3
 CATEGORIES=	www
@@ -6,7 +6,7 @@ MASTER_SITES=	http://www.lighttpd.net/download/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.lighttpd.net/
-COMMENT=	fast, light-footprint HTTP server
+COMMENT=	Fast, light-footprint HTTP server
 
 USE_LIBTOOL=		yes
 SHLIBTOOL_OVERRIDE=	libtool
diff --git a/www/make_album/Makefile b/www/make_album/Makefile
index ee6b4c38bf22..c52a766f8b3a 100644
--- a/www/make_album/Makefile
+++ b/www/make_album/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:25 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/09/28 12:30:35 rillig Exp $
 #
 
 DISTNAME=	make_album_1_6
@@ -18,8 +18,8 @@ MY_SCRIPTS=	index_albums ingest make_album newimagedir populate_master
 USE_TOOLS+=	perl:run
 REPLACE_PERL=	${MY_SCRIPTS}
 
-NO_CONFIGURE=	# defined
-NO_BUILD=	# defined
+NO_CONFIGURE=	yes
+NO_BUILD=	yes
 
 INSTALLATION_DIRS=	bin lib
 
diff --git a/www/mknmz-wwwoffle/Makefile b/www/mknmz-wwwoffle/Makefile
index f9621c8ce329..0bf040d4bd56 100644
--- a/www/mknmz-wwwoffle/Makefile
+++ b/www/mknmz-wwwoffle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:25 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/09/28 12:30:58 rillig Exp $
 #
 
 DISTNAME=	mknmz-wwwoffle-0.7.0
@@ -13,7 +13,7 @@ DEPENDS+=	namazu>=2.0.5:../../textproc/namazu2
 DEPENDS+=	wwwoffle>=2.6:../../www/wwwoffle
 
 USE_TOOLS+=	perl:run
-GNU_CONFIGURE=	# defined
+GNU_CONFIGURE=	yes
 CONFIG_ARGS+=	--prefix=${PREFIX}/share/namazu
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/neon/Makefile b/www/neon/Makefile
index 216351d859d3..21266e3fe39b 100644
--- a/www/neon/Makefile
+++ b/www/neon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/04/11 21:47:54 tv Exp $
+# $NetBSD: Makefile,v 1.30 2005/09/28 12:32:26 rillig Exp $
 
 DISTNAME=		neon-0.24.7
 PKGREVISION=		1
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE=	neon.pc.in
 
-GNU_CONFIGURE=		# defined
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-ssl=yes
 CONFIGURE_ARGS+=	--with-expat
 CONFIGURE_ARGS+=	--enable-shared
diff --git a/www/netscape7/Makefile b/www/netscape7/Makefile
index 850fce149b5a..fa4f26d017d2 100644
--- a/www/netscape7/Makefile
+++ b/www/netscape7/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2005/06/17 03:50:41 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2005/09/28 12:32:45 rillig Exp $
 #
 
 DISTNAME=		netscape-i686-pc-linux-gnu-sea
 PKGNAME=		netscape${VERS_MAJ}-${VERS_MAJ}.${VERS_MIN}
-PKGREVISION=		# none
 CATEGORIES=		www
 MASTER_SITES=		ftp://ftp.netscape.com/pub/netscape7/${SUB}/ \
 			ftp://sunsite.utk.edu/pub/netscape/netscape7/${SUB}/ \
diff --git a/www/opera-acroread7/Makefile b/www/opera-acroread7/Makefile
index 2079623f9cd7..1e7061aa39f6 100644
--- a/www/opera-acroread7/Makefile
+++ b/www/opera-acroread7/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2005/04/18 16:19:54 jschauma Exp $
+# $NetBSD: Makefile,v 1.2 2005/09/28 12:33:28 rillig Exp $
 
 DISTNAME= 		opera-acroread7-1.0
-PKGREVISION=		# none
 
 MAINTAINER=		jschauma@NetBSD.org
 COMMENT=		Acrobat Reader 7 plugin for opera
diff --git a/www/opera/Makefile b/www/opera/Makefile
index 5ea0e64bae53..79ea697740e2 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2005/09/22 21:50:03 jdolecek Exp $
+# $NetBSD: Makefile,v 1.43 2005/09/28 12:33:10 rillig Exp $
 
 DISTNAME=	opera-${OPERA_PKG_VERSION:S/u/pl/}
-PKGREVISION=	# empty
 CATEGORIES=	www
 MASTER_SITES=	http://www.panix.com/opera/files/${OPERA_DIR}/ \
 		ftp://ftp.hu-berlin.de/pub/www/opera/${OPERA_DIR}/ \
@@ -136,7 +135,7 @@ post-install:
 
 # regenerate distinfo for all ports supported by this package
 opera-distinfo:
-	( ${ECHO} '$$NetBSD: Makefile,v 1.42 2005/09/22 21:50:03 jdolecek Exp $$'; ${ECHO} ''; \
+	( ${ECHO} '$$NetBSD: Makefile,v 1.43 2005/09/28 12:33:10 rillig Exp $$'; ${ECHO} ''; \
 	_OPERA_OPSYS=NetBSD ${MAKE} distinfo 1>&2; \
 		${GREP} opera distinfo; \
 	_OPERA_OPSYS=FreeBSD ${MAKE} distinfo 1>&2; \
diff --git a/www/php-curl/Makefile b/www/php-curl/Makefile
index 8ac138686ea3..84423c434d53 100644
--- a/www/php-curl/Makefile
+++ b/www/php-curl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:48:01 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/09/28 12:34:03 rillig Exp $
 
 MODNAME=		curl
-PKGREVISION=		# empty
 CATEGORIES+=		www
 COMMENT=		PHP extension for curl functions
 
diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile
index 0d5569b1c0d0..75703a4f1f62 100644
--- a/www/sitecopy/Makefile
+++ b/www/sitecopy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/05/22 20:08:46 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2005/09/28 12:35:52 rillig Exp $
 
 DISTNAME=		sitecopy-0.13.4
 PKGREVISION=		5
@@ -9,12 +9,12 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.lyra.org/sitecopy/
 COMMENT=		Utility for synchronizing remote and local web sites
 
-BUILD_USES_MSGFMT=	# defined
+BUILD_USES_MSGFMT=	yes
 
 USE_TOOLS+=		gmake
-USE_PKGLOCALEDIR=	# defined
+USE_PKGLOCALEDIR=	yes
 
-GNU_CONFIGURE=		# defined
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-ssl
 CONFIGURE_ARGS+=	--with-included-neon
 CONFIGURE_ARGS+=	--with-libxml2