summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/analog/Makefile8
-rw-r--r--www/ap-Embperl/Makefile6
-rw-r--r--www/ap-jk/Makefile.common6
-rw-r--r--www/ap-throttle/Makefile4
-rw-r--r--www/ap-xslt/Makefile4
-rw-r--r--www/apache-tomcat55/Makefile10
-rw-r--r--www/apache2/Makefile4
-rw-r--r--www/apache2/options.mk12
-rw-r--r--www/august/Makefile4
-rw-r--r--www/checkbot/Makefile10
-rw-r--r--www/clearsilver/Makefile.common6
-rw-r--r--www/drivel/hacks.mk4
-rw-r--r--www/drupal/Makefile4
-rw-r--r--www/firefox-bin-acroread/Makefile4
-rw-r--r--www/firefox-bin-acroread5/Makefile4
-rw-r--r--www/firefox-bin-acroread7/Makefile4
-rw-r--r--www/firefox-bin-flash/Makefile.common6
-rw-r--r--www/firefox-bin/Makefile.NetBSD.i3864
-rw-r--r--www/geeklog/Makefile16
-rw-r--r--www/geeklog/Makefile.common4
-rw-r--r--www/grail/Makefile6
-rw-r--r--www/jakarta-tomcat4/Makefile8
-rw-r--r--www/jsdk20/Makefile4
-rw-r--r--www/kdewebdev3/Makefile4
-rw-r--r--www/lighttpd/options.mk6
-rw-r--r--www/navigator/Makefile.common14
-rw-r--r--www/opera-acroread/Makefile4
-rw-r--r--www/opera-acroread5/Makefile4
-rw-r--r--www/opera-acroread7/Makefile4
-rw-r--r--www/p5-Apache-Session-Wrapper/Makefile8
-rw-r--r--www/p5-CGI-Kwiki/Makefile6
-rw-r--r--www/p5-CGI/Makefile6
-rw-r--r--www/p5-CGI_Lite/Makefile6
-rw-r--r--www/p5-FCGI/Makefile6
-rw-r--r--www/p5-HTML-Mason/Makefile6
-rw-r--r--www/p5-HTTP-DAV/Makefile4
-rw-r--r--www/p5-HTTP-Request-Form/Makefile10
-rw-r--r--www/p5-HTTPD-User-Manage/Makefile4
-rw-r--r--www/p5-Kwiki-Archive-Rcs/Makefile6
-rw-r--r--www/p5-Kwiki-BreadCrumbs/Makefile6
-rw-r--r--www/p5-Kwiki-Edit-RequireUserName/Makefile6
-rw-r--r--www/p5-Kwiki-Favorites/Makefile6
-rw-r--r--www/p5-Kwiki-HtmlBlocks/Makefile6
-rw-r--r--www/p5-Kwiki-Icons-Gnome/Makefile6
-rw-r--r--www/p5-Kwiki-NewPage/Makefile6
-rw-r--r--www/p5-Kwiki-Notify-Mail/Makefile6
-rw-r--r--www/p5-Kwiki-PagePrivacy/Makefile6
-rw-r--r--www/p5-Kwiki-ParagraphBlocks/Makefile6
-rw-r--r--www/p5-Kwiki-PreformattedBlocks/Makefile6
-rw-r--r--www/p5-Kwiki-RecentChanges/Makefile6
-rw-r--r--www/p5-Kwiki-Revisions/Makefile6
-rw-r--r--www/p5-Kwiki-Scode/Makefile6
-rw-r--r--www/p5-Kwiki-Search/Makefile6
-rw-r--r--www/p5-Kwiki-Simple-Server-HTTP/Makefile6
-rw-r--r--www/p5-Kwiki-UserName/Makefile6
-rw-r--r--www/p5-Kwiki-UserPreferences/Makefile6
-rw-r--r--www/p5-Kwiki-Weather/Makefile6
-rw-r--r--www/p5-Kwiki-Wikiwyg/Makefile6
-rw-r--r--www/p5-Kwiki-Zipcode/Makefile6
-rw-r--r--www/p5-Kwiki/Makefile6
-rw-r--r--www/p5-libwww/Makefile4
-rw-r--r--www/py-django/options.mk6
-rw-r--r--www/py-pcgi/Makefile4
-rw-r--r--www/py-zpublisher/Makefile4
-rw-r--r--www/swish-e/Makefile6
-rw-r--r--www/tinyproxy/options.mk6
-rw-r--r--www/wApua/Makefile4
-rw-r--r--www/webalizer/Makefile6
-rw-r--r--www/whisker/Makefile4
-rw-r--r--www/wwwcount/Makefile10
-rw-r--r--www/wwwoffle/Makefile16
-rw-r--r--www/zope-confera/Makefile4
-rw-r--r--www/zope/Makefile4
-rw-r--r--www/zope29/Makefile4
74 files changed, 224 insertions, 224 deletions
diff --git a/www/analog/Makefile b/www/analog/Makefile
index 78b037b2cd9..2d0b630473b 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.54 2007/01/07 09:14:15 rillig Exp $
+# $NetBSD: Makefile,v 1.55 2007/02/22 19:27:18 wiz Exp $
-DISTNAME= analog-6.0
+DISTNAME= analog-6.0
CATEGORIES= www
-MASTER_SITES= ${HOMEPAGE} \
+MASTER_SITES= ${HOMEPAGE} \
http://www.web42.com/analog/ \
http://analog.org/loganalysis/ \
http://www.gekko.de/analog/
-MAINTAINER= tron@NetBSD.org
+MAINTAINER= tron@NetBSD.org
HOMEPAGE= http://www.analog.cx/
COMMENT= Extremely fast program for analysing WWW logfiles
diff --git a/www/ap-Embperl/Makefile b/www/ap-Embperl/Makefile
index 549af564c9a..f8d7f4ece06 100644
--- a/www/ap-Embperl/Makefile
+++ b/www/ap-Embperl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2006/06/02 18:27:58 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2007/02/22 19:27:18 wiz Exp $
#
-DISTNAME= HTML-Embperl-1.2.0
-PKGNAME= ap13-Embperl-1.2.0
+DISTNAME= HTML-Embperl-1.2.0
+PKGNAME= ap13-Embperl-1.2.0
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=HTML/} \
ftp://ftp.dev.ecos.de/pub/perl/embperl/
diff --git a/www/ap-jk/Makefile.common b/www/ap-jk/Makefile.common
index b0ce5dfab8f..dc7f7210f47 100644
--- a/www/ap-jk/Makefile.common
+++ b/www/ap-jk/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2006/11/15 11:04:04 abs Exp $
+# $NetBSD: Makefile.common,v 1.4 2007/02/22 19:27:18 wiz Exp $
JK_VERSION= 1.2.19
CATEGORIES= www java
@@ -10,8 +10,8 @@ COMMENT= Apache connector for accessing Jakarta Tomcat
CONFLICTS= ap-jk-[0-9]*
-PATCHDIR= ${.CURDIR}/../../www/ap-jk/patches
-DISTINFO_FILE= ${.CURDIR}/../../www/ap-jk/distinfo
+PATCHDIR= ${.CURDIR}/../../www/ap-jk/patches
+DISTINFO_FILE= ${.CURDIR}/../../www/ap-jk/distinfo
WRKSRC= ${WRKDIR}/${DISTNAME}/native
APACHE_MODULE= YES
diff --git a/www/ap-throttle/Makefile b/www/ap-throttle/Makefile
index 9c77a3de1ba..356aeaf451f 100644
--- a/www/ap-throttle/Makefile
+++ b/www/ap-throttle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/06/07 11:51:58 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:27:18 wiz Exp $
DISTNAME= mod_throttle312
PKGNAME= ap13-throttle-3.1.2
@@ -12,7 +12,7 @@ COMMENT= Apache module for limiting bandwidth usage
CONFLICTS= ap-throttle-[0-9]*
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:S/ap13-/mod_/}
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:S/ap13-/mod_/}
APACHE_MODULE_NAME= mod_throttle.so
APACHE_MODULE_SRC= mod_throttle.c
diff --git a/www/ap-xslt/Makefile b/www/ap-xslt/Makefile
index 211bc4d2e7b..94d74ead3d7 100644
--- a/www/ap-xslt/Makefile
+++ b/www/ap-xslt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/10/04 22:04:09 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2007/02/22 19:27:18 wiz Exp $
DISTNAME= modxslt-1.1
PKGNAME= ap13-xslt-1.1
@@ -14,7 +14,7 @@ CONFLICTS= ap-xslt-[0-9]*
WRKSRC= ${WRKDIR}/modxslt
APACHE_MODULE_NAME= mod_xslt.so
-LDFLAGS+= -lsablot
+LDFLAGS+= -lsablot
.include "../../www/apache/module.mk"
diff --git a/www/apache-tomcat55/Makefile b/www/apache-tomcat55/Makefile
index 7776d3e720a..b2cfb38ac94 100644
--- a/www/apache-tomcat55/Makefile
+++ b/www/apache-tomcat55/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2006/11/13 11:25:16 abs Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:27:19 wiz Exp $
-DISTNAME= apache-tomcat-${TOMCAT_VERSION}
+DISTNAME= apache-tomcat-${TOMCAT_VERSION}
CATEGORIES= www java
# The list of sites to download is generated by an apache website.
# The getsite.sh script parses the HTML and extracts the urls.
@@ -15,7 +15,7 @@ USE_JAVA= run
# This needs java 1.5 or higher.
USE_JAVA2= 1.5
-TOMCAT_LIB= ${PREFIX}/tomcat
+TOMCAT_LIB= ${PREFIX}/tomcat
CATALINA_DIR= Catalina/localhost
EGDIR= ${TOMCAT_LIB}/share/examples/apache-tomcat
@@ -31,8 +31,8 @@ EXTRACT_USING= gtar
PKG_SYSCONFDIR.apache-tomcat= ${TOMCAT_LIB}/conf
MAKE_DIRS= ${PKG_SYSCONFDIR.apache-tomcat}/${CATALINA_DIR}
-CONFLICTS+= jakarta-tomcat55-[0-9]*
-CONFLICTS+= jakarta-tomcat-[0-9]*
+CONFLICTS+= jakarta-tomcat55-[0-9]*
+CONFLICTS+= jakarta-tomcat-[0-9]*
RCD_SCRIPTS= tomcat
CFILES= server.xml web.xml tomcat-users.xml
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 1a03a85818b..716ab218cf5 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.110 2007/01/24 19:46:45 epg Exp $
+# $NetBSD: Makefile,v 1.111 2007/02/22 19:27:19 wiz Exp $
.include "Makefile.common"
@@ -108,7 +108,7 @@ RCD_SCRIPTS= apache
REQD_DIRS= ${PREFIX}/share/httpd
REQD_DIRS+= ${PREFIX}/share/httpd/htdocs
-OWN_DIRS= ${VARBASE}/log/httpd
+OWN_DIRS= ${VARBASE}/log/httpd
OWN_DIRS+= ${VARBASE}/db/httpd
OWN_DIRS_PERMS+= ${VARBASE}/db/httpd/proxy ${APACHE_USER} ${APACHE_GROUP} 0755
FIX_PERMS= apachectl apxs dbmmanage envvars-std mkcert
diff --git a/www/apache2/options.mk b/www/apache2/options.mk
index 8e01c928110..67d30d215d7 100644
--- a/www/apache2/options.mk
+++ b/www/apache2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2006/08/30 06:16:27 rillig Exp $
+# $NetBSD: options.mk,v 1.6 2007/02/22 19:27:19 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.apache
PKG_SUPPORTED_OPTIONS= suexec
@@ -19,10 +19,10 @@ APACHE_SUEXEC_CONFIGURE_ARGS+= \
--with-suexec-docroot=${APACHE_SUEXEC_DOCROOT:Q} \
--with-suexec-logfile=${APACHE_SUEXEC_LOGFILE:Q}
-APACHE_MODULES+= suexec
-CONFIGURE_ARGS+= ${APACHE_SUEXEC_CONFIGURE_ARGS:M--with-suexec-*}
-BUILD_DEFS+= APACHE_SUEXEC_CONFIGURE_ARGS
-PLIST_SUBST+= SUEXEC_COMMENT=
+APACHE_MODULES+= suexec
+CONFIGURE_ARGS+= ${APACHE_SUEXEC_CONFIGURE_ARGS:M--with-suexec-*}
+BUILD_DEFS+= APACHE_SUEXEC_CONFIGURE_ARGS
+PLIST_SUBST+= SUEXEC_COMMENT=
.else
-PLIST_SUBST+= SUEXEC_COMMENT="@comment "
+PLIST_SUBST+= SUEXEC_COMMENT="@comment "
.endif
diff --git a/www/august/Makefile b/www/august/Makefile
index ed3741f0c1d..13a4cfd6d4b 100644
--- a/www/august/Makefile
+++ b/www/august/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/10/20 20:25:04 reed Exp $
+# $NetBSD: Makefile,v 1.2 2007/02/22 19:27:19 wiz Exp $
#
DISTNAME= august0.63b.src
@@ -13,7 +13,7 @@ COMMENT= Simple Tk-based HTML editor
NO_BUILD= yes
USE_LANGUAGES= # none
-USE_TOOLS+= wish:run
+USE_TOOLS+= wish:run
INSTALLATION_DIRS= bin share/doc/august
diff --git a/www/checkbot/Makefile b/www/checkbot/Makefile
index 433a8b42bcc..de67e676f8a 100644
--- a/www/checkbot/Makefile
+++ b/www/checkbot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2007/02/18 11:10:45 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2007/02/22 19:27:19 wiz Exp $
#
DISTNAME= checkbot-1.79
@@ -9,10 +9,10 @@ MAINTAINER= abs@NetBSD.org
HOMEPAGE= http://degraaff.org/checkbot/
COMMENT= Verify links on a set of HTML pages
-DEPENDS+= p5-MailTools>=1.03:../../mail/p5-MailTools
-DEPENDS+= p5-Net-[0-9]*:../../net/p5-Net
-DEPENDS+= p5-URI>=1.10:../../www/p5-URI
-DEPENDS+= p5-libwww>=5.76:../../www/p5-libwww
+DEPENDS+= p5-MailTools>=1.03:../../mail/p5-MailTools
+DEPENDS+= p5-Net-[0-9]*:../../net/p5-Net
+DEPENDS+= p5-URI>=1.10:../../www/p5-URI
+DEPENDS+= p5-libwww>=5.76:../../www/p5-libwww
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/www/clearsilver/Makefile.common b/www/clearsilver/Makefile.common
index 92e1d34aff0..1ba63be0092 100644
--- a/www/clearsilver/Makefile.common
+++ b/www/clearsilver/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.7 2005/10/29 19:29:52 epg Exp $
+# $NetBSD: Makefile.common,v 1.8 2007/02/22 19:27:19 wiz Exp $
DISTNAME= clearsilver-0.10.1
-CLEARSILVER_BASE= ${DISTNAME:S/-/-base-/}
+CLEARSILVER_BASE= ${DISTNAME:S/-/-base-/}
CATEGORIES= www
MASTER_SITES= http://www.clearsilver.net/downloads/
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.clearsilver.net/
COMMENT= Fast, powerful, language-neutral HTML template system
DISTINFO_FILE= ${.CURDIR}/../../www/clearsilver/distinfo
-FILESDIR= ${.CURDIR}/../../www/clearsilver/files
+FILESDIR= ${.CURDIR}/../../www/clearsilver/files
PATCHDIR= ${.CURDIR}/../../www/clearsilver/patches
GNU_CONFIGURE= yes
diff --git a/www/drivel/hacks.mk b/www/drivel/hacks.mk
index 6f56f976929..fe9b0ce5665 100644
--- a/www/drivel/hacks.mk
+++ b/www/drivel/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2005/07/12 17:37:52 kristerw Exp $
+# $NetBSD: hacks.mk,v 1.2 2007/02/22 19:27:19 wiz Exp $
.include "../../mk/bsd.prefs.mk"
@@ -6,6 +6,6 @@
# defined, unless _XOPEN_SOURCE_EXTENDED also is defined
.if ${OPSYS} == "NetBSD"
.if empty(OS_VERSION:N1.[56]*)
-CFLAGS+= -D_XOPEN_SOURCE_EXTENDED
+CFLAGS+= -D_XOPEN_SOURCE_EXTENDED
.endif
.endif
diff --git a/www/drupal/Makefile b/www/drupal/Makefile
index e6a581f2ac1..84f9d8feb6b 100644
--- a/www/drupal/Makefile
+++ b/www/drupal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/01/31 21:54:18 adrianp Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/22 19:27:19 wiz Exp $
DISTNAME= drupal-4.7.6
CATEGORIES= www
@@ -27,7 +27,7 @@ SUBST_CLASSES+= conf
SUBST_STAGE.conf= pre-install
SUBST_FILES.conf= drupal.conf
SUBST_SED.conf= -e "s|@DRUPAL@|${DRUPAL}|g"
-SUBST_MESSAGE.conf= Fixing configuration files.
+SUBST_MESSAGE.conf= Fixing configuration files.
.include "../../mk/apachever.mk"
.include "../../lang/php/phpversion.mk"
diff --git a/www/firefox-bin-acroread/Makefile b/www/firefox-bin-acroread/Makefile
index 62c25ce50f0..cae7199934c 100644
--- a/www/firefox-bin-acroread/Makefile
+++ b/www/firefox-bin-acroread/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:11:21 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:27:19 wiz Exp $
-DISTNAME= MozillaFirebird-bin-acroread-1.0
+DISTNAME= MozillaFirebird-bin-acroread-1.0
PKGREVISION= 1
MAINTAINER= kei@NetBSD.org
diff --git a/www/firefox-bin-acroread5/Makefile b/www/firefox-bin-acroread5/Makefile
index 94bf0030354..42e95d0bb16 100644
--- a/www/firefox-bin-acroread5/Makefile
+++ b/www/firefox-bin-acroread5/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:11:21 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:27:19 wiz Exp $
-DISTNAME= MozillaFirebird-bin-acroread5-1.0
+DISTNAME= MozillaFirebird-bin-acroread5-1.0
PKGREVISION= 1
MAINTAINER= kei@NetBSD.org
diff --git a/www/firefox-bin-acroread7/Makefile b/www/firefox-bin-acroread7/Makefile
index ac6cd04cbce..a8407c5a1a9 100644
--- a/www/firefox-bin-acroread7/Makefile
+++ b/www/firefox-bin-acroread7/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2006/02/05 23:11:21 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:27:20 wiz Exp $
-DISTNAME= MozillaFirebird-bin-acroread7-1.0
+DISTNAME= MozillaFirebird-bin-acroread7-1.0
PKGREVISION= 1
MAINTAINER= kei@NetBSD.org
diff --git a/www/firefox-bin-flash/Makefile.common b/www/firefox-bin-flash/Makefile.common
index 2d146404bac..aa51a54d923 100644
--- a/www/firefox-bin-flash/Makefile.common
+++ b/www/firefox-bin-flash/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2007/02/01 13:49:40 ghen Exp $
+# $NetBSD: Makefile.common,v 1.18 2007/02/22 19:27:20 wiz Exp $
DISTNAME= install_flash_player_9_${DISTUNAME}
PKGNAME= ${MOZ_BIN}-flash-${FLASH_VERS:S/r/./}
@@ -8,7 +8,7 @@ MASTER_SITES= http://download.macromedia.com/get/flashplayer/current/
MAINTAINER?= pkgsrc-users@NetBSD.org
HOMEPAGE?= http://www.flash.com/
-ONLY_FOR_PLATFORM= *-*-i386
+ONLY_FOR_PLATFORM= *-*-i386
DIST_SUBDIR= flash/${FLASH_VERS}
@@ -23,7 +23,7 @@ WRKNAME= install_flash_player_9_${DISTUNAME}
DISTINFO_FILE= ${.CURDIR}/../../www/firefox-bin-flash/distinfo
LICENSE= flash-license
-RESTRICTED= Redistribution not permitted
+RESTRICTED= Redistribution not permitted
NO_SRC_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
diff --git a/www/firefox-bin/Makefile.NetBSD.i386 b/www/firefox-bin/Makefile.NetBSD.i386
index a24e88ef917..119d0eef50c 100644
--- a/www/firefox-bin/Makefile.NetBSD.i386
+++ b/www/firefox-bin/Makefile.NetBSD.i386
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.9 2006/06/09 16:37:18 salo Exp $
+# $NetBSD: Makefile.NetBSD.i386,v 1.10 2007/02/22 19:27:19 wiz Exp $
BUILD_DEFS+= MOZILLA_USE_LINUX
@@ -6,7 +6,7 @@ BUILD_DEFS+= MOZILLA_USE_LINUX
ONLY_FOR_PLATFORM+= NetBSD-*-i386
. include "Makefile.Linux.i386"
. if defined(SUSE_PREFER) && !empty(SUSE_PREFER:M10.0)
-DEPENDS+= suse_compat>=10.0:../../emulators/suse100_compat
+DEPENDS+= suse_compat>=10.0:../../emulators/suse100_compat
. endif
.else
PKG_SKIP_REASON+= "No native pre-built NetBSD binary available."
diff --git a/www/geeklog/Makefile b/www/geeklog/Makefile
index a32df3a9afa..3f8ad386e40 100644
--- a/www/geeklog/Makefile
+++ b/www/geeklog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/02/15 15:00:44 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:27:20 wiz Exp $
#
DISTNAME= geeklog-${VER}
@@ -59,13 +59,13 @@ SUBST_CLASSES+= paths
SUBST_FILES.paths+= ${WRKDIR}/README ${WRKDIR}/createdb.php
SUBST_FILES.paths+= ${WRKSRC}/config.php ${WRKSRC}/emailgeeklogstories
SUBST_FILES.paths+= ${WRKSRC}/public_html/lib-common.php
-SUBST_SED.paths+= -e 's,@GEEKLOG_DIR@,${GEEKLOG_DIR:Q},g'
-SUBST_SED.paths+= -e 's,@GEEKLOG_EXAMPLESDIR@,${GEEKLOG_EXAMPLESDIR:Q},g'
-SUBST_SED.paths+= -e 's,@GEEKLOG_PUBDIR@,${GEEKLOG_PUBDIR:Q},g'
-SUBST_SED.paths+= -e 's,@GEEKLOG_SITESUBDIR@,${GEEKLOG_SITESUBDIR:Q},g'
-SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR:Q},g'
-SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX:Q},g'
-SUBST_STAGE.paths= post-configure
+SUBST_SED.paths+= -e 's,@GEEKLOG_DIR@,${GEEKLOG_DIR:Q},g'
+SUBST_SED.paths+= -e 's,@GEEKLOG_EXAMPLESDIR@,${GEEKLOG_EXAMPLESDIR:Q},g'
+SUBST_SED.paths+= -e 's,@GEEKLOG_PUBDIR@,${GEEKLOG_PUBDIR:Q},g'
+SUBST_SED.paths+= -e 's,@GEEKLOG_SITESUBDIR@,${GEEKLOG_SITESUBDIR:Q},g'
+SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR:Q},g'
+SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX:Q},g'
+SUBST_STAGE.paths= post-configure
SUBST_CLASSES+= conf
SUBST_FILES.conf+= ${WRKDIR}/geeklog.conf
diff --git a/www/geeklog/Makefile.common b/www/geeklog/Makefile.common
index 0cdd94a8339..c78dc08ffaf 100644
--- a/www/geeklog/Makefile.common
+++ b/www/geeklog/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2006/06/18 08:34:05 taca Exp $
+# $NetBSD: Makefile.common,v 1.3 2007/02/22 19:27:20 wiz Exp $
#
GEEKLOG_BASE= share/geeklog
@@ -11,7 +11,7 @@ GEEKLOG_DIR= ${PREFIX}/${GEEKLOG_BASE}
# Geeklog public area
GEEKLOG_PUBDIR= ${PREFIX}/${GEEKLOG_PUB}
-GEEKLOG_DOCDIR= ${PREFIX}/share/doc/geeklog
+GEEKLOG_DOCDIR= ${PREFIX}/share/doc/geeklog
GEEKLOG_EXAMPLESDIR= ${PREFIX}/share/examples/geeklog
GEEKLOG_TMPL_DIR= ${PREFIX}/${GEEKLOG_TMPL}
diff --git a/www/grail/Makefile b/www/grail/Makefile
index b0721daa619..125c7070d71 100644
--- a/www/grail/Makefile
+++ b/www/grail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/02/05 23:11:24 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2007/02/22 19:27:20 wiz Exp $
#
DISTNAME= grail-0.6
@@ -11,8 +11,8 @@ MAINTAINER= tsarna@NetBSD.org
HOMEPAGE= http://grail.sourceforge.net/
COMMENT= Grail(TM) is a web browser written in Python
-NO_CONFIGURE= yes
-NO_BUILD= yes
+NO_CONFIGURE= yes
+NO_BUILD= yes
GRAILDIR= share/misc/grail-0.6
PLIST_SRC= ${WRKDIR}/.PLIST_SRC
diff --git a/www/jakarta-tomcat4/Makefile b/www/jakarta-tomcat4/Makefile
index 21e7f02911d..68738fd5234 100644
--- a/www/jakarta-tomcat4/Makefile
+++ b/www/jakarta-tomcat4/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2006/10/04 22:04:09 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/22 19:27:20 wiz Exp $
-PKGNAME= jakarta-tomcat4-${TOMCAT_VERSION}
-DISTNAME= jakarta-tomcat-${TOMCAT_VERSION}
+PKGNAME= jakarta-tomcat4-${TOMCAT_VERSION}
+DISTNAME= jakarta-tomcat-${TOMCAT_VERSION}
PKGREVISION= 2
WRKSRC= ${WRKDIR}/${DISTNAME}
CATEGORIES= www java
@@ -18,7 +18,7 @@ TOMCAT_VERSION= 4.1.30
USE_JAVA=run
USE_JAVA2=yes
-TOMCAT_LIB= ${PREFIX}/tomcat4
+TOMCAT_LIB= ${PREFIX}/tomcat4
SAMPLECONFDIR= ${TOMCAT_LIB}/conf
PKG_SYSCONFDIR.jakarta-tomcat4= ${SAMPLECONFDIR}
diff --git a/www/jsdk20/Makefile b/www/jsdk20/Makefile
index 4843e6dcd17..d0022f1a06b 100644
--- a/www/jsdk20/Makefile
+++ b/www/jsdk20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/10/04 22:04:10 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2007/02/22 19:27:20 wiz Exp $
# STOP! Don't update this to a later version of this software.
# The JSDK and Apache Jakarta projects have merged, making the
# jakarta-tomcat package the current version of this software.
@@ -22,7 +22,7 @@ LICENSE= sun-jsdk20-license
USE_JAVA= run
WRKSRC= ${WRKDIR}/JSDK2.0
-BUILD_DEFS+= JSDK_HOME
+BUILD_DEFS+= JSDK_HOME
NO_CONFIGURE= yes
NO_BUILD= yes
diff --git a/www/kdewebdev3/Makefile b/www/kdewebdev3/Makefile
index 7932263af33..c20ed543b68 100644
--- a/www/kdewebdev3/Makefile
+++ b/www/kdewebdev3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2007/01/26 02:53:43 markd Exp $
+# $NetBSD: Makefile,v 1.21 2007/02/22 19:27:20 wiz Exp $
DISTNAME= kdewebdev-${_KDE_VERSION}
CATEGORIES= www
-COMMENT= HTML editor and tools suitable for experienced web developers
+COMMENT= HTML editor and tools suitable for experienced web developers
.include "../../meta-pkgs/kde3/Makefile.kde3"
diff --git a/www/lighttpd/options.mk b/www/lighttpd/options.mk
index 3b472e893d5..02955d42b88 100644
--- a/www/lighttpd/options.mk
+++ b/www/lighttpd/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.5 2006/08/14 22:37:21 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2007/02/22 19:27:20 wiz Exp $
-PKG_OPTIONS_VAR = PKG_OPTIONS.lighttpd
-PKG_SUPPORTED_OPTIONS= bzip fam gdbm inet6 ldap lua mysql ssl memcache
+PKG_OPTIONS_VAR = PKG_OPTIONS.lighttpd
+PKG_SUPPORTED_OPTIONS= bzip fam gdbm inet6 ldap lua mysql ssl memcache
PKG_SUGGESTED_OPTIONS= inet6 ssl
.include "../../mk/bsd.options.mk"
diff --git a/www/navigator/Makefile.common b/www/navigator/Makefile.common
index f960e528648..e01fa83a2bd 100644
--- a/www/navigator/Makefile.common
+++ b/www/navigator/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.84 2006/10/04 22:04:10 wiz Exp $
+# $NetBSD: Makefile.common,v 1.85 2007/02/22 19:27:20 wiz Exp $
#
# Common include file for communicator and navigator packages
@@ -82,7 +82,7 @@ DEPENDS+= ns-flash>4.0:../../multimedia/ns-flash
. endif
.if ${BINNAME} == "communicator"
-BUILD_DEPENDS= binpatch>=1.0:../../pkgtools/binpatch
+BUILD_DEPENDS= binpatch>=1.0:../../pkgtools/binpatch
post-install:
${SH} ../../www/navigator/files/binpatch-x86-unknown-linux2.2-4.80.sh \
@@ -110,10 +110,10 @@ PKG_FAIL_REASON+= "${PKGNAME} requires Solaris libraries - see compat_svr4(8)"
. endif
NS_VERS= 4.79
PKGNAME= ${BINNAME}-${NS_VERS}
-DISTUNAME= sparc-sun-solaris2.5.1
-DIST_DIR_NAME= supported/sunos551
-WRKNAME= sparc-sun-solaris2.5.1
-VENDOR_NAME= Solaris 2.5.1
+DISTUNAME= sparc-sun-solaris2.5.1
+DIST_DIR_NAME= supported/sunos551
+WRKNAME= sparc-sun-solaris2.5.1
+VENDOR_NAME= Solaris 2.5.1
# powerpc is "unusual"
.elif ${MACHINE_ARCH} == "powerpc"
@@ -194,7 +194,7 @@ SUB= english/${NS_VERS}/unix/${DIST_DIR_NAME}/${DIST_SDIR_NAME}
BUILD_DEFS+= NS_ENCRYPTION
DIST_SUBDIR= netscape
-WRKSRC= ${WRKDIR}/${BINNAME}-v${NS_VERS_SHORT}.${WRKNAME}
+WRKSRC= ${WRKDIR}/${BINNAME}-v${NS_VERS_SHORT}.${WRKNAME}
MOZILLA_HOME= ${PREFIX}/lib/netscape/${NS_NAME}
NS_PLUGINS_DIR= ${PREFIX}/lib/netscape/plugins
diff --git a/www/opera-acroread/Makefile b/www/opera-acroread/Makefile
index 2d65607613a..897672404ac 100644
--- a/www/opera-acroread/Makefile
+++ b/www/opera-acroread/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2006/06/30 13:57:16 salo Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:27:20 wiz Exp $
-DISTNAME= opera-acroread-1.0
+DISTNAME= opera-acroread-1.0
PKGREVISION= 3
MAINTAINER= jschauma@NetBSD.org
diff --git a/www/opera-acroread5/Makefile b/www/opera-acroread5/Makefile
index 7ca29bd2609..6aa54c42fcf 100644
--- a/www/opera-acroread5/Makefile
+++ b/www/opera-acroread5/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2006/06/30 13:57:16 salo Exp $
+# $NetBSD: Makefile,v 1.6 2007/02/22 19:27:21 wiz Exp $
-DISTNAME= opera-acroread5-1.0
+DISTNAME= opera-acroread5-1.0
PKGREVISION= 3
MAINTAINER= jschauma@NetBSD.org
diff --git a/www/opera-acroread7/Makefile b/www/opera-acroread7/Makefile
index 5afa4fdf4cd..f6a46fd84b7 100644
--- a/www/opera-acroread7/Makefile
+++ b/www/opera-acroread7/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2006/08/06 05:20:40 kristerw Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:27:21 wiz Exp $
-DISTNAME= opera-acroread7-1.0
+DISTNAME= opera-acroread7-1.0
PKGREVISION= 2
MAINTAINER= jschauma@NetBSD.org
diff --git a/www/p5-Apache-Session-Wrapper/Makefile b/www/p5-Apache-Session-Wrapper/Makefile
index f73852c2d54..dcedc31f738 100644
--- a/www/p5-Apache-Session-Wrapper/Makefile
+++ b/www/p5-Apache-Session-Wrapper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/10/17 13:26:28 obache Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:27:21 wiz Exp $
DISTNAME= Apache-Session-Wrapper-0.31
PKGNAME= p5-${DISTNAME}
@@ -9,9 +9,9 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://search.cpan.org/dist/Apache-Session-Wrapper/
COMMENT= Perl5 module doing a wrapper around Apache::Session
-DEPENDS+= p5-Class-Container-[0-9]*:../../devel/p5-Class-Container
-DEPENDS+= p5-Exception-Class-[0-9]*:../../devel/p5-Exception-Class
-DEPENDS+= p5-Apache-Session>=1.6:../../www/p5-Apache-Session
+DEPENDS+= p5-Class-Container-[0-9]*:../../devel/p5-Class-Container
+DEPENDS+= p5-Exception-Class-[0-9]*:../../devel/p5-Exception-Class
+DEPENDS+= p5-Apache-Session>=1.6:../../www/p5-Apache-Session
PERL5_MODULE_TYPE= Module::Build
PERL5_PACKLIST= auto/Apache/Session/Wrapper/.packlist
diff --git a/www/p5-CGI-Kwiki/Makefile b/www/p5-CGI-Kwiki/Makefile
index ca56a28fdb0..1e2c9acc3bf 100644
--- a/www/p5-CGI-Kwiki/Makefile
+++ b/www/p5-CGI-Kwiki/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:31:00 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:21 wiz Exp $
#
-DISTNAME= CGI-Kwiki-0.18
-PKGNAME= p5-${DISTNAME}
+DISTNAME= CGI-Kwiki-0.18
+PKGNAME= p5-${DISTNAME}
SVR4_PKGNAME= p5ckw
PKGREVISION= 2
CATEGORIES= www perl5
diff --git a/www/p5-CGI/Makefile b/www/p5-CGI/Makefile
index 6cf4ff604ad..630e9ac6f76 100644
--- a/www/p5-CGI/Makefile
+++ b/www/p5-CGI/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.39 2006/10/04 22:04:10 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2007/02/22 19:27:21 wiz Exp $
#
VERS= 3.20
-DISTNAME= CGI.pm-${VERS}
-PKGNAME= p5-CGI-${VERS}
+DISTNAME= CGI.pm-${VERS}
+PKGNAME= p5-CGI-${VERS}
SVR4_PKGNAME= p5cgi
CATEGORIES= www perl5
MASTER_SITES+= ${MASTER_SITE_PERL_CPAN:=CGI/}
diff --git a/www/p5-CGI_Lite/Makefile b/www/p5-CGI_Lite/Makefile
index 6118b8be2de..4ae39d55648 100644
--- a/www/p5-CGI_Lite/Makefile
+++ b/www/p5-CGI_Lite/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2005/08/06 06:19:38 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/22 19:27:21 wiz Exp $
#
NAME= CGI-Lite-2.02
-DISTNAME= ${NAME}
-PKGNAME= p5-${NAME}
+DISTNAME= ${NAME}
+PKGNAME= p5-${NAME}
SVR4_PKGNAME= p5cgl
PKGREVISION= 1
CATEGORIES= www perl5
diff --git a/www/p5-FCGI/Makefile b/www/p5-FCGI/Makefile
index 38f6d5fe340..efe6633cd7f 100644
--- a/www/p5-FCGI/Makefile
+++ b/www/p5-FCGI/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2006/03/04 21:31:01 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2007/02/22 19:27:21 wiz Exp $
#
PKGVER= 0.67
-DISTNAME= FCGI-${PKGVER}
-PKGNAME= p5-FCGI-${PKGVER}
+DISTNAME= FCGI-${PKGVER}
+PKGNAME= p5-FCGI-${PKGVER}
SVR4_PKGNAME= p5fcg
PKGREVISION= 2
CATEGORIES= www perl5
diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile
index fed51ba1c4f..31c88c7e371 100644
--- a/www/p5-HTML-Mason/Makefile
+++ b/www/p5-HTML-Mason/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/06/02 18:28:00 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2007/02/22 19:27:21 wiz Exp $
DISTNAME= HTML-Mason-1.3101
PKGNAME= p5-HTML-Mason-1.31.1
@@ -11,8 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.masonhq.com/
COMMENT= Perl-based web site development and delivery system
-DEPENDS+= p5-Cache-Cache>=1.0:../../devel/p5-Cache-Cache
-DEPENDS+= p5-Params-Validate>=0.04:../../devel/p5-Params-Validate
+DEPENDS+= p5-Cache-Cache>=1.0:../../devel/p5-Cache-Cache
+DEPENDS+= p5-Params-Validate>=0.04:../../devel/p5-Params-Validate
DEPENDS+= p5-Exception-Class>=1.14:../../devel/p5-Exception-Class
DEPENDS+= p5-Class-Container>=0.10:../../devel/p5-Class-Container
diff --git a/www/p5-HTTP-DAV/Makefile b/www/p5-HTTP-DAV/Makefile
index 6ad32bded6c..db89389dc6a 100644
--- a/www/p5-HTTP-DAV/Makefile
+++ b/www/p5-HTTP-DAV/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:31:02 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:27:21 wiz Exp $
#
DISTNAME= HTTP-DAV-0.31
@@ -12,7 +12,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://webdav.org/perldav/
COMMENT= HTTP::DAV interface and 'dave'
-DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww
+DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww
DEPENDS+= p5-XML-DOM-[0-9]*:../../textproc/p5-XML-DOM
PERL5_PACKLIST= auto/HTTP/DAV/.packlist
diff --git a/www/p5-HTTP-Request-Form/Makefile b/www/p5-HTTP-Request-Form/Makefile
index 09571a91878..aee88cb2d8c 100644
--- a/www/p5-HTTP-Request-Form/Makefile
+++ b/www/p5-HTTP-Request-Form/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:31:02 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:27:21 wiz Exp $
#
DISTNAME= HTTP-Request-Form-0.7
@@ -11,10 +11,10 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=HTTP/}
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Construct HTTP::Request objects for form processing
-DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww
-DEPENDS+= p5-URI-[0-9]*:../../www/p5-URI
-DEPENDS+= p5-HTML-Tagset-[0-9]*:../../www/p5-HTML-Tagset
-DEPENDS+= p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree
+DEPENDS+= p5-libwww-[0-9]*:../../www/p5-libwww
+DEPENDS+= p5-URI-[0-9]*:../../www/p5-URI
+DEPENDS+= p5-HTML-Tagset-[0-9]*:../../www/p5-HTML-Tagset
+DEPENDS+= p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree
PERL5_PACKLIST= auto/HTTP/Request/Form/.packlist
diff --git a/www/p5-HTTPD-User-Manage/Makefile b/www/p5-HTTPD-User-Manage/Makefile
index 2c72ad922ec..517c55b185a 100644
--- a/www/p5-HTTPD-User-Manage/Makefile
+++ b/www/p5-HTTPD-User-Manage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/01/23 06:07:50 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2007/02/22 19:27:21 wiz Exp $
DISTNAME= HTTPD-User-Manage-1.58
PKGNAME= p5-${DISTNAME}
@@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://stein.cshl.org/~lstein/user_manage/
COMMENT= Perl script/modules for managing web access control
-PERL5_PACKLIST= auto/HTTPD-User-Manage/.packlist
+PERL5_PACKLIST= auto/HTTPD-User-Manage/.packlist
REPLACE_PERL= user_manage
INSTALLATION_DIRS= bin libexec/cgi-bin share/doc/user_manage
diff --git a/www/p5-Kwiki-Archive-Rcs/Makefile b/www/p5-Kwiki-Archive-Rcs/Makefile
index d604cef57c0..ca43477cf32 100644
--- a/www/p5-Kwiki-Archive-Rcs/Makefile
+++ b/www/p5-Kwiki-Archive-Rcs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2006/03/14 16:00:42 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:27:22 wiz Exp $
-DISTNAME= Kwiki-Archive-Rcs-0.15
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-Archive-Rcs-0.15
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-BreadCrumbs/Makefile b/www/p5-Kwiki-BreadCrumbs/Makefile
index d3aa70b2dca..f8cecda8647 100644
--- a/www/p5-Kwiki-BreadCrumbs/Makefile
+++ b/www/p5-Kwiki-BreadCrumbs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2006/03/14 16:00:42 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:27:22 wiz Exp $
-DISTNAME= Kwiki-BreadCrumbs-0.12
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-BreadCrumbs-0.12
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-Edit-RequireUserName/Makefile b/www/p5-Kwiki-Edit-RequireUserName/Makefile
index ef9b4fb31e2..30495b506b2 100644
--- a/www/p5-Kwiki-Edit-RequireUserName/Makefile
+++ b/www/p5-Kwiki-Edit-RequireUserName/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2006/03/04 21:31:02 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:27:22 wiz Exp $
-DISTNAME= Kwiki-Edit-RequireUserName-0.02
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-Edit-RequireUserName-0.02
+PKGNAME= p5-${DISTNAME}
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/JPEREGR/}
diff --git a/www/p5-Kwiki-Favorites/Makefile b/www/p5-Kwiki-Favorites/Makefile
index 01d89036251..e2710036a1a 100644
--- a/www/p5-Kwiki-Favorites/Makefile
+++ b/www/p5-Kwiki-Favorites/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2006/03/14 16:00:42 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:22 wiz Exp $
-DISTNAME= Kwiki-Favorites-0.13
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-Favorites-0.13
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-HtmlBlocks/Makefile b/www/p5-Kwiki-HtmlBlocks/Makefile
index 6f5725ca602..d68308f47b4 100644
--- a/www/p5-Kwiki-HtmlBlocks/Makefile
+++ b/www/p5-Kwiki-HtmlBlocks/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2006/03/14 16:00:42 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:27:22 wiz Exp $
-DISTNAME= Kwiki-HtmlBlocks-0.11
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-HtmlBlocks-0.11
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-Icons-Gnome/Makefile b/www/p5-Kwiki-Icons-Gnome/Makefile
index e5a91da0587..b8edc3bae3c 100644
--- a/www/p5-Kwiki-Icons-Gnome/Makefile
+++ b/www/p5-Kwiki-Icons-Gnome/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2006/03/14 16:00:42 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:22 wiz Exp $
-DISTNAME= Kwiki-Icons-Gnome-0.14
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-Icons-Gnome-0.14
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-NewPage/Makefile b/www/p5-Kwiki-NewPage/Makefile
index 4d782dd6da2..504aaacc25c 100644
--- a/www/p5-Kwiki-NewPage/Makefile
+++ b/www/p5-Kwiki-NewPage/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2006/03/14 16:00:53 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:27:22 wiz Exp $
-DISTNAME= Kwiki-NewPage-0.12
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-NewPage-0.12
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-Notify-Mail/Makefile b/www/p5-Kwiki-Notify-Mail/Makefile
index 1efc5ef5287..68efe26054b 100644
--- a/www/p5-Kwiki-Notify-Mail/Makefile
+++ b/www/p5-Kwiki-Notify-Mail/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2006/05/01 15:10:12 jschauma Exp $
+# $NetBSD: Makefile,v 1.2 2007/02/22 19:27:22 wiz Exp $
-DISTNAME= Kwiki-Notify-Mail-0.04
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-Notify-Mail-0.04
+PKGNAME= p5-${DISTNAME}
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-PagePrivacy/Makefile b/www/p5-Kwiki-PagePrivacy/Makefile
index 821912b677b..8d7b4df83f4 100644
--- a/www/p5-Kwiki-PagePrivacy/Makefile
+++ b/www/p5-Kwiki-PagePrivacy/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2006/03/14 16:00:53 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:27:22 wiz Exp $
-DISTNAME= Kwiki-PagePrivacy-0.10
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-PagePrivacy-0.10
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-ParagraphBlocks/Makefile b/www/p5-Kwiki-ParagraphBlocks/Makefile
index 80156bd7bc4..ff4cba239ab 100644
--- a/www/p5-Kwiki-ParagraphBlocks/Makefile
+++ b/www/p5-Kwiki-ParagraphBlocks/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2006/03/14 16:00:54 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:27:22 wiz Exp $
-DISTNAME= Kwiki-ParagraphBlocks-0.12
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-ParagraphBlocks-0.12
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-PreformattedBlocks/Makefile b/www/p5-Kwiki-PreformattedBlocks/Makefile
index 3dc4416d370..4934c0c259c 100644
--- a/www/p5-Kwiki-PreformattedBlocks/Makefile
+++ b/www/p5-Kwiki-PreformattedBlocks/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2006/03/14 16:00:54 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2007/02/22 19:27:23 wiz Exp $
-DISTNAME= Kwiki-PreformattedBlocks-0.11
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-PreformattedBlocks-0.11
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-RecentChanges/Makefile b/www/p5-Kwiki-RecentChanges/Makefile
index 1ecf3513756..98c152587fa 100644
--- a/www/p5-Kwiki-RecentChanges/Makefile
+++ b/www/p5-Kwiki-RecentChanges/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2006/03/14 16:00:54 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/22 19:27:23 wiz Exp $
-DISTNAME= Kwiki-RecentChanges-0.13
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-RecentChanges-0.13
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-Revisions/Makefile b/www/p5-Kwiki-Revisions/Makefile
index a4cef4645ac..3624a2d7c35 100644
--- a/www/p5-Kwiki-Revisions/Makefile
+++ b/www/p5-Kwiki-Revisions/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2006/03/14 16:00:54 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:27:23 wiz Exp $
-DISTNAME= Kwiki-Revisions-0.15
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-Revisions-0.15
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-Scode/Makefile b/www/p5-Kwiki-Scode/Makefile
index 7a9346dba7f..d079c5cab6a 100644
--- a/www/p5-Kwiki-Scode/Makefile
+++ b/www/p5-Kwiki-Scode/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2006/03/14 16:00:54 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:27:23 wiz Exp $
-DISTNAME= Kwiki-Scode-0.03
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-Scode-0.03
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 2
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-Search/Makefile b/www/p5-Kwiki-Search/Makefile
index d7732615bd1..b4b52820320 100644
--- a/www/p5-Kwiki-Search/Makefile
+++ b/www/p5-Kwiki-Search/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2006/03/14 16:00:54 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:23 wiz Exp $
-DISTNAME= Kwiki-Search-0.12
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-Search-0.12
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-Simple-Server-HTTP/Makefile b/www/p5-Kwiki-Simple-Server-HTTP/Makefile
index aa799f412e3..82961b1707b 100644
--- a/www/p5-Kwiki-Simple-Server-HTTP/Makefile
+++ b/www/p5-Kwiki-Simple-Server-HTTP/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/05/02 04:51:01 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2007/02/22 19:27:23 wiz Exp $
-DISTNAME= Kwiki-Simple-Server-HTTP-0.03
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-Simple-Server-HTTP-0.03
+PKGNAME= p5-${DISTNAME}
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-UserName/Makefile b/www/p5-Kwiki-UserName/Makefile
index 7c7eaf2d881..864603cbe16 100644
--- a/www/p5-Kwiki-UserName/Makefile
+++ b/www/p5-Kwiki-UserName/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2006/03/14 16:00:54 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:27:23 wiz Exp $
-DISTNAME= Kwiki-UserName-0.14
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-UserName-0.14
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-UserPreferences/Makefile b/www/p5-Kwiki-UserPreferences/Makefile
index 42b38e0bc81..586a4d3079b 100644
--- a/www/p5-Kwiki-UserPreferences/Makefile
+++ b/www/p5-Kwiki-UserPreferences/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2006/03/14 16:00:54 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/02/22 19:27:23 wiz Exp $
-DISTNAME= Kwiki-UserPreferences-0.13
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-UserPreferences-0.13
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-Weather/Makefile b/www/p5-Kwiki-Weather/Makefile
index 9d737754317..697eeb40805 100644
--- a/www/p5-Kwiki-Weather/Makefile
+++ b/www/p5-Kwiki-Weather/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2006/03/04 21:31:02 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:27:23 wiz Exp $
-DISTNAME= Kwiki-Weather-0.05
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-Weather-0.05
+PKGNAME= p5-${DISTNAME}
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-Wikiwyg/Makefile b/www/p5-Kwiki-Wikiwyg/Makefile
index 024dcb8ca53..ffbbebddd52 100644
--- a/www/p5-Kwiki-Wikiwyg/Makefile
+++ b/www/p5-Kwiki-Wikiwyg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/05/02 14:18:43 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2007/02/22 19:27:23 wiz Exp $
-DISTNAME= Kwiki-Wikiwyg-0.13
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-Wikiwyg-0.13
+PKGNAME= p5-${DISTNAME}
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki-Zipcode/Makefile b/www/p5-Kwiki-Zipcode/Makefile
index 04cc0d5be85..142184a3cb2 100644
--- a/www/p5-Kwiki-Zipcode/Makefile
+++ b/www/p5-Kwiki-Zipcode/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2006/03/04 21:31:02 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2007/02/22 19:27:23 wiz Exp $
-DISTNAME= Kwiki-Zipcode-0.12
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-Zipcode-0.12
+PKGNAME= p5-${DISTNAME}
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-Kwiki/Makefile b/www/p5-Kwiki/Makefile
index 97b85706fd2..5cb9d3fe7f8 100644
--- a/www/p5-Kwiki/Makefile
+++ b/www/p5-Kwiki/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2006/03/14 16:04:46 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2007/02/22 19:27:22 wiz Exp $
-DISTNAME= Kwiki-0.38
-PKGNAME= p5-${DISTNAME}
+DISTNAME= Kwiki-0.38
+PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Kwiki/}
diff --git a/www/p5-libwww/Makefile b/www/p5-libwww/Makefile
index 9e446f9e095..504858d5254 100644
--- a/www/p5-libwww/Makefile
+++ b/www/p5-libwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2006/11/05 17:37:55 joerg Exp $
+# $NetBSD: Makefile,v 1.47 2007/02/22 19:27:24 wiz Exp $
DISTNAME= libwww-perl-5.805
PKGNAME= p5-${DISTNAME:S/-perl-/-/}
@@ -21,7 +21,7 @@ DEPENDS+= p5-IO-Socket-SSL-[0-9]*:../../security/p5-IO-Socket-SSL
DEPENDS+= p5-MIME-Base64>=2.1:../../converters/p5-MIME-Base64
DEPENDS+= p5-Net>=1.09:../../net/p5-Net # for Net::FTP>=2.58
DEPENDS+= p5-URI>=1.10:../../www/p5-URI
-DEPENDS+= p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
+DEPENDS+= p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
PERL5_PACKLIST= auto/LWP/.packlist
MAKE_PARAMS= -n
diff --git a/www/py-django/options.mk b/www/py-django/options.mk
index 5a3ad6c9ff6..6e3b50462b2 100644
--- a/www/py-django/options.mk
+++ b/www/py-django/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.3 2007/02/20 11:57:41 joerg Exp $
+# $NetBSD: options.mk,v 1.4 2007/02/22 19:27:24 wiz Exp $
-PKG_OPTIONS_VAR = PKG_OPTIONS.django
-PKG_SUPPORTED_OPTIONS= mysql psycopg1 psycopg2 sqlite
+PKG_OPTIONS_VAR = PKG_OPTIONS.django
+PKG_SUPPORTED_OPTIONS= mysql psycopg1 psycopg2 sqlite
PKG_SUGGESTED_OPTIONS= psycopg1
.include "../../mk/bsd.options.mk"
diff --git a/www/py-pcgi/Makefile b/www/py-pcgi/Makefile
index 092899642ab..f450523c0d3 100644
--- a/www/py-pcgi/Makefile
+++ b/www/py-pcgi/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.14 2006/06/25 09:46:53 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:27:24 wiz Exp $
#
DISTNAME= Zope-2.2.2-src
PKGNAME= py-pcgi-2.2.2
PKGREVISION= 2
CATEGORIES= www python
-MASTER_SITES= http://www.zope.org/Products/Zope/2.2.2/
+MASTER_SITES= http://www.zope.org/Products/Zope/2.2.2/
EXTRACT_SUFX= .tgz
MAINTAINER= tsarna@NetBSD.org
diff --git a/www/py-zpublisher/Makefile b/www/py-zpublisher/Makefile
index 325e133d072..0a3cecd34cb 100644
--- a/www/py-zpublisher/Makefile
+++ b/www/py-zpublisher/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.13 2005/06/17 03:50:42 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:27:24 wiz Exp $
#
DISTNAME= Zope-2.2.2-src
PKGNAME= py-zpublisher-2.2.2
PKGREVISION= 1
CATEGORIES= www python
-MASTER_SITES= http://www.zope.org/Products/Zope/2.2.2/
+MASTER_SITES= http://www.zope.org/Products/Zope/2.2.2/
EXTRACT_SUFX= .tgz
MAINTAINER= tsarna@NetBSD.org
diff --git a/www/swish-e/Makefile b/www/swish-e/Makefile
index aaff99a7c68..cc942f081ac 100644
--- a/www/swish-e/Makefile
+++ b/www/swish-e/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/03/04 21:31:04 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2007/02/22 19:27:24 wiz Exp $
DISTNAME= swish-e-2.4.3
PKGREVISION= # empty
@@ -6,8 +6,8 @@ CATEGORIES= www textproc
MASTER_SITES= http://swish-e.org/distribution/
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://swish-e.org/
-COMMENT= Simple web indexing for humans - enhanced
+HOMEPAGE= http://swish-e.org/
+COMMENT= Simple web indexing for humans - enhanced
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
diff --git a/www/tinyproxy/options.mk b/www/tinyproxy/options.mk
index ab055b9c4d3..e9406a451c3 100644
--- a/www/tinyproxy/options.mk
+++ b/www/tinyproxy/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2005/12/02 17:06:04 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2007/02/22 19:27:24 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.tinyproxy
PKG_SUPPORTED_OPTIONS+= socks5
@@ -8,7 +8,7 @@ PKG_SUGGESTED_OPTIONS+= socks5
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Msocks5)
-CONFIGURE_ARGS+= --enable-socks
-BUILDLINK_TRANSFORM+= l:socks:socks5
+CONFIGURE_ARGS+= --enable-socks
+BUILDLINK_TRANSFORM+= l:socks:socks5
.include "../../net/socks5/buildlink3.mk"
.endif
diff --git a/www/wApua/Makefile b/www/wApua/Makefile
index 20f1a0fbcb8..4b7f72fb5b1 100644
--- a/www/wApua/Makefile
+++ b/www/wApua/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/05/14 14:35:49 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2007/02/22 19:27:24 wiz Exp $
#
DISTNAME= wApua-0.05.1
@@ -16,7 +16,7 @@ DEPENDS+= p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
DEPENDS+= p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
DEPENDS+= p5-Net-[0-9]*:../../net/p5-Net
-PERL5_PACKLIST= auto/wApua/.packlist
+PERL5_PACKLIST= auto/wApua/.packlist
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wApua
diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index 271b358658b..807fa59245b 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2007/01/07 09:14:15 rillig Exp $
+# $NetBSD: Makefile,v 1.42 2007/02/22 19:27:24 wiz Exp $
#
DISTNAME= webalizer-2.01-10-src
@@ -16,7 +16,7 @@ COMMENT= Web server log file analysis program
PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
-GNU_CONFIGURE= YES
+GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ARGS+= --enable-dns
CONFIGURE_ENV+= ac_cv_GDLIB=${BUILDLINK_PREFIX.gd}/include
@@ -38,7 +38,7 @@ SUBST_FILES.webalizer= sample.conf webalizer.1
SUBST_SED.webalizer= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
PKG_OPTIONS_VAR= PKG_OPTIONS.webalizer
-PKG_SUPPORTED_OPTIONS= geoip
+PKG_SUPPORTED_OPTIONS= geoip
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mgeoip)
diff --git a/www/whisker/Makefile b/www/whisker/Makefile
index 47d7ca77c04..7c87ccdd861 100644
--- a/www/whisker/Makefile
+++ b/www/whisker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:26 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2007/02/22 19:27:24 wiz Exp $
DISTNAME= whisker-2.1
PKGREVISION= 1
@@ -6,7 +6,7 @@ CATEGORIES= security www
MASTER_SITES= http://www.wiretrip.net/rfp/bins/whisker/
MAINTAINER= adrianp@stindustries.net
-HOMEPAGE= http://www.wiretrip.net/rfp/
+HOMEPAGE= http://www.wiretrip.net/rfp/
COMMENT= URL scanner used to search for known vulnerable CGIs on websites
DEPENDS+= p5-Net-SSLeay>=1.20:../../security/p5-Net-SSLeay
diff --git a/www/wwwcount/Makefile b/www/wwwcount/Makefile
index a621a8a2cf9..0d513a2c486 100644
--- a/www/wwwcount/Makefile
+++ b/www/wwwcount/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2006/07/19 19:48:21 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2007/02/22 19:27:24 wiz Exp $
-DISTNAME= wwwcount2.5
-PKGNAME= wwwcount-2.5
+DISTNAME= wwwcount2.5
+PKGNAME= wwwcount-2.5
PKGREVISION= 1
-CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_BACKUP}
+CATEGORIES= www
+MASTER_SITES= ${MASTER_SITE_BACKUP}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.muquit.com/muquit/software/Count/Count.html
diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index 14b8dbcf63d..33897919ee5 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2006/10/23 11:06:23 rillig Exp $
+# $NetBSD: Makefile,v 1.68 2007/02/22 19:27:25 wiz Exp $
DISTNAME= wwwoffle-2.9a
PKGREVISION= 1
@@ -17,19 +17,19 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-confdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ARGS+= --with-spooldir=${VARBASE}/wwwoffle
-PKG_SYSCONFSUBDIR= wwwoffle
+PKG_SYSCONFSUBDIR= wwwoffle
CONF_FILES+= ${PREFIX}/share/examples/wwwoffle/wwwoffle.conf ${PKG_SYSCONFDIR}/wwwoffle.conf
CONF_FILES_MODE= 0640
PLIST_SUBST+= GZIP_CMD=${GZIP_CMD:Q}
RCD_SCRIPTS= wwwoffled
-SUBST_CLASSES+= fix-paths
-SUBST_STAGE.fix-paths= pre-configure
-SUBST_MESSAGE.fix-paths= Fixing absolute paths.
-SUBST_FILES.fix-paths= cache/search/namazu/scripts/wwwoffle-namazu
-SUBST_FILES.fix-paths+= cache/search/hyperestraier/scripts/wwwoffle-estseek
-SUBST_SED.fix-paths= -e 's,@PREFIX@,${PREFIX},g'
+SUBST_CLASSES+= fix-paths
+SUBST_STAGE.fix-paths= pre-configure
+SUBST_MESSAGE.fix-paths= Fixing absolute paths.
+SUBST_FILES.fix-paths= cache/search/namazu/scripts/wwwoffle-namazu
+SUBST_FILES.fix-paths+= cache/search/hyperestraier/scripts/wwwoffle-estseek
+SUBST_SED.fix-paths= -e 's,@PREFIX@,${PREFIX},g'
.include "options.mk"
diff --git a/www/zope-confera/Makefile b/www/zope-confera/Makefile
index d82d54a7001..93ff93e9a03 100644
--- a/www/zope-confera/Makefile
+++ b/www/zope-confera/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.12 2005/06/17 03:50:43 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/22 19:27:25 wiz Exp $
#
DISTNAME= Confera-1.2.0-nonbin
PKGNAME= zope-confera-1.2.0
PKGREVISION= 1
CATEGORIES= www
-MASTER_SITES= http://www.zope.org/Download/Prereleases/Confera/
+MASTER_SITES= http://www.zope.org/Download/Prereleases/Confera/
EXTRACT_SUFX= .tgz
MAINTAINER= tsarna@NetBSD.org
diff --git a/www/zope/Makefile b/www/zope/Makefile
index b47481e871c..9fe536e69c4 100644
--- a/www/zope/Makefile
+++ b/www/zope/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.25 2005/12/30 13:24:34 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2007/02/22 19:27:25 wiz Exp $
#
DISTNAME= Zope-2.2.2-src
PKGNAME= zope-2.2.2
PKGREVISION= 1
CATEGORIES= www
-MASTER_SITES= http://www.zope.org/Products/Zope/2.2.2/
+MASTER_SITES= http://www.zope.org/Products/Zope/2.2.2/
EXTRACT_SUFX= .tgz
MAINTAINER= tsarna@NetBSD.org
diff --git a/www/zope29/Makefile b/www/zope29/Makefile
index 224d92f7cbe..6537645bacd 100644
--- a/www/zope29/Makefile
+++ b/www/zope29/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/09/10 00:56:53 taca Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/22 19:27:25 wiz Exp $
# FreeBSD Id: ports/www/zope29/Makefile,v 1.86 2006/08/03 15:53:04 garga Exp
DISTNAME= Zope-2.9.4-final
@@ -15,7 +15,7 @@ COMMENT= Zope, the Z Object Publishing Environment
DEPENDS+= ${PYPKGPREFIX}-xml-[0-9]*:../../textproc/py-xml
-DIST_SUBDIR= zope
+DIST_SUBDIR= zope
PYTHON_VERSIONS_ACCEPTED= 24
RCD_SCRIPTS= ${PKGBASE}29 zeo29