Unbreak. Don't include the unversioned notes.html file, and instead

put a note about it into the pkg-message.

While here, STAGE, use @sample, and rename patch-xy's.

7 files changed, 31 insertions, 44 deletions

diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile
index 312054d4962a..65ab17b62d6c 100644
--- a/www/thttpd/Makefile
+++ b/www/thttpd/Makefile
@@ -3,32 +3,20 @@
 
 PORTNAME=	thttpd
 PORTVERSION=	2.25b
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.acme.com/software/thttpd/ \
 		http://atreides.freenix.no/~anders/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} notes.html
-DIST_SUBDIR=	${PORTNAME}
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Tiny/turbo/throttling HTTP server
 
-BROKEN=		no distinfo provided for some of the distfiles
-
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 USE_RC_SUBR=	thttpd
 SUB_FILES=	pkg-message thttpd.conf.sample
 SUB_LIST=	WWWOWN=${WWWOWN}
-PORTDOCS=	notes.html
-
-MAN1=		makeweb.1 thttpdpasswd.1
-MAN8=		thttpd.8 redirect.8 ssi.8 syslogtocern.8
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
 
 post-patch:
 .for f in extras/htpasswd.1 extras/htpasswd.c thttpd.8 extras/Makefile.in
@@ -39,32 +27,23 @@ post-patch:
 	${MV} ${WRKSRC}/extras/htpasswd.c ${WRKSRC}/extras/thttpdpasswd.c
 
 post-configure:
-	@cd ${WRKSRC} && ${PATCH} < ${PATCHDIR}/extra-patch-config.h
+	@(cd ${WRKSRC} && ${PATCH} < ${PATCHDIR}/extra-patch-config.h)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/thttpd ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/thttpd.8 ${PREFIX}/man/man8
-	@${MKDIR} ${PREFIX}/www/data ${PREFIX}/www/cgi-bin
-	${INSTALL_PROGRAM} ${WRKSRC}/cgi-src/redirect ${PREFIX}/www/cgi-bin
-	${INSTALL_PROGRAM} ${WRKSRC}/cgi-src/ssi ${PREFIX}/www/cgi-bin
-	${INSTALL_PROGRAM} ${WRKSRC}/cgi-src/phf ${PREFIX}/www/cgi-bin
-	${INSTALL_MAN} ${WRKSRC}/cgi-src/redirect.8 ${PREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/cgi-src/ssi.8 ${PREFIX}/man/man8
-	${INSTALL_PROGRAM} ${WRKSRC}/extras/makeweb ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/extras/thttpdpasswd ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/extras/syslogtocern ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/extras/makeweb.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/extras/thttpdpasswd.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/extras/syslogtocern.8 ${PREFIX}/man/man8
-	${INSTALL_DATA} ${WRKDIR}/thttpd.conf.sample ${PREFIX}/etc
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/notes.html ${DOCSDIR}
-.endif
-
-post-install:
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
-
-.include <bsd.port.post.mk>
+	${INSTALL_PROGRAM} ${WRKSRC}/thttpd ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/thttpd.8 ${STAGEDIR}${PREFIX}/man/man8
+	@${MKDIR} ${STAGEDIR}${PREFIX}/www/data ${STAGEDIR}${PREFIX}/www/cgi-bin
+	${INSTALL_PROGRAM} ${WRKSRC}/cgi-src/redirect ${STAGEDIR}${PREFIX}/www/cgi-bin
+	${INSTALL_PROGRAM} ${WRKSRC}/cgi-src/ssi ${STAGEDIR}${PREFIX}/www/cgi-bin
+	${INSTALL_PROGRAM} ${WRKSRC}/cgi-src/phf ${STAGEDIR}${PREFIX}/www/cgi-bin
+	${INSTALL_MAN} ${WRKSRC}/cgi-src/redirect.8 ${STAGEDIR}${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/cgi-src/ssi.8 ${STAGEDIR}${PREFIX}/man/man8
+	${INSTALL_PROGRAM} ${WRKSRC}/extras/makeweb ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/extras/thttpdpasswd ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/extras/syslogtocern ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/extras/makeweb.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/extras/thttpdpasswd.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/extras/syslogtocern.8 ${STAGEDIR}${PREFIX}/man/man8
+	${INSTALL_DATA} ${WRKDIR}/thttpd.conf.sample ${STAGEDIR}${PREFIX}/etc
+
+.include <bsd.port.mk>
diff --git a/www/thttpd/distinfo b/www/thttpd/distinfo
index 557bc23270c2..6cc816c66711 100644
--- a/www/thttpd/distinfo
+++ b/www/thttpd/distinfo
@@ -1,3 +1,2 @@
-SHA256 (thttpd/thttpd-2.25b.tar.gz) = 07719b08b1cff6a21c08697a7bcb4395425b07ee753106262fb62a03a7d32360
-SIZE (thttpd/thttpd-2.25b.tar.gz) = 132275
-SHA256 (thttpd/notes.html) = IGNORE
+SHA256 (thttpd-2.25b.tar.gz) = 07719b08b1cff6a21c08697a7bcb4395425b07ee753106262fb62a03a7d32360
+SIZE (thttpd-2.25b.tar.gz) = 132275
diff --git a/www/thttpd/files/patch-ab b/www/thttpd/files/patch-Makefile.in
index a51144a82d33..a51144a82d33 100644
--- a/www/thttpd/files/patch-ab
+++ b/www/thttpd/files/patch-Makefile.in
diff --git a/www/thttpd/files/patch-ac b/www/thttpd/files/patch-cgi-src_Makefile.in
index 5c8235ba280c..5c8235ba280c 100644
--- a/www/thttpd/files/patch-ac
+++ b/www/thttpd/files/patch-cgi-src_Makefile.in
diff --git a/www/thttpd/files/patch-ad b/www/thttpd/files/patch-extras_Makefile.in
index ffbea63562e0..ffbea63562e0 100644
--- a/www/thttpd/files/patch-ad
+++ b/www/thttpd/files/patch-extras_Makefile.in
diff --git a/www/thttpd/files/pkg-message.in b/www/thttpd/files/pkg-message.in
index fcc656a00c35..ef371ea458b8 100644
--- a/www/thttpd/files/pkg-message.in
+++ b/www/thttpd/files/pkg-message.in
@@ -6,4 +6,7 @@ subdirectories off of the main web directory, you need to:
   2. chgrp yourgroup %%PREFIX%%/bin/makeweb %%PREFIX%%/www
   3. chmod 2755 %%PREFIX%%/bin/makeweb
   4. Tell them about makeweb(1)
+
+See http://www.acme.com/software/thttpd/notes.html for more
+detailed instructions.
 -----------------------------------------------------------------
diff --git a/www/thttpd/pkg-plist b/www/thttpd/pkg-plist
index 84a9a68b375d..46d83a69633e 100644
--- a/www/thttpd/pkg-plist
+++ b/www/thttpd/pkg-plist
@@ -1,7 +1,13 @@
 bin/thttpdpasswd
 bin/makeweb
 bin/syslogtocern
-etc/thttpd.conf.sample
+@sample etc/thttpd.conf.sample
+man/man1/makeweb.1.gz
+man/man1/thttpdpasswd.1.gz
+man/man8/redirect.8.gz
+man/man8/ssi.8.gz
+man/man8/syslogtocern.8.gz
+man/man8/thttpd.8.gz
 sbin/thttpd
 www/cgi-bin/phf
 www/cgi-bin/redirect