Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/Makefile,v
retrieving revision 1.91
diff -u -r1.91 Makefile
--- Makefile	8 Nov 2005 13:32:54 -0000	1.91
+++ Makefile	18 Dec 2005 07:59:32 -0000
@@ -134,11 +134,18 @@
 
 CVS?= cvs
 SUP?= cvsup
+PORTSNAP?= portsnap
+PORTSNAP_FLAGS?= -p ${.CURDIR}
 .if defined(SUPHOST)
 SUPFLAGS+=	-h ${SUPHOST}
 .endif
 update:
-.if defined(SUP_UPDATE) && defined(PORTSSUPFILE)
+.if defined(PORTSNAP_UPDATE)
+	@echo "--------------------------------------------------------------"
+	@echo ">>> Running ${PORTSNAP}"
+	@echo "--------------------------------------------------------------"
+	@${PORTSNAP} ${PORTSNAP_FLAGS} fetch update
+.elif defined(SUP_UPDATE) && defined(PORTSSUPFILE)
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Running ${SUP}"
 	@echo "--------------------------------------------------------------"
@@ -152,5 +159,5 @@
 	@${ECHO_MSG} "Error: Please define PORTSSUPFILE before doing make update."
 	@exit 1
 .else
-	@${ECHO_MSG} "Error: Please define either SUP_UPDATE or CVS_UPDATE first."
+	@${ECHO_MSG} "Error: Please define either PORTSNAP_UPDATE, SUP_UPDATE, or CVS_UPDATE first."
 .endif
Index: UPDATING
===================================================================
RCS file: /home/ncvs/ports/UPDATING,v
retrieving revision 1.257
diff -u -r1.257 UPDATING
--- UPDATING	13 Dec 2005 08:56:47 -0000	1.257
+++ UPDATING	18 Dec 2005 07:59:32 -0000
@@ -183,6 +183,27 @@
   attempting upgrade of xterm to 206_1 or newer. Previous versions remove
   xterm on deinstall so CONFLICTS have been set accordingly.
 
+20051110:
+  AFFECTS: users of mail/qmail, mail/qmail-ldap, mail/qmail-mysql,
+           mail/qmail-spamcontrol,
+           mail/qmail-tls and all ports that depend of it.
+  AUTHOR: garga@FreeBSD.org
+
+  If you use qmail installe don a PREFIX different of /var/qmail,
+  please, set a var on /etc/make.conf named QMAIL_PREFIX with this
+  value. It'll be used for many ports that depends of qmail.
+
+  To prevent stale dependencies, when you use one of qmail slave ports,
+  now you just need to set a var named QMAIL_SLAVEPORT on /etc/make.conf
+  assigning to it the name of slaveport you are using.
+
+  The valid options for now are:
+  * ldap
+  * mysql
+  * smtp_auth+tls
+  * spamcontrol
+  * tls
+
 20051105:
   AFFECTS: users of x11-toolkits/qt33
   AUTHOR: kde@FreeBSD.org
Index: Mk/bsd.mail.mk
===================================================================
RCS file: Mk/bsd.mail.mk
diff -N Mk/bsd.mail.mk
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Mk/bsd.mail.mk	18 Dec 2005 00:18:35 -0000
@@ -0,0 +1,71 @@
+#-*- mode: Fundamental; tab-width: 4; -*-
+# ex:ts=4
+#
+# $FreeBSD$
+#
+# Please view me with 4 column tabs!
+
+.if !defined(_POSTMKINCLUDED) && !defined(Mail_Pre_Include)
+
+# Please make sure all changes to this file are passed through the maintainer.
+# Do not commit them yourself (unless of course you're the Port's Wraith ;).
+Mail_Include_MAINTAINER=	garga@FreeBSD.org
+Mail_Pre_Include=			bsd.mail.mk
+
+
+## Begin QMAIL Stuff
+
+# Ports can use the following vars:
+#
+# QMAIL_PREFIX		- Define it if qmail is installed in a different PREFIX.
+#			  Default: /var/qmail
+#
+# QMAIL_SLAVEPORT	- Define it if you install a slaveport of qmail, to
+#			  prevent stale dependencies. Valid slaveports are:
+#			  ldap, mysql, smtp_auth+tls, spamcontrol and tls.
+#
+# USE_QMAIL_BUILD	- Add qmail or qmail slaveport to BUILD_DEPENDS.
+#
+# USE_QMAIL_RUN		- Add qmail or qmail slaveport to RUN_DEPENDS.
+#
+# USE_QMAIL		- Add qmail or qmail slaveport to RUN and BUILD_DEPENDS.
+#
+# WANT_QMAIL		- Set vars related to qmail, like QMAIL_PREFIX.
+
+QMAIL_PREFIX?=	/var/qmail
+
+_QMAIL_VALID_SLAVEPORTS=	ldap mysql smtp_auth+tls spamcontrol tls
+
+.if defined(USE_QMAIL) || defined(USE_QMAIL_RUN) || defined (USE_QMAIL_BUILD)
+
+.if defined(QMAIL_SLAVEPORT)
+.	for slave in ${_QMAIL_VALID_SLAVEPORTS}
+.		if ${QMAIL_SLAVEPORT:L} == ${slave}
+_QMAIL_SLAVEPORT_OKAY=	true
+.		endif
+.	endfor
+
+.	if !defined(_QMAIL_SLAVEPORT_OKAY)
+IGNORE=	"Invalid QMAIL_SLAVEPORT value. Only one can be set, valid values are: ${_QMAIL_VALID_SLAVEPORTS}"
+.	endif
+.endif
+
+.if defined(QMAIL_SLAVEPORT)
+QMAIL_DEPENDS=	${QMAIL_PREFIX}/bin/qmail-send:${PORTSDIR}/mail/qmail-${QMAIL_SLAVEPORT:L}
+.else
+QMAIL_DEPENDS=	${QMAIL_PREFIX}/bin/qmail-send:${PORTSDIR}/mail/qmail
+.endif
+
+.if defined(USE_QMAIL) || defined(USE_QMAIL_RUN)
+RUN_DEPENDS+=	${QMAIL_DEPENDS}
+.endif
+
+.if defined(USE_QMAIL) || defined(USE_QMAIL_BUILD)
+BUILD_DEPENDS+=	${QMAIL_DEPENDS}
+.endif
+
+.endif
+
+## End QMAIL Stuff
+
+.endif
Index: Mk/bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.518
diff -u -r1.518 bsd.port.mk
--- Mk/bsd.port.mk	8 Nov 2005 09:02:51 -0000	1.518
+++ Mk/bsd.port.mk	18 Dec 2005 09:53:50 -0000
@@ -115,6 +115,9 @@
 #				  subdirectory from FreeBSD mirror sites.
 # ALLFILES		- All of ${DISTFILES} and ${PATCHFILES}.
 # IGNOREFILES	- If set, don't perform checksum checks on these files.
+# NOFETCHFILES	- If set, don't download these files from the ${MASTER_SITES}
+#				  or ${MASTER_SITE_BACKUP} (but do from
+#				  ${MASTER_SITE_OVERRIDE})
 # EXTRACT_ONLY	- If set, a subset of ${DISTFILES} you want to
 #				  actually extract.
 #
@@ -250,6 +253,18 @@
 #				  package depends on.  "lib" is the name of a shared library.
 #				  make will use "ldconfig -r" to search for the library.
 #				  lib can contain extended regular expressions.
+# PERL_BUILD_DEPENDS
+#				- A list of "module:dir" tuples of Perl modules this
+#				  package depends to build. "module" is the name of the Perl
+#				  module which should be "use"d. make will use
+#				  "perl -e 'use module'" to check if the module is
+#				  available.
+# PERL_RUN_DEPENDS
+#				- A list of "module:dir" tuples of Perl modules this
+#				  package depends to run. "module" is the name of the Perl
+#				  module which should be "use"d. make will use
+#				  "perl -e 'use module'" to check if the module is
+#				  available.
 # DEPENDS		- A list of "dir[:target]" tuples of other ports this
 #				  package depends on being made first.  Use this only for
 #				  things that don't fall into the above four categories.
@@ -276,6 +291,9 @@
 #				  compression.
 # USE_ZIP		- If set, this port distfile uses zip, not tar w/[bg]zip
 #				  for compression.
+# USE_DOS2UNIX  - If set to "YES", remove the ^M from all files
+#				  under ${WRKSRC}. If set to a string, remove in all
+#				  files under ${WRKSRC} with one of these names the ^Ms.
 # USE_GCC		- If set, this port requires this version of gcc, either in
 #				  the system or installed from a port.
 # USE_GMAKE		- If set, this port uses gmake.
@@ -373,13 +391,12 @@
 # USE_FAM		- If set, this port uses the File Alteration Monitor.
 #
 # WANT_FAM_SYSTEM
-# 				- Legal values are: fam (default), gamin
+# 				- Legal values are: gamin (default),fam
 # 				  If set to an unknown value, the port is marked BROKEN.
 ##
 # USE_AUTOTOOLS	- If set, this port uses various GNU autotools
 #				  (libtool, autoconf, autoheader, automake et al.)
 #				  See bsd.autotools.mk for more details.
