22 files changed, 45 insertions, 74 deletions

diff --git a/benchmarks/tcpblast/Makefile b/benchmarks/tcpblast/Makefile
index 1a696c7e326d..cd4917f60b3b 100644
--- a/benchmarks/tcpblast/Makefile
+++ b/benchmarks/tcpblast/Makefile
@@ -5,19 +5,20 @@ PORTNAME=	tcpblast
 PORTVERSION=	1.1
 PORTREVISION=	1
 CATEGORIES=	benchmarks net ipv6
+MASTER_SITES=	# none
 DISTFILES=	# none
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Measures the throughput of a TCP connection
 
+NO_WRKSUBDIR=	yes
+
 PLIST_FILES=	bin/tcpblast
 
-USES=		uidfix
-WRKSRC=		${WRKDIR}/src
+do-build:
+	${CC} ${CFLAGS} ${FILESDIR}/${PORTNAME}.c -o ${WRKDIR}/${PORTNAME}
 
-do-extract:
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKDIR}
-	${CP} -RP ${.CURDIR}/src ${WRKDIR}
+do-install:
+	${INSTALL_PROGRAM} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/benchmarks/tcpblast/src/tcpblast.c b/benchmarks/tcpblast/files/tcpblast.c
index 5a191701dc89..47bac345b52b 100644
--- a/benchmarks/tcpblast/src/tcpblast.c
+++ b/benchmarks/tcpblast/files/tcpblast.c
@@ -17,6 +17,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
+#include <err.h>
 #include <errno.h>
 
 #define BLKSIZE 1024
@@ -26,7 +27,7 @@ struct	servent *sp;
 struct	hostent *host;
 
 long starts, startms, stops, stopms, expms;
-struct timeval ti; 
+struct timeval ti;
 struct timezone tiz;
 
 char 	greet[BLKSIZE] = "Hi!";
diff --git a/benchmarks/tcpblast/src/Makefile b/benchmarks/tcpblast/src/Makefile
deleted file mode 100644
index 068ad35579f8..000000000000
--- a/benchmarks/tcpblast/src/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-PROG=		tcpblast
-SRCS=		tcpblast.c
-NO_MAN=		yes
-BINDIR=		${PREFIX}/bin
-
-.include <bsd.prog.mk>
diff --git a/net-mgmt/nagios-check_cpu_usage/Makefile b/net-mgmt/nagios-check_cpu_usage/Makefile
index 71f21dd1a9b8..b953f28e87d0 100644
--- a/net-mgmt/nagios-check_cpu_usage/Makefile
+++ b/net-mgmt/nagios-check_cpu_usage/Makefile
@@ -11,12 +11,13 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Nagios plug-in to check CPU usage
 
 NO_BUILD=	yes
+NO_ARCH=	yes
 
 PLIST_FILES=	libexec/nagios/check_cpu_usage
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios
-	${INSTALL_SCRIPT} ${.CURDIR}/src/check_cpu_usage \
+	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios
+	${INSTALL_SCRIPT} ${FILESDIR}/check_cpu_usage \
 		${STAGEDIR}${PREFIX}/libexec/nagios
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/nagios-check_cpu_usage/src/check_cpu_usage b/net-mgmt/nagios-check_cpu_usage/files/check_cpu_usage
index d9a9e4c8641d..d9a9e4c8641d 100644
--- a/net-mgmt/nagios-check_cpu_usage/src/check_cpu_usage
+++ b/net-mgmt/nagios-check_cpu_usage/files/check_cpu_usage
diff --git a/net-mgmt/nagios-check_hdd_health/Makefile b/net-mgmt/nagios-check_hdd_health/Makefile
index 631590e27e8c..39bab451ea93 100644
--- a/net-mgmt/nagios-check_hdd_health/Makefile
+++ b/net-mgmt/nagios-check_hdd_health/Makefile
@@ -4,8 +4,8 @@
 PORTNAME=	nagios-check_hdd_health
 PORTVERSION=	1.1
 CATEGORIES=	net-mgmt
-MASTER_SITES=	# No distfile
-DISTFILES=	# No distfile
+MASTER_SITES=	# none
+DISTFILES=	# none
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Nagios plug-in to check HDD health from S.M.A.R.T
@@ -13,9 +13,13 @@ COMMENT=	Nagios plug-in to check HDD health from S.M.A.R.T
 RUN_DEPENDS=	smartmontools>=0:${PORTSDIR}/sysutils/smartmontools
 
 NO_BUILD=	yes
