25 files changed, 121 insertions, 285 deletions

diff --git a/comms/vrflash/Makefile b/comms/vrflash/Makefile
index d2a2bbd7c4c3..769130ef18c1 100644
--- a/comms/vrflash/Makefile
+++ b/comms/vrflash/Makefile
@@ -19,9 +19,9 @@ DOCS=		agenda-flashing-overview.txt troubleshooting.txt \
 do-install:
 	${INSTALL_PROGRAM} -m 755 ${WRKSRC}/vrflash ${PREFIX}/bin/
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
+	${MKDIR} ${DOCSDIR}
 .for i in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}/
 .endfor
 .endif
 
diff --git a/comms/vrflash/pkg-comment b/comms/vrflash/pkg-comment
index 4f27b9e5ba93..992e3227f938 100644
--- a/comms/vrflash/pkg-comment
+++ b/comms/vrflash/pkg-comment
@@ -1 +1 @@
-flash kernels and romdisks to the Agenda VR3
+Flash kernels and romdisks to the Agenda VR3
diff --git a/databases/metakit/Makefile b/databases/metakit/Makefile
index ce009a792fe8..f8268c5c368c 100644
--- a/databases/metakit/Makefile
+++ b/databases/metakit/Makefile
@@ -68,12 +68,11 @@ post-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/Mk4py.so ${PYTHON_SITELIBDIR}/
 .endif
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/metakit
-	(${TAR} -C ${WRKSRC}/../doc -cf - . | \
-		${TAR} -C ${PREFIX}/share/doc/metakit --unlink -xf -)
+	${MKDIR} ${DOCSDIR}
+	${TAR} -C ${WRKSRC}/../doc -cf - . | \
+		${TAR} -C ${DOCSDIR} --unlink -xf -
 	${INSTALL_DATA} ${WRKSRC}/../MetaKit.html ${WRKSRC}/../CHANGES \
-		${WRKSRC}/../README ${WRKSRC}/../WHATSNEW \
-		${PREFIX}/share/doc/metakit
+		${WRKSRC}/../README ${WRKSRC}/../WHATSNEW ${DOCSDIR}/
 .endif
 
 test:
diff --git a/emulators/frodo/Makefile b/emulators/frodo/Makefile
index e73478d45897..f74a58c663db 100644
--- a/emulators/frodo/Makefile
+++ b/emulators/frodo/Makefile
@@ -40,15 +40,16 @@ do-install:
 	${INSTALL_DATA} "${WRKDIR}/Frodo/Frodo Logo" ${PREFIX}/libexec/frodo
 	${CP} "${WRKDIR}/Frodo/TkGui.tcl" ${PREFIX}/libexec/frodo
 	${MKDIR} ${PREFIX}/libexec/frodo/64prgs
-	@(${TAR} -C ${WRKDIR}/Frodo/64prgs -cf - . | ${TAR} -C ${PREFIX}/libexec/frodo/64prgs -xf -)
+	@${TAR} -C ${WRKDIR}/Frodo/64prgs -cf - . | \
+		${TAR} -C ${PREFIX}/libexec/frodo/64prgs -xf -
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/frodo
+	${MKDIR} ${DOCSDIR}
 .for i in CHANGES
-	${INSTALL_DATA} ${WRKDIR}/Frodo/${i} ${PREFIX}/share/doc/frodo
+	${INSTALL_DATA} ${WRKDIR}/Frodo/${i} ${DOCSDIR}/
 .endfor
-	@(${TAR} -C ${WRKDIR}/Frodo/Docs -cf - . | ${TAR} -C ${PREFIX}/share/doc/frodo -xf -)
+	@${TAR} -C ${WRKDIR}/Frodo/Docs -cf - . | ${TAR} -C ${DOCSDIR} -xf -
 .endif
 
 .include <bsd.port.mk>