-#				  XXX: not currently in active use - this is a placeholder.
 ##
 # USE_JAVA		- If set, this port relies on the Java language.
 #				  Implies inclusion of bsd.java.mk.  (Also see
@@ -422,7 +439,16 @@
 #				  or a sound server which supports the FreeBSD native one),
 #				  use the default or the X11 prefix if it's a leaf port
 #				  (e.g. a game or program).
-#				  Implies NO_MTREE=yes.
+#				  Implies NO_MTREE=yes, and, if INSTALLS_SHLIB is defined:
+#				    - USE_LINUX=yes
+#				    - appropriate invocation of the Linux ldconfig
+# USE_LINUX_RPM	- Set to yes to pull in variables and targets useful to Linux
+#				  RPM ports.
+#				  Implies inclusion of bsd.linux-rpm.mk.
+# AUTOMATIC_PLIST
+#				- Set to yes to enable automatic packing list generation.
+#				  Currently has no effect unless USE_LINUX_RPM is set.
+#
 # OVERRIDE_LINUX_BASE_PORT	- This specifies the default linux base to use, for valid values
 #				  have a look at the description of USE_LINUX. This is an user-only
 #				  variable. Don't use it in any port, it's meant to be used in
@@ -813,6 +839,9 @@
 #				- If set, bsd.port.mk will automatically run ldconfig commands
 #				  from post-install and also add appropriate @exec/@unexec
 #				  directives to directories listed in LDCONFIG_DIRS.
+#				  If USE_LINUX_PREFIX is defined, the Linux version of ldconfig
+#				  will be used instead of the native FreeBSD version (in such
+#				  case, LDCONFIG_DIRS is ignored).
 # LDCONFIG_DIRS	- List of directories to run ldconfig if INSTALLS_SHLIB is set.
 #				  Note that this is passed through sed just like the
 #				  rest of PLIST, so ${PLIST_SUB} substitutions also
@@ -1022,12 +1051,7 @@
 TR?=		/usr/bin/tr
 TRUE?=		true				# Shell builtin
 UNAME?=		/usr/bin/uname
-.if exists(/usr/bin/unzip)
-UNZIP_CMD?=	/usr/bin/unzip
-.else
 UNZIP_CMD?=	${LOCALBASE}/bin/unzip
-ZIPDEPENDS=	yes
-.endif
 WHICH?=		/usr/bin/which
 XARGS?=		/usr/bin/xargs
 YACC?=		/usr/bin/yacc
@@ -1063,11 +1087,7 @@
 
 # Get __FreeBSD_version
 .if !defined(OSVERSION)
-.if exists(/sbin/sysctl)
 OSVERSION!=	/sbin/sysctl -n kern.osreldate
-.else
-OSVERSION!=	/usr/sbin/sysctl -n kern.osreldate
-.endif
 .endif
 
 # Get the object format.
@@ -1171,7 +1191,7 @@
 
 .if defined(PORTVERSION)
 .if ${PORTVERSION:M*[-_,]*}x != x
-BROKEN=			"PORTVERSION ${PORTVERSION} may not contain '-' '_' or ','"
+BROKEN=			PORTVERSION ${PORTVERSION} may not contain '-' '_' or ','
 .endif
 DISTVERSION?=	${PORTVERSION:S/:/::/g}
 .elif defined(DISTVERSION)
@@ -1209,6 +1229,11 @@
 .else
 INDEXFILE?=		INDEX
 .endif
+
+.if defined(USE_LINUX_RPM)
+.include "${PORTSDIR}/Mk/bsd.linux-rpm.mk"
+.endif
+
 .if defined(USE_BZIP2)
 EXTRACT_SUFX?=			.tar.bz2
 .elif defined(USE_ZIP)
@@ -1248,6 +1273,16 @@
 PREFIX?=		${LOCALBASE}
 .endif
 
+.if defined(USE_LINUX_PREFIX)
+LDCONFIG_CMD?=				${LINUXBASE}/sbin/ldconfig
+LDCONFIG_PLIST_EXEC_CMD?=	${LDCONFIG_CMD}
+LDCONFIG_PLIST_UNEXEC_CMD?=	${LDCONFIG_CMD}
+.else
+LDCONFIG_CMD?=				${LDCONFIG} -m ${LDCONFIG_RUNLIST}
+LDCONFIG_PLIST_EXEC_CMD?=	${LDCONFIG} -m ${LDCONFIG_PLIST}
+LDCONFIG_PLIST_UNEXEC_CMD?=	${LDCONFIG} -R
+.endif
+
 PKGCOMPATDIR?=		${LOCALBASE}/lib/compat/pkg
 
 .if ${OSVERSION} >= 500036
@@ -1307,10 +1342,6 @@
 PERL=		${LOCALBASE}/bin/perl
 .endif
 
-# XXX: (not yet): .if defined(USE_AUTOTOOLS)
-# .include "${PORTSDIR}/Mk/bsd.autotools.mk"
-# XXX: (not yet): .endif
-
 .if defined(USE_OPENSSL)
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 .endif
@@ -1363,6 +1394,10 @@
 .include "${PORTSDIR}/Mk/bsd.sdl.mk"
 .endif
 
+.if defined(USE_QMAIL) || defined(USE_QMAIL_RUN) || defined(USE_QMAIL_BUILD) || defined(WANT_QMAIL)
+.include "${PORTSDIR}/Mk/bsd.mail.mk"
+.endif
+
 .if ${OSVERSION} >= 502123
 X_WINDOW_SYSTEM ?= xorg
 .elif (${OSVERSION} >= 450005 && !defined(XFREE86_VERSION)) || \
@@ -1377,8 +1412,6 @@
 
 WANT_OPENLDAP_VER?=	22
 
-WANT_FAM_SYSTEM?=	fam
-
 # Owner and group of the WWW user
 WWWOWN?=	www
 WWWGRP?=	www
@@ -1413,6 +1446,9 @@
 SUB_LIST+=	PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}	\
 			DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR}
 
+PLIST_REINPLACE+=	dirrmtry
+PLIST_REINPLACE_DIRRMTRY=s!^@dirrmtry \(.*\)!@unexec rmdir %D/\1 2>/dev/null || true!
+
 .if defined(WITHOUT_CPU_CFLAGS)
 .if defined(_CPUCFLAGS)
 .if !empty(_CPUCFLAGS)
@@ -1454,7 +1490,7 @@
 .if ${PATCHFILES:M*.bz2}x != x && defined(BZIP2DEPENDS)
 PATCH_DEPENDS+=		bzip2:${PORTSDIR}/archivers/bzip2
 .endif
-.if ${PATCHFILES:M*.zip}x != x && defined(ZIPDEPENDS)
+.if ${PATCHFILES:M*.zip}x != x
 PATCH_DEPENDS+=		unzip:${PORTSDIR}/archivers/unzip
 .endif
 .endif
@@ -1462,7 +1498,7 @@
 .if defined(USE_BZIP2) && defined(BZIP2DEPENDS)
 EXTRACT_DEPENDS+=	bzip2:${PORTSDIR}/archivers/bzip2
 .endif
-.if defined(USE_ZIP) && defined(ZIPDEPENDS)
+.if defined(USE_ZIP)
 EXTRACT_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 .endif
 .if defined(USE_GMAKE)
@@ -1470,6 +1506,10 @@
 CONFIGURE_ENV+=	MAKE=${GMAKE}
 .endif
 
+.if defined(USE_DOS2UNIX)
+USE_REINPLACE=	yes
+.endif
+
 .if defined(USE_GCC)
 .include "${PORTSDIR}/Mk/bsd.gcc.mk"
 .endif
@@ -1490,19 +1530,33 @@
 .elif ${WANT_OPENLDAP_VER} == 23
 LIB_DEPENDS+=		ldap-2.3.1:${PORTSDIR}/net/openldap23${_OPENLDAP_FLAVOUR}-client
 .else
-BROKEN=				"unknown OpenLDAP version: ${WANT_OPENLDAP_VER}"
+BROKEN=				unknown OpenLDAP version: ${WANT_OPENLDAP_VER}
 .endif
 .endif
 
 .if defined(USE_FAM)
-.if ${WANT_FAM_SYSTEM} == fam
-LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/fam
-.elif ${WANT_FAM_SYSTEM} == gamin
-LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/gamin
-.else
-BROKEN=			"unknown FAM system: ${WANT_FAM_SYSTEM}"
+DEFAULT_FAM_SYSTEM=	gamin
+# Currently supported FAM systems
+FAM_SYSTEM_FAM=		fam.0:${PORTSDIR}/devel/fam
+FAM_SYSTEM_GAMIN=	fam.0:${PORTSDIR}/devel/gamin
+
+.if defined(WANT_FAM_SYSTEM)
+.if defined(WITH_FAM_SYSTEM) && ${WITH_FAM_SYSTEM}!=${WANT_FAM_SYSTEM}
+BROKEN=	The port wants to use ${WANT_FAM_SYSTEM} as its FAM system and you wish to use ${WITH_FAM_SYSTEM}
 .endif
