summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorreed <reed@pkgsrc.org>2004-12-28 02:47:40 +0000
committerreed <reed@pkgsrc.org>2004-12-28 02:47:40 +0000
commit32d8f290c274c874d8a81e82744c6ff676d174f8 (patch)
tree8823f72baedbd3b5995504940cccdd29b3f0c027
parent4252af99538681327231d82010cba8761339f033 (diff)
downloadpkgsrc-32d8f290c274c874d8a81e82744c6ff676d174f8.tar.gz
The default location of the pkgsrc-installed rc.d scripts is now
under share/examples/rc.d. The variable name already was named RCD_SCRIPTS_EXAMPLEDIR. This is from ideas from Greg Woods and others. Also bumped PKGREVISION for all packages using RCD_SCRIPTS mechanism (as requested by wiz).
-rw-r--r--audio/daapd/Makefile4
-rw-r--r--audio/icecast/Makefile3
-rw-r--r--audio/icecast1/Makefile4
-rw-r--r--audio/moss/Makefile3
-rw-r--r--audio/musicpd/Makefile3
-rw-r--r--audio/oss/Makefile3
-rw-r--r--audio/rplay/Makefile4
-rw-r--r--audio/ubs/Makefile4
-rw-r--r--chat/dircproxy/Makefile4
-rw-r--r--chat/ircd-hybrid/Makefile4
-rw-r--r--chat/ircservices/Makefile3
-rw-r--r--chat/ircu/Makefile3
-rw-r--r--chat/jabberd/Makefile4
-rw-r--r--chat/jabberd2/Makefile4
-rw-r--r--chat/mu-conference/Makefile4
-rw-r--r--chat/silc-server/Makefile4
-rw-r--r--chat/zephyr/Makefile4
-rw-r--r--comms/conserver/Makefile4
-rw-r--r--comms/fidogate/Makefile4
-rw-r--r--comms/hylafax/Makefile4
-rw-r--r--databases/geneweb/Makefile3
-rw-r--r--databases/mysql-server/Makefile3
-rw-r--r--databases/mysql3-server/Makefile4
-rw-r--r--databases/mysql4-server/Makefile4
-rw-r--r--databases/openldap/Makefile3
-rw-r--r--databases/postgresql73-server/Makefile4
-rw-r--r--databases/postgresql74-server/Makefile4
-rw-r--r--devel/distcc/Makefile4
-rw-r--r--devel/isect/Makefile4
-rw-r--r--devel/p4d/Makefile3
-rw-r--r--emulators/cygwin_esound/Makefile3
-rw-r--r--games/quake3server/Makefile3
-rw-r--r--graphics/cambevao/Makefile3
-rw-r--r--graphics/nvtv/Makefile4
-rw-r--r--inputmethod/canna-server/Makefile4
-rw-r--r--inputmethod/ja-freewnn-lib/Makefile4
-rw-r--r--inputmethod/sj3-server-bin/Makefile4
-rw-r--r--inputmethod/skkserv/Makefile4
-rw-r--r--mail/clamav/Makefile4
-rw-r--r--mail/clamsmtp/Makefile3
-rw-r--r--mail/courier-auth/Makefile3
-rw-r--r--mail/courier-imap/Makefile4
-rw-r--r--mail/cyrus-imapd/Makefile4
-rw-r--r--mail/cyrus-imapd21/Makefile4
-rw-r--r--mail/cyrus-imapd22/Makefile3
-rw-r--r--mail/dovecot/Makefile3
-rw-r--r--mail/exim/Makefile3
-rw-r--r--mail/exim3/Makefile4
-rw-r--r--mail/fetchmail/Makefile4
-rw-r--r--mail/gld/Makefile3
-rw-r--r--mail/mailman/Makefile4
-rw-r--r--mail/mailscanner/Makefile3
-rw-r--r--mail/milter-greylist/Makefile3
-rw-r--r--mail/mimedefang/Makefile3
-rw-r--r--mail/nullmailer/Makefile3
-rw-r--r--mail/popa3d/Makefile4
-rw-r--r--mail/postfix-current/Makefile3
-rw-r--r--mail/postfix/Makefile4
-rw-r--r--mail/postgrey/Makefile3
-rw-r--r--mail/prayer/Makefile4
-rw-r--r--mail/proxsmtp/Makefile3
-rw-r--r--mail/qmHandle/Makefile3
-rw-r--r--mail/qmail-run/Makefile3
-rw-r--r--mail/qpopper/Makefile4
-rw-r--r--mail/spamass-milter/Makefile3
-rw-r--r--mail/spamassassin/Makefile3
-rw-r--r--mail/sqwebmail/Makefile4
-rw-r--r--mail/teapop/Makefile4
-rw-r--r--mail/tmda/Makefile3
-rw-r--r--misc/dnetc/Makefile3
-rw-r--r--misc/setiathome/Makefile3
-rw-r--r--mk/bsd.pkg.install.mk5
-rw-r--r--net/argus/Makefile3
-rw-r--r--net/arla/Makefile5
-rw-r--r--net/bind8/Makefile3
-rw-r--r--net/bpalogin/Makefile3
-rw-r--r--net/chrony/Makefile3
-rw-r--r--net/ddclient/Makefile3
-rw-r--r--net/delegate/Makefile3
-rw-r--r--net/dhid/Makefile4
-rw-r--r--net/djbdns-run/Makefile3
-rw-r--r--net/dtcp/Makefile3
-rw-r--r--net/dynipclient/Makefile4
-rw-r--r--net/freeradius/Makefile4
-rw-r--r--net/gated/Makefile3
-rw-r--r--net/gnugk/Makefile3
-rw-r--r--net/ipa/Makefile3
-rw-r--r--net/iplog/Makefile4
-rw-r--r--net/ja-samba/Makefile4
-rw-r--r--net/jftpgw/Makefile3
-rw-r--r--net/maradns/Makefile4
-rw-r--r--net/mldonkey/Makefile4
-rw-r--r--net/net-snmp/Makefile4
-rw-r--r--net/netatalk/Makefile3
-rw-r--r--net/netatalk1/Makefile4
-rw-r--r--net/ntp4/Makefile4
-rw-r--r--net/oidentd/Makefile4
-rw-r--r--net/openntpd/Makefile3
-rw-r--r--net/openslp/Makefile3
-rw-r--r--net/openvpn-current/Makefile4
-rw-r--r--net/proftpd/Makefile3
-rw-r--r--net/pure-ftpd/Makefile3
-rw-r--r--net/pxe/Makefile3
-rw-r--r--net/pygopherd/Makefile3
-rw-r--r--net/radiusd-cistron/Makefile3
-rw-r--r--net/rinetd/Makefile3
-rw-r--r--net/rp-pppoe/Makefile3
-rw-r--r--net/samba/Makefile3
-rw-r--r--net/samba2/Makefile3
-rw-r--r--net/smokeping/Makefile3
-rw-r--r--net/snort/Makefile3
-rw-r--r--net/socks5/Makefile4
-rw-r--r--net/speedtouch/Makefile3
-rw-r--r--net/spread/Makefile3
-rw-r--r--net/trickle/Makefile4
-rw-r--r--net/upclient/Makefile4
-rw-r--r--net/vsftpd/Makefile4
-rw-r--r--net/whoson/Makefile3
-rw-r--r--news/inn/Makefile4
-rw-r--r--parallel/sge/Makefile4
-rw-r--r--pkgtools/rc.subr/Makefile3
-rw-r--r--print/cups/Makefile3
-rw-r--r--security/amavisd-new/Makefile3
-rw-r--r--security/cfs/Makefile4
-rw-r--r--security/cyrus-sasl/Makefile4
-rw-r--r--security/cyrus-saslauthd/Makefile4
-rw-r--r--security/heimdal/Makefile4
-rw-r--r--security/honeyd-arpd/Makefile4
-rw-r--r--security/honeyd/Makefile4
-rw-r--r--security/isakmpd/Makefile4
-rw-r--r--security/mit-krb5/Makefile3
-rw-r--r--security/nessus-core/Makefile3
-rw-r--r--security/openssh+gssapi/Makefile4
-rw-r--r--security/openssh/Makefile4
-rw-r--r--security/pflkm/Makefile3
-rw-r--r--security/pks/Makefile4
-rw-r--r--security/racoon/Makefile3
-rw-r--r--security/sfs/Makefile4
-rw-r--r--security/ssh2/Makefile4
-rw-r--r--security/stunnel/Makefile4
-rw-r--r--security/winbind/Makefile3
-rw-r--r--security/xdm-krb4/Makefile4
-rw-r--r--sysutils/apcupsd/Makefile4
-rw-r--r--sysutils/bacula/Makefile4
-rw-r--r--sysutils/bkpupsd/Makefile4
-rw-r--r--sysutils/cfengine2/Makefile4
-rw-r--r--sysutils/dbus/Makefile4
-rw-r--r--sysutils/fam/Makefile4
-rw-r--r--sysutils/gkrellm-server/Makefile3
-rw-r--r--sysutils/smartmontools/Makefile3
-rw-r--r--sysutils/swapd/Makefile3
-rw-r--r--sysutils/ups-nut/Makefile4
-rw-r--r--sysutils/webmin/Makefile3
-rw-r--r--textproc/ndtpd/Makefile4
-rw-r--r--time/anacron/Makefile3
-rw-r--r--www/apache/Makefile4
-rw-r--r--www/apache2/Makefile4
-rw-r--r--www/hiawatha/Makefile4
-rw-r--r--www/iasp/Makefile4
-rw-r--r--www/jakarta-tomcat/Makefile3
-rw-r--r--www/jakarta-tomcat4/Makefile3
-rw-r--r--www/privoxy/Makefile4
-rw-r--r--www/screws/Makefile4
-rw-r--r--www/squid/Makefile4
-rw-r--r--www/thttpd/Makefile4
-rw-r--r--www/thy/Makefile4
-rw-r--r--www/tinyproxy/Makefile4
-rw-r--r--www/wwwoffle/Makefile3
-rw-r--r--x11/gdm/Makefile4
-rw-r--r--x11/kdebase3/Makefile4
-rw-r--r--x11/wdm/Makefile4
-rw-r--r--x11/xfstt/Makefile4
172 files changed, 347 insertions, 265 deletions
diff --git a/audio/daapd/Makefile b/audio/daapd/Makefile
index 69918e61ca0..97322450f86 100644
--- a/audio/daapd/Makefile
+++ b/audio/daapd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2004/11/20 15:08:23 mjl Exp $
+# $NetBSD: Makefile,v 1.5 2004/12/28 02:47:41 reed Exp $
DISTNAME= daapd-0.2.3d
-# PKGREVISION= 1
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${HOMEPAGE}
EXTRACT_SUFX= .tgz
diff --git a/audio/icecast/Makefile b/audio/icecast/Makefile
index 105381677e1..64581f69565 100644
--- a/audio/icecast/Makefile
+++ b/audio/icecast/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2004/12/04 23:09:06 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2004/12/28 02:47:41 reed Exp $
#
DISTNAME= icecast-2.1.0
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://svn.xiph.org/releases/icecast/
diff --git a/audio/icecast1/Makefile b/audio/icecast1/Makefile
index 8057142a3f4..b49d6532ee7 100644
--- a/audio/icecast1/Makefile
+++ b/audio/icecast1/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/12/22 16:14:23 kim Exp $
+# $NetBSD: Makefile,v 1.11 2004/12/28 02:47:41 reed Exp $
#
DISTNAME= icecast-1.3.12
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= audio
MASTER_SITES= http://www.icecast.org/releases/
diff --git a/audio/moss/Makefile b/audio/moss/Makefile
index e4314766e91..2ebce777d65 100644
--- a/audio/moss/Makefile
+++ b/audio/moss/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2004/11/27 01:22:26 minskim Exp $
+# $NetBSD: Makefile,v 1.7 2004/12/28 02:47:41 reed Exp $
DISTNAME= moss-0.1.13
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://kldp.net/frs/download.php/1580/
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index fd5c932f288..cbb49c003e3 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2004/11/25 20:16:52 xtraeme Exp $
+# $NetBSD: Makefile,v 1.13 2004/12/28 02:47:41 reed Exp $
DISTNAME= mpd-0.11.5
PKGNAME= ${DISTNAME:S/mpd/musicpd/}
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://mercury.chem.pitt.edu/~shank/
diff --git a/audio/oss/Makefile b/audio/oss/Makefile
index 9a85bd5cd6a..c64c830369f 100644
--- a/audio/oss/Makefile
+++ b/audio/oss/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2004/06/09 22:46:48 agc Exp $
+# $NetBSD: Makefile,v 1.30 2004/12/28 02:47:41 reed Exp $
DISTNAME= oss-${OSS_VERSION} # Overridden below
PKGNAME= oss-${OSS_VERSION}
+PKGREVISION= 1
CATEGORIES= audio sysutils
MASTER_SITES= ftp://ftp.opensound.com/pub/oss/netbsd/
diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index 119dd773015..9a706814375 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2004/12/22 16:18:42 ben Exp $
+# $NetBSD: Makefile,v 1.47 2004/12/28 02:47:41 reed Exp $
#
DISTNAME= rplay-3.3.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= audio
MASTER_SITES= ftp://rplay.doit.org/pub/rplay/ \
http://rplay.doit.org/dist/
diff --git a/audio/ubs/Makefile b/audio/ubs/Makefile
index 520da71c544..6c4f0ebfbf9 100644
--- a/audio/ubs/Makefile
+++ b/audio/ubs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2004/10/03 00:13:10 tv Exp $
+# $NetBSD: Makefile,v 1.4 2004/12/28 02:47:41 reed Exp $
#
DISTNAME= ubs-0.17
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://aboleo.net/software/ubs/downloads/
diff --git a/chat/dircproxy/Makefile b/chat/dircproxy/Makefile
index 7210b0ed40b..bf0d950d1a1 100644
--- a/chat/dircproxy/Makefile
+++ b/chat/dircproxy/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2004/04/11 05:43:07 snj Exp $
+# $NetBSD: Makefile,v 1.7 2004/12/28 02:47:41 reed Exp $
DISTNAME= dircproxy-1.0.5
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= chat
MASTER_SITES= http://www.dircproxy.net/download/stable/
diff --git a/chat/ircd-hybrid/Makefile b/chat/ircd-hybrid/Makefile
index 90d7a53e3c5..e3d6983651c 100644
--- a/chat/ircd-hybrid/Makefile
+++ b/chat/ircd-hybrid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2004/10/03 00:13:14 tv Exp $
+# $NetBSD: Makefile,v 1.14 2004/12/28 02:47:41 reed Exp $
#
DISTNAME= ircd-hybrid-6.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= chat
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ircd-hybrid/}
EXTRACT_SUFX= .tgz
diff --git a/chat/ircservices/Makefile b/chat/ircservices/Makefile
index 5de50ba9e11..18fd079e0ad 100644
--- a/chat/ircservices/Makefile
+++ b/chat/ircservices/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/10/04 15:06:34 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2004/12/28 02:47:41 reed Exp $
#
DISTNAME= ircservices-5.0.41
+PKGREVISION= 1
CATEGORIES= chat
MASTER_SITES= ftp://ftp.esper.net/ircservices/ \
ftp://ftp.esper.net/ircservices/old/
diff --git a/chat/ircu/Makefile b/chat/ircu/Makefile
index 399404ad0b7..d93d77c02c4 100644
--- a/chat/ircu/Makefile
+++ b/chat/ircu/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2004/09/28 12:32:17 adrianp Exp $
+# $NetBSD: Makefile,v 1.12 2004/12/28 02:47:41 reed Exp $
#
DISTNAME= ircu2.10.11.07
PKGNAME= ircu-2.10.11.07
+PKGREVISION= 1
CATEGORIES= chat
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=undernet-ircu/}
diff --git a/chat/jabberd/Makefile b/chat/jabberd/Makefile
index 0bc72bd2086..c47efd275f9 100644
--- a/chat/jabberd/Makefile
+++ b/chat/jabberd/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2004/10/03 00:13:14 tv Exp $
+# $NetBSD: Makefile,v 1.10 2004/12/28 02:47:41 reed Exp $
#
DISTNAME= jabber-1.4.2
PKGNAME= jabberd-1.4.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= chat
MASTER_SITES= http://jabberd.jabberstudio.org/downloads/ \
http://jabberd.jabberstudio.org/1.4/dist/
diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile
index 72f6f555b0f..0dc06422a84 100644
--- a/chat/jabberd2/Makefile
+++ b/chat/jabberd2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2004/11/29 17:59:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.17 2004/12/28 02:47:41 reed Exp $
#
DISTNAME= jabberd-2.0s4
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= chat
MASTER_SITES= http://www.jabberstudio.org/files/jabberd2/
diff --git a/chat/mu-conference/Makefile b/chat/mu-conference/Makefile
index 90aa5063da8..15726e60b84 100644
--- a/chat/mu-conference/Makefile
+++ b/chat/mu-conference/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2004/12/14 19:38:19 minskim Exp $
+# $NetBSD: Makefile,v 1.6 2004/12/28 02:47:41 reed Exp $
#
DISTNAME= mu-conference-0.6.0
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= chat
MASTER_SITES= http://jabber.terrapin.com/JCR/ http://www.jabberstudio.org/projects/mu-conference/releases/download.php?file=
DISTFILES= ${DISTNAME}.tar.gz jcr-0.1.2.tar.gz
diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile
index 1c3bb285d87..636e1095d50 100644
--- a/chat/silc-server/Makefile
+++ b/chat/silc-server/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2004/10/03 00:13:15 tv Exp $
+# $NetBSD: Makefile,v 1.36 2004/12/28 02:47:41 reed Exp $
#
DISTNAME= silc-server-0.9.18
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= chat security
MASTER_SITES= http://www.silcnet.org/download/server/sources/ \
ftp://ftp.silcnet.org/silc/server/sources/ \
diff --git a/chat/zephyr/Makefile b/chat/zephyr/Makefile
index a9e87e9b59e..e502325b47e 100644
--- a/chat/zephyr/Makefile
+++ b/chat/zephyr/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2004/10/03 00:13:16 tv Exp $
+# $NetBSD: Makefile,v 1.5 2004/12/28 02:47:42 reed Exp $
#
DISTNAME= zephyr-20010518
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= chat net
MASTER_SITES= ftp://athena-dist.mit.edu/pub/ATHENA/zephyr/
diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile
index 9d123b8dcd7..c3059098d43 100644
--- a/comms/conserver/Makefile
+++ b/comms/conserver/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2004/10/03 00:13:16 tv Exp $
+# $NetBSD: Makefile,v 1.15 2004/12/28 02:47:42 reed Exp $
#
DISTNAME= conserver-7.2.7
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= comms
MASTER_SITES= ftp://ftp.conserver.com/conserver/
diff --git a/comms/fidogate/Makefile b/comms/fidogate/Makefile
index bb040aa6761..94ef18cc6a8 100644
--- a/comms/fidogate/Makefile
+++ b/comms/fidogate/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2004/10/11 22:14:52 reed Exp $
+# $NetBSD: Makefile,v 1.36 2004/12/28 02:47:42 reed Exp $
#
DISTNAME= fidogate-4.4.9
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= comms
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fidogate/}
diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index 869820358f0..ff79e5a0d9c 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2004/10/03 00:13:16 tv Exp $
+# $NetBSD: Makefile,v 1.40 2004/12/28 02:47:42 reed Exp $
#
DISTNAME= hylafax-4.1.8
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= comms
MASTER_SITES= ftp://ftp.hylafax.org/source/ \
ftp://ftp.leo.org/pub/comp/os/unix/networking/fax/hylafax/source/
diff --git a/databases/geneweb/Makefile b/databases/geneweb/Makefile
index ea74f7f2008..cf428f1c325 100644
--- a/databases/geneweb/Makefile
+++ b/databases/geneweb/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2004/12/03 15:14:53 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2004/12/28 02:47:43 reed Exp $
#
DISTNAME= geneweb-4.09
+PKGREVISION= 1
CATEGORIES= databases
MASTER_SITES= ftp://ftp.inria.fr/INRIA/Projects/cristal/geneweb/Src/
diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile
index 2bddf795bcc..31906324641 100644
--- a/databases/mysql-server/Makefile
+++ b/databases/mysql-server/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.60 2004/11/09 06:44:32 xtraeme Exp $
+# $NetBSD: Makefile,v 1.61 2004/12/28 02:47:43 reed Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
SVR4_PKGNAME= mysqs
+PKGREVISION= 1
COMMENT= MySQL 4, a free SQL database (server)
CONFLICTS= {mysql-server-[0-9]*,mysql3-server-[0-9]*}
diff --git a/databases/mysql3-server/Makefile b/databases/mysql3-server/Makefile
index 216e934f148..ff6ee1ee8e2 100644
--- a/databases/mysql3-server/Makefile
+++ b/databases/mysql3-server/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2004/10/31 06:57:05 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/12/28 02:47:43 reed Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
-PKGREVISION= 1
+PKGREVISION= 2
SVR4_PKGNAME= mysqs
COMMENT= MySQL 3, a free SQL database (server)
diff --git a/databases/mysql4-server/Makefile b/databases/mysql4-server/Makefile
index 8a23a581864..95e92f1cbb6 100644
--- a/databases/mysql4-server/Makefile
+++ b/databases/mysql4-server/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2004/11/09 06:44:32 xtraeme Exp $
+# $NetBSD: Makefile,v 1.14 2004/12/28 02:47:43 reed Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
-PKGREVISION= 1
+PKGREVISION= 2
SVR4_PKGNAME= mysqs
COMMENT= MySQL 4, a free SQL database (server)
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index eea77f1fa4a..feb268d1950 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.92 2004/12/22 06:22:48 jlam Exp $
+# $NetBSD: Makefile,v 1.93 2004/12/28 02:47:43 reed Exp $
DISTNAME= openldap-2.2.19
SVR4_PKGNAME= oldap
+PKGREVISION= 1
CATEGORIES= databases
MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
EXTRACT_SUFX= .tgz
diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index 657b14ac1f0..bb715b29843 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2004/12/18 15:59:55 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2004/12/28 02:47:43 reed Exp $
PKGNAME= postgresql73-server-${BASE_VERS}
-PKGREVISION= 2
+PKGREVISION= 3
SVR4_PKGNAME= pstgs
COMMENT= PostgreSQL database server programs
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index 317711a2739..3a0c7c9c7ca 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2004/12/18 15:59:55 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2004/12/28 02:47:43 reed Exp $
PKGNAME= postgresql74-server-${BASE_VERS}
-PKGREVISION= 2
+PKGREVISION= 3
SVR4_PKGNAME= pstgs
COMMENT= PostgreSQL database server programs
diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile
index 94c8d2b6292..c69200a65bf 100644
--- a/devel/distcc/Makefile
+++ b/devel/distcc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2004/11/17 11:45:49 xtraeme Exp $
+# $NetBSD: Makefile,v 1.20 2004/12/28 02:47:43 reed Exp $
DISTNAME= distcc-2.18.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://distcc.samba.org/ftp/distcc/
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/isect/Makefile b/devel/isect/Makefile
index 679e1e8c06c..8f20dbb56ee 100644
--- a/devel/isect/Makefile
+++ b/devel/isect/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2004/10/03 00:13:29 tv Exp $
+# $NetBSD: Makefile,v 1.29 2004/12/28 02:47:43 reed Exp $
#
DISTNAME= isect-1.6.2
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=isectd/}
diff --git a/devel/p4d/Makefile b/devel/p4d/Makefile
index fa08f66b308..1bfeeec2357 100644
--- a/devel/p4d/Makefile
+++ b/devel/p4d/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:15 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2004/12/28 02:47:43 reed Exp $
#
DISTNAME= p4d
HOMEPAGE= http://www.perforce.com/perforce/products/p4d.html
+PKGREVISION= 1
COMMENT= Perforce SCM server
P4BINONLY= # defined
diff --git a/emulators/cygwin_esound/Makefile b/emulators/cygwin_esound/Makefile
index 1399d2cf7d1..8efb43f56bb 100644
--- a/emulators/cygwin_esound/Makefile
+++ b/emulators/cygwin_esound/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/11 20:14:35 tv Exp $
+# $NetBSD: Makefile,v 1.2 2004/12/28 02:47:43 reed Exp $
#
DISTNAME= esound-0.2.35-1
PKGNAME= ${DISTNAME:S/-/!/:S/-/./g:S/!/-/:S/^/cygwin_/}
+PKGREVISION= 1
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_CYGWIN:=release/esound/} \
${MASTER_SITE_CYGWIN:=release/esound/libesound0/} \
diff --git a/games/quake3server/Makefile b/games/quake3server/Makefile
index 67cc22685f3..b76bf9e89d2 100644
--- a/games/quake3server/Makefile
+++ b/games/quake3server/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2004/01/22 09:02:30 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2004/12/28 02:47:43 reed Exp $
DISTNAME= linuxq3apoint-1.32b.x86
PKGNAME= quake3server-1.32b
+PKGREVISION= 1
CATEGORIES= games net
MASTER_SITES= ftp://ftp.bluesnews.com/idstuff/quake3/linux/ \
ftp://ftp.idsoftware.com/idstuff/quake3/linux/
diff --git a/graphics/cambevao/Makefile b/graphics/cambevao/Makefile
index cc2dfa3bb48..500026e3278 100644
--- a/graphics/cambevao/Makefile
+++ b/graphics/cambevao/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2004/11/26 23:30:04 abs Exp $
+# $NetBSD: Makefile,v 1.5 2004/12/28 02:47:43 reed Exp $
#
DISTNAME= cambevao-2.2
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://core.de/~coto/projects/cambevao/
diff --git a/graphics/nvtv/Makefile b/graphics/nvtv/Makefile
index beb16bbc0f6..271ee60f200 100644
--- a/graphics/nvtv/Makefile
+++ b/graphics/nvtv/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2004/10/03 00:14:56 tv Exp $
+# $NetBSD: Makefile,v 1.5 2004/12/28 02:47:43 reed Exp $
PKGNAME= ${DISTNAME}
-PKGREVISION= 1
+PKGREVISION= 2
.include "Makefile.common"
CONFLICTS= nvtv-gtk2-[0-9]*
diff --git a/inputmethod/canna-server/Makefile b/inputmethod/canna-server/Makefile
index 18176906f32..187ed6e61eb 100644
--- a/inputmethod/canna-server/Makefile
+++ b/inputmethod/canna-server/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2004/04/27 20:51:10 reed Exp $
+# $NetBSD: Makefile,v 1.10 2004/12/28 02:47:43 reed Exp $
#
.include "../canna/Makefile.common"
+PKGREVISION= 1
+
CANNA_MODULE= server
USE_BUILDLINK3= yes
diff --git a/inputmethod/ja-freewnn-lib/Makefile b/inputmethod/ja-freewnn-lib/Makefile
index 130681c067c..2d52f2daf77 100644
--- a/inputmethod/ja-freewnn-lib/Makefile
+++ b/inputmethod/ja-freewnn-lib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2004/04/18 23:47:28 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2004/12/28 02:47:43 reed Exp $
#
PKGNAME= ja-FreeWnn-lib-1.10
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= japanese inputmethod
MAINTAINER= tech-pkg-ja@jp.NetBSD.org
diff --git a/inputmethod/sj3-server-bin/Makefile b/inputmethod/sj3-server-bin/Makefile
index 70c8a901655..bc8b99d8379 100644
--- a/inputmethod/sj3-server-bin/Makefile
+++ b/inputmethod/sj3-server-bin/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2004/03/05 21:23:00 minskim Exp $
+# $NetBSD: Makefile,v 1.9 2004/12/28 02:47:43 reed Exp $
#
DISTNAME= sj3-2.0.1.20
PKGNAME= sj3-server-bin-2.0.1.20
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= japanese inputmethod
MASTER_SITES= ftp://ftp.sony.co.jp/pub/unsupported/src/ \
ftp://ftp.cs.titech.ac.jp/pub/japanese/sj3/
diff --git a/inputmethod/skkserv/Makefile b/inputmethod/skkserv/Makefile
index bdb67f87b54..b6cabda5841 100644
--- a/inputmethod/skkserv/Makefile
+++ b/inputmethod/skkserv/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2004/04/27 20:51:10 reed Exp $
+# $NetBSD: Makefile,v 1.10 2004/12/28 02:47:44 reed Exp $
DISTNAME= skk9.6
PKGNAME= skkserv-3.9.4
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= japanese inputmethod
MASTER_SITES= ftp://skk.kuis.kyoto-u.ac.jp/skk/9.6/
diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index 9450707a22b..5f0146b9a2e 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2004/10/30 12:09:12 recht Exp $
+# $NetBSD: Makefile,v 1.32 2004/12/28 02:47:44 reed Exp $
DISTNAME= clamav-${CLAMAV_VERSION}
PKGNAME= clamav-${CLAMAV_VERSION:S/-/./}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=clamav/}
diff --git a/mail/clamsmtp/Makefile b/mail/clamsmtp/Makefile
index a306d15c14b..339527bbe2a 100644
--- a/mail/clamsmtp/Makefile
+++ b/mail/clamsmtp/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2004/12/20 23:40:27 xtraeme Exp $
+# $NetBSD: Makefile,v 1.15 2004/12/28 02:47:44 reed Exp $
DISTNAME= clamsmtp-1.2
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://memberwebs.com/nielsen/software/clamsmtp/
diff --git a/mail/courier-auth/Makefile b/mail/courier-auth/Makefile
index 65e1a0b09fd..c3fe66dd2a4 100644
--- a/mail/courier-auth/Makefile
+++ b/mail/courier-auth/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2004/07/14 21:37:09 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2004/12/28 02:47:44 reed Exp $
PKGNAME= courier-auth-${BASE_VERS}
+PKGREVISION= 1
CATEGORIES= security
COMMENT= authentication modules for Courier mail packages
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index f1aca238423..042d1f37875 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2004/10/03 00:12:52 tv Exp $
+# $NetBSD: Makefile,v 1.32 2004/12/28 02:47:44 reed Exp $
DISTNAME= courier-imap-3.0.5
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= IMAP server for access to maildir-style mailboxes
HOMEPAGE= http://www.inter7.com/courierimap/
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index e5b08b610bc..301ddaf7165 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2004/10/03 00:12:52 tv Exp $
+# $NetBSD: Makefile,v 1.49 2004/12/28 02:47:44 reed Exp $
DISTNAME= cyrus-imapd-2.0.17
-PKGREVISION= 4
+PKGREVISION= 5
SVR4_PKGNAME= cimap
CATEGORIES= mail
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile
index 73729a2c29b..9904cf21a52 100644
--- a/mail/cyrus-imapd21/Makefile
+++ b/mail/cyrus-imapd21/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2004/11/15 17:54:49 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2004/12/28 02:47:44 reed Exp $
DISTNAME= cyrus-imapd-2.1.15
-PKGREVISION= 4
+PKGREVISION= 5
SVR4_PKGNAME= cimap
CATEGORIES= mail
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 4304b8adc93..0bc39781118 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2004/12/05 17:29:58 cube Exp $
+# $NetBSD: Makefile,v 1.30 2004/12/28 02:47:44 reed Exp $
DISTNAME= cyrus-imapd-2.2.10
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index de20bbd55eb..90a3fc0512f 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2004/12/21 00:00:34 xtraeme Exp $
+# $NetBSD: Makefile,v 1.30 2004/12/28 02:47:44 reed Exp $
DISTNAME= dovecot-0.99.12.1
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.dovecot.org/releases/
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 7da20671ab6..bbae165ecf1 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2004/12/28 01:42:19 reed Exp $
+# $NetBSD: Makefile,v 1.52 2004/12/28 02:47:44 reed Exp $
DISTNAME= exim-${EXIM_VERSION}
+PKGREVISION= 1
CATEGORIES= mail net
PKGREVISION= 2
diff --git a/mail/exim3/Makefile b/mail/exim3/Makefile
index 25fab10e86d..f3108bd0616 100644
--- a/mail/exim3/Makefile
+++ b/mail/exim3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2004/11/15 17:54:49 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2004/12/28 02:47:44 reed Exp $
DISTNAME= exim-3.36
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= mail net
MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim3/ \
http://public.planetmirror.com.au/pub/exim/exim3/
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index e2a8353251a..5f88d444a66 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.148 2004/10/03 00:12:53 tv Exp $
+# $NetBSD: Makefile,v 1.149 2004/12/28 02:47:44 reed Exp $
DISTNAME= fetchmail-6.2.5
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= mail
MASTER_SITES= http://catb.org/~esr/fetchmail/ \
http://sunsite.unc.edu/pub/Linux/system/mail/pop/
diff --git a/mail/gld/Makefile b/mail/gld/Makefile
index 919c47f9df1..ae8001c5a5e 100644
--- a/mail/gld/Makefile
+++ b/mail/gld/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2004/11/25 07:19:32 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2004/12/28 02:47:44 reed Exp $
#
DISTNAME= gld-1.4
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.gasmi.net/down/
EXTRACT_SUFX= .tgz
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index b023dbb6947..4b1a111ce6b 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2004/12/25 16:55:33 kim Exp $
+# $NetBSD: Makefile,v 1.17 2004/12/28 02:47:44 reed Exp $
DISTNAME= mailman-2.1.4
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= mail www
MASTER_SITES= http://www.list.org/ \
${MASTER_SITE_GNU:=mailman/}
diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index 70df41fafd5..3ca77291d00 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2004/09/26 18:35:51 agc Exp $
+# $NetBSD: Makefile,v 1.3 2004/12/28 02:47:44 reed Exp $
#
DISTNAME= MailScanner-4.30.3-2
PKGNAME= mailscanner-4.30.3.2
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.sng.ecs.soton.ac.uk/mailscanner/files/4/tar/
diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile
index bd1f91c5dc7..84f0c82da9a 100644
--- a/mail/milter-greylist/Makefile
+++ b/mail/milter-greylist/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2004/12/12 00:14:13 tron Exp $
+# $NetBSD: Makefile,v 1.14 2004/12/28 02:47:44 reed Exp $
DISTNAME= milter-greylist-1.6
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= ftp://ftp.espci.fr/pub/milter-greylist/
EXTRACT_SUFX= .tgz
diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index e505f8fa690..08dc315beb1 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2004/12/01 11:21:31 markd Exp $
+# $NetBSD: Makefile,v 1.21 2004/12/28 02:47:44 reed Exp $
DISTNAME= mimedefang-2.49
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.mimedefang.org/static/
diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile
index 81a11ba0160..ea210dd1cd8 100644
--- a/mail/nullmailer/Makefile
+++ b/mail/nullmailer/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2004/08/30 14:34:11 schmonz Exp $
+# $NetBSD: Makefile,v 1.12 2004/12/28 02:47:44 reed Exp $
DISTNAME= nullmailer-1.00RC7
PKGNAME= ${DISTNAME:S/0RC7/.0rc7/}
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://untroubled.org/nullmailer/
diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile
index ed28b1abfba..2344a9bbf33 100644
--- a/mail/popa3d/Makefile
+++ b/mail/popa3d/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2004/10/03 00:12:54 tv Exp $
+# $NetBSD: Makefile,v 1.38 2004/12/28 02:47:44 reed Exp $
#
DISTNAME= popa3d-0.6.4.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= mail
MASTER_SITES= http://www.openwall.com/popa3d/ \
ftp://ftp.openwall.com/pub/projects/popa3d/ \
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 8c4e92098ca..21885fdfa9c 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2004/12/03 15:15:02 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2004/12/28 02:47:45 reed Exp $
DISTNAME= postfix-2.2-20040628
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
http://public.planetmirror.com.au/pub/postfix/experimental/
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index df445851cd0..455d4e040fd 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.155 2004/12/23 13:51:27 kim Exp $
+# $NetBSD: Makefile,v 1.156 2004/12/28 02:47:45 reed Exp $
DISTNAME= postfix-2.1.5
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= mail
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/
DIST_SUBDIR= postfix
diff --git a/mail/postgrey/Makefile b/mail/postgrey/Makefile
index f440160861b..cdddb82167f 100644
--- a/mail/postgrey/Makefile
+++ b/mail/postgrey/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/12/22 15:51:38 kim Exp $
+# $NetBSD: Makefile,v 1.2 2004/12/28 02:47:45 reed Exp $
#
DISTNAME= postgrey-1.17
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://isg.ee.ethz.ch/tools/postgrey/pub/ \
http://isg.ee.ethz.ch/tools/postgrey/pub/old/
diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile
index bd22ca006f6..11c9cfed606 100644
--- a/mail/prayer/Makefile
+++ b/mail/prayer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2004/10/03 00:12:54 tv Exp $
+# $NetBSD: Makefile,v 1.18 2004/12/28 02:47:45 reed Exp $
#
DISTNAME= prayer-1.0.8
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= mail www
MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/
diff --git a/mail/proxsmtp/Makefile b/mail/proxsmtp/Makefile
index 18dc458bfbd..a151bff9c5f 100644
--- a/mail/proxsmtp/Makefile
+++ b/mail/proxsmtp/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2004/12/04 20:37:47 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2004/12/28 02:47:45 reed Exp $
DISTNAME= proxsmtp-1.0
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://memberwebs.com/nielsen/software/proxsmtp/
diff --git a/mail/qmHandle/Makefile b/mail/qmHandle/Makefile
index 189148f00df..431616aafda 100644
--- a/mail/qmHandle/Makefile
+++ b/mail/qmHandle/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2004/07/22 00:52:36 schmonz Exp $
+# $NetBSD: Makefile,v 1.12 2004/12/28 02:47:45 reed Exp $
#
DISTNAME= qmhandle-1.2.0
PKGNAME= ${DISTNAME:S/h/H/}
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qmhandle/}
diff --git a/mail/qmail-run/Makefile b/mail/qmail-run/Makefile
index be2631e8525..d7ad237a7b0 100644
--- a/mail/qmail-run/Makefile
+++ b/mail/qmail-run/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2004/08/23 04:10:26 schmonz Exp $
+# $NetBSD: Makefile,v 1.6 2004/12/28 02:47:45 reed Exp $
#
DISTNAME= qmail-run-20040823
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 8da947499d9..5c74180e2a8 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.45 2004/12/18 03:59:30 grant Exp $
+# $NetBSD: Makefile,v 1.46 2004/12/28 02:47:45 reed Exp $
#
DISTNAME= qpopper${VERSION}
PKGNAME= qpopper-${VERSION}
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= mail
MASTER_SITES= ftp://ftp.qualcomm.com/eudora/servers/unix/popper/
diff --git a/mail/spamass-milter/Makefile b/mail/spamass-milter/Makefile
index a495efbece2..fc75a0192a1 100644
--- a/mail/spamass-milter/Makefile
+++ b/mail/spamass-milter/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2004/12/03 12:31:09 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2004/12/28 02:47:45 reed Exp $
#
DISTNAME= spamass-milter-0.2.0
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://savannah.nongnu.org/download/spamass-milt/
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 9971fd91038..ead92e1a09f 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.50 2004/11/08 17:07:23 mjl Exp $
+# $NetBSD: Makefile,v 1.51 2004/12/28 02:47:45 reed Exp $
DISTNAME= Mail-SpamAssassin-${SPAMASSASSIN_VERSION}
PKGNAME= spamassassin-${SPAMASSASSIN_VERSION}
PKGREVISION= # empty
SVR4_PKGNAME= sa
+PKGREVISION= 1
CATEGORIES= mail perl5
MASTER_SITES= ${MASTER_SITE_APACHE:=spamassassin/} \
http://spamassassin.apache.org/released/
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index f461bdd86ec..a81673162b7 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2004/10/03 00:12:54 tv Exp $
+# $NetBSD: Makefile,v 1.26 2004/12/28 02:47:45 reed Exp $
DISTNAME= sqwebmail-4.0.5
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www
COMMENT= webmail CGI for access to local maildir-style mailboxes
HOMEPAGE= http://www.inter7.com/sqwebmail/
diff --git a/mail/teapop/Makefile b/mail/teapop/Makefile
index 4ce7aba02c3..16f29225cb9 100644
--- a/mail/teapop/Makefile
+++ b/mail/teapop/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2004/12/04 14:50:32 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2004/12/28 02:47:45 reed Exp $
DISTNAME= teapop-0.3.8
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= mail
MASTER_SITES= ftp://ftp.toontown.org/pub/teapop/ \
http://www.toontown.org/pub/teapop/
diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index dca0348e6a7..2e40d296f68 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2004/12/13 15:20:37 kim Exp $
+# $NetBSD: Makefile,v 1.22 2004/12/28 02:47:46 reed Exp $
#
DISTNAME= tmda-1.0.3
+PKGREVISION= 1
CATEGORIES= mail python
MASTER_SITES= http://tmda.net/releases/stable/
EXTRACT_SUFX= .tgz
diff --git a/misc/dnetc/Makefile b/misc/dnetc/Makefile
index ccea656f0c4..034c9198a1c 100644
--- a/misc/dnetc/Makefile
+++ b/misc/dnetc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/07/24 00:36:51 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 2004/12/28 02:47:46 reed Exp $
DISTNAME= ${DISTNAME_${OPSYS}_${MACHINE_ARCH}}
PKGNAME= dnetc-2.${DISTVER_${OPSYS}_${MACHINE_ARCH}}
+PKGREVISION= 1
CATEGORIES= misc
MASTER_SITES= http://http.distributed.net/pub/dcti/current-client/
diff --git a/misc/setiathome/Makefile b/misc/setiathome/Makefile
index 1b16d716c52..74acd08cef4 100644
--- a/misc/setiathome/Makefile
+++ b/misc/setiathome/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2004/11/12 14:41:47 sketch Exp $
+# $NetBSD: Makefile,v 1.14 2004/12/28 02:47:46 reed Exp $
#
DISTNAME= ${PKGNAME_NOREV}
PKGNAME= setiathome-3.08
+PKGREVISION= 1
CATEGORIES= misc
MASTER_SITES= ftp://alien.ssl.berkeley.edu/pub/ \
ftp://setidata.ssl.berkeley.edu/pub/
diff --git a/mk/bsd.pkg.install.mk b/mk/bsd.pkg.install.mk
index 6e9d4fba8d2..268f0c38804 100644
--- a/mk/bsd.pkg.install.mk
+++ b/mk/bsd.pkg.install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.install.mk,v 1.66 2004/12/27 06:41:50 jlam Exp $
+# $NetBSD: bsd.pkg.install.mk,v 1.67 2004/12/28 02:47:40 reed Exp $
#
# This Makefile fragment is included by bsd.pkg.mk to use the common
# INSTALL/DEINSTALL scripts. To use this Makefile fragment, simply:
@@ -170,7 +170,7 @@ SUPPORT_FILES_MODE?= 0644
SUPPORT_FILES_PERMS?= # empty
RCD_SCRIPTS?= # empty
RCD_SCRIPTS_MODE?= 0755
-RCD_SCRIPTS_EXAMPLEDIR?= etc/rc.d
+RCD_SCRIPTS_EXAMPLEDIR?= share/examples/rc.d
.if !empty(RCD_SCRIPTS_EXAMPLEDIR:M/*)
PKG_FAIL_REASON+= \
"bsd.pkg.install.mk: RCD_SCRIPTS_EXAMPLEDIR can't be an absolute path."
@@ -339,6 +339,7 @@ ${INSTALL_FILE}: ${INSTALL_SRC}
#
# RCD_SCRIPTS_EXAMPLEDIR the directory relative to ${PREFIX} in
# which to install the example rc.d scripts
+# (defaults to share/examples/rc.d)
#
# If the source rc.d script is not present, then the automatic handling
# doesn't occur.
diff --git a/net/argus/Makefile b/net/argus/Makefile
index 0021a1d2ddf..5397dd6b6a7 100644
--- a/net/argus/Makefile
+++ b/net/argus/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/07/07 17:22:30 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/12/28 02:47:46 reed Exp $
#
DISTNAME= argus-3.3
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.tcp4me.com/code/argus-archive/
EXTRACT_SUFX= .tgz
diff --git a/net/arla/Makefile b/net/arla/Makefile
index 1561d3663de..9fce081a985 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2004/10/03 00:17:49 tv Exp $
+# $NetBSD: Makefile,v 1.40 2004/12/28 02:47:46 reed Exp $
DISTNAME= arla-0.35.12
-PKGREVISION= 1
-#PKGREVISION=
+PKGREVISION= 2
CATEGORIES= net security
MASTER_SITES= ftp://ftp.stacken.kth.se/pub/arla/
diff --git a/net/bind8/Makefile b/net/bind8/Makefile
index 17bbe730654..f7becd342fd 100644
--- a/net/bind8/Makefile
+++ b/net/bind8/Makefile
@@ -1,11 +1,12 @@
#
-# $NetBSD: Makefile,v 1.27 2004/04/18 13:53:40 seb Exp $
+# $NetBSD: Makefile,v 1.28 2004/12/28 02:47:46 reed Exp $
#
# FreeBSD Id: Makefile,v 1.12 1999/06/28 21:25:07 billf Exp
#
DISTNAME= bind
PKGNAME= bind-${BIND_VERSION}
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.isc.org/isc/bind/src/${BIND_VERSION}/
DISTFILES= ${DISTNAME}-src.tar.gz ${DISTNAME}-doc.tar.gz
diff --git a/net/bpalogin/Makefile b/net/bpalogin/Makefile
index cf33b3cc7e5..8ccf5232b65 100644
--- a/net/bpalogin/Makefile
+++ b/net/bpalogin/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2004/12/03 15:15:05 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2004/12/28 02:47:46 reed Exp $
#
DISTNAME= bpalogin-2.0.2
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://bpalogin.sourceforge.net/download/ \
${MASTER_SITE_SOURCEFORGE:=bpalogin/}
diff --git a/net/chrony/Makefile b/net/chrony/Makefile
index 30616dc9a8b..257d1a6d959 100644
--- a/net/chrony/Makefile
+++ b/net/chrony/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2004/11/30 11:26:59 hannken Exp $
+# $NetBSD: Makefile,v 1.14 2004/12/28 02:47:46 reed Exp $
DISTNAME= chrony-1.20
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://chrony.sunsite.dk/projects/chrony/
diff --git a/net/ddclient/Makefile b/net/ddclient/Makefile
index 949670d5c25..97b8fc26207 100644
--- a/net/ddclient/Makefile
+++ b/net/ddclient/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2004/07/24 02:52:27 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/12/28 02:47:46 reed Exp $
DISTNAME= ddclient-3.6.2
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${HOMEPAGE}
diff --git a/net/delegate/Makefile b/net/delegate/Makefile
index efa61fb8343..d6ab9bc1c31 100644
--- a/net/delegate/Makefile
+++ b/net/delegate/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2004/11/09 15:17:24 adam Exp $
+# $NetBSD: Makefile,v 1.29 2004/12/28 02:47:46 reed Exp $
# FreeBSD Id: Makefile,v 1.14 1998/11/09 09:24:20 max Exp
DISTNAME= ${PKGNAME_NOREV:S/-//}
PKGNAME= delegate-8.9.6
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.delegate.org/pub/DeleGate/ \
ftp://etlport.etl.go.jp/pub/DeleGate/ \
diff --git a/net/dhid/Makefile b/net/dhid/Makefile
index aef4b1b14cb..4bc67e6d514 100644
--- a/net/dhid/Makefile
+++ b/net/dhid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2004/10/03 01:53:42 tv Exp $
+# $NetBSD: Makefile,v 1.14 2004/12/28 02:47:46 reed Exp $
#
DISTNAME= dhid-5.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net
MASTER_SITES= ftp://ftp.dhis.org/pub/dhis/
diff --git a/net/djbdns-run/Makefile b/net/djbdns-run/Makefile
index 981ebabb8a6..cf5a7335858 100644
--- a/net/djbdns-run/Makefile
+++ b/net/djbdns-run/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2004/09/02 08:23:02 schmonz Exp $
+# $NetBSD: Makefile,v 1.4 2004/12/28 02:47:46 reed Exp $
#
DISTNAME= djbdns-run-20040902
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/net/dtcp/Makefile b/net/dtcp/Makefile
index b98a6959fcd..8692b6c11dd 100644
--- a/net/dtcp/Makefile
+++ b/net/dtcp/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2004/11/28 04:10:36 taca Exp $
+# $NetBSD: Makefile,v 1.6 2004/12/28 02:47:46 reed Exp $
#
DISTNAME= dtcp-20040611
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.imasy.or.jp/~ume/ipv6/ \
http://home.jp.FreeBSD.org/~ume/ipv6/
diff --git a/net/dynipclient/Makefile b/net/dynipclient/Makefile
index 0342ab1cd5c..ec730ed54cc 100644
--- a/net/dynipclient/Makefile
+++ b/net/dynipclient/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2004/04/25 08:33:08 snj Exp $
+# $NetBSD: Makefile,v 1.9 2004/12/28 02:47:46 reed Exp $
#
DISTNAME= dynip_3.00
PKGNAME= dynipclient-3.00
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net
MASTER_SITES= ftp://ftp.dynip.com/software/unix/
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 15a7fbee023..19bffeb10f6 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2004/12/22 10:07:21 adrianp Exp $
+# $NetBSD: Makefile,v 1.22 2004/12/28 02:47:46 reed Exp $
DISTNAME= freeradius-1.0.1
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= net
MASTER_SITES= ftp://ftp.freeradius.org/pub/radius/ \
ftp://ftp.Awfulhak.org/pub/radius/
diff --git a/net/gated/Makefile b/net/gated/Makefile
index 6cf02eaf2f8..b3fbb6b6129 100644
--- a/net/gated/Makefile
+++ b/net/gated/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2004/12/03 15:15:05 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2004/12/28 02:47:46 reed Exp $
# FreeBSD Id: Makefile,v 1.17 1998/04/26 18:47:12 peter Exp
#
DISTNAME= gated-3-5-11
PKGNAME= gated-3.5.11
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://ftp.rge.com/pub/networking/gated/ \
http://www.zcu.cz/ftp/pub/security/merit/gated/ \
diff --git a/net/gnugk/Makefile b/net/gnugk/Makefile
index 202624ca084..3165380431d 100644
--- a/net/gnugk/Makefile
+++ b/net/gnugk/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2004/12/02 12:27:08 adam Exp $
+# $NetBSD: Makefile,v 1.3 2004/12/28 02:47:46 reed Exp $
DISTNAME= gnugk-2.2.0
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openh323gk/}
EXTRACT_SUFX= .tgz
diff --git a/net/ipa/Makefile b/net/ipa/Makefile
index 7fe45bc4aaf..1334c6234c8 100644
--- a/net/ipa/Makefile
+++ b/net/ipa/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2004/12/27 22:33:18 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2004/12/28 02:47:46 reed Exp $
#
DISTNAME= ipa-1.3.6
+PKGREVISION= 1
CATEGORIES= net sysutils
MASTER_SITES= http://ipa-system.sourceforge.net/ \
http://www.mirrors.wiretapped.net/security/network-monitoring/ipa/ \
diff --git a/net/iplog/Makefile b/net/iplog/Makefile
index c4573452880..22feb8fb4fd 100644
--- a/net/iplog/Makefile
+++ b/net/iplog/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2004/04/13 13:33:27 adam Exp $
+# $NetBSD: Makefile,v 1.8 2004/12/28 02:47:46 reed Exp $
#
DISTNAME= iplog-2.2.3
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ojnk/}
diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile
index 2a0c6829fed..400e3dafcd0 100644
--- a/net/ja-samba/Makefile
+++ b/net/ja-samba/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2004/10/03 16:16:39 taca Exp $
+# $NetBSD: Makefile,v 1.31 2004/12/28 02:47:46 reed Exp $
.include "Makefile.common"
PKGNAME= ja-samba-${SAMBA_BASE_VERS}.${SAMBA_JA_VERS}
-PKGREVISION=
+PKGREVISION= 1
CATEGORIES= net
MAINTAINER= tech-pkg-ja@jp.NetBSD.org
diff --git a/net/jftpgw/Makefile b/net/jftpgw/Makefile
index 23978863c10..041ffbcd940 100644
--- a/net/jftpgw/Makefile
+++ b/net/jftpgw/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2004/12/03 13:55:48 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2004/12/28 02:47:46 reed Exp $
DISTNAME= jftpgw-0.13.4
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.mcknight.de/jftpgw/
diff --git a/net/maradns/Makefile b/net/maradns/Makefile
index 041f3f59ad2..db509e66b61 100644
--- a/net/maradns/Makefile
+++ b/net/maradns/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2004/12/04 23:09:07 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2004/12/28 02:47:47 reed Exp $
DISTNAME= maradns-1.0.18
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net
MASTER_SITES= http://www.maradns.org/download/
EXTRACT_SUFX= .tar.bz2
diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile
index 769a4dd0f56..8a4dc9afb36 100644
--- a/net/mldonkey/Makefile
+++ b/net/mldonkey/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2004/12/25 19:13:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2004/12/28 02:47:47 reed Exp $
#
.include "Makefile.common"
-PKGREVISION= 3
+PKGREVISION= 4
USE_PKGINSTALL= YES
diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index ee1e338d6c8..3106819b4c4 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2004/11/28 19:19:52 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2004/12/28 02:47:47 reed Exp $
DISTNAME= net-snmp-5.1.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=net-snmp/} \
ftp://ftp.net-smnp.org/pub/sourceforge/net-snmp/
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 70ebc57ad11..0dc9ffb64f8 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2004/11/02 11:26:28 markd Exp $
+# $NetBSD: Makefile,v 1.33 2004/12/28 02:47:47 reed Exp $
DISTNAME= netatalk-2.0.1
+PKGREVISION= 1
CATEGORIES= net print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netatalk/}
EXTRACT_SUFX= .tar.bz2
diff --git a/net/netatalk1/Makefile b/net/netatalk1/Makefile
index 5e48c5f389e..2e59a90ef9f 100644
--- a/net/netatalk1/Makefile
+++ b/net/netatalk1/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/11/02 11:20:10 markd Exp $
+# $NetBSD: Makefile,v 1.2 2004/12/28 02:47:47 reed Exp $
DISTNAME= netatalk-1.6.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netatalk/} \
http://me.in-berlin.de/~jroger/netatalk/
diff --git a/net/ntp4/Makefile b/net/ntp4/Makefile
index 0fda7ce20ef..7f7382f517c 100644
--- a/net/ntp4/Makefile
+++ b/net/ntp4/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2004/10/03 00:17:56 tv Exp $
+# $NetBSD: Makefile,v 1.38 2004/12/28 02:47:47 reed Exp $
#
DISTNAME= ntp-4.2.0
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= net
MASTER_SITES= ftp://ftp.udel.edu/pub/ntp/ntp4/ \
http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/
diff --git a/net/oidentd/Makefile b/net/oidentd/Makefile
index d42cbd9e890..43bd877e83d 100644
--- a/net/oidentd/Makefile
+++ b/net/oidentd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2004/04/12 14:18:15 tron Exp $
+# $NetBSD: Makefile,v 1.4 2004/12/28 02:47:47 reed Exp $
DISTNAME= oidentd-2.0.7
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ojnk/}
diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile
index 59beb40f414..9df6831f5ac 100644
--- a/net/openntpd/Makefile
+++ b/net/openntpd/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2004/11/19 14:15:56 peter Exp $
+# $NetBSD: Makefile,v 1.7 2004/12/28 02:47:47 reed Exp $
DISTNAME= openntpd-3.6p1
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/ \
ftp://ftp5.usa.openbsd.org/pub/OpenBSD/OpenNTPD/ \
diff --git a/net/openslp/Makefile b/net/openslp/Makefile
index da95afcd60b..24fd39153cf 100644
--- a/net/openslp/Makefile
+++ b/net/openslp/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2004/11/27 04:41:12 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2004/12/28 02:47:47 reed Exp $
DISTNAME= openslp-1.2.0
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openslp/}
diff --git a/net/openvpn-current/Makefile b/net/openvpn-current/Makefile
index 2a7d6b87b6f..d11e4d81367 100644
--- a/net/openvpn-current/Makefile
+++ b/net/openvpn-current/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2004/12/07 21:29:57 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2004/12/28 02:47:47 reed Exp $
#
DISTNAME= openvpn-2.0_beta15
PKGNAME= ${DISTNAME:S/_//}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openvpn/}
diff --git a/net/proftpd/Makefile b/net/proftpd/Makefile
index df8eb9f6c20..29b02db2c4b 100644
--- a/net/proftpd/Makefile
+++ b/net/proftpd/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2004/12/13 06:56:18 martti Exp $
+# $NetBSD: Makefile,v 1.18 2004/12/28 02:47:47 reed Exp $
DISTNAME= proftpd-1.2.10
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \
ftp://ftp.servus.at/ProFTPD/distrib/source/ \
diff --git a/net/pure-ftpd/Makefile b/net/pure-ftpd/Makefile
index 88918c7e6c0..453cd0128e4 100644
--- a/net/pure-ftpd/Makefile
+++ b/net/pure-ftpd/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2004/10/20 11:10:29 cube Exp $
+# $NetBSD: Makefile,v 1.11 2004/12/28 02:47:47 reed Exp $
DISTNAME= pure-ftpd-1.0.20
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/ \
ftp://ftp2.fr.pureftpd.org/pub/mirrors/ftp.fr.pureftpd.org/pub/pure-ftpd/releases/ \
diff --git a/net/pxe/Makefile b/net/pxe/Makefile
index cfd9e3fe55a..a0a8ade2677 100644
--- a/net/pxe/Makefile
+++ b/net/pxe/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2004/11/13 22:04:53 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2004/12/28 02:47:47 reed Exp $
#
DISTNAME= pxe-1.4
+PKGREVISION= 1
CATEGORIES= net sysutils
MASTER_SITES= http://www.kano.org.uk/projects/pxe/
diff --git a/net/pygopherd/Makefile b/net/pygopherd/Makefile
index d6d144b6a1f..1ff6c437593 100644
--- a/net/pygopherd/Makefile
+++ b/net/pygopherd/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2004/07/09 22:45:04 recht Exp $
+# $NetBSD: Makefile,v 1.5 2004/12/28 02:47:47 reed Exp $
#
DISTNAME= pygopherd_2.0.9
PKGNAME= ${DISTNAME:S/_/-/}
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://gopher.quux.org:70/devel/gopher/Downloads/pygopherd/
diff --git a/net/radiusd-cistron/Makefile b/net/radiusd-cistron/Makefile
index 5c09ee8dce7..b4bc620eed7 100644
--- a/net/radiusd-cistron/Makefile
+++ b/net/radiusd-cistron/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2004/04/25 08:53:35 snj Exp $
+# $NetBSD: Makefile,v 1.14 2004/12/28 02:47:47 reed Exp $
DISTNAME= radiusd-cistron-1.6.7
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.cistron.nl/pub/people/miquels/radius/ \
ftp://ftp.freeradius.org/pub/radius/
diff --git a/net/rinetd/Makefile b/net/rinetd/Makefile
index d58b9ee53cb..38a76eb9629 100644
--- a/net/rinetd/Makefile
+++ b/net/rinetd/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2004/12/03 15:15:06 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2004/12/28 02:47:47 reed Exp $
#
DISTNAME= rinetd
PKGNAME= ${DISTNAME}-0.62
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.boutell.com/rinetd/http/
diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile
index 566985b526f..7f3b6db872c 100644
--- a/net/rp-pppoe/Makefile
+++ b/net/rp-pppoe/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2004/01/20 12:22:21 agc Exp $
+# $NetBSD: Makefile,v 1.26 2004/12/28 02:47:47 reed Exp $
DISTNAME= rp-pppoe-3.5
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${HOMEPAGE} \
http://roaringpenguin.luky.org/pppoe/
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 8c9978eff7a..38d52778681 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.136 2004/12/17 18:55:47 tron Exp $
+# $NetBSD: Makefile,v 1.137 2004/12/28 02:47:47 reed Exp $
DISTNAME= samba-3.0.10
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.samba.org/pub/samba/old-versions/ \
ftp://ring.asahi-net.or.jp/pub/net/samba/old-versions/ \
diff --git a/net/samba2/Makefile b/net/samba2/Makefile
index d5260fc7abb..08c58541b73 100644
--- a/net/samba2/Makefile
+++ b/net/samba2/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.16 2004/11/15 14:41:17 kim Exp $
+# $NetBSD: Makefile,v 1.17 2004/12/28 02:47:48 reed Exp $
.include "Makefile.common"
PKGREVISION= # empty1
MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.samba.org/
+PKGREVISION= 1
COMMENT= SMB/CIFS protocol server suite for UNIX
USE_BUILDLINK3= yes
diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile
index 14bff86cf2a..79a5db48a56 100644
--- a/net/smokeping/Makefile
+++ b/net/smokeping/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2004/06/23 22:25:44 adrianp Exp $
+# $NetBSD: Makefile,v 1.9 2004/12/28 02:47:48 reed Exp $
DISTNAME= smokeping-1.30
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://people.ee.ethz.ch/~oetiker/webtools/smokeping/pub/
diff --git a/net/snort/Makefile b/net/snort/Makefile
index 7fcd47de61a..a29589d7425 100644
--- a/net/snort/Makefile
+++ b/net/snort/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2003/12/31 14:11:42 salo Exp $
+# $NetBSD: Makefile,v 1.25 2004/12/28 02:47:48 reed Exp $
#
.include "Makefile.common"
+PKGREVISION= 1
COMMENT= The Open Source Network Intrusion Detection System
.include "../../mk/bsd.pkg.mk"
diff --git a/net/socks5/Makefile b/net/socks5/Makefile
index 5e2944c8ec1..beb2e968b02 100644
--- a/net/socks5/Makefile
+++ b/net/socks5/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.32 2004/01/20 12:22:22 agc Exp $
+# $NetBSD: Makefile,v 1.33 2004/12/28 02:47:48 reed Exp $
# FreeBSD Id: Makefile,v 1.14 1997/08/28 06:49:06 obrien Exp
#
DISTNAME= socks5-v1_0r2
PKGNAME= socks5-1.0.2
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= net security
MASTER_SITES= # empty -- manual fetch needed
EXTRACT_SUFX= _tar.gz
diff --git a/net/speedtouch/Makefile b/net/speedtouch/Makefile
index 42aaecc71fd..060d5a41835 100644
--- a/net/speedtouch/Makefile
+++ b/net/speedtouch/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2004/12/23 18:11:18 skrll Exp $
+# $NetBSD: Makefile,v 1.14 2004/12/28 02:47:48 reed Exp $
#
DISTNAME= speedtouch-1.3.1
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=speedtouch/}
DISTFILES= ${DISTNAME}.tar.bz2
diff --git a/net/spread/Makefile b/net/spread/Makefile
index 5f51e3764f1..aa3937c2e2f 100644
--- a/net/spread/Makefile
+++ b/net/spread/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2004/10/30 11:54:12 recht Exp $
+# $NetBSD: Makefile,v 1.16 2004/12/28 02:47:48 reed Exp $
#
DISTNAME= spread-src-3.17.3
PKGNAME= ${DISTNAME:S/-src//}
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.cnds.jhu.edu/download/noformdown/
diff --git a/net/trickle/Makefile b/net/trickle/Makefile
index 54e37c43e2a..874accea223 100644
--- a/net/trickle/Makefile
+++ b/net/trickle/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2004/05/07 01:14:49 xtraeme Exp $
+# $NetBSD: Makefile,v 1.8 2004/12/28 02:47:48 reed Exp $
#
DISTNAME= trickle-1.06
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= net
MASTER_SITES= http://monkey.org/~marius/trickle/
diff --git a/net/upclient/Makefile b/net/upclient/Makefile
index 85491a6eee4..02ca7169225 100644
--- a/net/upclient/Makefile
+++ b/net/upclient/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2004/12/03 15:15:06 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2004/12/28 02:47:48 reed Exp $
#
DISTNAME= upclient-4.2.1.23
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= net
MASTER_SITES= http://uptimes.atomicvoid.net/files/
diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile
index 56d9ac8d21c..74b001e8e6a 100644
--- a/net/vsftpd/Makefile
+++ b/net/vsftpd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2004/12/03 15:15:07 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2004/12/28 02:47:48 reed Exp $
#
DISTNAME= vsftpd-1.2.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net
MASTER_SITES= ftp://vsftpd.beasts.org/users/cevans/
diff --git a/net/whoson/Makefile b/net/whoson/Makefile
index 0f70f7536bd..3f940d7656e 100644
--- a/net/whoson/Makefile
+++ b/net/whoson/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/11 16:51:54 abs Exp $
+# $NetBSD: Makefile,v 1.2 2004/12/28 02:47:48 reed Exp $
#
DISTNAME= whoson-2.03
+PKGREVISION= 1
CATEGORIES= net security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=whoson/}
diff --git a/news/inn/Makefile b/news/inn/Makefile
index 868e37d6a72..f50536f820d 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2004/10/03 00:18:02 tv Exp $
+# $NetBSD: Makefile,v 1.60 2004/12/28 02:47:48 reed Exp $
DISTNAME= inn-2.4.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= news
MASTER_SITES= ftp://ftp.isc.org/isc/inn/ \
ftp://ftp.sunet.se/pub/news/nntp/inn/ \
diff --git a/parallel/sge/Makefile b/parallel/sge/Makefile
index 300d2028f75..6988e89703a 100644
--- a/parallel/sge/Makefile
+++ b/parallel/sge/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2004/10/03 00:18:03 tv Exp $
+# $NetBSD: Makefile,v 1.5 2004/12/28 02:47:48 reed Exp $
#
DISTNAME= sge-5.3p6
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= parallel sysutils
MASTER_SITES= ${MASTER_SITE_LOCAL}
diff --git a/pkgtools/rc.subr/Makefile b/pkgtools/rc.subr/Makefile
index 5a040186daf..9471bde9342 100644
--- a/pkgtools/rc.subr/Makefile
+++ b/pkgtools/rc.subr/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2004/10/11 19:32:14 tv Exp $
+# $NetBSD: Makefile,v 1.9 2004/12/28 02:47:48 reed Exp $
#
DISTNAME= rc.subr-20041011
+PKGREVISION= 1
CATEGORIES= pkgtools
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/print/cups/Makefile b/print/cups/Makefile
index f95449d2325..4aaff384fe0 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2004/11/30 17:41:52 jlam Exp $
+# $NetBSD: Makefile,v 1.83 2004/12/28 02:47:48 reed Exp $
#
# The CUPS author is very good about taking back changes into the main
# CUPS distribution. The correct place to send patches or bug-fixes is:
@@ -9,6 +9,7 @@ PKGNAME= cups-${VERS}
BASE_VERS= 1.1.22
DIST_VERS= ${BASE_VERS}
VERS= ${DIST_VERS:S/-/./g}
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= ftp://ftp.easysw.com/pub/cups/${BASE_VERS}/ \
ftp://ftp2.easysw.com/pub/cups/${BASE_VERS}/ \
diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 178ee6d6725..fc3f774dbce 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2004/11/28 23:31:49 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2004/12/28 02:47:48 reed Exp $
DISTNAME= amavisd-new-${VERSION}${PATCHLEVEL}
PKGNAME= amavisd-new-${VERSION}${PATCHLEVEL:S/-//}
+PKGREVISION= 1
CATEGORIES= security mail
MASTER_SITES= http://www.ijs.si/software/amavisd/ \
http://mirrors.catpipe.net/amavisd-new/ \
diff --git a/security/cfs/Makefile b/security/cfs/Makefile
index 856649ed432..c3e6bd203f5 100644
--- a/security/cfs/Makefile
+++ b/security/cfs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2004/12/18 19:24:26 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2004/12/28 02:47:48 reed Exp $
DISTNAME= cfs-1.4.1
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= security
MASTER_SITES= http://www.crypto.com/software/
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 19a9099d81e..235ce048aff 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2004/10/03 00:18:08 tv Exp $
+# $NetBSD: Makefile,v 1.47 2004/12/28 02:47:48 reed Exp $
.include "Makefile.common"
-PKGREVISION= 7
+PKGREVISION= 8
SVR4_PKGNAME= csasl
COMMENT= Simple Authentication and Security Layer
diff --git a/security/cyrus-saslauthd/Makefile b/security/cyrus-saslauthd/Makefile
index c0de6d23a25..de93ea4b744 100644
--- a/security/cyrus-saslauthd/Makefile
+++ b/security/cyrus-saslauthd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2004/12/03 15:15:08 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2004/12/28 02:47:49 reed Exp $
DISTNAME= cyrus-sasl-2.1.19
PKGNAME= ${DISTNAME:S/sasl/saslauthd/}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= security
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 06b524904cf..6704ac5f175 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2004/12/23 14:43:28 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2004/12/28 02:47:49 reed Exp $
DISTNAME= heimdal-0.6.3
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= security
MASTER_SITES= ftp://ftp.pdc.kth.se/pub/heimdal/src/ \
ftp://ftp.sunet.se/pub/unix/admin/mirror-pdc/heimdal/src/
diff --git a/security/honeyd-arpd/Makefile b/security/honeyd-arpd/Makefile
index 316a83c4015..ac798cd6e74 100644
--- a/security/honeyd-arpd/Makefile
+++ b/security/honeyd-arpd/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2004/04/30 17:26:23 tv Exp $
+# $NetBSD: Makefile,v 1.4 2004/12/28 02:47:49 reed Exp $
#
DISTNAME= arpd-0.2
PKGNAME= honeyd-arpd-0.2
-PKGREVISION= 1
+PKGREVISION= 2
WRKSRC= ${WRKDIR}/arpd
CATEGORIES= security net
MASTER_SITES= http://niels.xtdnet.nl/honeyd/
diff --git a/security/honeyd/Makefile b/security/honeyd/Makefile
index a1e9c8d71bc..b1e3742eb59 100644
--- a/security/honeyd/Makefile
+++ b/security/honeyd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2004/10/03 00:18:09 tv Exp $
+# $NetBSD: Makefile,v 1.5 2004/12/28 02:47:49 reed Exp $
#
DISTNAME= honeyd-0.8b
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= security net
MASTER_SITES= http://niels.xtdnet.nl/honeyd/
diff --git a/security/isakmpd/Makefile b/security/isakmpd/Makefile
index 04ca4f0e0e2..830394276c7 100644
--- a/security/isakmpd/Makefile
+++ b/security/isakmpd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2004/12/03 15:15:08 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2004/12/28 02:47:49 reed Exp $
#
DISTNAME= isakmpd-20030903
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= security net
MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/packages/distfiles/LOCAL_PORTS/
diff --git a/security/mit-krb5/Makefile b/security/mit-krb5/Makefile
index 4e351449ddc..21803d257cc 100644
--- a/security/mit-krb5/Makefile
+++ b/security/mit-krb5/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2004/12/23 04:02:39 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2004/12/28 02:47:49 reed Exp $
DISTNAME= krb5-1.3.6
PKGNAME= mit-${DISTNAME:S/-signed$//}
+PKGREVISION= 1
CATEGORIES= security
MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/1.3/
DISTFILES= ${DISTNAME}-signed${EXTRACT_SUFX}
diff --git a/security/nessus-core/Makefile b/security/nessus-core/Makefile
index 6d13553d519..4959a955ad0 100644
--- a/security/nessus-core/Makefile
+++ b/security/nessus-core/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.16 2004/11/02 00:01:04 adrianp Exp $
+# $NetBSD: Makefile,v 1.17 2004/12/28 02:47:49 reed Exp $
DISTNAME= nessus-core-${VERS}
.include "../nessus/Makefile.common"
COMMENT= Core module of the Nessus Network Security Scanner
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/nessus-core
USE_BUILDLINK3= yes
USE_PKGINSTALL= yes
diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile
index 50205fd0d10..703ff8a4806 100644
--- a/security/openssh+gssapi/Makefile
+++ b/security/openssh+gssapi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/10/03 00:18:11 tv Exp $
+# $NetBSD: Makefile,v 1.18 2004/12/28 02:47:49 reed Exp $
# NOTE: This package is modeled on ../openssh, but does not share
# files with it as that package may update faster than the gssapi
@@ -6,7 +6,7 @@
DISTNAME= openssh-3.6.1p2
PKGNAME= openssh+gssapi-3.6.1.2.20030430
-PKGREVISION= 4
+PKGREVISION= 5
SVR4_PKGNAME= osshgss
CATEGORIES= security
MASTER_SITES= ftp://ftp7.usa.openbsd.org/pub/os/OpenBSD/OpenSSH/portable/ \
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 1217dc9711f..c18345ae0ac 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.145 2004/11/25 19:25:28 xtraeme Exp $
+# $NetBSD: Makefile,v 1.146 2004/12/28 02:47:49 reed Exp $
DISTNAME= openssh-3.9p1
PKGNAME= openssh-3.9.1
-PKGREVISION= 3
+PKGREVISION= 4
SVR4_PKGNAME= ossh
CATEGORIES= security
MASTER_SITES= ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/ \
diff --git a/security/pflkm/Makefile b/security/pflkm/Makefile
index 3e67eda37f2..b18de91e9ed 100644
--- a/security/pflkm/Makefile
+++ b/security/pflkm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2004/12/04 15:01:55 peter Exp $
+# $NetBSD: Makefile,v 1.3 2004/12/28 02:47:49 reed Exp $
DISTNAME= pflkm-20041204
+PKGREVISION= 1
CATEGORIES= security ipv6
MASTER_SITES= http://nedbsd.nl/~ppostma/pf/
diff --git a/security/pks/Makefile b/security/pks/Makefile
index 0936f987dc7..f650168c54d 100644
--- a/security/pks/Makefile
+++ b/security/pks/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2004/10/03 00:18:12 tv Exp $
+# $NetBSD: Makefile,v 1.16 2004/12/28 02:47:49 reed Exp $
DISTNAME= pks-0.9.4
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= security www
MASTER_SITES+= http://www.mit.edu/people/marc/pks/ \
ftp://ftp.neonramp.com/pub/pksd/
diff --git a/security/racoon/Makefile b/security/racoon/Makefile
index ce1da20c8db..36d8108d80e 100644
--- a/security/racoon/Makefile
+++ b/security/racoon/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.72 2004/12/02 06:44:27 itojun Exp $
+# $NetBSD: Makefile,v 1.73 2004/12/28 02:47:49 reed Exp $
#
DISTNAME= racoon-20040818a
+PKGREVISION= 1
CATEGORIES= security net
MASTER_SITES= ftp://ftp.kame.net/pub/kame/misc/
diff --git a/security/sfs/Makefile b/security/sfs/Makefile
index ab10b9a74f4..13d914086f1 100644
--- a/security/sfs/Makefile
+++ b/security/sfs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2004/10/03 00:18:13 tv Exp $
+# $NetBSD: Makefile,v 1.17 2004/12/28 02:47:49 reed Exp $
#
DISTNAME= sfs-0.7.2
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= net security
MASTER_SITES= http://www.fs.net/sfs/@new-york.lcs.mit.edu,u83s4uk49nt8rmp4uwmt2exvz6d3cavh/pub/sfswww/dist/
diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile
index 9a677eca5fb..bbe9f3aeae2 100644
--- a/security/ssh2/Makefile
+++ b/security/ssh2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2004/12/28 01:39:32 reed Exp $
+# $NetBSD: Makefile,v 1.10 2004/12/28 02:47:49 reed Exp $
#
PKGNAME= ${DISTNAME:C/ssh-/ssh2-/}
COMMENT= Secure Shell client and server for V.2 SSH protocol
-PKGREVISION= 2
+PKGREVISION= 3
CONFLICTS= ssh2-nox11-[0-9]*
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index f2f6099e484..6cdf1428716 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2004/10/03 00:18:13 tv Exp $
+# $NetBSD: Makefile,v 1.43 2004/12/28 02:47:49 reed Exp $
DISTNAME= stunnel-4.05
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= security
MASTER_SITES= ftp://ftp.fu-berlin.de/unix/security/stunnel/ \
ftp://stunnel.mirt.net/stunnel/ \
diff --git a/security/winbind/Makefile b/security/winbind/Makefile
index 74fe0297deb..df05ce54c51 100644
--- a/security/winbind/Makefile
+++ b/security/winbind/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2004/12/03 15:15:09 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2004/12/28 02:47:49 reed Exp $
PKGNAME= winbind-${SAMBA_DIST_VERS}
PKGREVISION= # empty1
+PKGREVISION= 1
CATEGORIES= security
USE_BUILDLINK3= yes
diff --git a/security/xdm-krb4/Makefile b/security/xdm-krb4/Makefile
index b3c296841b0..89089c5e114 100644
--- a/security/xdm-krb4/Makefile
+++ b/security/xdm-krb4/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2004/10/03 00:18:14 tv Exp $
+# $NetBSD: Makefile,v 1.18 2004/12/28 02:47:49 reed Exp $
#
DISTNAME= xdm-krb4-3.3.6.3
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= security x11
MASTER_SITES= ftp://gutemine.geo.Uni-Koeln.DE/pub/xdm-krb4/
diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index 0f3d9c0c16c..8cdf509f64f 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2004/12/05 17:26:47 bouyer Exp $
+# $NetBSD: Makefile,v 1.32 2004/12/28 02:47:50 reed Exp $
DISTNAME= apcupsd-3.8.6
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=apcupsd/}
diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile
index 0e517eea171..0b1186339d4 100644
--- a/sysutils/bacula/Makefile
+++ b/sysutils/bacula/Makefile
@@ -1,3 +1,5 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/11/06 16:17:38 mjl Exp $
+# $NetBSD: Makefile,v 1.2 2004/12/28 02:47:50 reed Exp $
.include "Makefile.common"
+
+PKGREVISION= 1
diff --git a/sysutils/bkpupsd/Makefile b/sysutils/bkpupsd/Makefile
index 6a9a189c92d..8e42445a7c9 100644
--- a/sysutils/bkpupsd/Makefile
+++ b/sysutils/bkpupsd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2004/12/14 15:09:03 taca Exp $
+# $NetBSD: Makefile,v 1.13 2004/12/28 02:47:50 reed Exp $
#
DISTNAME= bkpupsd-2.1.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.jone-system.com/pub/misc/ \
ftp://ftp.back-street.net/pub/misc/
diff --git a/sysutils/cfengine2/Makefile b/sysutils/cfengine2/Makefile
index 4a946779d06..98c0c17a09c 100644
--- a/sysutils/cfengine2/Makefile
+++ b/sysutils/cfengine2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2004/10/03 00:18:14 tv Exp $
+# $NetBSD: Makefile,v 1.13 2004/12/28 02:47:50 reed Exp $
#
-PKGREVISION= 1
+PKGREVISION= 2
.include "../../sysutils/cfengine2/Makefile.common"
diff --git a/sysutils/dbus/Makefile b/sysutils/dbus/Makefile
index c792b7a4574..fbe66c62138 100644
--- a/sysutils/dbus/Makefile
+++ b/sysutils/dbus/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2004/10/12 08:15:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/12/28 02:47:50 reed Exp $
#
.include "Makefile.common"
-PKGREVISION= 1
+PKGREVISION= 2
PKG_USERS= messagebus:messagebus::System\\ message\\ bus:${VARBASE}/run/dbus:/sbin/nologin
PKG_GROUPS= messagebus
diff --git a/sysutils/fam/Makefile b/sysutils/fam/Makefile
index 16c3a3d97c0..e04366b0f18 100644
--- a/sysutils/fam/Makefile
+++ b/sysutils/fam/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2004/11/19 12:35:22 sketch Exp $
+# $NetBSD: Makefile,v 1.21 2004/12/28 02:47:50 reed Exp $
#
DISTNAME= fam-2.7.0
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= sysutils devel
MASTER_SITES= ftp://oss.sgi.com/projects/fam/download/stable/ \
ftp://ftp.tuwien.ac.at/opsys/linux/gentoo/distfiles/ \
diff --git a/sysutils/gkrellm-server/Makefile b/sysutils/gkrellm-server/Makefile
index 6446271d885..ae566d1936b 100644
--- a/sysutils/gkrellm-server/Makefile
+++ b/sysutils/gkrellm-server/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2004/10/03 00:18:15 tv Exp $
+# $NetBSD: Makefile,v 1.10 2004/12/28 02:47:50 reed Exp $
.include "../../sysutils/gkrellm/Makefile.common"
PKGREVISION= # empty1
GKRELLM_PKGBASE= gkrellm-server
+PKGREVISION= 1
COMMENT= Monitoring daemon remotely accessible by a GKrellM client
DEPENDS+= gkrellm-share-${GKRELLM_VERSION}:../../sysutils/gkrellm-share
diff --git a/sysutils/smartmontools/Makefile b/sysutils/smartmontools/Makefile
index 44c9636ce23..6e9e5e408f0 100644
--- a/sysutils/smartmontools/Makefile
+++ b/sysutils/smartmontools/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2004/07/15 20:42:26 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2004/12/28 02:47:50 reed Exp $
#
DISTNAME= smartmontools-5.32
+PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=smartmontools/}
diff --git a/sysutils/swapd/Makefile b/sysutils/swapd/Makefile
index a3a4b29cbf1..fc37a1aff35 100644
--- a/sysutils/swapd/Makefile
+++ b/sysutils/swapd/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2004/11/01 23:05:49 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2004/12/28 02:47:50 reed Exp $
#
DISTNAME= swapd-1.0.2
+PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://www.rkeene.org/files/oss/swapd/source/
diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile
index 7dbe63c752e..2ef281fd6b7 100644
--- a/sysutils/ups-nut/Makefile
+++ b/sysutils/ups-nut/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2004/08/03 05:21:50 martti Exp $
+# $NetBSD: Makefile,v 1.33 2004/12/28 02:47:50 reed Exp $
#
DISTNAME= nut-2.0.0
PKGNAME= ups-nut-2.0.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://random.networkupstools.org/source/2.0/
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index c50547180ff..f7cc890ea37 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2004/07/23 19:47:21 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2004/12/28 02:47:50 reed Exp $
DISTNAME= webmin-1.150-minimal
PKGNAME= ${DISTNAME:S/-minimal$//}
+PKGREVISION= 1
CATEGORIES= sysutils www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=webadmin/}
diff --git a/textproc/ndtpd/Makefile b/textproc/ndtpd/Makefile
index a0e4a183671..e1c555c4cbb 100644
--- a/textproc/ndtpd/Makefile
+++ b/textproc/ndtpd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2004/11/20 16:02:53 uebayasi Exp $
+# $NetBSD: Makefile,v 1.17 2004/12/28 02:47:50 reed Exp $
#
DISTNAME= ndtpd-3.1.5
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= textproc japanese
MASTER_SITES= ftp://ftp.sra.co.jp/pub/net/ndtp/ndtpd/
diff --git a/time/anacron/Makefile b/time/anacron/Makefile
index 009c64878ae..e416dc22f7c 100644
--- a/time/anacron/Makefile
+++ b/time/anacron/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2004/04/11 18:02:24 salo Exp $
+# $NetBSD: Makefile,v 1.3 2004/12/28 02:47:50 reed Exp $
#
DISTNAME= anacron-2.3
+PKGREVISION= 1
CATEGORIES= time
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=anacron/}
diff --git a/www/apache/Makefile b/www/apache/Makefile
index 5baf904e3d0..b0f95875fbc 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.158 2004/11/26 18:52:47 jlam Exp $
+# $NetBSD: Makefile,v 1.159 2004/12/28 02:47:50 reed Exp $
#
# This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
# code hooks that allow mod_ssl to be compiled separately later, if desired).
DISTNAME= apache_1.3.33
PKGNAME= ${DISTNAME:S/_/-/}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \
${MASTER_SITE_APACHE:=httpd/old/}
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index c0efaa09f42..b3d4d8ba271 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.61 2004/12/18 08:42:12 adrianp Exp $
+# $NetBSD: Makefile,v 1.62 2004/12/28 02:47:50 reed Exp $
.include "Makefile.common"
PKGNAME= apache-${APACHE_VERSION}
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= www
HOMEPAGE= http://httpd.apache.org/
diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile
index cb0b61ff808..4dab9227096 100644
--- a/www/hiawatha/Makefile
+++ b/www/hiawatha/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2004/06/28 17:28:58 abs Exp $
+# $NetBSD: Makefile,v 1.15 2004/12/28 02:47:50 reed Exp $
#
DISTNAME= hiawatha
PKGNAME= hiawatha-0.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= textproc www
MASTER_SITES= ${HOMEPAGE} ${MASTER_SITE_BACKUP}
EXTRACT_SUFX= .zip
diff --git a/www/iasp/Makefile b/www/iasp/Makefile
index 8fa5e56881e..0ac43979ed3 100644
--- a/www/iasp/Makefile
+++ b/www/iasp/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2004/01/20 12:27:59 agc Exp $
+# $NetBSD: Makefile,v 1.6 2004/12/28 02:47:50 reed Exp $
.include "../iasp/Makefile.common"
PKGNAME= iasp-${IASP_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= Instant ASP: Java implementation of Active Server Pages
SCRIPTS_ENV+= CAT=${CAT:Q}
diff --git a/www/jakarta-tomcat/Makefile b/www/jakarta-tomcat/Makefile
index 9d12bff3019..22da0a76375 100644
--- a/www/jakarta-tomcat/Makefile
+++ b/www/jakarta-tomcat/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2004/10/11 21:15:48 abs Exp $
+# $NetBSD: Makefile,v 1.50 2004/12/28 02:47:50 reed Exp $
DISTNAME= jakarta-tomcat-${TOMCAT_VERSION}
+PKGREVISION= 1
CATEGORIES= www java
# The list of sites to download is generated by a jakarta website.
# The getsite.sh script parses the HTML and extracts the urls.
diff --git a/www/jakarta-tomcat4/Makefile b/www/jakarta-tomcat4/Makefile
index e4bb0c47993..9ea50ba446d 100644
--- a/www/jakarta-tomcat4/Makefile
+++ b/www/jakarta-tomcat4/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2004/06/28 17:28:58 abs Exp $
+# $NetBSD: Makefile,v 1.4 2004/12/28 02:47:50 reed Exp $
PKGNAME= jakarta-tomcat4-${TOMCAT_VERSION}
DISTNAME= jakarta-tomcat-${TOMCAT_VERSION}
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/${DISTNAME}
CATEGORIES= www java
# The list of sites to download is generated by a jakarta website.
diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index 02a4dd6e7f8..65beecfa382 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2004/12/18 20:58:30 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2004/12/28 02:47:50 reed Exp $
#
DISTNAME= ${PKGNAME_NOREV}-stable-src
PKGNAME= privoxy-3.0.3
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ijbswa/}
diff --git a/www/screws/Makefile b/www/screws/Makefile
index 986c96f1f06..878fe20c28e 100644
--- a/www/screws/Makefile
+++ b/www/screws/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2004/10/03 00:18:27 tv Exp $
+# $NetBSD: Makefile,v 1.4 2004/12/28 02:47:50 reed Exp $
#
DISTNAME= screws-0.54
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www
MASTER_SITES= ftp://ftp.nopcode.org/prj/screws/
diff --git a/www/squid/Makefile b/www/squid/Makefile
index b4259ce47b6..1d48d0e33e6 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.120 2004/12/14 14:27:07 taca Exp $
+# $NetBSD: Makefile,v 1.121 2004/12/28 02:47:51 reed Exp $
DISTNAME= squid-2.5.STABLE7
PKGNAME= squid-2.5.7
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= www
MASTER_SITES= http://www.squid-cache.org/Versions/v2/2.5/ \
ftp://ftp.leo.org/pub/comp/general/infosys/www/daemons/squid/squid-2/STABLE/ \
diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile
index 0aca7257518..692390816cb 100644
--- a/www/thttpd/Makefile
+++ b/www/thttpd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2004/09/14 08:32:16 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2004/12/28 02:47:51 reed Exp $
DISTNAME= thttpd-2.25b
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www
MASTER_SITES= http://www.acme.com/software/thttpd/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
diff --git a/www/thy/Makefile b/www/thy/Makefile
index a568597591f..affd396b868 100644
--- a/www/thy/Makefile
+++ b/www/thy/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2004/10/03 00:18:27 tv Exp $
+# $NetBSD: Makefile,v 1.4 2004/12/28 02:47:51 reed Exp $
#
DISTNAME= thy-0.9.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www
MASTER_SITES= ftp://bonehunter.rulez.org/pub/thy/stable/
EXTRACT_SUFX= .tar.bz2
diff --git a/www/tinyproxy/Makefile b/www/tinyproxy/Makefile
index 8d456ccf28a..4a2f93acb3c 100644
--- a/www/tinyproxy/Makefile
+++ b/www/tinyproxy/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2004/10/03 00:18:27 tv Exp $
+# $NetBSD: Makefile,v 1.14 2004/12/28 02:47:51 reed Exp $
#
DISTNAME= tinyproxy-1.6.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tinyproxy/}
diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index 6c4a5bb7854..080c3ff2f44 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2004/08/29 15:03:46 recht Exp $
+# $NetBSD: Makefile,v 1.52 2004/12/28 02:47:52 reed Exp $
DISTNAME= wwwoffle-2.8c
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SUNSITE:=apps/www/servers/} \
ftp://ftp.demon.co.uk/pub/unix/httpd/ \
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index d4675bec15b..04d4aaca35e 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.70 2004/10/03 00:18:29 tv Exp $
+# $NetBSD: Makefile,v 1.71 2004/12/28 02:47:52 reed Exp $
#
DISTNAME= gdm-2.6.0.5
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gdm/2.6/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 10433b880b3..19107aeae20 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.65 2004/12/14 11:05:27 markd Exp $
+# $NetBSD: Makefile,v 1.66 2004/12/28 02:47:52 reed Exp $
DISTNAME= kdebase-${_KDE_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
COMMENT= Base modules for the KDE 3 integrated X11 desktop
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index 7ea98e19136..daf4df2a8e3 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2004/10/03 00:18:38 tv Exp $
+# $NetBSD: Makefile,v 1.18 2004/12/28 02:47:52 reed Exp $
DISTNAME= wdm-1.25
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11 windowmaker
MASTER_SITES= http://voins.program.ru/wdm/
diff --git a/x11/xfstt/Makefile b/x11/xfstt/Makefile
index c3143f70b26..93ef421c5a3 100644
--- a/x11/xfstt/Makefile
+++ b/x11/xfstt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2004/01/25 20:46:19 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2004/12/28 02:47:52 reed Exp $
#
DISTNAME= xfstt-1.6
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11 net fonts
MASTER_SITES= http://download.berlios.de/xfstt/