diff --git a/german/unix-connect/Makefile b/german/unix-connect/Makefile
index c7b3639ecf82..180755a85db8 100644
--- a/german/unix-connect/Makefile
+++ b/german/unix-connect/Makefile
@@ -31,11 +31,11 @@ CFLAGS:= ${CFLAGS:S/-O[0-9]*//g}	# gcc generates broken code in uwsmtp
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/unix-connect
+	${MKDIR} ${DOCSDIR}
 .for i in README INSTALL TODO ChangeLog ChangeLog.configure
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/unix-connect
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
 .endfor
-	@cd ${WRKSRC}/docs; tar cf - . | (cd ${PREFIX}/share/doc/unix-connect; tar xf -)
+	@${TAR} -C ${WRKSRC}/docs -cf - . | ${TAR} -C ${DOCSDIR} -xf -
 .endif
 
 .include <bsd.port.mk>
diff --git a/german/unix-connect/pkg-descr b/german/unix-connect/pkg-descr
index 297f5c476491..9a4c9e22355d 100644
--- a/german/unix-connect/pkg-descr
+++ b/german/unix-connect/pkg-descr
@@ -18,4 +18,4 @@ vermieden werden koennen.
 
 FTP: ftp://unix-connect.sf.net/pub/unix-connect/
 FTP: ftp://ftp.dinoex.org/pub/unix-connenct/
-WWW: http://www.dinoex.de/unix-connect.html
\ No newline at end of file
+WWW: http://www.dinoex.de/unix-connect.html
diff --git a/lang/tcl82/Makefile b/lang/tcl82/Makefile
index 5cc15f933ab1..5a0e92fd447a 100644
--- a/lang/tcl82/Makefile
+++ b/lang/tcl82/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	tcl
 PORTVERSION=	8.2.3
 PORTREVISION=	1
 CATEGORIES=	lang tcl82
-MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_2/
+MASTER_SITES=	${MASTER_SITE_TCLTK}
+MASTER_SITE_SUBDIR=	tcl8_2
 DISTNAME=	tcl8.2.3
 
 MAINTAINER=	dinoex@FreeBSD.org
diff --git a/mail/kiltdown/Makefile b/mail/kiltdown/Makefile
index fa11355a0da5..6fdb22330f90 100644
--- a/mail/kiltdown/Makefile
+++ b/mail/kiltdown/Makefile
@@ -20,17 +20,17 @@ USE_X_PREFIX=	yes
 USE_QT_VER=	2
 USE_GMAKE=	yes
 MY_CONFIGURE_ARGS=	-release
-MY_CONFIGURE_ARGS+=	-qtinc /usr/X11R6/include/qt2 -qtlib /usr/X11R6/lib
-MY_CONFIGURE_ARGS+=	-dbinc /usr/local/include/db3 -dblib /usr/local/lib
+MY_CONFIGURE_ARGS+=	-qtinc ${X11BASE}/include/qt2 -qtlib ${X11BASE}/lib
+MY_CONFIGURE_ARGS+=	-dbinc ${LOCALBASE}/include/db3 -dblib ${LOCALBASE}/lib
 BUILD_ENV+=		PATH=${PATH}:${X11BASE}/bin
 
 post-patch:
 	@${PERL5} -pi \
 	 -e "s/SYS_CFLAGS=-pthread/SYS_CFLAGS=${PTHREAD_CFLAGS} ${CFLAGS}/" \
-		${WRKSRC}/configs/bsd-generic 
+		${WRKSRC}/configs/bsd-generic
 	@${PERL5} -pi \
 	 -e "s/SYS_LDFLAGS=-pthread/SYS_LDFLAGS=${PTHREAD_LIBS} ${LDFLAGS}/" \
-		${WRKSRC}/configs/bsd-generic 
+		${WRKSRC}/configs/bsd-generic
 
 do-configure:
 	(cd ${CONFIGURE_WRKSRC} && \
diff --git a/mail/sendmail-old/Makefile b/mail/sendmail-old/Makefile
index 915fc416838c..3d670ffbf35a 100644
--- a/mail/sendmail-old/Makefile
+++ b/mail/sendmail-old/Makefile
@@ -148,21 +148,16 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man1
 .endfor
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/sendmail ${PREFIX}/share/doc/sendmail
-	@cd ${WRKSRC}; ${TAR} cf - cf |\
-		(cd ${PREFIX}/share/sendmail; ${TAR} xf -)
-	@cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/sendmail/
-	${INSTALL_DATA} ${WRKSRC}/devtools/README \
-		${PREFIX}/share/doc/sendmail/DEVTOOLS
-	${INSTALL_DATA} ${WRKSRC}/sendmail/README \
-		${PREFIX}/share/doc/sendmail/SENDMAIL
-	${INSTALL_DATA} ${WRKSRC}/mail.local/README \
-		${PREFIX}/share/doc/sendmail/MAIL.LOCAL
-	${INSTALL_DATA} ${WRKSRC}/smrsh/README \
-		${PREFIX}/share/doc/sendmail/SMRSH
+	${MKDIR} ${PREFIX}/share/sendmail ${DOCSDIR}
+	@${TAR} -C ${WRKSRC} -cf - cf | \
+		${TAR} -C ${PREFIX}/share/sendmail -xf -
+	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/devtools/README ${DOCSDIR}/DEVTOOLS
+	${INSTALL_DATA} ${WRKSRC}/sendmail/README ${DOCSDIR}/SENDMAIL
+	${INSTALL_DATA} ${WRKSRC}/mail.local/README ${DOCSDIR}/MAIL.LOCAL
+	${INSTALL_DATA} ${WRKSRC}/smrsh/README ${DOCSDIR}/SMRSH
 .if defined(SENDMAIL_WITH_MILTER)
-	${INSTALL_DATA} ${WRKSRC}/libmilter/README \
-		${PREFIX}/share/doc/sendmail/MILTER
+	${INSTALL_DATA} ${WRKSRC}/libmilter/README ${DOCSDIR}/MILTER
 .endif
 .endif
 .if exists(${DESTDIR}/etc/mail/mailer.conf)
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index f95fd296a5f8..4a38327b720a 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -152,23 +152,17 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man1
 .endfor
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/sendmail ${PREFIX}/share/doc/sendmail
-	@cd ${WRKSRC}; ${TAR} cf - cf |\
-		(cd ${PREFIX}/share/sendmail; ${TAR} xf -)
-	@cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/sendmail/
-	${INSTALL_DATA} ${WRKSRC}/doc/op/op.ps \
-		${PREFIX}/share/doc/sendmail/op.ps
-	${INSTALL_DATA} ${WRKSRC}/devtools/README \
-		${PREFIX}/share/doc/sendmail/DEVTOOLS
-	${INSTALL_DATA} ${WRKSRC}/sendmail/README \
-		${PREFIX}/share/doc/sendmail/SENDMAIL
-	${INSTALL_DATA} ${WRKSRC}/mail.local/README \
-		${PREFIX}/share/doc/sendmail/MAIL.LOCAL
-	${INSTALL_DATA} ${WRKSRC}/smrsh/README \
-		${PREFIX}/share/doc/sendmail/SMRSH
+	${MKDIR} ${PREFIX}/share/sendmail ${DOCSDIR}
+	@${TAR} -C ${WRKSRC} -cf - cf | \
+		${TAR} -C ${PREFIX}/share/sendmail -xf -
+	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/op/op.ps ${DOCSDIR}/op.ps
+	${INSTALL_DATA} ${WRKSRC}/devtools/README ${DOCSDIR}/DEVTOOLS
+	${INSTALL_DATA} ${WRKSRC}/sendmail/README ${DOCSDIR}/SENDMAIL
+	${INSTALL_DATA} ${WRKSRC}/mail.local/README ${DOCSDIR}/MAIL.LOCAL
+	${INSTALL_DATA} ${WRKSRC}/smrsh/README ${DOCSDIR}/SMRSH
 .if defined(SENDMAIL_WITH_MILTER)
-	${INSTALL_DATA} ${WRKSRC}/libmilter/README \
-		${PREFIX}/share/doc/sendmail/MILTER
+	${INSTALL_DATA} ${WRKSRC}/libmilter/README ${DOCSDIR}/MILTER
 .endif
 .endif
 .if exists(${DESTDIR}/etc/mail/mailer.conf)
diff --git a/mail/sendmail/pkg-plist b/mail/sendmail/pkg-plist
index 9b68d0fbcb67..428a07caf8d3 100644
--- a/mail/sendmail/pkg-plist
+++ b/mail/sendmail/pkg-plist
@@ -1,4 +1,4 @@
-@comment $FreeBSD: /tmp/pcvs/ports/mail/sendmail/pkg-plist,v 1.9 2001-10-21 03:10:29 dinoex Exp $
+@comment $FreeBSD: /tmp/pcvs/ports/mail/sendmail/pkg-plist,v 1.10 2002-01-05 23:43:12 dinoex Exp $
 @exec if ! pw groupshow smmsp 2>/dev/null; then pw groupadd smmsp -g 90; fi
 @exec if ! pw usershow smmsp 2>/dev/null; then pw useradd smmsp -g smmsp -u 90 -h - -d /nonexistent -s /nonexistent -c "Sendmail Queue"; fi
 @exec mkdir -p /var/spool/clientmqueue
@@ -21,7 +21,7 @@ sbin/makemap
 sbin/praliases
 @group smmsp
 sbin/sendmail
-@group wheel
+@group
 @comment (overwritten by pkg_add) chown root:smmsp sbin/sendmail
 @exec chmod 2555 sbin/sendmail
 %%PORTDOCS%%share/doc/sendmail/op.ps
diff --git a/mail/sendmail811/Makefile b/mail/sendmail811/Makefile
index 915fc416838c..3d670ffbf35a 100644
--- a/mail/sendmail811/Makefile
+++ b/mail/sendmail811/Makefile
@@ -148,21 +148,16 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man1
 .endfor
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/sendmail ${PREFIX}/share/doc/sendmail
-	@cd ${WRKSRC}; ${TAR} cf - cf |\
-		(cd ${PREFIX}/share/sendmail; ${TAR} xf -)
-	@cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/sendmail/
-	${INSTALL_DATA} ${WRKSRC}/devtools/README \
-		${PREFIX}/share/doc/sendmail/DEVTOOLS
-	${INSTALL_DATA} ${WRKSRC}/sendmail/README \
-		${PREFIX}/share/doc/sendmail/SENDMAIL
-	${INSTALL_DATA} ${WRKSRC}/mail.local/README \
-		${PREFIX}/share/doc/sendmail/MAIL.LOCAL
-	${INSTALL_DATA} ${WRKSRC}/smrsh/README \
-		${PREFIX}/share/doc/sendmail/SMRSH
+	${MKDIR} ${PREFIX}/share/sendmail ${DOCSDIR}
+	@${TAR} -C ${WRKSRC} -cf - cf | \
+		${TAR} -C ${PREFIX}/share/sendmail -xf -
+	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/devtools/README ${DOCSDIR}/DEVTOOLS
+	${INSTALL_DATA} ${WRKSRC}/sendmail/README ${DOCSDIR}/SENDMAIL
+	${INSTALL_DATA} ${WRKSRC}/mail.local/README ${DOCSDIR}/MAIL.LOCAL
+	${INSTALL_DATA} ${WRKSRC}/smrsh/README ${DOCSDIR}/SMRSH
 .if defined(SENDMAIL_WITH_MILTER)
-	${INSTALL_DATA} ${WRKSRC}/libmilter/README \
-		${PREFIX}/share/doc/sendmail/MILTER
+	${INSTALL_DATA} ${WRKSRC}/libmilter/README ${DOCSDIR}/MILTER
 .endif
 .endif
 .if exists(${DESTDIR}/etc/mail/mailer.conf)
diff --git a/mail/sendmail812/Makefile b/mail/sendmail812/Makefile
index f95fd296a5f8..4a38327b720a 100644
--- a/mail/sendmail812/Makefile
+++ b/mail/sendmail812/Makefile
@@ -152,23 +152,17 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man1
 .endfor
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/sendmail ${PREFIX}/share/doc/sendmail
-	@cd ${WRKSRC}; ${TAR} cf - cf |\
-		(cd ${PREFIX}/share/sendmail; ${TAR} xf -)
-	@cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/sendmail/
-	${INSTALL_DATA} ${WRKSRC}/doc/op/op.ps \
-		${PREFIX}/share/doc/sendmail/op.ps
-	${INSTALL_DATA} ${WRKSRC}/devtools/README \
-		${PREFIX}/share/doc/sendmail/DEVTOOLS
-	${INSTALL_DATA} ${WRKSRC}/sendmail/README \
-		${PREFIX}/share/doc/sendmail/SENDMAIL
-	${INSTALL_DATA} ${WRKSRC}/mail.local/README \
-		${PREFIX}/share/doc/sendmail/MAIL.LOCAL
-	${INSTALL_DATA} ${WRKSRC}/smrsh/README \
-		${PREFIX}/share/doc/sendmail/SMRSH
+	${MKDIR} ${PREFIX}/share/sendmail ${DOCSDIR}
+	@${TAR} -C ${WRKSRC} -cf - cf | \
+		${TAR} -C ${PREFIX}/share/sendmail -xf -
+	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/op/op.ps ${DOCSDIR}/op.ps
+	${INSTALL_DATA} ${WRKSRC}/devtools/README ${DOCSDIR}/DEVTOOLS
+	${INSTALL_DATA} ${WRKSRC}/sendmail/README ${DOCSDIR}/SENDMAIL
+	${INSTALL_DATA} ${WRKSRC}/mail.local/README ${DOCSDIR}/MAIL.LOCAL
+	${INSTALL_DATA} ${WRKSRC}/smrsh/README ${DOCSDIR}/SMRSH
 .if defined(SENDMAIL_WITH_MILTER)
-	${INSTALL_DATA} ${WRKSRC}/libmilter/README \
-		${PREFIX}/share/doc/sendmail/MILTER
+	${INSTALL_DATA} ${WRKSRC}/libmilter/README ${DOCSDIR}/MILTER
 .endif
 .endif
 .if exists(${DESTDIR}/etc/mail/mailer.conf)
diff --git a/mail/sendmail812/pkg-plist b/mail/sendmail812/pkg-plist
index 747a72c0806c..e344fa5f6555 100644
--- a/mail/sendmail812/pkg-plist
+++ b/mail/sendmail812/pkg-plist
@@ -1,4 +1,4 @@
-@comment $FreeBSD: /tmp/pcvs/ports/mail/sendmail812/Attic/pkg-plist,v 1.9 2001-10-21 03:10:29 dinoex Exp $
+@comment $FreeBSD: /tmp/pcvs/ports/mail/sendmail812/Attic/pkg-plist,v 1.10 2002-01-05 23:43:12 dinoex Exp $
 @exec if ! pw groupshow smmsp 2>/dev/null; then pw groupadd smmsp -g 90; fi
 @exec if ! pw usershow smmsp 2>/dev/null; then pw useradd smmsp -g smmsp -u 90 -h - -d /nonexistent -s /nonexistent -c "Sendmail Queue"; fi
 @exec mkdir -p /var/spool/clientmqueue
@@ -21,7 +21,7 @@ sbin/makemap
 sbin/praliases
 @group smmsp
 sbin/sendmail
-@group wheel
+@group
 @comment (overwritten by pkg_add) chown root:smmsp sbin/sendmail
 @exec chmod 2555 sbin/sendmail
 %%PORTDOCS%%share/doc/sendmail/op.ps
diff --git a/net/crescendo/Makefile b/net/crescendo/Makefile
index fd873f7c3b36..010232eb3152 100644
--- a/net/crescendo/Makefile
+++ b/net/crescendo/Makefile
@@ -24,9 +24,7 @@ CONFIGURE_ARGS+=	--enable-compile-warnings=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CFLAGS+=	-g
-PLIST_SUB=	DOCDIR=${DOCDIR}
-
-DOCDIR=		share/doc/${PORTNAME}
+PLIST_SUB=	DOCDIR=share/doc/${PORTNAME}
 
 pre-patch:
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
@@ -35,10 +33,10 @@ pre-patch:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/${DOCDIR}
+	${MKDIR} ${DOCSDIR}
 .for file in AUTHORS COPYING ChangeLog HACKING INSTALL NEWS \
 		README README.BINARY TODO
-	${INSTALL_MAN} ${WRKSRC}/${file} ${PREFIX}/${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}/
 .endfor
 .endif
 
diff --git a/news/cnews/Makefile b/news/cnews/Makefile
index c3d711132816..d4371e826c49 100644
--- a/news/cnews/Makefile
+++ b/news/cnews/Makefile
@@ -124,7 +124,7 @@ do-install:
 	@${ECHO} "!!!!!!!!"
 	@${ECHO} ""
 
-test: 
+test:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 	${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} r)
 
diff --git a/news/fidogate/Makefile b/news/fidogate/Makefile
index d19efe128d70..a83713490f35 100644
--- a/news/fidogate/Makefile
+++ b/news/fidogate/Makefile
@@ -25,6 +25,10 @@ FORBIDDEN=	indefinite hang
 USE_GMAKE=	yes
 USE_PERL5=	yes
 
+DOCLIST=	fidogate.texi fidogate.txt gatebau94.txt kludge-rfc.doc \			msgid.doc qmail.txt texinfo.tex dirs.html index.html \
+		template.html fido howto misc rfc gatebau/msgid.sgml \
+		gatebau/msgid.tex gatebau/msgid.txt
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 300000
@@ -32,40 +36,25 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-perl
 .endif
 
 pre-configure:
-	@${MV} ${WRKSRC}/config.make ${WRKSRC}/config.make.sed
-	@${SED} -e 's/\$${PREFIX}/${PREFIX:S/\//\\\//g}/g' \
-		< ${WRKSRC}/config.make.sed > ${WRKSRC}/config.make
+	@${PERL5} -pi -e "s=.{PREFIX}=${PREFIX}=g" ${WRKSRC}/config.make
+.if defined(FIDOGATE_RUNAS)
+	@${PERL5} -pi -e "s/OWNER.*= news/OWNER		= ${FIDOGATE_RUNAS}/" \
+		${WRKSRC}/config.make
+.endif
 
 pre-install:
 	${MKDIR} ${PREFIX}/libexec/fidogate
-	${MKDIR} ${PREFIX}/share/doc/fidogate/html
-	${MKDIR} ${PREFIX}/share/doc/fidogate/info
-	${MKDIR} ${PREFIX}/share/doc/fidogate/fido
-	${MKDIR} ${PREFIX}/share/doc/fidogate/howto
-	${MKDIR} ${PREFIX}/share/doc/fidogate/misc
-	${MKDIR} ${PREFIX}/share/doc/fidogate/gatebau
-
-DOCLIST=	\
-	fidogate.texi fidogate.txt \
-	gatebau94.txt kludge-rfc.doc msgid.doc \
-	qmail.txt texinfo.tex \
-	dirs.html index.html template.html \
-	fido \
-	howto \
-	misc \
-	rfc \
-	gatebau/msgid.sgml \
-	gatebau/msgid.tex \
-	gatebau/msgid.txt
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}/html ${DOCSDIR}/info ${DOCSDIR}/fido \
+		${DOCSDIR}/howto ${DOCSDIR}/misc ${DOCSDIR}/gatebau
+.endif
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/fidogate
-	@cd ${WRKSRC}/doc; tar cf - ${DOCLIST} |\
-		(cd ${PREFIX}/share/doc/fidogate; tar xf -)
-	${MKDIR} ${PREFIX}/share/examples/fidogate
-	@cd ${WRKSRC}/examples; tar cf - . |\
-		(cd ${PREFIX}/share/examples/fidogate; tar xf -)
+	${MKDIR} ${DOCSDIR}
+	@${TAR} -C ${WRKSRC}/doc -cf - ${DOCLIST} | ${TAR} -C ${DOCSDIR} -xf -
+	${MKDIR} ${EXAMPLESDIR}
+	@${TAR} -C ${WRKSRC}/examples -cf - . | ${TAR} -C ${EXAMPLESDIR} -xf -
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/news/ifmail/Makefile b/news/ifmail/Makefile
index 73214c91f181..2ff93f1a4f03 100644
--- a/news/ifmail/Makefile
+++ b/news/ifmail/Makefile
@@ -17,8 +17,17 @@ MAINTAINER=	dinoex@FreeBSD.org
 MAN3=		parsedate.3
 MAN8=		ifmail.8 iftoss.8
 