+FAM_SYSTEM=	${WANT_FAM_SYSTEM}
+.elif defined(WITH_FAM_SYSTEM)
+FAM_SYSTEM=	${WITH_FAM_SYSTEM}
+.else
+FAM_SYSTEM=	${DEFAULT_FAM_SYSTEM}
+.endif # WANT_FAM_SYSTEM
+
+.if defined(FAM_SYSTEM_${FAM_SYSTEM:U})
+LIB_DEPENDS+=	${FAM_SYSTEM_${FAM_SYSTEM:U}}
+.else
+BROKEN=			unknown FAM system: ${FAM_SYSTEM}
 .endif
+.endif # USE_FAM
 
 .if defined(USE_GETOPT_LONG)
 .if ${OSVERSION} < 500041
@@ -1541,6 +1595,11 @@
 .	endif
 .endif
 
+.if defined(USE_LINUX_PREFIX) && defined(INSTALLS_SHLIB)
+# we need ${LINUXBASE}/sbin/ldconfig
+USE_LINUX?=	yes
+.endif
+
 .if defined(USE_LINUX)
 
 # install(1) also does a brandelf on strip, so don't strip with FreeBSD tools.
@@ -1715,7 +1774,10 @@
 
 .if defined(PERL_CONFIGURE)
 USE_PERL5=	yes
-USE_REINPLACE=yes
+.endif
+
+.if defined(PERL_RUN_DEPENDS) || defined(PERL_BUILD_DEPENDS)
+USE_PERL5_BUILD=	yes
 .endif
 
 .if ${PERL_LEVEL} >= 500600
@@ -1729,13 +1791,9 @@
 .endif
 .endif
 
-# XXX: (not yet): .if defined(USE_AUTOTOOLS)
-.include "${PORTSDIR}/Mk/bsd.autotools.mk"
-# XXX: (not yet): .endif
-
 .if defined(USE_MYSQL) || defined(WANT_MYSQL_VER) || \
 	defined(USE_PGSQL) || defined(WANT_PGSQL_VER) || \
-	defined(USE_BDB) || defined(USE_SQLITE) 
+	defined(USE_BDB) || defined(USE_SQLITE)
 .include "${PORTSDIR}/Mk/bsd.database.mk"
 .endif
 
@@ -1763,6 +1821,14 @@
 .include "${PORTSDIR}/Mk/bsd.apache.mk"
 .endif
 
+# XXX: (not yet): .if defined(USE_AUTOTOOLS)
+.include "${PORTSDIR}/Mk/bsd.autotools.mk"
+# XXX: (not yet): .endif
+
+.if defined(USE_LINUX_RPM)
+.include "${PORTSDIR}/Mk/bsd.linux-rpm.mk"
+.endif
+
 .if exists(${PORTSDIR}/../Makefile.inc)
 .include "${PORTSDIR}/../Makefile.inc"
 USE_SUBMAKE=	yes
@@ -1812,11 +1878,9 @@
 RUN_DEPENDS+=	gs:${PORTSDIR}/${GHOSTSCRIPT_PORT}
 .endif
 
-# Special macro for doing in-place file editing using regexps
-.if defined(USE_REINPLACE)
+# Macro for doing in-place file editing using regexps
 REINPLACE_ARGS?=	-i.bak
 REINPLACE_CMD?=	${SED} ${REINPLACE_ARGS}