+NO_ARCH=	yes
+
+PLIST_FILES=	libexec/nagios/check_hdd_health
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios
-	@${INSTALL_SCRIPT} ${.CURDIR}/src/check_hdd_health ${STAGEDIR}${PREFIX}/libexec/nagios
+	${INSTALL_SCRIPT} ${FILESDIR}/check_hdd_health \
+		${STAGEDIR}${PREFIX}/libexec/nagios
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/nagios-check_hdd_health/src/check_hdd_health b/net-mgmt/nagios-check_hdd_health/files/check_hdd_health
index de20fb9359ae..de20fb9359ae 100644
--- a/net-mgmt/nagios-check_hdd_health/src/check_hdd_health
+++ b/net-mgmt/nagios-check_hdd_health/files/check_hdd_health
diff --git a/net-mgmt/nagios-check_hdd_health/pkg-plist b/net-mgmt/nagios-check_hdd_health/pkg-plist
deleted file mode 100644
index a7532a19b10a..000000000000
--- a/net-mgmt/nagios-check_hdd_health/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-libexec/nagios/check_hdd_health
diff --git a/net/tcpmssd/Makefile b/net/tcpmssd/Makefile
index eb05bcb03250..276201429098 100644
--- a/net/tcpmssd/Makefile
+++ b/net/tcpmssd/Makefile
@@ -10,20 +10,15 @@ DISTFILES=	# none
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utility to correct requested TCP receive segment size
 
-WRKSRC=		${WRKDIR}/src
-
-SRC=		${.CURDIR}/src
+NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	bin/tcpmssd man/man8/tcpmssd.8.gz
 
-pre-patch:
-	@${CP} -R ${SRC} ${WRKDIR}
-
 do-build:
-	(cd ${WRKSRC} && ${MAKE} tcpmssd)
+	${CC} ${CFLAGS} ${FILESDIR}/${PORTNAME}.c -o ${WRKDIR}/${PORTNAME}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/tcpmssd ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/tcpmssd.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
+	${INSTALL_PROGRAM} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${FILESDIR}/${PORTNAME}.8 ${STAGEDIR}${MANPREFIX}/man/man8
 
 .include <bsd.port.mk>
diff --git a/net/tcpmssd/src/tcpmssd.8 b/net/tcpmssd/files/tcpmssd.8
index 1b0d37e45ee2..1b0d37e45ee2 100644
--- a/net/tcpmssd/src/tcpmssd.8
+++ b/net/tcpmssd/files/tcpmssd.8
diff --git a/net/tcpmssd/src/tcpmssd.c b/net/tcpmssd/files/tcpmssd.c
index eac7d38c9a79..eac7d38c9a79 100644
--- a/net/tcpmssd/src/tcpmssd.c
+++ b/net/tcpmssd/files/tcpmssd.c
diff --git a/security/safesh/Makefile b/security/safesh/Makefile
index 8ca5eb0f7f82..6b0d1236dfa0 100644
--- a/security/safesh/Makefile
+++ b/security/safesh/Makefile
@@ -6,24 +6,27 @@ PORTVERSION=	1.5
 CATEGORIES=	security
 MASTER_SITES=	# none
 DISTFILES=	# none
-EXTRACT_ONLY=	# none
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Authentication manager for OpenSSH (making secure auth easier)
 
 NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
+NO_ARCH=	yes
 
-SRC=		${.CURDIR}/src
+PLIST_FILES=	bin/cvs-safesh \
+		bin/safesh \
+		bin/safeshinstall \
+		bin/scpsh \
+		man/man1/safesh.1.gz
 
 # XXX Anybody that know how to create manlinks from ports easily, please
 # contact me.
 
 do-install:
-	${INSTALL_SCRIPT} ${SRC}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	${INSTALL_SCRIPT} ${SRC}/cvs-safesh.sh ${STAGEDIR}${PREFIX}/bin/cvs-safesh
-	${INSTALL_MAN} ${SRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1
-	@${LN} -sf ${PORTNAME} ${STAGEDIR}${PREFIX}/bin/scpsh
-	@${LN} -sf ${PORTNAME} ${STAGEDIR}${PREFIX}/bin/safeshinstall
+	${INSTALL_SCRIPT} ${FILESDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_SCRIPT} ${FILESDIR}/cvs-safesh.sh ${STAGEDIR}${PREFIX}/bin/cvs-safesh
+	${INSTALL_MAN} ${FILESDIR}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1
+	${LN} -sf ${PORTNAME} ${STAGEDIR}${PREFIX}/bin/scpsh
+	${LN} -sf ${PORTNAME} ${STAGEDIR}${PREFIX}/bin/safeshinstall
 
 .include <bsd.port.mk>
diff --git a/security/safesh/src/cvs-safesh.sh b/security/safesh/files/cvs-safesh.sh
index e56e8116d7d1..e56e8116d7d1 100644
--- a/security/safesh/src/cvs-safesh.sh
+++ b/security/safesh/files/cvs-safesh.sh
diff --git a/security/safesh/src/safesh.1 b/security/safesh/files/safesh.1
index 938cd43eb188..938cd43eb188 100644
--- a/security/safesh/src/safesh.1
+++ b/security/safesh/files/safesh.1
diff --git a/security/safesh/src/safesh.sh b/security/safesh/files/safesh.sh
index 3ea1c18d85e6..3ea1c18d85e6 100644
--- a/security/safesh/src/safesh.sh
+++ b/security/safesh/files/safesh.sh
diff --git a/security/safesh/pkg-plist b/security/safesh/pkg-plist
deleted file mode 100644
index 5d3b9d8d38e1..000000000000
--- a/security/safesh/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/cvs-safesh
-bin/safesh
-bin/safeshinstall
-bin/scpsh
-man/man1/safesh.1.gz
diff --git a/sysutils/personality/Makefile b/sysutils/personality/Makefile
index 8550a8ff6a16..04d772a4bc24 100644
--- a/sysutils/personality/Makefile
+++ b/sysutils/personality/Makefile
@@ -4,24 +4,20 @@
 PORTNAME=	personality
 PORTVERSION=	1.0
 CATEGORIES=	sysutils
+MASTER_SITES=	# none
 DISTFILES=	# none
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	System configuration management utility to alter system personality
 
-WRKSRC=		${WRKDIR}/src
-NO_BUILD=	YES
+NO_BUILD=	yes
+NO_ARCH=	yes
 SUB_FILES=	pkg-message
 
-PLIST_FILES=	man/man8/${PORTNAME}.8.gz sbin/personality
-
-do-extract:
-	@ ${RM} -rf ${WRKDIR}
-	@ ${MKDIR} ${WRKDIR}
-	@ ${CP} -RP ${.CURDIR}/src ${WRKDIR}
+PLIST_FILES=	man/man8/${PORTNAME}.8.gz sbin/${PORTNAME}
 
 do-install:
-	@ ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
-	@ ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${PREFIX}/man/man8
+	${INSTALL_SCRIPT} ${FILESDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.8 ${STAGEDIR}${PREFIX}/man/man8
 
 .include <bsd.port.mk>
diff --git a/sysutils/personality/src/personality b/sysutils/personality/files/personality
index e20f373a0e60..e20f373a0e60 100644
--- a/sysutils/personality/src/personality
+++ b/sysutils/personality/files/personality
diff --git a/sysutils/personality/src/personality.8 b/sysutils/personality/files/personality.8
index 52ce0ed832cf..52ce0ed832cf 100644
--- a/sysutils/personality/src/personality.8
+++ b/sysutils/personality/files/personality.8
diff --git a/textproc/mkcatalog/Makefile b/textproc/mkcatalog/Makefile
index 971957489a88..b9031b2c61db 100644
--- a/textproc/mkcatalog/Makefile
+++ b/textproc/mkcatalog/Makefile
@@ -13,19 +13,13 @@ COMMENT=	Maintenance utility for sgml catalog files
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-PLIST_FILES=	sbin/mkcatalog
-SCRIPTS_ENV=	CONFIGURE_TARGETS=${CONFIGURE_TARGETS}
-
-SRC=			${.CURDIR}/src
-CONFIGURE_TARGETS=	mkcatalog
+NO_ARCH=	yes
 
-pre-configure:
-.for f in ${CONFIGURE_TARGETS}
-	${CP} ${SRC}/${f}.in ${WRKDIR}
-.endfor
+SUB_FILES=	mkcatalog
+PLIST_FILES=	sbin/mkcatalog
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKDIR}/mkcatalog \
+	${INSTALL_SCRIPT} ${WRKDIR}/mkcatalog \
 		${STAGEDIR}${PREFIX}/sbin/mkcatalog
 
 .include <bsd.port.mk>
diff --git a/textproc/mkcatalog/src/mkcatalog.in b/textproc/mkcatalog/files/mkcatalog.in
index 791952332c2e..bc7e08e61637 100644
--- a/textproc/mkcatalog/src/mkcatalog.in
+++ b/textproc/mkcatalog/files/mkcatalog.in
@@ -47,7 +47,7 @@ verbose_msg ()
     esac
 }
 
-PREFIX=@@PREFIX@@
+PREFIX=%%PREFIX%%
 TMPDIR=/tmp
 ARGV0=`sh_basename $0`
 
diff --git a/textproc/mkcatalog/scripts/configure b/textproc/mkcatalog/scripts/configure
deleted file mode 100644
index 8b2dbab2fa60..000000000000
--- a/textproc/mkcatalog/scripts/configure
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-#
-
-for i in ${CONFIGURE_TARGETS}
-do
-	if [ -f ${WRKDIR}/${i}.in ]; then
-	cat ${WRKDIR}/${i}.in | /usr/bin/sed \
-		-e "s;@@PREFIX@@;${PREFIX};g" \
-	> ${WRKDIR}/${i}
-	fi
-done