Date: Mon, 23 Jun 2014 01:31:31 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358885 - in head/www/thttpd: . files Message-ID: <201406230131.s5N1VVNI000682@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Mon Jun 23 01:31:30 2014 New Revision: 358885 URL: http://svnweb.freebsd.org/changeset/ports/358885 QAT: https://qat.redports.org/buildarchive/r358885/ Log: 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. Added: head/www/thttpd/files/patch-Makefile.in - copied unchanged from r358883, head/www/thttpd/files/patch-ab head/www/thttpd/files/patch-cgi-src_Makefile.in - copied unchanged from r358883, head/www/thttpd/files/patch-ac head/www/thttpd/files/patch-extras_Makefile.in - copied unchanged from r358883, head/www/thttpd/files/patch-ad Deleted: head/www/thttpd/files/patch-ab head/www/thttpd/files/patch-ac head/www/thttpd/files/patch-ad Modified: head/www/thttpd/Makefile head/www/thttpd/distinfo head/www/thttpd/files/pkg-message.in head/www/thttpd/pkg-plist Modified: head/www/thttpd/Makefile ============================================================================== --- head/www/thttpd/Makefile Mon Jun 23 00:59:51 2014 (r358884) +++ head/www/thttpd/Makefile Mon Jun 23 01:31:30 2014 (r358885) @@ -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} + ${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.post.mk> +.include <bsd.port.mk> Modified: head/www/thttpd/distinfo ============================================================================== --- head/www/thttpd/distinfo Mon Jun 23 00:59:51 2014 (r358884) +++ head/www/thttpd/distinfo Mon Jun 23 01:31:30 2014 (r358885) @@ -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 Copied: head/www/thttpd/files/patch-Makefile.in (from r358883, head/www/thttpd/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/thttpd/files/patch-Makefile.in Mon Jun 23 01:31:30 2014 (r358885, copy of r358883, head/www/thttpd/files/patch-ab) @@ -0,0 +1,11 @@ +--- Makefile.in.orig Tue Apr 24 19:21:06 2001 ++++ Makefile.in Tue Apr 24 19:21:33 2001 +@@ -47,7 +47,7 @@ + # You shouldn't need to edit anything below here. + + CC = @CC@ +-CCOPT = @V_CCOPT@ ++CCOPT = @CFLAGS@ + DEFS = @DEFS@ + INCLS = -I. + CFLAGS = $(CCOPT) $(DEFS) $(INCLS) Copied: head/www/thttpd/files/patch-cgi-src_Makefile.in (from r358883, head/www/thttpd/files/patch-ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/thttpd/files/patch-cgi-src_Makefile.in Mon Jun 23 01:31:30 2014 (r358885, copy of r358883, head/www/thttpd/files/patch-ac) @@ -0,0 +1,11 @@ +--- cgi-src/Makefile.in.orig Tue Apr 24 19:44:12 2001 ++++ cgi-src/Makefile.in Tue Apr 24 19:44:25 2001 +@@ -31,7 +31,7 @@ + MANDIR = @mandir@ + + CC = @CC@ +-CCOPT = @V_CCOPT@ ++CCOPT = @CFLAGS@ + DEFS = @DEFS@ + INCLS = -I.. + CFLAGS = $(CCOPT) $(DEFS) $(INCLS) Copied: head/www/thttpd/files/patch-extras_Makefile.in (from r358883, head/www/thttpd/files/patch-ad) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/thttpd/files/patch-extras_Makefile.in Mon Jun 23 01:31:30 2014 (r358885, copy of r358883, head/www/thttpd/files/patch-ad) @@ -0,0 +1,11 @@ +--- extras/Makefile.in.orig Tue Apr 24 19:46:03 2001 ++++ extras/Makefile.in Tue Apr 24 19:46:13 2001 +@@ -32,7 +32,7 @@ + MANDIR = @mandir@ + + CC = @CC@ +-CCOPT = @V_CCOPT@ ++CCOPT = @CFLAGS@ + DEFS = @DEFS@ + INCLS = -I.. + CFLAGS = $(CCOPT) $(DEFS) $(INCLS) Modified: head/www/thttpd/files/pkg-message.in ============================================================================== --- head/www/thttpd/files/pkg-message.in Mon Jun 23 00:59:51 2014 (r358884) +++ head/www/thttpd/files/pkg-message.in Mon Jun 23 01:31:30 2014 (r358885) @@ -6,4 +6,7 @@ subdirectories off of the main web direc 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. ----------------------------------------------------------------- Modified: head/www/thttpd/pkg-plist ============================================================================== --- head/www/thttpd/pkg-plist Mon Jun 23 00:59:51 2014 (r358884) +++ head/www/thttpd/pkg-plist Mon Jun 23 01:31:30 2014 (r358885) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406230131.s5N1VVNI000682>