summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Packages.txt13
-rw-r--r--archivers/zip/Makefile4
-rw-r--r--audio/libcdaudio/Makefile4
-rw-r--r--benchmarks/hbench/Makefile5
-rw-r--r--cad/mpac/Makefile4
-rw-r--r--chat/irssi/Makefile4
-rw-r--r--chat/sirc/Makefile4
-rw-r--r--chat/tkicb/Makefile5
-rw-r--r--chat/xchat/Makefile4
-rw-r--r--comms/hylafax/Makefile4
-rw-r--r--comms/pilot-link-libs/Makefile5
-rw-r--r--comms/plptools/Makefile4
-rw-r--r--converters/rpm2cpio/Makefile5
-rw-r--r--databases/zope-mysql/Makefile5
-rw-r--r--devel/GConf/Makefile4
-rw-r--r--devel/automake/Makefile5
-rw-r--r--devel/cvs/Makefile4
-rw-r--r--devel/electricfence/Makefile4
-rw-r--r--devel/gettext-lib/Makefile5
-rw-r--r--devel/gettext/Makefile4
-rw-r--r--devel/libstroke/Makefile4
-rw-r--r--devel/noweb/Makefile4
-rw-r--r--devel/pilrc/Makefile5
-rw-r--r--devel/rcs/Makefile4
-rw-r--r--devel/unproven-pthreads/Makefile4
-rw-r--r--devel/w32api/Makefile5
-rw-r--r--editors/joe/Makefile5
-rw-r--r--editors/nvi-m17n/Makefile5
-rw-r--r--editors/sam/Makefile5
-rw-r--r--emulators/hercules/Makefile4
-rw-r--r--emulators/suse_vmware/Makefile4
-rw-r--r--games/abuse/Makefile5
-rw-r--r--games/clanbomber/Makefile4
-rw-r--r--games/gnuchess/Makefile5
-rw-r--r--games/knightcap/Makefile5
-rw-r--r--games/netris/Makefile4
-rw-r--r--games/xdoom/Makefile5
-rw-r--r--games/xgalaga/Makefile4
-rw-r--r--graphics/Mesa/Makefile4
-rw-r--r--graphics/avifile-devel/Makefile4
-rw-r--r--graphics/blender/Makefile5
-rw-r--r--graphics/dvdview/Makefile5
-rw-r--r--graphics/g2/Makefile4
-rw-r--r--graphics/gphoto2/Makefile5
-rw-r--r--graphics/iGMT/Makefile5
-rw-r--r--graphics/mpeg_encode/Makefile5
-rw-r--r--graphics/xanim/Makefile5
-rw-r--r--graphics/xart/Makefile5
-rw-r--r--graphics/xv/Makefile4
-rw-r--r--japanese/namazu1/Makefile4
-rw-r--r--japanese/p5-Text-ChaSen/Makefile5
-rw-r--r--japanese/skkserv/Makefile5
-rw-r--r--lang/clisp/Makefile5
-rw-r--r--lang/f2c/Makefile4
-rw-r--r--lang/gcc-ssp/Makefile5
-rw-r--r--lang/snobol/Makefile4
-rw-r--r--lang/tcl/Makefile5
-rw-r--r--lang/vscm/Makefile5
-rw-r--r--mail/nmh/Makefile4
-rw-r--r--mail/popa3d/Makefile4
-rw-r--r--mail/sendmail/Makefile5
-rw-r--r--mail/wl/Makefile4
-rw-r--r--math/dcdflib.c/Makefile4
-rw-r--r--math/scilab/Makefile5
-rw-r--r--misc/kdepim2/Makefile4
-rw-r--r--misc/kdeutils2/Makefile4
-rw-r--r--mk/bsd.pkg.mk10
-rw-r--r--net/ORBit/Makefile4
-rw-r--r--net/ispman/Makefile4
-rw-r--r--net/mouse-pppoe/Makefile5
-rw-r--r--net/mtr-gtk/Makefile5
-rw-r--r--net/mtr/Makefile4
-rw-r--r--net/napshare/Makefile4
-rw-r--r--net/netatalk-asun/Makefile5
-rw-r--r--net/netatalk/Makefile5
-rw-r--r--net/nocol/Makefile4
-rw-r--r--net/ntop/Makefile4
-rw-r--r--net/pload/Makefile4
-rw-r--r--net/ra-rtsp-proxy/Makefile5
-rw-r--r--net/wmnet/Makefile4
-rw-r--r--news/knews/Makefile5
-rw-r--r--news/slrn/Makefile4
-rw-r--r--news/tin/Makefile4
-rw-r--r--print/teTeX-bin/Makefile5
-rw-r--r--print/teTeX-share/Makefile5
-rw-r--r--print/teTeX-sharesrc/Makefile5
-rw-r--r--print/tex-jadetex/Makefile5
-rw-r--r--security/amavis/Makefile4
-rw-r--r--security/cyrus-sasl/Makefile4
-rw-r--r--security/openssl/Makefile4
-rw-r--r--security/ssh/Makefile4
-rw-r--r--security/tcp_wrappers/Makefile5
-rw-r--r--shells/bash2/Makefile4
-rw-r--r--sysutils/aperture/Makefile5
-rw-r--r--sysutils/kapm/Makefile4
-rw-r--r--sysutils/mtools/Makefile4
-rw-r--r--sysutils/rtty/Makefile4
-rw-r--r--sysutils/tload/Makefile5
-rw-r--r--sysutils/xbatt/Makefile5
-rw-r--r--sysutils/xbattbar/Makefile5
-rw-r--r--sysutils/xdu/Makefile4
-rw-r--r--textproc/helpdeco/Makefile5
-rw-r--r--textproc/ispell-base/Makefile5
-rw-r--r--textproc/jade/Makefile4
-rw-r--r--textproc/libxml2/Makefile4
-rw-r--r--textproc/p5-XML-Node/Makefile5
-rw-r--r--textproc/rtf-tools/Makefile5
-rw-r--r--www/ap-perl/Makefile5
-rw-r--r--www/ap-xslt/Makefile5
-rw-r--r--www/apache6/Makefile5
-rw-r--r--www/arena/Makefile4
-rw-r--r--www/checkbot/Makefile4
-rw-r--r--www/libwww/Makefile5
-rw-r--r--www/w3m/Makefile5
-rw-r--r--x11/qt2-designer-kde/Makefile5
-rw-r--r--x11/qt2-designer/Makefile5
-rw-r--r--x11/qt2-libs/Makefile5
-rw-r--r--x11/tk/Makefile5
-rw-r--r--x11/xearth/Makefile4
-rw-r--r--x11/xforms/Makefile5
-rw-r--r--x11/xfstt/Makefile4
-rw-r--r--x11/xview-config/Makefile5
-rw-r--r--x11/xview-lib/Makefile5
123 files changed, 323 insertions, 246 deletions
diff --git a/Packages.txt b/Packages.txt
index 0dca4d0d0b4..b671d528df8 100644
--- a/Packages.txt
+++ b/Packages.txt
@@ -1,4 +1,4 @@
-# $NetBSD: Packages.txt,v 1.215 2001/11/27 03:03:11 hubertf Exp $
+# $NetBSD: Packages.txt,v 1.216 2001/11/29 01:12:24 hubertf Exp $
###########################################################################
==========================
@@ -1977,8 +1977,15 @@ NOMAN=YES either in the environment or in /etc/mk.conf.
When making fixes to an existing package it can be useful to change
the version number in PKGNAME. To avoid conflicting with future versions
-by the original author, use a 'nb1' suffix (later versions should
-increment this to give 'nb2' and so on).
+by the original author, a 'nb1' ('nb2', ...) suffix is used on package
+versions. The "nb" is treated like a "." by the pkg tools.
+
+To set the package's revision, set the PKGREVISION variable, e.g.
+
+DISTNAME= foo-17.42
+PKGREVISION= 9
+
+This will result in a PKGNAME of foo-17.42nb9.
10.18 "Could not find bsd.own.mk" - what's wrong?
diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile
index 251c84196fc..de94af09900 100644
--- a/archivers/zip/Makefile
+++ b/archivers/zip/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2001/09/27 23:17:41 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2001/11/29 01:12:25 hubertf Exp $
# FreeBSD Id: Makefile,v 1.10 1997/04/27 16:06:15 ache Exp
#
DISTNAME= zip-2.3
-PKGNAME= ${DISTNAME}nb1
+PKGREVISION= 1
CATEGORIES= archivers
MASTER_SITES= ftp://ftp.info-zip.org/pub/infozip/src/ \
ftp://ftp.icce.rug.nl/infozip/src/
diff --git a/audio/libcdaudio/Makefile b/audio/libcdaudio/Makefile
index 9afdc9d1d01..04c6b242ef5 100644
--- a/audio/libcdaudio/Makefile
+++ b/audio/libcdaudio/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2001/11/26 05:56:36 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/11/29 01:12:25 hubertf Exp $
#
DISTNAME= libcdaudio-0.99.4
-PKGNAME= libcdaudio-0.99.4nb1
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= ftp://cdcd.undergrid.net/libcdaudio/ \
http://cdcd.undergrid.net/libcdaudio/source_archive/ \
diff --git a/benchmarks/hbench/Makefile b/benchmarks/hbench/Makefile
index 23f84ee05cd..bc84683b8a6 100644
--- a/benchmarks/hbench/Makefile
+++ b/benchmarks/hbench/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2001/11/28 05:20:38 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2001/11/29 01:12:26 hubertf Exp $
DISTNAME= hbench-OS-1.0
-PKGNAME= hbench-1.0nb1
+PKGNAME= hbench-1.0
+PKGREVISION= 1
CATEGORIES= benchmarks
MASTER_SITES= ftp://ftp.eecs.harvard.edu/pub/hbench-OS/
diff --git a/cad/mpac/Makefile b/cad/mpac/Makefile
index e675be9b857..2c0358d73a2 100644
--- a/cad/mpac/Makefile
+++ b/cad/mpac/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/07/01 18:36:03 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/29 01:12:26 hubertf Exp $
#
DISTNAME= mpac-0.2.2
-PKGNAME= mpac-0.2.2nb1
+PKGREVISION= 1
CATEGORIES= cad
MASTER_SITES= http://goemon.polito.it/ftp/pub/software/lethal/Elettronica/antenna/
diff --git a/chat/irssi/Makefile b/chat/irssi/Makefile
index a567b2e2839..a9457e91115 100644
--- a/chat/irssi/Makefile
+++ b/chat/irssi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2001/11/27 16:10:10 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/11/29 01:12:26 hubertf Exp $
DISTNAME= irssi-0.7.98.4
-PKGNAME= ${DISTNAME}nb1
+PKGREVISION= 1
CATEGORIES= chat
MASTER_SITES= http://www.irssi.org/files/
diff --git a/chat/sirc/Makefile b/chat/sirc/Makefile
index d45fbb39969..22521646336 100644
--- a/chat/sirc/Makefile
+++ b/chat/sirc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2001/11/28 05:20:42 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/11/29 01:12:26 hubertf Exp $
DISTNAME= sirc-2.211
-PKGNAME= sirc-2.211nb1
+PKGREVISION= 1
CATEGORIES= chat
MASTER_SITES= http://www.iagora.com/~espel/sirc/ \
http://www.iagora.com/~espel/sirc/scripts/
diff --git a/chat/tkicb/Makefile b/chat/tkicb/Makefile
index dc042c8d4ad..504d8ddf5e0 100644
--- a/chat/tkicb/Makefile
+++ b/chat/tkicb/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/06/26 13:51:00 zuntum Exp $
+# $NetBSD: Makefile,v 1.5 2001/11/29 01:12:26 hubertf Exp $
#
DISTNAME= icb.2.1.4
-PKGNAME= tkicb-2.1.4nb1
+PKGNAME= tkicb-2.1.4
+PKGREVISION= 1
CATEGORIES= chat x11
MASTER_SITES= ftp://shoshin.armory.com/pub/
EXTRACT_SUFX= .tar.Z
diff --git a/chat/xchat/Makefile b/chat/xchat/Makefile
index 89c9a61a5c7..8d1975c9a1e 100644
--- a/chat/xchat/Makefile
+++ b/chat/xchat/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2001/10/22 00:01:03 mycroft Exp $
+# $NetBSD: Makefile,v 1.13 2001/11/29 01:12:27 hubertf Exp $
DISTNAME= xchat-1.8.3
-PKGNAME= ${DISTNAME}nb1
+PKGREVISION= 1
CATEGORIES= chat x11 gnome
MASTER_SITES= ${HOMEPAGE}files/source/1.8/
EXTRACT_SUFX= .tar.bz2
diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index 3606b7b1878..77d84688231 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2001/09/27 23:17:49 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2001/11/29 01:12:27 hubertf Exp $
#
DISTNAME= hylafax-4.1
-PKGNAME= hylafax-4.1nb1
+PKGREVISION= 1
CATEGORIES= comms
MASTER_SITES= ftp://ftp.hylafax.org/source/ \
ftp://ftp.leo.org/pub/comp/os/unix/networking/fax/hylafax/source/
diff --git a/comms/pilot-link-libs/Makefile b/comms/pilot-link-libs/Makefile
index 51b7a74caa5..9c86710573e 100644
--- a/comms/pilot-link-libs/Makefile
+++ b/comms/pilot-link-libs/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2001/08/09 08:49:48 dillo Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/29 01:12:27 hubertf Exp $
#
.include "../../comms/pilot-link/Makefile.common"
-PKGNAME= pilot-link-libs-${PILOT_LINK_VERS}nb1
+PKGNAME= pilot-link-libs-${PILOT_LINK_VERS}
+PKGREVISION= 1
COMMENT= Libraries for talking to the 3Com Pilot PDA
CONFLICTS+= pilot-link-0.8.* pilot-link-0.9.[0-3]
diff --git a/comms/plptools/Makefile b/comms/plptools/Makefile
index c9bed4169df..7cdb4cd1e8c 100644
--- a/comms/plptools/Makefile
+++ b/comms/plptools/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2001/11/06 22:23:49 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2001/11/29 01:12:27 hubertf Exp $
#
DISTNAME= plptools-0.6
-PKGNAME= ${DISTNAME}nb1
+PKGREVISION= 1
CATEGORIES= comms
MASTER_SITES= ftp://ftp.to.com/pub/psion/tarballs/
diff --git a/converters/rpm2cpio/Makefile b/converters/rpm2cpio/Makefile
index b078f189305..ebd50b954c1 100644
--- a/converters/rpm2cpio/Makefile
+++ b/converters/rpm2cpio/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2001/11/28 05:20:43 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/11/29 01:12:28 hubertf Exp $
# FreeBSD Id: ports/misc/rpm2cpio/Makefile,v 1.2 1999/08/25 07:22:29 obrien Exp
DISTNAME= rpm2cpio
-PKGNAME= rpm2cpio-1.0nb1
+PKGNAME= rpm2cpio-1.0
+PKGREVISION= 1
CATEGORIES= misc
MASTER_SITES= http://www.iagora.com/~espel/
EXTRACT_SUFX= # none
diff --git a/databases/zope-mysql/Makefile b/databases/zope-mysql/Makefile
index 713af3bb2ac..e72c3188074 100644
--- a/databases/zope-mysql/Makefile
+++ b/databases/zope-mysql/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2001/02/16 14:17:45 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2001/11/29 01:12:28 hubertf Exp $
#
DISTNAME= ZMySQLDA-1.1.3-nonbin
-PKGNAME= zope-mysql-1.1.3nb2
+PKGNAME= zope-mysql-1.1.3
+PKGREVISION= 2
CATEGORIES= databases www
MASTER_SITES= http://www.zope.org/Members/MikeP/ZMySQLDA/
diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index 756a40d59dc..3ebe913b61d 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2001/10/24 22:10:50 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2001/11/29 01:12:28 hubertf Exp $
#
DISTNAME= GConf-1.0.4
-PKGNAME= GConf-1.0.4nb1
+PKGREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/GConf/}
EXTRACT_SUFX= .tar.bz2
diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index d6585874c6d..693815dd782 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.24 2001/11/28 05:20:46 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2001/11/29 01:12:28 hubertf Exp $
# FreeBSD Id: Makefile,v 1.5 1997/09/19 09:29:04 max Exp
#
DISTNAME= automake-1.4-p5
-PKGNAME= ${DISTNAME:C/-p/./}nb1
+PKGNAME= ${DISTNAME:C/-p/./}
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=automake/}
diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index 93bdf8f780c..b73b1115342 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2001/09/27 23:17:55 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2001/11/29 01:12:28 hubertf Exp $
#
DISTNAME= cvs-1.11
-PKGNAME= ${DISTNAME}nb2
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ftp://ftp.cvshome.org/pub/${DISTNAME}/ \
${MASTER_SITE_GNU:=cvs/}
diff --git a/devel/electricfence/Makefile b/devel/electricfence/Makefile
index d0e09865ebe..a8512faf2f3 100644
--- a/devel/electricfence/Makefile
+++ b/devel/electricfence/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2001/11/10 19:59:00 agc Exp $
+# $NetBSD: Makefile,v 1.7 2001/11/29 01:12:29 hubertf Exp $
DISTNAME= ElectricFence-2.1
-PKGNAME= ElectricFence-2.1nb1
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ftp://ftp.perens.com/pub/ElectricFence/
diff --git a/devel/gettext-lib/Makefile b/devel/gettext-lib/Makefile
index 5dbd2df6848..38012afebbb 100644
--- a/devel/gettext-lib/Makefile
+++ b/devel/gettext-lib/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2001/10/18 15:20:10 veego Exp $
+# $NetBSD: Makefile,v 1.11 2001/11/29 01:12:29 hubertf Exp $
# FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp
#
DISTNAME= gettext-0.10.35
-PKGNAME= gettext-lib-0.10.35nb1
+PKGNAME= gettext-lib-0.10.35
+PKGREVISION= 1
SVR4_PKGNAME= gttli
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=gettext/}
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index f868248ad2c..b5f332b0a34 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2001/08/02 18:11:02 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2001/11/29 01:12:29 hubertf Exp $
# FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp
#
DISTNAME= gettext-0.10.35
-PKGNAME= gettext-0.10.35nb2
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=gettext/}
diff --git a/devel/libstroke/Makefile b/devel/libstroke/Makefile
index d990879fbd7..016c1e6e825 100644
--- a/devel/libstroke/Makefile
+++ b/devel/libstroke/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2001/02/16 14:38:39 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/11/29 01:12:29 hubertf Exp $
#
DISTNAME= libstroke-0.3
-PKGNAME= libstroke-0.3nb1
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.etla.net/libstroke/
diff --git a/devel/noweb/Makefile b/devel/noweb/Makefile
index bc057332c8c..44c791c1df9 100644
--- a/devel/noweb/Makefile
+++ b/devel/noweb/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2001/07/27 10:50:48 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2001/11/29 01:12:30 hubertf Exp $
# FreeBSD Id: Makefile,v 1.10 1997/09/15 07:22:06 tg Exp
#
DISTNAME= noweb-2.9a
-PKGNAME= noweb-2.9anb1
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ftp://ftp.cs.virginia.edu/pub/nr/
EXTRACT_SUFX= .tgz
diff --git a/devel/pilrc/Makefile b/devel/pilrc/Makefile
index 0a767e922d2..8afb2fb2e96 100644
--- a/devel/pilrc/Makefile
+++ b/devel/pilrc/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2001/06/29 04:54:51 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/11/29 01:12:30 hubertf Exp $
#
DISTNAME= pilrc-2.8p4
-PKGNAME= pilrc-2.8.4nb1
+PKGNAME= pilrc-2.8.4
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/pilrc-2.8p4
CATEGORIES= devel
MASTER_SITES= http://www.ardiri.com/download/palm/pilrc/patch/
diff --git a/devel/rcs/Makefile b/devel/rcs/Makefile
index 6428e299d88..3779e5a07b4 100644
--- a/devel/rcs/Makefile
+++ b/devel/rcs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2001/11/12 03:06:31 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2001/11/29 01:12:30 hubertf Exp $
#
DISTNAME= rcs-5.7
-PKGNAME= rcs-5.7nb1
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=rcs/}
diff --git a/devel/unproven-pthreads/Makefile b/devel/unproven-pthreads/Makefile
index 39a84be6855..f97621783a3 100644
--- a/devel/unproven-pthreads/Makefile
+++ b/devel/unproven-pthreads/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2001/09/27 23:17:58 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2001/11/29 01:12:30 hubertf Exp $
#
DISTNAME= unproven-pthreads-0.17
-PKGNAME= ${DISTNAME}nb2
+PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ftp://ftp.flame.org/pub/netbsd/
diff --git a/devel/w32api/Makefile b/devel/w32api/Makefile
index 43de20edbb9..2352729c824 100644
--- a/devel/w32api/Makefile
+++ b/devel/w32api/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2001/11/02 00:30:10 kent Exp $
+# $NetBSD: Makefile,v 1.8 2001/11/29 01:12:30 hubertf Exp $
# $PEACE: Makefile,v 1.15 2001/10/20 03:00:07 kent Exp $
DISTNAME= w32api-1.1-src
-PKGNAME= w32api-1.1nb1
+PKGNAME= w32api-1.1
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
CATEGORIES= devel
MASTER_SITES= http://prdownloads.sourceforge.net/mingw/
diff --git a/editors/joe/Makefile b/editors/joe/Makefile
index 0c9c5e8965f..a6c37854075 100644
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2001/05/22 12:23:28 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2001/11/29 01:12:31 hubertf Exp $
#
DISTNAME= joe2.8
-PKGNAME= joe-2.8nb1
+PKGNAME= joe-2.8
+PKGREVISION= 1
CATEGORIES= editors
MASTER_SITES= ftp://ftp.std.com/src/editors/
EXTRACT_SUFX= .tar.Z
diff --git a/editors/nvi-m17n/Makefile b/editors/nvi-m17n/Makefile
index 6009348f423..d74b012ff8f 100644
--- a/editors/nvi-m17n/Makefile
+++ b/editors/nvi-m17n/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2001/10/25 07:46:27 itojun Exp $
+# $NetBSD: Makefile,v 1.13 2001/11/29 01:12:31 hubertf Exp $
# FreeBSD Id: Makefile,v 1.11 1999/04/17 10:51:03 itojun Exp
DISTNAME= nvi-1.79
-PKGNAME= nvi-m17n-1.79.19991117nb1
+PKGNAME= nvi-m17n-1.79.19991117
+PKGREVISION= 1
CATEGORIES= editors
MASTER_SITES= ftp://sleepy.vwh.net/pub/ \
ftp://ftp.foretune.co.jp/pub/tools/nvi-m17n/
diff --git a/editors/sam/Makefile b/editors/sam/Makefile
index 02d5d3e83dc..86714f168ce 100644
--- a/editors/sam/Makefile
+++ b/editors/sam/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2001/11/18 19:17:05 dillo Exp $
+# $NetBSD: Makefile,v 1.20 2001/11/29 01:12:32 hubertf Exp $
# FreeBSD Id: Makefile,v 1.3 1996/11/12 02:19:40 obrien Exp
#
DISTNAME= sam
-PKGNAME= sam-4.3nb1
+PKGNAME= sam-4.3
+PKGREVISION= 1
CATEGORIES= editors plan9
MASTER_SITES= ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
EXTRACT_SUFX= .msg.gz
diff --git a/emulators/hercules/Makefile b/emulators/hercules/Makefile
index 31878b41120..64dec5a43f3 100644
--- a/emulators/hercules/Makefile
+++ b/emulators/hercules/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2001/09/27 23:18:02 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/11/29 01:12:32 hubertf Exp $
DISTNAME= hercules-2.11
-PKGNAME= ${DISTNAME}nb1
+PKGREVISION= 1
CATEGORIES= emulators
MASTER_SITES= http://www.conmicro.cx/hercules/
diff --git a/emulators/suse_vmware/Makefile b/emulators/suse_vmware/Makefile
index 8375351545d..28b74af13a2 100644
--- a/emulators/suse_vmware/Makefile
+++ b/emulators/suse_vmware/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2001/08/01 23:21:00 kristerw Exp $
+# $NetBSD: Makefile,v 1.4 2001/11/29 01:12:32 hubertf Exp $
DISTNAME= suse_vmware-${SUSE_VERSION}
-PKGNAME= ${DISTNAME}nb1
+PKGREVISION= 1
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUSE:=a1/}
DISTFILES= ${RPMFILES}
diff --git a/games/abuse/Makefile b/games/abuse/Makefile
index 0f666f5d063..967e2a35c03 100644
--- a/games/abuse/Makefile
+++ b/games/abuse/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2001/07/02 15:30:59 abs Exp $
+# $NetBSD: Makefile,v 1.10 2001/11/29 01:12:32 hubertf Exp $
DISTNAME= abuse_pd
-PKGNAME= abuse-2.0nb1
+PKGNAME= abuse-2.0
+PKGREVISION= 1
CATEGORIES= games x11
MASTER_SITES= http://www.crack.com/games/abuse/
DISTFILES= ${DISTNAME}.tgz abuse_data.tar.gz
diff --git a/games/clanbomber/Makefile b/games/clanbomber/Makefile
index 7e605265487..be506288110 100644
--- a/games/clanbomber/Makefile
+++ b/games/clanbomber/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2001/10/24 22:10:55 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/11/29 01:12:32 hubertf Exp $
DISTNAME= clanbomber-1.01
-PKGNAME= ${DISTNAME}nb1
+PKGREVISION= 1
CATEGORIES= games x11
MASTER_SITES= http://www.clanbomber.de/files/
diff --git a/games/gnuchess/Makefile b/games/gnuchess/Makefile
index 1277c51351d..d789ad44f29 100644
--- a/games/gnuchess/Makefile
+++ b/games/gnuchess/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2001/11/11 07:54:55 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/11/29 01:12:33 hubertf Exp $
# FreeBSD Id: Makefile,v 1.6 1999/01/27 07:41:12 fenner Exp
#
DISTNAME= chess-5.00
-PKGNAME= gnuchess-5.00nb2
+PKGNAME= gnuchess-5.00
+PKGREVISION= 2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_GNU:=chess/}
diff --git a/games/knightcap/Makefile b/games/knightcap/Makefile
index a559a456819..46bcab574be 100644
--- a/games/knightcap/Makefile
+++ b/games/knightcap/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:07 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/11/29 01:12:33 hubertf Exp $
DISTNAME= KnightCap-3.6
-PKGNAME= knightcap-3.6nb1
+PKGNAME= knightcap-3.6
+PKGREVISION= 1
CATEGORIES= games
MASTER_SITES= ftp://samba.anu.edu.au/pub/KnightCap/
diff --git a/games/netris/Makefile b/games/netris/Makefile
index fb49ef211ea..6b015d87bb0 100644
--- a/games/netris/Makefile
+++ b/games/netris/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 15:10:55 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/11/29 01:12:33 hubertf Exp $
#
DISTNAME= netris-0.5
-PKGNAME= netris-0.5nb1
+PKGREVISION= 1
CATEGORIES= games
MASTER_SITES= ftp://ftp.netris.org/pub/netris/
diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile
index da949187e70..efea1d219dc 100644
--- a/games/xdoom/Makefile
+++ b/games/xdoom/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2001/09/27 23:18:09 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2001/11/29 01:12:33 hubertf Exp $
DISTNAME= linuxdoom-1.10
-PKGNAME= xdoom-1.10nb1
+PKGNAME= xdoom-1.10
+PKGREVISION= 1
WRKSRC= ${WRKDIR}
CATEGORIES= games x11
MASTER_SITES= ftp://ftp.idsoftware.com/idstuff/source/
diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile
index cf51d96e11c..12e43c112a0 100644
--- a/games/xgalaga/Makefile
+++ b/games/xgalaga/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2001/09/10 01:08:54 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 2001/11/29 01:12:33 hubertf Exp $
#
DISTNAME= xgalaga-2.0.34
-PKGNAME= ${DISTNAME}nb1
+PKGREVISION= 1
CATEGORIES= games x11
MASTER_SITES= http://ogresoft.dyn.ml.org/
diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile
index 13d851fa471..680b2c987bb 100644
--- a/graphics/Mesa/Makefile
+++ b/graphics/Mesa/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.42 2001/09/27 23:18:09 jlam Exp $
+# $NetBSD: Makefile,v 1.43 2001/11/29 01:12:34 hubertf Exp $
#
.include "Makefile.common"
DISTNAME= Mesa-${MESA_VERSION}
-PKGNAME= ${DISTNAME}nb1
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/graphics/avifile-devel/Makefile b/graphics/avifile-devel/Makefile
index 5d0fc09fbc5..8dacea88a58 100644
--- a/graphics/avifile-devel/Makefile
+++ b/graphics/avifile-devel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2001/10/24 22:10:59 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2001/11/29 01:12:34 hubertf Exp $
#
DISTNAME= avifile-0.6.20010814
-PKGNAME= ${DISTNAME}nb1
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://zuntum.utech.lublin.pl/distfiles/
EXTRACT_SUFX= .tar.bz2
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index b9449f2dfa9..2295a97b163 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2001/11/27 03:49:44 hubertf Exp $
+# $NetBSD: Makefile,v 1.10 2001/11/29 01:12:34 hubertf Exp $
#
-PKGNAME= blender-2.11nb4
+PKGNAME= blender-2.11
+PKGREVISION= 4
CATEGORIES= graphics
MASTER_SITES= ftp://www.blender.nl/pub/
diff --git a/graphics/dvdview/Makefile b/graphics/dvdview/Makefile
index 95d06e034d2..83b59e03ca2 100644
--- a/graphics/dvdview/Makefile
+++ b/graphics/dvdview/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2001/08/30 22:56:42 elric Exp $
+# $NetBSD: Makefile,v 1.5 2001/11/29 01:12:35 hubertf Exp $
DISTNAME= dvdview1.1.0
-PKGNAME= dvdview-1.1.0nb1
+PKGNAME= dvdview-1.1.0
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://rachmaninoff.informatik.uni-mannheim.de/dvdview/arch/
diff --git a/graphics/g2/Makefile b/graphics/g2/Makefile
index 29ca5fd9232..6abdf62671d 100644
--- a/graphics/g2/Makefile
+++ b/graphics/g2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2001/05/03 21:17:23 jtb Exp $
+# $NetBSD: Makefile,v 1.7 2001/11/29 01:12:35 hubertf Exp $
DISTNAME= g2-0.40
-PKGNAME= g2-0.40nb1
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ftp://g2.sourceforge.net/pub/g2/
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index 99b16ce329a..86c5ad7b1e8 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2001/08/02 12:16:05 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/11/29 01:12:35 hubertf Exp $
DISTNAME= gphoto-2.0beta1
-PKGNAME= gphoto-2.0.0.1nb1
+PKGNAME= gphoto-2.0.0.1
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.gphoto.net/dist/
diff --git a/graphics/iGMT/Makefile b/graphics/iGMT/Makefile
index adf1f254b01..a1713256227 100644
--- a/graphics/iGMT/Makefile
+++ b/graphics/iGMT/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2001/05/19 17:48:27 jtb Exp $
+# $NetBSD: Makefile,v 1.12 2001/11/29 01:12:36 hubertf Exp $
DISTNAME= igmt_v1.2
-PKGNAME= iGMT-1.2nb1
+PKGNAME= iGMT-1.2
+PKGREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://op.gfz-potsdam.de/igmt/
diff --git a/graphics/mpeg_encode/Makefile b/graphics/mpeg_encode/Makefile
index d071dfcb69d..dcee656676a 100644
--- a/graphics/mpeg_encode/Makefile
+++ b/graphics/mpeg_encode/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/09/22 17:48:26 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/29 01:12:36 hubertf Exp $
#
DISTNAME= mpeg_encode-1.5b-src
-PKGNAME= ${DISTNAME:S/-src//}nb1
+PKGNAME= ${DISTNAME:S/-src//}
+PKGREVISION= 1
CATEGORIES= graphics net
MASTER_SITES= ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/encode/
diff --git a/graphics/xanim/Makefile b/graphics/xanim/Makefile
index a8dc97cb117..f468ed757b5 100644
--- a/graphics/xanim/Makefile
+++ b/graphics/xanim/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2001/10/21 15:40:51 mycroft Exp $
+# $NetBSD: Makefile,v 1.24 2001/11/29 01:12:36 hubertf Exp $
DISTNAME= xanim2801
-PKGNAME= xanim-2.80.1nb1
+PKGNAME= xanim-2.80.1
+PKGREVISION= 1
CATEGORIES= graphics x11
MASTER_SITES= ftp://xanim.va.pubnix.com/\
ftp://xanim.va.pubnix.com/modules/ \
diff --git a/graphics/xart/Makefile b/graphics/xart/Makefile
index 5f64fb9f5a5..687fc8f0f33 100644
--- a/graphics/xart/Makefile
+++ b/graphics/xart/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2001/08/22 17:38:58 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2001/11/29 01:12:37 hubertf Exp $
#
DISTNAME= xart19980415
-PKGNAME= xart-19980415nb1
+PKGNAME= xart-19980415
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/19980415
CATEGORIES= graphics x11
MASTER_SITES= http://linux01.gwdg.de/~rhohen/linux/
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index 0b3194fc215..84a8dff8662 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2001/09/27 23:18:14 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2001/11/29 01:12:37 hubertf Exp $
DISTNAME= xv-3.10a
-PKGNAME= ${DISTNAME}nb1
+PKGREVISION= 1
CATEGORIES= graphics x11
MASTER_SITES= ftp://ftp.cis.upenn.edu/pub/xv/ \
ftp://ftp.kuis.kyoto-u.ac.jp/X11/contrib/clients/xv/ \
diff --git a/japanese/namazu1/Makefile b/japanese/namazu1/Makefile
index 2f242b79a28..22c6b17fb30 100644
--- a/japanese/namazu1/Makefile
+++ b/japanese/namazu1/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2001/09/27 23:18:14 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/11/29 01:12:37 hubertf Exp $
# FreeBSD Id: Makefile,v 1.1.1.1 1999/03/31 11:52:07 flathill Exp $
DISTNAME= namazu-1.3.0.11
-PKGNAME= namazu-1.3.0.11nb1
+PKGREVISION= 1
CATEGORIES= japanese textproc
MASTER_SITES= http://www.namazu.org/stable/
diff --git a/japanese/p5-Text-ChaSen/Makefile b/japanese/p5-Text-ChaSen/Makefile
index 935a84d4ffe..32fb73924fc 100644
--- a/japanese/p5-Text-ChaSen/Makefile
+++ b/japanese/p5-Text-ChaSen/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2001/11/26 06:50:00 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/11/29 01:12:38 hubertf Exp $
DISTNAME= Text-ChaSen-1.03
-PKGNAME= p5-${DISTNAME}nb1
+PKGNAME= p5-${DISTNAME}
+PKGREVISION= 1
SVR4_PKGNAME= p5tcs
CATEGORIES= japanese perl5
MASTER_SITES= http://www.daionet.gr.jp/~knok/chasen/
diff --git a/japanese/skkserv/Makefile b/japanese/skkserv/Makefile
index 00ba990bfe9..bb28b1e7ee8 100644
--- a/japanese/skkserv/Makefile
+++ b/japanese/skkserv/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2001/11/18 12:21:05 frueauf Exp $
+# $NetBSD: Makefile,v 1.9 2001/11/29 01:12:38 hubertf Exp $
DISTNAME= skk9.6
-PKGNAME= skkserv-3.9.4nb1
+PKGNAME= skkserv-3.9.4
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/skk-9.6
CATEGORIES= japanese
MASTER_SITES= ftp://skk.kuis.kyoto-u.ac.jp/skk/9.6/
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index fd619d6b914..a1092184282 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2001/03/23 14:36:04 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2001/11/29 01:12:38 hubertf Exp $
DISTNAME= clisp-2000-03-06
-PKGNAME= clisp-20000306nb1
+PKGNAME= clisp-20000306
+PKGREVISION= 1
CATEGORIES= lang
MASTER_SITES= ftp://ftp2.cons.org/pub/lisp/clisp/source/ \
ftp://ftp.tu-darmstadt.de/pub/programming/languages/lisp/clisp/source/
diff --git a/lang/f2c/Makefile b/lang/f2c/Makefile
index ad1850d0a97..ca444d2b87b 100644
--- a/lang/f2c/Makefile
+++ b/lang/f2c/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2001/07/18 21:48:36 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2001/11/29 01:12:38 hubertf Exp $
DISTNAME= f2c-20001205
-PKGNAME= f2c-20001205nb4
+PKGREVISION= 4
WRKSRC= ${WRKDIR}/f2c
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_LOCAL}
diff --git a/lang/gcc-ssp/Makefile b/lang/gcc-ssp/Makefile
index bd5f5f681b5..27d9e67a968 100644
--- a/lang/gcc-ssp/Makefile
+++ b/lang/gcc-ssp/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/09/27 23:18:17 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/11/29 01:12:39 hubertf Exp $
DISTNAME= gcc-2.95.2
GCC_VERSION= 2.95.2
-PKGNAME= gcc-ssp-2.95.2nb3
+PKGNAME= gcc-ssp-2.95.2
+PKGREVISION= 3
PKGBASENAME= gcc-ssp
CATEGORIES= lang security
MASTER_SITES= ${MASTER_SITE_GNU:=gcc/}
diff --git a/lang/snobol/Makefile b/lang/snobol/Makefile
index 96b58c4ba1c..c683bcb483c 100644
--- a/lang/snobol/Makefile
+++ b/lang/snobol/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2001/09/27 23:18:18 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/11/29 01:12:39 hubertf Exp $
#
DISTNAME= snobol-0.99.4
-PKGNAME= snobol-0.99.4nb1
+PKGREVISION= 1
CATEGORIES= lang
MASTER_SITES= ftp://ftp.snobol4.com/ \
ftp://alpha.gnu.org/budne/snobol/
diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index cd0722ed207..0e714332f8e 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2001/09/27 23:18:20 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/11/29 01:12:39 hubertf Exp $
#
DISTNAME= tcl8.3.2
-PKGNAME= tcl-8.3.2nb2
+PKGNAME= tcl-8.3.2
+PKGREVISION= 2
CATEGORIES= lang
MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_3/ \
ftp://gd.tuwien.ac.at/languages/tcl/scriptics/tcl8_3/ \
diff --git a/lang/vscm/Makefile b/lang/vscm/Makefile
index 7cc58619b7b..da375e6199d 100644
--- a/lang/vscm/Makefile
+++ b/lang/vscm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2001/05/11 01:43:03 jtb Exp $
+# $NetBSD: Makefile,v 1.8 2001/11/29 01:12:39 hubertf Exp $
DISTNAME= vscmV0r4
-PKGNAME= vscm-0.4nb1
+PKGNAME= vscm-0.4
+PKGREVISION= 1
CATEGORIES= lang
MASTER_SITES= ftp://ftp.cs.indiana.edu/pub/scheme-repository/imp/vscm/
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index c84f2a10673..df27b510dc7 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.43 2001/09/27 23:18:21 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2001/11/29 01:12:40 hubertf Exp $
# FreeBSD Id: Makefile,v 1.2 1997/08/04 06:51:28 markm Exp
#
DISTNAME= nmh-1.0.4
-PKGNAME= ${DISTNAME}nb1
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= ftp://ftp.mhost.com/pub/nmh/ \
ftp://ftp.gw.com/pub/unix/mail/mh/nmh/
diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile
index bd051df9e7b..987da23e0fd 100644
--- a/mail/popa3d/Makefile
+++ b/mail/popa3d/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2001/11/26 20:38:31 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/11/29 01:12:40 hubertf Exp $
#
DISTNAME= popa3d-0.4.9.4
-PKGNAME= ${DISTNAME}nb1
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.openwall.com/popa3d/ \
ftp://ftp.openwall.com/pub/projects/popa3d/ \
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 6903f12391d..5d7fcd47412 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2001/10/19 08:51:31 veego Exp $
+# $NetBSD: Makefile,v 1.42 2001/11/29 01:12:40 hubertf Exp $
DISTNAME= sendmail.8.11.6
-PKGNAME= sendmail-8.11.6nb1
+PKGNAME= sendmail-8.11.6
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/ \
ftp://ftp.fu-berlin.de/pub/unix/mail/sendmail/ \
diff --git a/mail/wl/Makefile b/mail/wl/Makefile
index a7973d6ff56..5e65ba04d78 100644
--- a/mail/wl/Makefile
+++ b/mail/wl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2001/07/24 08:17:18 taca Exp $
+# $NetBSD: Makefile,v 1.6 2001/11/29 01:12:40 hubertf Exp $
DISTNAME= wl-2.6.0
-PKGNAME= ${DISTNAME}nb1
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= ftp://ftp.ring.gr.jp/pub/text/elisp/wl/stable/
diff --git a/math/dcdflib.c/Makefile b/math/dcdflib.c/Makefile
index df1bc77ebbf..b4a2defd2a4 100644
--- a/math/dcdflib.c/Makefile
+++ b/math/dcdflib.c/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2001/04/14 21:43:51 jtb Exp $
+# $NetBSD: Makefile,v 1.6 2001/11/29 01:12:40 hubertf Exp $
DISTNAME= dcdflib.c-1.1
-PKGNAME= dcdflib.c-1.1nb1
+PKGREVISION= 1
CATEGORIES= math
MASTER_SITES= ftp://odin.mdacc.tmc.edu/pub/source/
diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index 1cc7b003732..c027a1d2d03 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2001/11/28 16:52:20 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2001/11/29 01:12:41 hubertf Exp $
#
DISTNAME= ${SCIBASE}.src
-PKGNAME= ${SCIBASE}nb1
+PKGNAME= ${SCIBASE}
+PKGREVISION= 1
SCIBASE= scilab-2.6
WRKSRC= ${WRKDIR}/${DISTNAME:.src=}
CATEGORIES= math
diff --git a/misc/kdepim2/Makefile b/misc/kdepim2/Makefile
index 9cbeed8bbda..60d99ccd817 100644
--- a/misc/kdepim2/Makefile
+++ b/misc/kdepim2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2001/11/13 21:21:01 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/11/29 01:12:41 hubertf Exp $
DISTNAME= kdepim-2.2.1
-PKGNAME= ${DISTNAME}nb1
+PKGREVISION= 1
CATEGORIES= misc
COMMENT= Personal Information Management tools for the KDE desktop
diff --git a/misc/kdeutils2/Makefile b/misc/kdeutils2/Makefile
index cbe56362ce1..544cd182a4b 100644
--- a/misc/kdeutils2/Makefile
+++ b/misc/kdeutils2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2001/11/13 21:22:24 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/11/29 01:12:41 hubertf Exp $
DISTNAME= kdeutils-2.2.1
-PKGNAME= ${DISTNAME}nb1
+PKGREVISION= 1
COMMENT= Utilities for the KDE integrated X11 desktop
.include "../../x11/kde2/Makefile.kde2"
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 16396f644cf..dcf68c37c49 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.865 2001/11/28 19:55:31 jlam Exp $
+# $NetBSD: bsd.pkg.mk,v 1.866 2001/11/29 01:17:25 hubertf Exp $
#
# This file is in the public domain.
#
@@ -860,7 +860,15 @@ PATCH_SITES:= ${_MASTER_SITE_OVERRIDE} ${PATCH_SITES}
# Derived names so that they're easily overridable.
DISTFILES?= ${DISTNAME}${EXTRACT_SUFX}
+.if defined(PKGREVISION) && ${PKGREVISION} != ""
+. if defined(PKGNAME)
+PKGNAME:= ${PKGNAME}nb${PKGREVISION}
+. else
+PKGNAME?= ${DISTNAME}nb${PKGREVISION}
+. endif
+.else
PKGNAME?= ${DISTNAME}
+.endif
SVR4_PKGNAME?= ${PKGNAME}
MAINTAINER?= packages@netbsd.org
diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile
index 5ff31b9231a..c868be4fc76 100644
--- a/net/ORBit/Makefile
+++ b/net/ORBit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.69 2001/10/15 22:34:00 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2001/11/29 01:12:41 hubertf Exp $
#
DISTNAME= ORBit-0.${ORBIT_MAJOR}.${ORBIT_MINOR}
-PKGNAME= ${DISTNAME}nb1
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/ORBit/}
EXTRACT_SUFX= .tar.bz2
diff --git a/net/ispman/Makefile b/net/ispman/Makefile
index 29a0092028a..aa4beff17fd 100644
--- a/net/ispman/Makefile
+++ b/net/ispman/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2001/03/22 13:29:18 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/11/29 01:12:41 hubertf Exp $
#
DISTNAME= ispman-0.5
-PKGNAME= ${DISTNAME}nb1
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/ispman
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ispman/}
diff --git a/net/mouse-pppoe/Makefile b/net/mouse-pppoe/Makefile
index e34d1c89a03..d4449008046 100644
--- a/net/mouse-pppoe/Makefile
+++ b/net/mouse-pppoe/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2001/09/09 20:36:38 agc Exp $
+# $NetBSD: Makefile,v 1.9 2001/11/29 01:12:42 hubertf Exp $
DISTNAME= pppoe.20000912
-PKGNAME= mouse-${DISTNAME:S/./-/}nb1
+PKGNAME= mouse-${DISTNAME:S/./-/}
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.netbsd.org/pub/NetBSD/misc/mouse/pppoe/
diff --git a/net/mtr-gtk/Makefile b/net/mtr-gtk/Makefile
index 7f114b4e06d..6ab79cbafbe 100644
--- a/net/mtr-gtk/Makefile
+++ b/net/mtr-gtk/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/11/04 14:09:32 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/29 01:12:42 hubertf Exp $
#
DISTNAME= mtr-0.42
-PKGNAME= mtr-gtk-0.42nb1
+PKGNAME= mtr-gtk-0.42
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.bitwizard.nl/mtr/ \
http://www.giovannelli.it/~gmarco/files/
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 9d77b186f48..e14d6eb3287 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2001/11/04 14:09:31 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2001/11/29 01:12:42 hubertf Exp $
#
DISTNAME= mtr-0.42
-PKGNAME= ${DISTNAME}nb1
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.bitwizard.nl/mtr/ \
http://www.giovannelli.it/~gmarco/files/
diff --git a/net/napshare/Makefile b/net/napshare/Makefile
index 9c1f84557c3..a051f5066d7 100644
--- a/net/napshare/Makefile
+++ b/net/napshare/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2001/09/22 16:22:30 tron Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/29 01:12:42 hubertf Exp $
DISTNAME= napshare-0.1
-PKGNAME= ${DISTNAME}nb1
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=napshare/}
diff --git a/net/netatalk-asun/Makefile b/net/netatalk-asun/Makefile
index d1c76b8b469..d07ed48a22b 100644
--- a/net/netatalk-asun/Makefile
+++ b/net/netatalk-asun/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2001/09/27 23:18:28 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/11/29 01:12:43 hubertf Exp $
DISTNAME= netatalk-1.4b2+asun2.1.3
-PKGNAME= netatalk-asun-2.1.3nb5
+PKGNAME= netatalk-asun-2.1.3
+PKGREVISION= 5
CATEGORIES= net print
MASTER_SITES= ftp://ftp.cobaltnet.com/pub/users/asun/release/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.u.washington.edu/public/asun/
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index ee7d6e7f366..552e7d52b41 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2001/02/17 18:19:12 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2001/11/29 01:12:43 hubertf Exp $
#
DISTNAME= netatalk-990130
-PKGNAME= netatalk-umich-19990130nb2
+PKGNAME= netatalk-umich-19990130
+PKGREVISION= 2
WRKSRC= ${WRKDIR}/netatalk-990130
CATEGORIES= net
MASTER_SITES= ftp://terminator.rs.itd.umich.edu/unix/netatalk/
diff --git a/net/nocol/Makefile b/net/nocol/Makefile
index 085a336b256..a631c2c5d4d 100644
--- a/net/nocol/Makefile
+++ b/net/nocol/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2001/02/25 04:18:06 hubertf Exp $
+# $NetBSD: Makefile,v 1.14 2001/11/29 01:12:43 hubertf Exp $
#
DISTNAME= nocol-4.3.1
-PKGNAME= nocol-4.3.1nb1
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.netplex-tech.com/software/nocol/downloads/
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 44caffe4b7a..52ec2ea2d27 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2001/09/10 17:33:40 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2001/11/29 01:12:43 hubertf Exp $
DISTNAME= ntop-1.1
-PKGNAME= ntop-1.1nb1
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.unipi.it/pub/local/ntop/source/
EXTRACT_SUFX= -src.tar.gz
diff --git a/net/pload/Makefile b/net/pload/Makefile
index 26af05f81f9..60ba30b89fe 100644
--- a/net/pload/Makefile
+++ b/net/pload/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2001/02/17 18:19:27 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/11/29 01:12:43 hubertf Exp $
#
DISTNAME= pload-0.9.4
-PKGNAME= pload-0.9.4nb1
+PKGREVISION= 1
CATEGORIES= net x11
MASTER_SITES= http://www.engr.utk.edu/~mdsmith/pload/
diff --git a/net/ra-rtsp-proxy/Makefile b/net/ra-rtsp-proxy/Makefile
index e8eb6e5ca47..329d40f39c4 100644
--- a/net/ra-rtsp-proxy/Makefile
+++ b/net/ra-rtsp-proxy/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2001/10/31 14:34:57 tv Exp $
+# $NetBSD: Makefile,v 1.16 2001/11/29 01:12:44 hubertf Exp $
DISTNAME= rtspd-src-1.0.0.0
-PKGNAME= ra-rtsp-proxy-1.0.0.0nb1
+PKGNAME= ra-rtsp-proxy-1.0.0.0
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://docs.real.com/docs/proxykit/
diff --git a/net/wmnet/Makefile b/net/wmnet/Makefile
index d9324ab1e58..5f820b73eb6 100644
--- a/net/wmnet/Makefile
+++ b/net/wmnet/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2001/06/30 09:55:57 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/11/29 01:12:44 hubertf Exp $
DISTNAME= wmnet-1.06
-PKGNAME= ${DISTNAME}nb2
+PKGREVISION= 2
CATEGORIES= net x11
MASTER_SITES= http://www.digitalkaos.net/linux/wmnet/download/
diff --git a/news/knews/Makefile b/news/knews/Makefile
index 70fca840e6c..afae48b302f 100644
--- a/news/knews/Makefile
+++ b/news/knews/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2001/08/15 06:09:01 fredb Exp $
+# $NetBSD: Makefile,v 1.36 2001/11/29 01:12:44 hubertf Exp $
DISTNAME= knews-1.0b.1
-PKGNAME= knews-1.0nb7
+PKGNAME= knews-1.0
+PKGREVISION= 7
CATEGORIES= news x11
MASTER_SITES= http://www.matematik.su.se/~kjj/
diff --git a/news/slrn/Makefile b/news/slrn/Makefile
index 6d043f8784d..23034d68839 100644
--- a/news/slrn/Makefile
+++ b/news/slrn/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2001/10/23 01:55:44 lukem Exp $
+# $NetBSD: Makefile,v 1.18 2001/11/29 01:12:44 hubertf Exp $
#
DISTNAME= slrn-0.9.7.2
-PKGNAME= ${DISTNAME}nb1
+PKGREVISION= 1
CATEGORIES= news
MASTER_SITES= ftp://slrn.sourceforge.net/pub/slrn/ \
ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/slrn/ \
diff --git a/news/tin/Makefile b/news/tin/Makefile
index 16d78f8ac4d..c5d506ba992 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2001/06/05 00:54:08 jtb Exp $
+# $NetBSD: Makefile,v 1.12 2001/11/29 01:12:44 hubertf Exp $
# $FreeBSD Id: Makefile,v 1.17 1997/06/16 06:39:51 max Exp
DISTNAME= tin-1.4.5
-PKGNAME= ${DISTNAME}nb1
+PKGREVISION= 1
CATEGORIES= news
MASTER_SITES= ftp://ftp.tin.org/pub/news/clients/tin/current/ \
ftp://ftp.cs.tu-berlin.de/pub/net/news/tin/current/ \
diff --git a/print/teTeX-bin/Makefile b/print/teTeX-bin/Makefile
index 87d7513151f..3dac493d2dc 100644
--- a/print/teTeX-bin/Makefile
+++ b/print/teTeX-bin/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.31 2001/10/25 04:13:43 fredb Exp $
+# $NetBSD: Makefile,v 1.32 2001/11/29 01:12:45 hubertf Exp $
# FreeBSD Id: Makefile,v 1.20 1997/08/05 06:56:41 tg Exp
#
DISTNAME= teTeX-src-1.0.7
-PKGNAME= teTeX-bin-1.0.7nb1
+PKGNAME= teTeX-bin-1.0.7
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/teTeX-1.0
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/1.0/distrib/sources/}
diff --git a/print/teTeX-share/Makefile b/print/teTeX-share/Makefile
index 28fc56591d1..13ce4354491 100644
--- a/print/teTeX-share/Makefile
+++ b/print/teTeX-share/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2001/10/24 00:28:48 kei Exp $
+# $NetBSD: Makefile,v 1.10 2001/11/29 01:12:45 hubertf Exp $
#
DISTNAME= teTeX-texmf-1.0.2
-PKGNAME= teTeX-share-1.0.2nb1
+PKGNAME= teTeX-share-1.0.2
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/1.0/distrib/sources/}
diff --git a/print/teTeX-sharesrc/Makefile b/print/teTeX-sharesrc/Makefile
index a4d15b65587..77a4af9501a 100644
--- a/print/teTeX-sharesrc/Makefile
+++ b/print/teTeX-sharesrc/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2001/10/24 00:28:49 kei Exp $
+# $NetBSD: Makefile,v 1.10 2001/11/29 01:12:45 hubertf Exp $
# FreeBSD Id: Makefile,v 1.20 1997/08/05 06:56:41 tg Exp
#
DISTNAME= teTeX-texmfsrc-1.0.1
-PKGNAME= teTeX-sharesrc-1.0.1nb1
+PKGNAME= teTeX-sharesrc-1.0.1
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/1.0/distrib/sources/}
diff --git a/print/tex-jadetex/Makefile b/print/tex-jadetex/Makefile
index 033a251a7ae..648484d0a1c 100644
--- a/print/tex-jadetex/Makefile
+++ b/print/tex-jadetex/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/10/04 18:47:06 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2001/11/29 01:12:46 hubertf Exp $
#
DISTNAME= jadetex-2.20
-PKGNAME= tex-${DISTNAME}nb1
+PKGNAME= tex-${DISTNAME}
+PKGREVISION= 1
CATEGORIES= print
MASTER_SITES= http://www.tug.org/applications/jadetex/
EXTRACT_SUFX= .zip
diff --git a/security/amavis/Makefile b/security/amavis/Makefile
index d01f4bfc16d..42c92ce041d 100644
--- a/security/amavis/Makefile
+++ b/security/amavis/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2001/10/22 07:01:50 martti Exp $
+# $NetBSD: Makefile,v 1.11 2001/11/29 01:12:46 hubertf Exp $
#
DISTNAME= amavis-0.2.1
-PKGNAME= amavis-0.2.1nb4
+PKGREVISION= 4
CATEGORIES= security mail
MASTER_SITES= http://www.amavis.org/dist/ \
http://aachalon.de/AMaViS/
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 70a90cd4254..08de350e018 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2001/11/26 20:38:32 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2001/11/29 01:12:46 hubertf Exp $
DISTNAME= cyrus-sasl-1.5.24
-PKGNAME= ${DISTNAME}nb3
+PKGREVISION= 3
SVR4_PKGNAME= csasl
CATEGORIES= security
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 5fca04b9e81..b6ca98f7ecd 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2001/10/18 15:20:35 veego Exp $
+# $NetBSD: Makefile,v 1.49 2001/11/29 01:12:46 hubertf Exp $
DISTNAME= openssl-0.9.6
-PKGNAME= ${DISTNAME}nb2
+PKGREVISION= 2
SVR4_PKGNAME= ossl
CATEGORIES= security
MASTER_SITES= ftp://ftp.openssl.org/source/ \
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 65f2454ac7e..2aff305b65b 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2001/09/27 23:18:41 jlam Exp $
+# $NetBSD: Makefile,v 1.94 2001/11/29 01:12:47 hubertf Exp $
# FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
#
@@ -7,7 +7,7 @@
# modifying/redistributing it.
#
DISTNAME= ssh-1.2.27
-PKGNAME= ssh-1.2.27nb1
+PKGREVISION= 1
CATEGORIES= security net
MASTER_SITES= ftp://ftp.ssh.com/pub/ssh/old/ \
ftp://ftp.funet.fi/pub/unix/security/login/ssh/ \
diff --git a/security/tcp_wrappers/Makefile b/security/tcp_wrappers/Makefile
index bc8e38d113b..9a00522aed4 100644
--- a/security/tcp_wrappers/Makefile
+++ b/security/tcp_wrappers/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2001/03/10 23:28:08 tron Exp $
+# $NetBSD: Makefile,v 1.6 2001/11/29 01:12:47 hubertf Exp $
DISTNAME= tcp_wrappers_7.6-ipv6.1
-PKGNAME= tcp_wrappers-7.6.1nb1
+PKGNAME= tcp_wrappers-7.6.1
+PKGREVISION= 1
CATEGORIES= security net
MASTER_SITES= ftp://ftp.porcupine.org/pub/security/
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index 350150c61ff..471a27ce130 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.30 2001/09/23 21:01:29 tron Exp $
+# $NetBSD: Makefile,v 1.31 2001/11/29 01:12:47 hubertf Exp $
#
V= 2.05
DV= 2.05
DISTNAME= bash-${V}
-PKGNAME= ${DISTNAME}nb1
+PKGREVISION= 1
CATEGORIES= shells
MASTER_SITES= ${MASTER_SITE_GNU:=bash/} \
ftp://slc2.ins.cwru.edu/pub/dist/
diff --git a/sysutils/aperture/Makefile b/sysutils/aperture/Makefile
index e81bce02463..d453ba941d0 100644
--- a/sysutils/aperture/Makefile
+++ b/sysutils/aperture/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2001/09/09 20:36:46 agc Exp $
+# $NetBSD: Makefile,v 1.16 2001/11/29 01:12:47 hubertf Exp $
DISTNAME= apNetBSD
-PKGNAME= aperture-2.0nb1
+PKGNAME= aperture-2.0
+PKGREVISION= 1
CATEGORIES= sysutils x11
EXTRACT_SUFX= .shar
diff --git a/sysutils/kapm/Makefile b/sysutils/kapm/Makefile
index 6dfed18df8a..320a07bb0b7 100644
--- a/sysutils/kapm/Makefile
+++ b/sysutils/kapm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2001/11/26 23:09:29 hubertf Exp $
+# $NetBSD: Makefile,v 1.12 2001/11/29 01:12:48 hubertf Exp $
#
DISTNAME= kapm-0.3.1
-PKGNAME= ${DISTNAME}nb1
+PKGREVISION= 1
CATEGORIES= sysutils x11 kde
MASTER_SITES= ftp://bodnar42.dhs.org/pub/kapm/
diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile
index ebd3e52fc52..4f3bbc18d88 100644
--- a/sysutils/mtools/Makefile
+++ b/sysutils/mtools/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2001/06/11 06:34:50 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2001/11/29 01:12:48 hubertf Exp $
#
DISTNAME= mtools-3.9.7
-PKGNAME= mtools-3.9.7nb1
+PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.tux.org/pub/tux/knaff/mtools/
diff --git a/sysutils/rtty/Makefile b/sysutils/rtty/Makefile
index 0ae1e5732c9..5352b27f1ac 100644
--- a/sysutils/rtty/Makefile
+++ b/sysutils/rtty/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2001/09/09 20:36:47 agc Exp $
+# $NetBSD: Makefile,v 1.15 2001/11/29 01:12:48 hubertf Exp $
# FreeBSD Id: Makefile,v 1.3 1997/01/06 12:13:36 jkh Exp
#
DISTNAME= rtty-3.2
-PKGNAME= ${DISTNAME}nb1
+PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.vix.com/pub/vixie/
diff --git a/sysutils/tload/Makefile b/sysutils/tload/Makefile
index ad2f7811d76..2af9833e87a 100644
--- a/sysutils/tload/Makefile
+++ b/sysutils/tload/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/05/22 02:59:25 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 2001/11/29 01:12:48 hubertf Exp $
#
DISTNAME= procps-2.0.6
-PKGNAME= tload-2.0.6nb1
+PKGNAME= tload-2.0.6
+PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ftp://people.redhat.com/johnsonm/procps/
diff --git a/sysutils/xbatt/Makefile b/sysutils/xbatt/Makefile
index 4ea42dea91f..30a44693bba 100644
--- a/sysutils/xbatt/Makefile
+++ b/sysutils/xbatt/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2001/11/26 20:02:35 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/11/29 01:12:48 hubertf Exp $
#
DISTNAME= xbatt-1.3pr1
-PKGNAME= xbatt-1.3.1nb1
+PKGNAME= xbatt-1.3.1
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/xbatt-1.3
CATEGORIES= sysutils x11
MASTER_SITES= http://www2.clave.gr.jp/~eto/xbatt/
diff --git a/sysutils/xbattbar/Makefile b/sysutils/xbattbar/Makefile
index 5747325db80..e11649fc2ff 100644
--- a/sysutils/xbattbar/Makefile
+++ b/sysutils/xbattbar/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2001/11/26 20:07:34 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2001/11/29 01:12:49 hubertf Exp $
DISTNAME= ${PKGNAME:S/-/_/}
-PKGNAME= xbattbar-1.4.2nb1
+PKGNAME= xbattbar-1.4.2
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/${PKGNAME}
CATEGORIES= sysutils x11
MASTER_SITES= http://infonet.aist-nara.ac.jp/member/suguru/
diff --git a/sysutils/xdu/Makefile b/sysutils/xdu/Makefile
index 073dd1967a3..37549f84976 100644
--- a/sysutils/xdu/Makefile
+++ b/sysutils/xdu/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2001/08/25 16:34:26 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 2001/11/29 01:12:49 hubertf Exp $
#
DISTNAME= xdu-3.0
-PKGNAME= xdu-3.0nb2
+PKGREVISION= 2
CATEGORIES= sysutils x11
MASTER_SITES= http://sd.wareonearth.com/~phil/xdu/ ftp://ftp.arl.mil/pub/
EXTRACT_SUFX= .tar.Z
diff --git a/textproc/helpdeco/Makefile b/textproc/helpdeco/Makefile
index 0e4de915057..f695fd5421e 100644
--- a/textproc/helpdeco/Makefile
+++ b/textproc/helpdeco/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:49 agc Exp $
+# $NetBSD: Makefile,v 1.3 2001/11/29 01:12:49 hubertf Exp $
#
DISTNAME= helpdc21
-PKGNAME= helpdeco-21nb1
+PKGNAME= helpdeco-21
+PKGREVISION= 1
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SIMTEL:=win95/winhelp/}
EXTRACT_SUFX= .zip
diff --git a/textproc/ispell-base/Makefile b/textproc/ispell-base/Makefile
index 99865acc4d8..895e7f5f966 100644
--- a/textproc/ispell-base/Makefile
+++ b/textproc/ispell-base/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/06/20 09:29:26 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/11/29 01:12:49 hubertf Exp $
#
DISTNAME= ispell-3.1.20
-PKGNAME= ispell-base-3.1.20nb1
+PKGNAME= ispell-base-3.1.20
+PKGREVISION= 1
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.cs.ucla.edu/pub/ispell-3.1/
diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile
index 1707d1b04a5..de2a698107f 100644
--- a/textproc/jade/Makefile
+++ b/textproc/jade/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2001/10/27 07:00:53 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2001/11/29 01:12:49 hubertf Exp $
DISTNAME= jade-1.2.1
-PKGNAME= jade-1.2.1nb4
+PKGREVISION= 4
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.jclark.com/pub/jade/ \
ftp://ftp.funet.fi/pub/mirrors/ftp.jclark.com/pub/jade/ \
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 8b8844f475c..799f3f58cc7 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2001/11/17 15:28:49 tron Exp $
+# $NetBSD: Makefile,v 1.9 2001/11/29 01:12:50 hubertf Exp $
DISTNAME= libxml2-2.4.10
-PKGNAME= ${DISTNAME}nb1
+PKGREVISION= 1
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/libxml/}
diff --git a/textproc/p5-XML-Node/Makefile b/textproc/p5-XML-Node/Makefile
index 039b766eae8..6dcf46510fb 100644
--- a/textproc/p5-XML-Node/Makefile
+++ b/textproc/p5-XML-Node/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2001/11/26 06:50:25 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/11/29 01:12:50 hubertf Exp $
#
DISTNAME= XML-Node-0.10
-PKGNAME= p5-${DISTNAME}nb1
+PKGNAME= p5-${DISTNAME}
+PKGREVISION= 1
SVR4_PKGNAME= p5xno
CATEGORIES= textproc perl5
MASTER_SITES= http://belmont-shores.ics.uci.edu/pub/ \
diff --git a/textproc/rtf-tools/Makefile b/textproc/rtf-tools/Makefile
index 14021e2b26e..93d0516aae0 100644
--- a/textproc/rtf-tools/Makefile
+++ b/textproc/rtf-tools/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/05/31 11:04:56 agc Exp $
+# $NetBSD: Makefile,v 1.4 2001/11/29 01:12:50 hubertf Exp $
#
DISTNAME= RTF-1.10
-PKGNAME= rtf-tools-1.10nb1
+PKGNAME= rtf-tools-1.10
+PKGREVISION= 1
CATEGORIES= textproc
MASTER_SITES= http://www.primate.wisc.edu/software/RTF/
EXTRACT_SUFX= .tar.Z
diff --git a/www/ap-perl/Makefile b/www/ap-perl/Makefile
index a9677e31840..780a2b18541 100644
--- a/www/ap-perl/Makefile
+++ b/www/ap-perl/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2001/11/26 15:02:32 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2001/11/29 01:12:50 hubertf Exp $
#
DISTNAME= mod_perl-1.25
-PKGNAME= ap-perl-1.25nb1
+PKGNAME= ap-perl-1.25
+PKGREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Apache/} \
http://perl.apache.org/dist/
diff --git a/www/ap-xslt/Makefile b/www/ap-xslt/Makefile
index 28083fea3b2..ffe24e051a2 100644
--- a/www/ap-xslt/Makefile
+++ b/www/ap-xslt/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2001/10/23 17:21:56 jwise Exp $
+# $NetBSD: Makefile,v 1.6 2001/11/29 01:12:50 hubertf Exp $
DISTNAME= modxslt
-PKGNAME= ap-xslt-1.1nb1
+PKGNAME= ap-xslt-1.1
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= http://download.sourceforge.net/modxslt/
diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index 15a271b86d6..700bd365bfe 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2001/11/25 18:59:48 jlam Exp $
+# $NetBSD: Makefile,v 1.47 2001/11/29 01:12:51 hubertf Exp $
#
# This package does not compile in mod_ssl support hooks, as it conflicts
# with IPv6-enable patch.
@@ -8,7 +8,8 @@
#
DISTNAME= apache_1.3.22
-PKGNAME= apache6-1.3.22nb1
+PKGNAME= apache6-1.3.22
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= http://httpd.apache.org/dist/httpd/ \
http://www.apache.de/dist/httpd/ \
diff --git a/www/arena/Makefile b/www/arena/Makefile
index d53746b19be..a24eaca1e70 100644
--- a/www/arena/Makefile
+++ b/www/arena/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2001/09/20 20:54:50 fredb Exp $
+# $NetBSD: Makefile,v 1.41 2001/11/29 01:12:51 hubertf Exp $
DISTNAME= arena-0.3.62
-PKGNAME= arena-0.3.62nb1
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/Arena-0.3.62
CATEGORIES= www
MASTER_SITES= ftp://ftp.yggdrasil.com/pub/dist/web/arena/
diff --git a/www/checkbot/Makefile b/www/checkbot/Makefile
index bbcb992535a..6fb3befd86a 100644
--- a/www/checkbot/Makefile
+++ b/www/checkbot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2001/09/27 20:43:04 abs Exp $
+# $NetBSD: Makefile,v 1.11 2001/11/29 01:12:51 hubertf Exp $
#
DISTNAME= checkbot-1.64
-PKGNAME= checkbot-1.64nb1
+PKGREVISION= 1
CATEGORIES= www net perl5
MASTER_SITES= http://degraaff.org/checkbot/
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index 3b5d17c7c33..58bf2a8c645 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2001/08/27 14:35:16 tron Exp $
+# $NetBSD: Makefile,v 1.29 2001/11/29 01:12:51 hubertf Exp $
DISTNAME= w3c-libwww-5.3.2
-PKGNAME= libwww-5.3.2nb1
+PKGNAME= libwww-5.3.2
+PKGREVISION= 1
CATEGORIES= www devel
MASTER_SITES= http://www.w3.org/Library/Distribution/ \
ftp://ftp.uni-hannover.de/pub/mirror/info-systems/WWW/libwww/
diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index e92aaefcc93..e02e79dcf05 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2001/09/28 10:10:40 itojun Exp $
+# $NetBSD: Makefile,v 1.29 2001/11/29 01:12:52 hubertf Exp $
#
DISTNAME= w3m-0.2.1
-PKGNAME= w3m-0.2.1.0.19nb2
+PKGNAME= w3m-0.2.1.0.19
+PKGREVISION= 2
CATEGORIES= www
MASTER_SITES= ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/
diff --git a/x11/qt2-designer-kde/Makefile b/x11/qt2-designer-kde/Makefile
index ed3e89a8d70..54a19482d1c 100644
--- a/x11/qt2-designer-kde/Makefile
+++ b/x11/qt2-designer-kde/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2001/11/16 09:09:33 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/11/29 01:12:52 hubertf Exp $
#
.include "../qt2-libs/Makefile.common"
-PKGNAME= qt2-designer-kde-${QTVERSION}nb1
+PKGNAME= qt2-designer-kde-${QTVERSION}
+PKGREVISION= 1
COMMENT= Visual (WYSIWYG) QT GUI builder with KDE widget support
CONFLICTS+= qt2-designer-[0-9]*
diff --git a/x11/qt2-designer/Makefile b/x11/qt2-designer/Makefile
index e91b84e7627..5691ce53e8d 100644
--- a/x11/qt2-designer/Makefile
+++ b/x11/qt2-designer/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2001/11/16 09:09:33 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2001/11/29 01:12:52 hubertf Exp $
#
.include "../qt2-libs/Makefile.common"
-PKGNAME= qt2-designer-${QTVERSION}nb1
+PKGNAME= qt2-designer-${QTVERSION}
+PKGREVISION= 1
COMMENT= Visual (WYSIWYG) QT GUI builder
CONFLICTS+= qt2-designer-kde-[0-9]*
diff --git a/x11/qt2-libs/Makefile b/x11/qt2-libs/Makefile
index 2f15f3f8da5..341311c267b 100644
--- a/x11/qt2-libs/Makefile
+++ b/x11/qt2-libs/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.15 2001/11/16 09:08:05 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/11/29 01:12:52 hubertf Exp $
#
#USE_MESA= yes
.include "../qt2-libs/Makefile.common"
-PKGNAME= qt2-libs-${QTVERSION}nb1
+PKGNAME= qt2-libs-${QTVERSION}
+PKGREVISION= 1
COMMENT= C++ X GUI toolkit
USE_BUILDLINK_ONLY= yes
diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index 3fa3583c527..3cf2c51cc1e 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2001/10/24 22:11:15 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/11/29 01:12:52 hubertf Exp $
DISTNAME= tk8.3.2
-PKGNAME= tk-8.3.2nb1
+PKGNAME= tk-8.3.2
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_3/ \
ftp://ftp.informatik.uni-hamburg.de/pub/soft/lang/tcl/tcl8_3/
diff --git a/x11/xearth/Makefile b/x11/xearth/Makefile
index d245483dfb3..f570821a985 100644
--- a/x11/xearth/Makefile
+++ b/x11/xearth/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2001/07/10 14:32:32 atatat Exp $
+# $NetBSD: Makefile,v 1.9 2001/11/29 01:12:53 hubertf Exp $
#
DISTNAME= xearth-1.1
-PKGNAME= xearth-1.1nb1
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ftp://cag.lcs.mit.edu/pub/tuna/ \
ftp://ftp.cs.colorado.edu/users/tuna/
diff --git a/x11/xforms/Makefile b/x11/xforms/Makefile
index 9cde184736d..4549e696585 100644
--- a/x11/xforms/Makefile
+++ b/x11/xforms/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.37 2001/08/09 13:45:43 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2001/11/29 01:12:53 hubertf Exp $
#
DISTNAME= bxform-088
-PKGNAME= xforms-0.88nb1
+PKGNAME= xforms-0.88
+PKGREVISION= 1
WRKSRC= ${WRKDIR}/xforms
CATEGORIES= x11
MASTER_SITES= ftp://ncmir.ucsd.edu/pub/xforms/${ARCH_SUBDIR}/
diff --git a/x11/xfstt/Makefile b/x11/xfstt/Makefile
index 65154726715..78c4098672b 100644
--- a/x11/xfstt/Makefile
+++ b/x11/xfstt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2001/02/28 10:42:03 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/11/29 01:12:53 hubertf Exp $
#
DISTNAME= xfstt-1.1
-PKGNAME= ${DISTNAME}nb1
+PKGREVISION= 1
CATEGORIES= x11 net
MASTER_SITES= ${MASTER_SITE_SUNSITE:=X11/fonts/}
diff --git a/x11/xview-config/Makefile b/x11/xview-config/Makefile
index 9e70f978bff..4daba9a4b56 100644
--- a/x11/xview-config/Makefile
+++ b/x11/xview-config/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2001/02/17 17:07:29 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2001/11/29 01:12:53 hubertf Exp $
# $FreeBSD Id: Makefile,v 1.9 1998/05/04 03:34:50 steve Exp
#
DISTNAME= xview3.2p1-X11R6
-PKGNAME= xview-config-3.2.1nb2
+PKGNAME= xview-config-3.2.1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
diff --git a/x11/xview-lib/Makefile b/x11/xview-lib/Makefile
index e9312357c9a..d3019516136 100644
--- a/x11/xview-lib/Makefile
+++ b/x11/xview-lib/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2001/05/11 20:41:31 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.17 2001/11/29 01:12:53 hubertf Exp $
# $FreeBSD Id: Makefile,v 1.13 1997/07/17 15:13:03 max Exp
#
DISTNAME= xview3.2p1-X11R6
-PKGNAME= xview-lib-3.2.1nb2
+PKGNAME= xview-lib-3.2.1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}