+.if defined(IFMAIL_RUNAS)
+pre-configure:
+	@${PERL5} -pi -e "s/OWNER = ifmail/OWNER = ${IFMAIL_RUNAS}/" \
+		${WRKSRC}/CONFIG
+.endif
+
 pre-install:
-	@PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+.if !defined(IFMAIL_RUNAS)
+	if ! pw usershow ifmail; then pw useradd ifmail -g uucp -u 70 \
+		-h - -d /nonexistent -s /nonexistent -c "Ifmail Server"; fi
+.endif
 	${MKDIR} ${PREFIX}/libexec/ifmail
 
 post-install:
@@ -29,13 +38,13 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/iflib/${i} ${PREFIX}/man/man3
 .endfor
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/ifmail
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ifmail
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
 .for i in ifcico ifgate iflib
-	${INSTALL_DATA} ${WRKSRC}/${i}/README ${PREFIX}/share/doc/ifmail/README.${i}
+	${INSTALL_DATA} ${WRKSRC}/${i}/README ${DOCSDIR}/README.${i}
 .endfor
+	${MKDIR} ${EXAMPLESDIR}
+	@${TAR} -C ${WRKSRC}/misc -cf - . | ${TAR} -C ${EXAMPLESDIR} -xf -
 .endif
-	${MKDIR} ${PREFIX}/share/examples/ifmail
-	@cd ${WRKSRC}/misc; tar cf - . | (cd ${PREFIX}/share/examples/ifmail; tar xf -)
 
 .include <bsd.port.mk>