-.endif
 
 # Names of cookies used to skip already completed stages
 EXTRACT_COOKIE?=	${WRKDIR}/.extract_done.${PKGNAME}.${PREFIX:S/\//_/g}
@@ -1838,10 +1902,6 @@
 XMKMF?=			xmkmf -a
 .if exists(/sbin/md5)
 MD5?=			/sbin/md5
-.elif exists(/bin/md5)
-MD5?=			/bin/md5
-.elif exists(/usr/bin/md5)
-MD5?=			/usr/bin/md5
 .else
 MD5?=			md5
 .endif
@@ -1930,11 +1990,7 @@
 PATCH_DIST_ARGS+=	--suffix .orig
 .endif
 
-.if exists(/bin/tar)
-TAR?=	/bin/tar
-.else
 TAR?=	/usr/bin/tar
-.endif
 
 # EXTRACT_SUFX is defined in .pre.mk section
 .if defined(USE_ZIP)
@@ -2320,6 +2376,8 @@
 .endif
 .endfor
 
+NOFETCHFILES?=
+
 # Organize DISTFILES, PATCHFILES, _MASTER_SITES_ALL, _PATCH_SITES_ALL
 # according to grouping rules (:something)
 DISTFILES?=		${DISTNAME}${EXTRACT_SUFX}
@@ -2514,12 +2572,12 @@
 VALID_CATEGORIES+= accessibility afterstep arabic archivers astro audio \
 	benchmarks biology cad chinese comms converters databases \
 	deskutils devel dns editors elisp emulators finance french ftp \
-	games german gnome graphics haskell hebrew hungarian \
+	games geography german gnome graphics hamradio haskell hebrew hungarian \
 	ipv6 irc japanese java kde korean lang linux lisp \
 	mail math mbone misc multimedia net net-im net-mgmt news \
-	offix palm parallel pear perl5 picobsd plan9 polish portuguese print \
-	python ruby russian \
-	scheme science security shells sysutils \
+	palm parallel pear perl5 picobsd plan9 polish portuguese print \
+	python ruby rubygem russian \
+	scheme science security shells spanish sysutils \
 	tcl80 tcl81 tcl82 tcl83 tcl84 textproc \
 	tk80 tk82 tk83 tk84 tkstep80 \
 	ukrainian vietnamese windowmaker www \
@@ -2579,11 +2637,7 @@
 .if defined(GNU_CONFIGURE)
 # Maximum command line length
 .if !defined(CONFIGURE_MAX_CMD_LEN)
-.if exists(/sbin/sysctl)
 CONFIGURE_MAX_CMD_LEN!=	/sbin/sysctl -n kern.argmax
-.else
-CONFIGURE_MAX_CMD_LEN!=	/usr/sbin/sysctl -n kern.argmax
-.endif
 .endif
 CONFIGURE_ARGS+=	--prefix=${PREFIX} ${CONFIGURE_TARGET}
 CONFIGURE_ENV+=		lt_cv_sys_max_cmd_len=${CONFIGURE_MAX_CMD_LEN}
@@ -2740,8 +2794,6 @@
 # Don't build a port if it's restricted and we don't want to get
 # into that.
 #
-# Don't build a port on an ELF machine if it's broken for ELF.
-#
 # Don't build a port if it's broken, unless we're running a parallel
 # build (in case it's fixed).
 #
@@ -2770,32 +2822,32 @@
 
 .if !defined(__ARCH_OK)
 .if defined(ONLY_FOR_ARCHS)
-IGNORE=		"is only for ${ONLY_FOR_ARCHS},"
+IGNORE=		is only for ${ONLY_FOR_ARCHS},
 .else # defined(NOT_FOR_ARCHS)
-IGNORE=		"does not run on ${NOT_FOR_ARCHS},"
+IGNORE=		does not run on ${NOT_FOR_ARCHS},
 .endif
-IGNORE+=	"and you are running ${ARCH}"
+IGNORE+=	and you are running ${ARCH}
 .endif
 
 .if !defined(NO_IGNORE)
 .if (defined(IS_INTERACTIVE) && defined(BATCH))
-IGNORE=	"is an interactive port"
+IGNORE=	is an interactive port
 .elif (!defined(IS_INTERACTIVE) && defined(INTERACTIVE))
-IGNORE=	"is not an interactive port"
+IGNORE=	is not an interactive port
 .elif (defined(NO_CDROM) && defined(FOR_CDROM))
-IGNORE=	"may not be placed on a CDROM: ${NO_CDROM}"
+IGNORE=	may not be placed on a CDROM: ${NO_CDROM}
 .elif (defined(RESTRICTED) && defined(NO_RESTRICTED))
-IGNORE=	"is restricted: ${RESTRICTED}"
+IGNORE=	is restricted: ${RESTRICTED}
 .elif defined(BROKEN)
 .if !defined(TRYBROKEN)
-IGNORE=	"is marked as broken: ${BROKEN}"
+IGNORE=	is marked as broken: ${BROKEN}
 .endif
 .elif defined(FORBIDDEN)
-IGNORE=	"is forbidden: ${FORBIDDEN}"
+IGNORE=	is forbidden: ${FORBIDDEN}
 .endif
 
 .if (defined(MANUAL_PACKAGE_BUILD) && defined(PACKAGE_BUILDING) && !defined(PARALLEL_PACKAGE_BUILD))
-IGNORE=	"has to be built manually: ${MANUAL_PACKAGE_BUILD}"
+IGNORE=	has to be built manually: ${MANUAL_PACKAGE_BUILD}
 clean:
 	@${IGNORECMD}
 .endif
@@ -2804,15 +2856,17 @@
 .if defined(IGNORE_SILENT)
 IGNORECMD=	${DO_NADA}
 .else
-IGNORECMD=	${ECHO_MSG} "===>  ${PKGNAME} ${IGNORE}."
+IGNORECMD=	${ECHO_MSG} "===>  ${PKGNAME} "${IGNORE:Q}.
 .endif
 
 .for target in check-sanity fetch checksum extract patch configure all build install reinstall package
+.if !target(${target})
 ${target}:
 	@${IGNORECMD}
 .if defined(INSTALLS_DEPENDS)
 	@${FALSE}
 .endif
+.endif
 .endfor
 
 .endif
@@ -2927,7 +2981,7 @@
 .if defined(IGNORE_SILENT)
 	@${DO_NADA}
 .else
-	@${ECHO_MSG} "===>  ${PKGNAME} may not be packaged: ${NO_PACKAGE}."
+	@${ECHO_MSG} "===>  ${PKGNAME} may not be packaged: "${NO_PACKAGE:Q}.
 .endif
 .endif
 
@@ -2984,7 +3038,7 @@
 	@${ECHO_MSG}
 	@${ECHO_MSG} "This port is deprecated; you may wish to reconsider installing it:"
 	@${ECHO_MSG}
-	@${ECHO_MSG} "${DEPRECATED}."
+	@${ECHO_MSG} ${DEPRECATED:Q}.
 	@${ECHO_MSG}
 .if defined(EXPIRATION_DATE)
 	@${ECHO_MSG} "It is scheduled to be removed on or after ${EXPIRATION_DATE}."
@@ -3174,9 +3228,27 @@
 
 # Patch
 
+.if !target(patch-dos2unix)
+patch-dos2unix:
+.if defined(USE_DOS2UNIX)
+.if ${USE_DOS2UNIX:U}=="YES"
+	@${ECHO_MSG} "===>   Converting DOS text files to UNIX text files"
+	@${FIND} -E ${WRKSRC} -type f -print0 | \
+			${XARGS} -0 ${REINPLACE_CMD} -i"" -e 's/[[:cntrl:]]*$$//'
+.else
+.for f in ${USE_DOS2UNIX}
+	@${ECHO_MSG} "===>   Converting DOS text file to UNIX text file: ${f}"
+	@${REINPLACE_CMD} -i"" -e 's/[[:cntrl:]]*$$//' ${WRKSRC}/${f}
+.endfor
+.else
+	${DO_NADA}
+.endif
+.endif
+
 .if !target(do-patch)
 do-patch:
 .if defined(PATCHFILES)
+.endif
 	@${ECHO_MSG} "===>  Applying distribution patches for ${PKGNAME}"
 	@(cd ${_DISTDIR}; \
 	  for i in ${_PATCHFILES}; do \
@@ -3519,10 +3591,10 @@
 .if defined(INSTALLS_SHLIB)
 .if !defined(INSTALL_AS_USER)
 	@${ECHO_MSG} "===>   Running ldconfig"
-	${LDCONFIG} -m ${LDCONFIG_RUNLIST}
+	${LDCONFIG_CMD}
 .else
 	@${ECHO_MSG} "===>   Running ldconfig (errors are ignored)"
-	-${LDCONFIG} -m ${LDCONFIG_RUNLIST}
+	-${LDCONFIG_CMD}
 .endif
 .else
 	@${DO_NADA}
@@ -3676,9 +3748,9 @@
 # Please note that the order of the following targets is important, and
 # should not be modified.
 
-_SANITY_SEQ=		pre-everything check-makefile check-categories \
-			check-makevars check-depends check-deprecated \
-			check-vulnerable buildanyway-message options-message
+_SANITY_SEQ=	pre-everything check-makefile check-categories \
+				check-makevars check-depends check-deprecated \
+				check-vulnerable buildanyway-message options-message
 _FETCH_DEP=		check-sanity
 _FETCH_SEQ=		fetch-depends pre-fetch pre-fetch-script \
 				do-fetch post-fetch post-fetch-script
@@ -3687,19 +3759,20 @@
 				pre-extract-script do-extract \
 				post-extract post-extract-script
 _PATCH_DEP=		extract
-_PATCH_SEQ=		patch-message patch-depends pre-patch pre-patch-script \
-				do-patch post-patch post-patch-script
+_PATCH_SEQ=		patch-message patch-depends patch-dos2unix pre-patch \
+				pre-patch-script do-patch post-patch post-patch-script
 _CONFIGURE_DEP=	patch
-_CONFIGURE_SEQ=	build-depends lib-depends misc-depends configure-message \
-		pre-configure pre-configure-script patch-autotools \
-		run-autotools do-configure post-configure post-configure-script
+_CONFIGURE_SEQ=	build-depends lib-depends perl-build-depends misc-depends \
+				configure-message pre-configure pre-configure-script \
+				run-autotools do-configure post-configure post-configure-script
 _BUILD_DEP=		configure
 _BUILD_SEQ=		build-message pre-build pre-build-script do-build \
 				post-build post-build-script
 _INSTALL_DEP=	build
 _INSTALL_SEQ=	install-message check-conflicts \
-			    run-depends lib-depends apply-slist pre-install \
-				pre-install-script generate-plist check-already-installed
+			    run-depends lib-depends perl-run-depends apply-slist \
+				pre-install pre-install-script generate-plist \
+				check-already-installed
 _INSTALL_SUSEQ= check-umask install-mtree pre-su-install \
 				pre-su-install-script do-install install-desktop-entries \
 				post-install post-install-script add-plist-info \
@@ -4013,6 +4086,11 @@
 				SORTED_MASTER_SITES_CMD_TMP="${SORTED_MASTER_SITES_DEFAULT_CMD}" ; \
 			fi ; \
 			for site in `eval $$SORTED_MASTER_SITES_CMD_TMP ${_RANDOMIZE_SITES}`; do \
+				if [ ! -z "`${ECHO_CMD} ${NOFETCHFILES} | ${GREP} -w $${file}`" ]; then \
+					if [ -z "`${ECHO_CMD} ${MASTER_SITE_OVERRIDE} | ${GREP} -w $${site}`" ]; then \
+						continue; \
+					fi; \
+				fi; \
 				DIR=${DIST_SUBDIR}; \
 				CKSIZE=`${GREP} "^SIZE ($${DIR:+$$DIR/}$$file)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \
 				case $${file} in \
@@ -4285,7 +4363,7 @@
 ################################################################
 
 .if !target(depends)
-depends: extract-depends patch-depends lib-depends misc-depends fetch-depends build-depends run-depends
+depends: extract-depends patch-depends lib-depends perl-build-depends perl-run-depends misc-depends fetch-depends build-depends run-depends
 
 .if defined(ALWAYS_BUILD_DEPENDS)
 _DEPEND_ALWAYS=	1
@@ -4293,6 +4371,21 @@
 _DEPEND_ALWAYS=	0
 .endif
 
+_INSTALL_DEPENDS=	\
+		if [ X${USE_PACKAGE_DEPENDS} != "X" ]; then \
+			subpkgfile=`(cd $$dir; ${MAKE} $$depends_args -V PKGFILE)`; \
+			if [ -r "$${subpkgfile}" -a "$$target" = "${DEPENDS_TARGET}" ]; then \
+				${ECHO_MSG} "===>   Installing existing package $${subpkgfile}"; \
+				${PKG_ADD} $${subpkgfile}; \
+			else \
+			  (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \
+			fi; \
+		else \
+			(cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \
+		fi ; \
+		${ECHO_MSG} "===>   Returning to build of ${PKGNAME}"; \
+
+
 .for deptype in EXTRACT PATCH FETCH BUILD RUN
 ${deptype:L}-depends:
 .if defined(${deptype}_DEPENDS)
@@ -4361,18 +4454,7 @@
 			if [ ! -d "$$dir" ]; then \
 				${ECHO_MSG} "     => No directory for $$prog.  Skipping.."; \
 			else \
-				if [ X${USE_PACKAGE_DEPENDS} != "X" ]; then \
-					subpkgfile=`(cd $$dir; ${MAKE} $$depends_args -V PKGFILE)`; \
-					if [ -r "$${subpkgfile}" -a "$$target" = "${DEPENDS_TARGET}" ]; then \
-						${ECHO_MSG} "===>   Installing existing package $${subpkgfile}"; \
-						${PKG_ADD} $${subpkgfile}; \
-					else \
-					  (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \
-					fi; \
-				else \
-					(cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \
-				fi ; \
-				${ECHO_MSG} "===>   Returning to build of ${PKGNAME}"; \
+				${_INSTALL_DEPENDS} \
 			fi; \
 		fi; \
 	done
@@ -4417,18 +4499,7 @@
 			if [ ! -d "$$dir" ]; then \
 				${ECHO_MSG} "     => No directory for $$lib.  Skipping.."; \
 			else \
-				if [ X${USE_PACKAGE_DEPENDS} != "X" ]; then \
-					subpkgfile=`(cd $$dir; ${MAKE} $$depends_args -V PKGFILE)`; \
-					if [ -r "$${subpkgfile}" -a "$$target" = "${DEPENDS_TARGET}" ]; then \
-						${ECHO_MSG} "===>   Installing existing package $${subpkgfile}"; \
-						${PKG_ADD} $${subpkgfile}; \
-					else \
-					  (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \
-					fi; \
-				else \
-					(cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \
-				fi ; \
-				${ECHO_MSG} "===>   Returning to build of ${PKGNAME}"; \
+				${_INSTALL_DEPENDS} \
 				if ! ${LDCONFIG} -r | ${GREP} -vwF -e "${PKGCOMPATDIR}" | ${GREP} -qwE -e "-l$$pattern"; then \
 					${ECHO_MSG} "Error: shared library \"$$lib\" does not exist"; \
 					${FALSE}; \
@@ -4438,6 +4509,35 @@
 	done
 .endif
 
+.for deptype in BUILD RUN
+perl-${deptype:L}-depends:
+.if defined(PERL_${deptype}_DEPENDS)
+	@for tupple in ${PERL_${deptype}_DEPENDS}; do \
+		mod=$${tupple%:*}; \
+		mod=`${ECHO_CMD} $${mod} | sed -e 's/\-/::/g'`; \
+		dir=$${tupple##*:}; \
+		${ECHO_MSG} -n "===>   ${PKGNAME} depends on Perl module: $$mod"; \
+		if ${PERL} -M$${mod} -e 1 2>/dev/null; then \
+			${ECHO_MSG} " - found"; \
+		else \
+			${ECHO_MSG} " - not found"; \
+			${ECHO_MSG} "===>    Verifying install for $$mod in $$dir"; \
+			if [ ! -d "$$dir" ]; then \
+				${ECHO_MSG} "     => No directory for $$mod.  Skipping.."; \
+			else \
+				${_INSTALL_DEPENDS} \
+				if ! ${PERL} -M$${mod} -e 1 2>/dev/null; then \
+					${ECHO_MSG} "Error: Perl module \"$${mod}\" does not exist"; \
+					${FALSE}; \
+				fi; \
+			fi; \
+		fi; \
+    done
+.else
+	@${DO_NADA}
+.endif
+.endfor
+
 misc-depends:
 .if defined(DEPENDS)
 .if !defined(NO_DEPENDS)
@@ -4467,25 +4567,42 @@
 
 # Dependency lists: both build and runtime, recursive.  Print out directory names.
 
+_UNIFIED_DEPENDS=${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS} ${RUN_DEPENDS} ${PERL_BUILD_DEPENDS} ${PERL_RUN_DEPENDS}
+_DEPEND_DIRS=	${_UNIFIED_DEPENDS:C,^[^:]*:([^:]*),\1,} ${DEPENDS:C,:.*,,}
+
 all-depends-list:
-.if defined(EXTRACT_DEPENDS) || defined(PATCH_DEPENDS) || defined(FETCH_DEPENDS) || defined(BUILD_DEPENDS) || defined(LIB_DEPENDS) || defined(RUN_DEPENDS) || defined(DEPENDS)
 	@${ALL-DEPENDS-LIST}
-.endif
 
 ALL-DEPENDS-LIST= \
-	checked="${PARENT_CHECKED}"; \
-	for dir in $$(${ECHO_CMD} "${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS} ${RUN_DEPENDS}" | ${SED} -e 'y/ /\n/' | ${CUT} -f 2 -d ':') $$(${ECHO_CMD} ${DEPENDS} | ${SED} -e 'y/ /\n/' | ${CUT} -f 1 -d ':'); do \
-		if [ -d $$dir ]; then \
-			if (${ECHO_CMD} $$checked | ${GREP} -qwv "$$dir"); then \
-				child=$$(cd $$dir; ${MAKE} PARENT_CHECKED="$$checked" all-depends-list); \
-				for d in $$child; do ${ECHO_CMD} $$d; done; \
-				${ECHO_CMD} $$dir; \
-				checked="$$dir $$child $$checked"; \
-			fi; \
-		else \
-			${ECHO_MSG} "${PKGNAME}: \"$$dir\" non-existent -- dependency list incomplete" >&2; \
-		fi; \
-	done | ${SORT} -u
+	L="${_DEPEND_DIRS}";						\
+	checked="";							\
+	while [ -n "$$L" ]; do						\
+		l="";							\
+		for d in $$L; do					\
+			case $$checked in				\
+			$$d\ *|*\ $$d\ *|*\ $$d)			\
+				continue;;				\
+			esac;						\
+			checked="$$checked $$d";			\
+			if [ ! -d $$d ]; then				\
+				${ECHO_MSG} "${PKGNAME}: \"$$d\" non-existent -- dependency list incomplete" >&2; \
+				continue;				\
+			fi;						\
+			${ECHO_CMD} $$d;				\
+			if ! children=$$(${MAKE} -C $$d -V _DEPEND_DIRS); then\
+				${ECHO_MSG} "${PKGNAME}: \"$$d\" erroneous -- dependency list incomplete" >&2; \
+				continue;				\
+			fi;						\
+			for child in $$children; do			\
+				case "$$checked $$l" in			\
+				$$child\ *|*\ $$child\ *|*\ $$child)	\
+					continue;;			\
+				esac;					\
+				l="$$l $$child";			\
+			done;						\
+		done;							\
+		L=$$l;							\
+	done
 
 .if !target(clean-depends)
 clean-depends:
@@ -4519,7 +4636,7 @@
 .if !target(fetch-required)
 fetch-required: fetch
 	@${ECHO_MSG} "===> Fetching all required distfiles for ${PKGNAME} and dependencies"
-.for deptype in EXTRACT PATCH FETCH BUILD RUN
+.for deptype in EXTRACT PATCH FETCH BUILD RUN PERL_BUILD PERL_RUN
 .if defined(${deptype}_DEPENDS)
 .if !defined(NO_DEPENDS)
 	@for i in ${${deptype}_DEPENDS}; do \
@@ -4547,7 +4664,7 @@
 
 .if !target(fetch-required-list)
 fetch-required-list: fetch-list
-.for deptype in EXTRACT PATCH FETCH BUILD RUN
+.for deptype in EXTRACT PATCH FETCH BUILD RUN PERL_BUILD PERL_RUN
 .if defined(${deptype}_DEPENDS)
 .if !defined(NO_DEPENDS)
 	@for i in ${${deptype}_DEPENDS}; do \
@@ -4584,12 +4701,12 @@
 # Dependency lists: build and runtime.  Print out directory names.
 
 build-depends-list:
-.if defined(EXTRACT_DEPENDS) || defined(PATCH_DEPENDS) || defined(FETCH_DEPENDS) || defined(BUILD_DEPENDS) || defined(LIB_DEPENDS) || defined(DEPENDS)
+.if defined(EXTRACT_DEPENDS) || defined(PATCH_DEPENDS) || defined(FETCH_DEPENDS) || defined(BUILD_DEPENDS) || defined(LIB_DEPENDS) || defined(DEPENDS) || defined(PERL_BUILD_DEPENDS)
 	@${BUILD-DEPENDS-LIST}
 .endif
 
 BUILD-DEPENDS-LIST= \
-	for dir in $$(${ECHO_CMD} "${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS}" | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//' | ${SORT} -u) $$(${ECHO_CMD} ${DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/:.*//' | ${SORT} -u); do \
+	for dir in $$(${ECHO_CMD} "${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS} ${PERL_BUILD_DEPENDS}" | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//' | ${SORT} -u) $$(${ECHO_CMD} ${DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/:.*//' | ${SORT} -u); do \
 		if [ -d $$dir ]; then \
 			${ECHO_CMD} $$dir; \
 		else \
@@ -4598,12 +4715,12 @@
 	done | ${SORT} -u
 
 run-depends-list:
-.if defined(LIB_DEPENDS) || defined(RUN_DEPENDS) || defined(DEPENDS)
+.if defined(LIB_DEPENDS) || defined(RUN_DEPENDS) || defined(DEPENDS) || defined(PERL_RUN_DEPENDS)
 	@${RUN-DEPENDS-LIST}
 .endif
 
 RUN-DEPENDS-LIST= \
-	for dir in $$(${ECHO_CMD} "${LIB_DEPENDS} ${RUN_DEPENDS}" | ${SED} -e 'y/ /\n/' | ${CUT} -f 2 -d ':' | ${SORT} -u) $$(${ECHO_CMD} ${DEPENDS} | ${SED} -e 'y/ /\n/' | ${CUT} -f 1 -d ':' | ${SORT} -u); do \
+	for dir in $$(${ECHO_CMD} "${LIB_DEPENDS} ${RUN_DEPENDS} ${PERL_RUN_DEPENDS}" | ${SED} -e 'y/ /\n/' | ${CUT} -f 2 -d ':' | ${SORT} -u) $$(${ECHO_CMD} ${DEPENDS} | ${SED} -e 'y/ /\n/' | ${CUT} -f 1 -d ':' | ${SORT} -u); do \
 		if [ -d $$dir ]; then \
 			${ECHO_CMD} $$dir; \
 		else \
@@ -4615,7 +4732,7 @@
 # and package names.
 
 package-depends-list:
-.if defined(CHILD_DEPENDS) || defined(LIB_DEPENDS) || defined(RUN_DEPENDS) || defined(DEPENDS)
+.if defined(CHILD_DEPENDS) || defined(LIB_DEPENDS) || defined(RUN_DEPENDS) || defined(DEPENDS) || defined(PERL_RUN_DEPENDS)
 	@${PACKAGE-DEPENDS-LIST}
 .endif
 
@@ -4634,7 +4751,7 @@
 		done; \
 	fi; \
 	checked="${PARENT_CHECKED}"; \
-	for dir in $$(${ECHO_CMD} "${LIB_DEPENDS} ${RUN_DEPENDS}" | ${SED} -e 'y/ /\n/' | ${CUT} -f 2 -d ':') $$(${ECHO_CMD} ${DEPENDS} | ${SED} -e 'y/ /\n/' | ${CUT} -f 1 -d ':'); do \
+	for dir in $$(${ECHO_CMD} "${LIB_DEPENDS} ${RUN_DEPENDS} ${PERL_RUN_DEPENDS}" | ${SED} -e 'y/ /\n/' | ${CUT} -f 2 -d ':') $$(${ECHO_CMD} ${DEPENDS} | ${SED} -e 'y/ /\n/' | ${CUT} -f 1 -d ':'); do \
 		dir=$$(${REALPATH} $$dir); \
 		if [ -d $$dir ]; then \
 			if (${ECHO_CMD} $$checked | ${GREP} -qwv "$$dir"); then \
@@ -4676,6 +4793,9 @@
 # distribution-name|port-path|installation-prefix|comment| \
 #  description-file|maintainer|categories|extract-depends| \
 #  patch-depends|fetch-depends|build-depends|run-depends|www site
+#
+# If this ever changes, portmgr should contact the portsnap maintainer
+# first to avoid gratuitous breakage.
 
 .if !target(describe)
 describe:
@@ -4699,7 +4819,9 @@
 		@rdirs = map((split /:/)[1], split(q{ }, q{${RUN_DEPENDS}})); \
 		@ddirs = map((split /:/)[0], split(q{ }, q{${DEPENDS}})); \
 		@ldirs = map((split /:/)[1], split(q{ }, q{${LIB_DEPENDS}})); \
-		for my $$i (\@edirs, \@pdirs, \@fdirs, \@bdirs, \@rdirs, \@ddirs, \@ldirs) { \
+		@prdirs = map((split /:/)[1], split(q{ }, q{${PERL_RUN_DEPENDS}})); \
+		@pbdirs = map((split /:/)[1], split(q{ }, q{${PERL_BUILD_DEPENDS}})); \
+		for my $$i (\@edirs, \@pdirs, \@fdirs, \@bdirs, \@rdirs, \@ddirs, \@ldirs, \@prdirs, \@pbdirs) { \
 			my @dirs = @$$i; \
 			@$$i = (); \
 			for (@dirs) { \
@@ -4723,11 +4845,11 @@
 			$$xf{$$_} = 1; \
 		} \
 		print join(q{ }, sort keys %xf), q{|}; \
-		for (@bdirs, @ddirs, @ldirs) { \
+		for (@bdirs, @ddirs, @ldirs, @pbdirs) { \
 			$$xb{$$_} = 1; \
 		} \
 		print join(q{ }, sort keys %xb), q{|}; \
-		for (@rdirs, @ddirs, @ldirs) { \
+		for (@rdirs, @ddirs, @ldirs, @prdirs) { \
 			$$xr{$$_} = 1; \
 		} \
 		print join(q{ }, sort keys %xr), q{|}; \
@@ -4744,7 +4866,7 @@
 
 www-site:
 .if exists(${DESCR})
-	@${GREP} '^WWW:[ 	]' ${DESCR} | ${AWK} '{print $$2}' | ${HEAD} -1
+	@${AWK} '$$1 ~ /^WWW:/ {print $$2}' ${DESCR} | ${HEAD} -1
 .else
 	@${ECHO_CMD}
 .endif
@@ -4784,23 +4906,31 @@
 
 # The following two targets require an up-to-date INDEX in ${PORTSDIR}
 
+_PRETTY_PRINT_DEPENDS_LIST=\
+	if [ ! -r ${PORTSDIR}/${INDEXFILE} ] ; then \
+		${ECHO_CMD} "${.TARGET} requires an INDEX file (${INDEXFILE}). Please run make index or make fetchindex."; \
+	else \
+		${ECHO_CMD} -n 'This port requires package(s) "' ; \
+		${ECHO_CMD} -n `${AWK} -F\| '$$1 ~ /^${PKGNAME}/ {print $$8;}' ${PORTSDIR}/${INDEXFILE}` ; \
+		${ECHO_CMD} '" to ${.TARGET:C/pretty-print-(.*)-depends-list/\1/}.'; \
+	fi;
+
+
 .if !target(pretty-print-build-depends-list)
 pretty-print-build-depends-list:
 .if defined(EXTRACT_DEPENDS) || defined(PATCH_DEPENDS) || \
 	defined(FETCH_DEPENDS) || defined(BUILD_DEPENDS) || \
-	defined(LIB_DEPENDS) || defined(DEPENDS)
-	@${ECHO_CMD} -n 'This port requires package(s) "'
-	@${ECHO_CMD} -n `${GREP} '^${PKGNAME}|' ${PORTSDIR}/${INDEXFILE} | ${AWK} -F\| '{print $$8;}'`
-	@${ECHO_CMD} '" to build.'
+	defined(LIB_DEPENDS) || defined(DEPENDS) || \
+	defined(PERL_BUILD_DEPENDS)
+	@${_PRETTY_PRINT_DEPENDS_LIST}
 .endif
 .endif
 
 .if !target(pretty-print-run-depends-list)
 pretty-print-run-depends-list:
-.if defined(RUN_DEPENDS) || defined(LIB_DEPENDS) || defined(DEPENDS)
-	@${ECHO_CMD} -n 'This port requires package(s) "'
-	@${ECHO_CMD} -n `${GREP} '^${PKGNAME}|' ${PORTSDIR}/${INDEXFILE} | ${AWK} -F\| '{print $$9;}'`
-	@${ECHO_CMD} '" to run.'
+.if defined(RUN_DEPENDS) || defined(LIB_DEPENDS) || \
+	defined(DEPENDS) || defined(PERL_RUN_DEPENDS)
+	@${_PRETTY_PRINT_DEPENDS_LIST}
 .endif
 .endif
 
@@ -4858,15 +4988,21 @@
 	@if [ -f ${PLIST} ]; then \
 		${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${PLIST} >> ${TMPPLIST}; \
 	fi
+.for reinplace in ${PLIST_REINPLACE}
+.if defined(PLIST_REINPLACE_${reinplace})
+	@${SED} -e '${PLIST_REINPLACE_${reinplace:U}}' ${PLIST} >> ${TMPPLIST}
+.endif
+.endfor
+ 
 .for dir in ${PLIST_DIRS}
 	@${ECHO_CMD} ${dir} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} | ${SED} -e 's,^,@dirrm ,' >> ${TMPPLIST}
 .endfor
 .if defined(INSTALLS_SHLIB) && !defined(INSTALL_AS_USER)
-	@${ECHO_CMD} "@exec ${LDCONFIG} -m ${LDCONFIG_PLIST}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${LDCONFIG} -R" >> ${TMPPLIST}
+	@${ECHO_CMD} "@exec ${LDCONFIG_PLIST_EXEC_CMD}" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec ${LDCONFIG_PLIST_UNEXEC_CMD}" >> ${TMPPLIST}
 .elif defined(INSTALLS_SHLIB)
-	@${ECHO_CMD} "@exec ${LDCONFIG} -m ${LDCONFIG_PLIST} || ${TRUE}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${LDCONFIG} -R || ${TRUE}" >> ${TMPPLIST}
+	@${ECHO_CMD} "@exec ${LDCONFIG_PLIST_EXEC_CMD} || ${TRUE}" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec ${LDCONFIG_PLIST_UNEXEC_CMD} || ${TRUE}" >> ${TMPPLIST}
 .endif
 .if !defined(NO_FILTER_SHLIBS)
 .if (${PORTOBJFORMAT} == "aout")
@@ -4952,11 +5088,18 @@
 .if defined(USE_RC_SUBR) && ${USE_RC_SUBR:U} != "YES"
 	@${ECHO_CMD} "===> Installing rcNG startup script(s)"
 	@${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
+.if ${OSVERSION} >= 700007
+	@for i in ${USE_RC_SUBR}; do \
+		${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${PREFIX}/etc/rc.d/$${i%.sh}; \
+		${ECHO_CMD} "etc/rc.d/$${i%.sh}" >> ${TMPPLIST}; \
+	done
+.else
 	@for i in ${USE_RC_SUBR}; do \
 		${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${PREFIX}/etc/rc.d/$${i%.sh}.sh; \
 		${ECHO_CMD} "etc/rc.d/$${i%.sh}.sh" >> ${TMPPLIST}; \
 	done
 .endif
+.endif
 .else
 	@${DO_NADA}
 .endif
Index: Mk/bsd.port.subdir.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.subdir.mk,v
retrieving revision 1.61
diff -u -r1.61 bsd.port.subdir.mk
--- Mk/bsd.port.subdir.mk	8 Nov 2005 09:02:51 -0000	1.61
+++ Mk/bsd.port.subdir.mk	18 Dec 2005 09:14:36 -0000
@@ -265,10 +265,8 @@
 .endif
 COMMENTFILE?=	${.CURDIR}/pkg/COMMENT
 DESCR?=		${.CURDIR}/pkg/DESCR
-.if ${OSVERSION} >= 600000
-INDEXFILE?=	INDEX-6
-.elif ${OSVERSION} >= 500036
-INDEXFILE?=	INDEX-5
+.if ${OSVERSION} >= 500036
+INDEXFILE?=	INDEX-${OSVERSION:C/([0-9]).*/\1/}
 .else
 INDEXFILE?=	INDEX
 .endif
@@ -333,8 +331,11 @@
 PORTSEARCH_XKEYLIM?=0
 PORTSEARCH_IGNORECASE?=1
 
-search: ${PORTSDIR}/${INDEXFILE}
-	@here=${.CURDIR}; \
+_PORTSEARCH=	\
+	here=${.CURDIR}; \
+	if [ ! -r ${PORTSDIR}/${INDEXFILE} ] ; then \
+		echo "The ${.TARGET} target requires ${INDEXFILE}. Please run make index or make fetchindex."; \
+	else \
 	cd ${PORTSDIR}; \
 	if [ -z "$$key"   -a -z "$$xkey"   -a \
 	     -z "$$name"  -a -z "$$xname"  -a \
@@ -346,9 +347,9 @@
 	     -z "$$rdeps" -a -z "$$xrdeps" -a \
 	     -z "$$www"   -a -z "$$xwww"   ]; \
 	then \
-	  echo "The search target requires a keyword parameter or name parameter,"; \
-	  echo "e.g.: \"make search key=somekeyword\""; \
-	  echo "or    \"make search name=somekeyword\""; \
+	  echo "The ${.TARGET} target requires a keyword parameter or name parameter,"; \
+	  echo "e.g.: \"make ${.TARGET} key=somekeyword\""; \
+	  echo "or    \"make ${.TARGET} name=somekeyword\""; \
 	  exit; \
 	fi; \
 	awk -F\| -v there="$$here/" -v top="$$(pwd -P)" \
@@ -365,6 +366,7 @@
 	    -v keylim="$${keylim:-${PORTSEARCH_KEYLIM}}" \
 	    -v xkeylim="$${xkeylim:-${PORTSEARCH_XKEYLIM}}" \
 	    -v display="$${display:-${PORTSEARCH_DISPLAY_FIELDS}}" \
+	    -v xdisplay="$$xdisplay" \
 	'BEGIN { \
             gsub(/\+/,"\\+",name); \
 	    if (substr(there, 1, length(top)) == top) \
@@ -407,6 +409,10 @@
 	    for (i in d) { \
 	      disp[fields[d[i]]] = 1; \
 	    } \
+	    split(xdisplay, xd, /,[ \t]*/); \
+	    for (i in xd) { \
+	      delete disp[fields[xd[i]]]; \
+	    } \
 	  } \
 	  { \
 	    if (substr($$2, 1, therelen) != there) \
@@ -431,4 +437,11 @@
 	      if (i in disp) \
 	        printf("%s:\t%s\n", names[i], $$i); \
 	    print(""); \
-	  }' ${PORTSDIR}/${INDEXFILE}
+	  }' ${PORTSDIR}/${INDEXFILE} ; fi
+
+search:
+	@${_PORTSEARCH}
+
+quicksearch:
+	@export display="name,path,info" ; \
+	${_PORTSEARCH}
Index: astro/sattrack/Makefile
===================================================================
RCS file: /home/ncvs/ports/astro/sattrack/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- astro/sattrack/Makefile	12 Mar 2004 21:03:25 -0000	1.20
+++ astro/sattrack/Makefile	18 Dec 2005 07:59:32 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	sattrack
 PORTVERSION=	3.1.6
-CATEGORIES=	astro
+CATEGORIES=	astro hamradio
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
 
Index: comms/acfax/Makefile
===================================================================
RCS file: /home/ncvs/ports/comms/acfax/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- comms/acfax/Makefile	5 Feb 2004 20:37:00 -0000	1.8
+++ comms/acfax/Makefile	18 Dec 2005 07:59:32 -0000
@@ -8,7 +8,7 @@
 PORTNAME=	acfax
 PORTVERSION=	0.981011
 PORTREVISION=	1
-CATEGORIES=	comms
+CATEGORIES=	comms hamradio
 MASTER_SITES=	ftp://ftp.funet.fi/pub/ham/unix/Linux/misc/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/^0.//}
 
Index: comms/aldo/Makefile
===================================================================
RCS file: /home/ncvs/ports/comms/aldo/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- comms/aldo/Makefile	18 Oct 2005 17:17:56 -0000	1.7
+++ comms/aldo/Makefile	18 Dec 2005 07:59:33 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	aldo
 PORTVERSION=	0.6.11
-CATEGORIES=	comms
+CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
Index: comms/cwdaemon/Makefile
===================================================================
RCS file: /home/ncvs/ports/comms/cwdaemon/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- comms/cwdaemon/Makefile	17 Mar 2005 15:45:39 -0000	1.1
+++ comms/cwdaemon/Makefile	18 Dec 2005 07:59:33 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	cwdaemon
 PORTVERSION=	0.9.2
-CATEGORIES=	comms
+CATEGORIES=	comms hamradio
 MASTER_SITES=	http://pg4i.mattsnetwork.co.uk/download/
 DIST_SUBDIR=	${PORTNAME}
 
Index: comms/echolinux/Makefile
===================================================================
RCS file: /home/ncvs/ports/comms/echolinux/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- comms/echolinux/Makefile	3 Nov 2005 12:33:07 -0000	1.4
+++ comms/echolinux/Makefile	18 Dec 2005 07:59:33 -0000
@@ -8,7 +8,7 @@
 PORTNAME=	echolinux
 PORTVERSION=	0.16a
 PORTREVISION=	2
-CATEGORIES=	comms
+CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	cqinet
 EXTRACT_SUFX=	.tgz
Index: comms/gmfsk/Makefile
===================================================================
RCS file: /home/ncvs/ports/comms/gmfsk/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- comms/gmfsk/Makefile	5 Nov 2005 05:19:57 -0000	1.9
+++ comms/gmfsk/Makefile	18 Dec 2005 07:59:33 -0000
@@ -8,7 +8,7 @@
 PORTNAME=	gmfsk
 PORTVERSION=	0.6
 PORTREVISION=	3
-CATEGORIES=	comms audio
+CATEGORIES=	comms audio hamradio
 MASTER_SITES=	http://gmfsk.connect.fi/
 
 MAINTAINER=	carl@stagecraft.cx
Index: comms/gpredict/Makefile
===================================================================
RCS file: /home/ncvs/ports/comms/gpredict/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- comms/gpredict/Makefile	10 Nov 2005 09:23:23 -0000	1.4
+++ comms/gpredict/Makefile	18 Dec 2005 07:59:33 -0000
@@ -6,7 +6,7 @@
 
 PORTNAME=	gpredict
 PORTVERSION=	0.5.1
-CATEGORIES=	comms
+CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	groundstation
 
Index: comms/gpsk31/Makefile
===================================================================
RCS file: /home/ncvs/ports/comms/gpsk31/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- comms/gpsk31/Makefile	30 May 2005 21:50:00 -0000	1.1
+++ comms/gpsk31/Makefile	18 Dec 2005 07:59:33 -0000
@@ -6,7 +6,7 @@
 
 PORTNAME=	gpsk31
 PORTVERSION=	0.2.4a
-CATEGORIES=	comms
+CATEGORIES=	comms hamradio
 MASTER_SITES=	http://ftp.iasi.roedu.net/mirrors/ftp.1409.org/gpsk31/
 
 MAINTAINER=	xride@x12.dk
Index: comms/grig/Makefile
===================================================================
RCS file: /home/ncvs/ports/comms/grig/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- comms/grig/Makefile	9 Oct 2004 07:51:12 -0000	1.5
+++ comms/grig/Makefile	18 Dec 2005 07:59:33 -0000
@@ -7,7 +7,7 @@
 PORTNAME=	grig
 PORTVERSION=	0.2.2
 PORTREVISION=	3
-CATEGORIES=	comms
+CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	groundstation
 
Index: comms/hamfax/Makefile
===================================================================
RCS file: /home/ncvs/ports/comms/hamfax/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- comms/hamfax/Makefile	30 Oct 2005 09:40:55 -0000	1.9
+++ comms/hamfax/Makefile	18 Dec 2005 07:59:33 -0000
@@ -6,7 +6,7 @@
 
 PORTNAME=	hamfax
 PORTVERSION=	0.6.4
-CATEGORIES=	comms audio
+CATEGORIES=	comms audio hamradio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	hamfax
 DISTNAME=	HamFax-${PORTVERSION}
Index: comms/hamlib/Makefile
===================================================================
RCS file: /home/ncvs/ports/comms/hamlib/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- comms/hamlib/Makefile	27 Nov 2005 04:17:16 -0000	1.9
+++ comms/hamlib/Makefile	18 Dec 2005 07:59:33 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	hamlib
 PORTVERSION=	1.2.2
-CATEGORIES=	comms
+CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}-${PORTVERSION}
Index: comms/klog/Makefile
===================================================================
RCS file: /home/ncvs/ports/comms/klog/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- comms/klog/Makefile	5 Nov 2005 05:20:13 -0000	1.8
+++ comms/klog/Makefile	18 Dec 2005 07:59:33 -0000
@@ -7,7 +7,7 @@
 PORTNAME=	klog
 PORTVERSION=	0.3.2
 PORTREVISION=	1
-CATEGORIES=	comms
+CATEGORIES=	comms hamradio
 MASTER_SITES=	http://download.berlios.de/klog/
 
 MAINTAINER=	az@FreeBSD.org
Index: comms/kpsk/Makefile
===================================================================
RCS file: /home/ncvs/ports/comms/kpsk/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- comms/kpsk/Makefile	5 Nov 2005 05:21:26 -0000	1.10
+++ comms/kpsk/Makefile	18 Dec 2005 07:59:33 -0000
@@ -7,7 +7,7 @@
 PORTNAME=	kpsk
 PORTVERSION=	1.0
 PORTREVISION=	4
-CATEGORIES=	comms kde
+CATEGORIES=	comms kde hamradio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kpsk
 
Index: comms/linrad/Makefile
===================================================================
RCS file: /home/ncvs/ports/comms/linrad/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- comms/linrad/Makefile	15 Nov 2005 06:48:14 -0000	1.3
+++ comms/linrad/Makefile	18 Dec 2005 07:59:33 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	linrad
 PORTVERSION=	0.16a
-CATEGORIES=	comms
+CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.nitehawk.com/sm5bsz/linuxdsp/archive/
 DISTNAME=	lir01-20
 EXTRACT_SUFX=	.tbz
Index: comms/nasawash/Makefile
===================================================================
RCS file: /home/ncvs/ports/comms/nasawash/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- comms/nasawash/Makefile	5 Jul 2004 08:52:36 -0000	1.1
+++ comms/nasawash/Makefile	18 Dec 2005 07:59:33 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	nasawash
 PORTVERSION=	0.50
-CATEGORIES=	comms
+CATEGORIES=	comms hamradio
 MASTER_SITES=	ftp://ftp.amsat.org/amsat/software/Linux/
 DISTNAME=	nasawash
 EXTRACT_SUFX=	.tgz
Index: comms/nec2c/Makefile
===================================================================
RCS file: /home/ncvs/ports/comms/nec2c/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- comms/nec2c/Makefile	8 Dec 2005 12:13:58 -0000	1.2
+++ comms/nec2c/Makefile	18 Dec 2005 07:59:33 -0000
@@ -6,7 +6,7 @@
 
 PORTNAME=	nec2c
 PORTVERSION=	.9
-CATEGORIES=	comms
+CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.si-list.org/NEC_Archives/
 DISTNAME=	nec2c
 DIST_SUBDIR=	${PORTNAME}
Index: comms/qsstv/Makefile
===================================================================
RCS file: /home/ncvs/ports/comms/qsstv/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- comms/qsstv/Makefile	20 Jul 2005 15:32:53 -0000	1.5
+++ comms/qsstv/Makefile	18 Dec 2005 07:59:33 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	qsstv
 PORTVERSION=	6.0a
-CATEGORIES=	comms
+CATEGORIES=	comms hamradio
 MASTER_SITES=	http://users.telenet.be/on4qz/snapshots/download/
 EXTRACT_SUFX=	.tgz
 
Index: comms/splat/Makefile
===================================================================
RCS file: /home/ncvs/ports/comms/splat/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- comms/splat/Makefile	12 Jul 2005 10:47:36 -0000	1.1
+++ comms/splat/Makefile	18 Dec 2005 07:59:33 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	splat
 PORTVERSION=	1.1.0
-CATEGORIES=	comms
+CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/ham
 
Index: comms/thebridge/Makefile
===================================================================
RCS file: /home/ncvs/ports/comms/thebridge/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- comms/thebridge/Makefile	27 Jun 2004 13:56:53 -0000	1.1
+++ comms/thebridge/Makefile	18 Dec 2005 07:59:33 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	thebridge
 PORTVERSION=	0.72
-CATEGORIES=	comms
+CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	cqinet
 EXTRACT_SUFX=	.tgz
Index: comms/tlf/Makefile
===================================================================
RCS file: /home/ncvs/ports/comms/tlf/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- comms/tlf/Makefile	12 Nov 2004 21:51:27 -0000	1.1
+++ comms/tlf/Makefile	18 Dec 2005 07:59:33 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	tlf
 PORTVERSION=	0.9.19
-CATEGORIES=	comms
+CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.wwns.com/tlf/ \
 		http://sharon.esrac.ele.tue.nl/pub/linux/ham/tlf/
 DIST_SUBDIR=	${PORTNAME}
Index: comms/trustedqsl/Makefile
===================================================================
RCS file: /home/ncvs/ports/comms/trustedqsl/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- comms/trustedqsl/Makefile	22 Nov 2005 21:40:50 -0000	1.7
+++ comms/trustedqsl/Makefile	18 Dec 2005 07:59:33 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	trustedqsl
 PORTVERSION=	1.11
-CATEGORIES=	comms
+CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	trustedqsl
 DISTFILES=	tqsllib-1.4.tar.gz TrustedQSL-1.11.tar.gz
Index: comms/twpsk/Makefile
===================================================================
RCS file: /home/ncvs/ports/comms/twpsk/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- comms/twpsk/Makefile	11 Dec 2005 19:20:01 -0000	1.2
+++ comms/twpsk/Makefile	18 Dec 2005 07:59:33 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	twpsk
 PORTVERSION=	2.1
-CATEGORIES=	comms
+CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.ibiblio.org/pub/linux/apps/ham/
 
 MAINTAINER=	xride@x12.dk
Index: comms/xastir/Makefile
===================================================================
RCS file: /home/ncvs/ports/comms/xastir/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- comms/xastir/Makefile	25 Oct 2005 22:15:18 -0000	1.5
+++ comms/xastir/Makefile	18 Dec 2005 07:59:33 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	xastir
 PORTVERSION=	1.7.0
-CATEGORIES=	comms
+CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xastir
 
Index: comms/xdx/Makefile
===================================================================
RCS file: /home/ncvs/ports/comms/xdx/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- comms/xdx/Makefile	5 Nov 2005 05:19:19 -0000	1.6
+++ comms/xdx/Makefile	18 Dec 2005 07:59:33 -0000
@@ -7,7 +7,7 @@
 PORTNAME=	xdx
 PORTVERSION=	1.2
 PORTREVISION=	3
-CATEGORIES=	comms
+CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.qsl.net/pg4i/download/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	pav
Index: comms/xlog/Makefile
===================================================================
RCS file: /home/ncvs/ports/comms/xlog/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- comms/xlog/Makefile	5 Nov 2005 05:19:19 -0000	1.29
+++ comms/xlog/Makefile	18 Dec 2005 07:59:33 -0000
@@ -7,7 +7,7 @@
 PORTNAME=	xlog
 PORTVERSION=	1.2.2
 PORTREVISION=	1
-CATEGORIES=	comms
+CATEGORIES=	comms hamradio
 MASTER_SITES=	http://pg4i.mattsnetwork.co.uk/download/ \
 		http://www.qsl.net/pg4i/download/
 
Index: comms/yagiuda/Makefile
===================================================================
RCS file: /home/ncvs/ports/comms/yagiuda/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- comms/yagiuda/Makefile	20 Jul 2005 14:58:46 -0000	1.1
+++ comms/yagiuda/Makefile	18 Dec 2005 07:59:33 -0000
@@ -6,7 +6,7 @@
 
 PORTNAME=	yagiuda
 PORTVERSION=	1.19
-CATEGORIES=	comms
+CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.g8wrb.org/yagi/
 
 MAINTAINER=	db@db.net
Index: security/dropbear/Makefile
===================================================================
RCS file: /home/ncvs/ports/security/dropbear/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- security/dropbear/Makefile	10 Jul 2005 19:52:15 -0000	1.12
+++ security/dropbear/Makefile	17 Dec 2005 19:41:54 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dropbear
-PORTVERSION=	0.46
+PORTVERSION=	0.47
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://matt.ucc.asn.au/dropbear/releases/