diff --git a/news/ifmail/pkg-deinstall b/news/ifmail/pkg-deinstall
deleted file mode 100644
index 50d05233e469..000000000000
--- a/news/ifmail/pkg-deinstall
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-user=ifmail
-
-ask() {
-    local question default answer
-
-    question=$1
-    default=$2
-    if [ -z "${PACKAGE_BUILDING}" ]; then
-	read -p "${question} [${default}]? " answer
-    fi
-    if [ x${answer} = x ]; then
-	answer=${default}
-    fi
-    echo ${answer}
-}
-
-yesno() {
-    local dflt question answer
-
-    question=$1
-    dflt=$2
-    while :; do
-	answer=$(ask "${question}" "${dflt}")
-	case "${answer}" in
-	[Yy]*)		return 0;;
-	[Nn]*)		return 1;;
-	esac
-	echo "Please answer yes or no."
-    done
-}
-
-if [ x$2 != xDEINSTALL ]; then
-    exit
-fi
-
-if yesno "Do you want me to remove user \"${user}\"" y; then
-    if [ `id -u` -ne 0 ]; then
-	echo "You must be root to delete the user."
-	exit 1
-    fi
-    pw userdel -n ${user}
-    echo "Done."
-fi
diff --git a/news/ifmail/pkg-install b/news/ifmail/pkg-install
deleted file mode 100644
index 544ec0d2bdb4..000000000000
--- a/news/ifmail/pkg-install
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-user=ifmail
-group=uucp
-uid=70
-
-ask() {
-    local question default answer
-
-    question=$1
-    default=$2
-    if [ -z "${PACKAGE_BUILDING}" ]; then
-	read -p "${question} [${default}]? " answer
-    fi
-    if [ x${answer} = x ]; then
-	answer=${default}
-    fi
-    echo ${answer}
-}
-
-yesno() {
-    local dflt question answer
-
-    question=$1
-    dflt=$2
-    while :; do
-	answer=$(ask "${question}" "${dflt}")
-	case "${answer}" in
-	[Yy]*)		return 0;;
-	[Nn]*)		return 1;;
-	esac
-	echo "Please answer yes or no."
-    done
-}
-
-case $2 in
-
-PRE-INSTALL)
-
-    if which -s pw; then
-	:
-    else
-	cat <<EOF
-
-This system looks like a pre-2.2 version of FreeBSD.  I see that
-it is missing the "pw" utility.  I need this utility.  Please get
-it and install it, and try again.  You can get the sources from:
-
-  ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/src/usr.sbin/pw.tar
-
-EOF
-	exit 1
-    fi
-    
-    if pw user show "${user}" 2>/dev/null; then
-	echo "You already have a user \"${user}\", so I will use it."
-    else
-	echo "You need a user \"${user}\"."
-	if which -s pw && yesno "Would you like me to create it" y; then
-	    if [ `id -u` -ne 0 ]; then
-		echo "You must be root to add the user."
-		exit 1
-	    fi
-	    if pw user show ${uid} >/dev/null 2>&1; then
-		echo "The ifmail user is normally UID ${uid}.  However, you currently have"
-		echo "a UID ${uid}."
-		if yesno "Should I just pick a new UID" y; then
-		    while pw user show ${uid} >/dev/null 2>&1; do
-			uid=`expr ${uid} + 1`
-		    done
-		    if [ $uid -gt 99 ]; then
-			echo "I can't find a low UID to use.  Please create an 'ifmail' user"
-			echo "and try the installation again."
-			exit 1
-		    fi
-		else
-		    exit 1
-		fi
-		echo "Ok, I'll use UID ${uid}."
-	    fi
-	    pw useradd ${user} -g ${group} -u ${uid} -h - -d /nonexistent \
-		-s /nonexistent -c "Ifmail user" || exit 1
-	    echo "Done."
-	else
-	    echo "Please create it, and try again."
-	    exit 1
-	fi
-    fi
-
-    ;;
-
-#
-# The package system untar's the file first, potentially before the
-# ifmail user is created.  This means that the files in
-# ${PKG_PREFIX}/libexec/ifmail will be setuid root, not setuid ifmail.
-# We have to fix this up.
-POST-INSTALL)
-    chown ifmail ${PKG_PREFIX}/libexec/ifmail/*
-    ;;
-esac
diff --git a/news/ifmail/pkg-plist b/news/ifmail/pkg-plist
index 3a590bdefd0f..a2b449c7f209 100644
--- a/news/ifmail/pkg-plist
+++ b/news/ifmail/pkg-plist
@@ -1,3 +1,7 @@
+@exec if ! pw usershow ifmail 2>/dev/null; then pw useradd ifmail -g uucp -u 70 -h - -d /nonexistent -s /nonexistent -c "Ifmail Server"; fi
+@unexec if pw usershow ifmail | grep -q 70:70; then pw userdel ifmail; fi
+@owner ifmail
+@group uucp
 libexec/ifmail/ifcico
 libexec/ifmail/ifindex
 libexec/ifmail/ifmail
@@ -8,6 +12,8 @@ libexec/ifmail/ifstat
 libexec/ifmail/iftoss
 libexec/ifmail/ifunpack
 libexec/ifmail/nlpatch
+@owner
+@group
 @dirrm libexec/ifmail
 %%PORTDOCS%%share/doc/ifmail/README
 %%PORTDOCS%%share/doc/ifmail/README.ifcico
diff --git a/news/suck/Makefile b/news/suck/Makefile
index 2cde8cc38b10..7d35b675844b 100644
--- a/news/suck/Makefile
+++ b/news/suck/Makefile
@@ -53,11 +53,11 @@ post-patch:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/examples/suck
-	${INSTALL_SCRIPT} ${WRKSRC}/sample/get.news.inn ${PREFIX}/share/examples/suck
-	${INSTALL_SCRIPT} ${WRKSRC}/sample/get.news.generic ${PREFIX}/share/examples/suck
-	${INSTALL_SCRIPT} ${WRKSRC}/sample/put.news ${PREFIX}/share/examples/suck
-	${INSTALL_DATA} ${WRKSRC}/sample/*.sample ${PREFIX}/share/examples/suck
+	${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/sample/get.news.inn ${EXAMPLESDIR}/
+	${INSTALL_SCRIPT} ${WRKSRC}/sample/get.news.generic ${EXAMPLESDIR}/
+	${INSTALL_SCRIPT} ${WRKSRC}/sample/put.news ${EXAMPLESDIR}/
+	${INSTALL_DATA} ${WRKSRC}/sample/*.sample ${EXAMPLESDIR}/
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/security/openssl-beta/Makefile b/security/openssl-beta/Makefile
index a10932ada9b5..64dd35a7c672 100644
--- a/security/openssl-beta/Makefile
+++ b/security/openssl-beta/Makefile
@@ -120,8 +120,8 @@ post-install:
 .endfor
 .endif
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/openssl
-	@${INSTALL_DATA} ${WRKSRC}/doc/openssl.txt ${PREFIX}/share/doc/openssl
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/openssl.txt ${DOCSDIR}/
 .endif
 	@${SED} -e 's#/usr/local#${PREFIX}#g' ${PKGMESSAGE}
 
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index a10932ada9b5..64dd35a7c672 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -120,8 +120,8 @@ post-install:
 .endfor
 .endif
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/openssl
-	@${INSTALL_DATA} ${WRKSRC}/doc/openssl.txt ${PREFIX}/share/doc/openssl
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/openssl.txt ${DOCSDIR}/
 .endif
 	@${SED} -e 's#/usr/local#${PREFIX}#g' ${PKGMESSAGE}
 
diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index 9981a1f98f0b..8d056efe3c59 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -20,6 +20,8 @@ LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+DOCSDIR?=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+EXAMPLESDIR?=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 
 .if defined(BATCH)
 # no cosmetique spaces allowed
@@ -73,15 +75,13 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/webalizer.1 ${PREFIX}/man/man1/${i}
 .endfor
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/${PKGNAMEPREFIX}webalizer
+	${MKDIR} ${DOCSDIR}
 .for i in ${DOC1}
-	@${INSTALL_DATA} ${WRKSRC}/${i} \
-		${PREFIX}/share/doc/${PKGNAMEPREFIX}webalizer/${i}
+	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/${i}
 .endfor
-	${MKDIR} ${PREFIX}/share/examples/${PKGNAMEPREFIX}webalizer
+	${MKDIR} ${EXAMPLESDIR}
 .for i in msfree.png sample.conf webalizer.png
-	@${INSTALL_DATA} ${WRKSRC}/${i} \
-		${PREFIX}/share/examples/${PKGNAMEPREFIX}webalizer/${i}
+	@${INSTALL_DATA} ${WRKSRC}/${i} ${EXAMPLESDIR}/${i}
 .endfor
 .endif