From owner-svn-ports-head@FreeBSD.ORG Fri Apr 18 03:12:17 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C9A47B09; Fri, 18 Apr 2014 03:12:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B5882150B; Fri, 18 Apr 2014 03:12:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3I3CHl1008326; Fri, 18 Apr 2014 03:12:17 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3I3CGhY008320; Fri, 18 Apr 2014 03:12:16 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201404180312.s3I3CGhY008320@svn.freebsd.org> From: Adam Weinberger Date: Fri, 18 Apr 2014 03:12:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351516 - in head/www/mini_httpd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Apr 2014 03:12:18 -0000 Author: adamw Date: Fri Apr 18 03:12:16 2014 New Revision: 351516 URL: http://svnweb.freebsd.org/changeset/ports/351516 QAT: https://qat.redports.org/buildarchive/r351516/ Log: STAGE support, replace a wacky "NO_SSL" with an OPTION, remove extraneous stuff and pick some patch nits. Most interestingly, it appears that 16 months ago I started installing a binary as a manpage. So, we're fixing that too, and a PORTREVISION bump. Modified: head/www/mini_httpd/Makefile head/www/mini_httpd/files/patch-Makefile head/www/mini_httpd/files/patch-mini_httpd.c head/www/mini_httpd/pkg-plist Modified: head/www/mini_httpd/Makefile ============================================================================== --- head/www/mini_httpd/Makefile Fri Apr 18 02:53:13 2014 (r351515) +++ head/www/mini_httpd/Makefile Fri Apr 18 03:12:16 2014 (r351516) @@ -3,32 +3,27 @@ PORTNAME= mini_httpd PORTVERSION= 1.19 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www ipv6 MASTER_SITES= http://www.acme.com/software/mini_httpd/ MAINTAINER= ports@FreeBSD.org COMMENT= Small HTTP server with support for GET, HEAD, POST, CGI, SSL, IPv6 -.ifndef NO_SSL -MAKE_ARGS+= -DUSE_OPENSSL -.endif +OPTIONS_DEFINE= SSL +SSL_MAKE_ARGS= -DUSE_OPENSSL -MAN1= ${PORTNAME}-htpasswd.1 -MAN8= ${PORTNAME}.8 - -NO_STAGE= yes post-patch: ${REINPLACE_CMD} -e 's/htpasswd/${PORTNAME}-htpasswd/g' ${WRKSRC}/htpasswd.1 ${REINPLACE_CMD} -e 's/\(htpasswd(1)\)/${PORTNAME}-\1/g' ${WRKSRC}/${PORTNAME}.8 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/mini_httpd ${PREFIX}/sbin/ - ${INSTALL_PROGRAM} ${WRKSRC}/htpasswd ${PREFIX}/sbin/${PORTNAME}-htpasswd - ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mini_httpd_wrapper ${PREFIX}/sbin/ - ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mini_httpd.sh ${PREFIX}/etc/rc.d/ - ${INSTALL_MAN} ${WRKSRC}/htpasswd ${PREFIX}/man/man1/${MAN1} - ${INSTALL_MAN} ${WRKSRC}/${MAN8} ${PREFIX}/man/man8 - ${INSTALL_DATA} ${WRKSRC}/mini_httpd.cnf ${PREFIX}/etc/mini_httpd.cnf.sample + ${INSTALL_PROGRAM} ${WRKSRC}/mini_httpd ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_PROGRAM} ${WRKSRC}/htpasswd ${STAGEDIR}${PREFIX}/sbin/${PORTNAME}-htpasswd + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mini_httpd_wrapper ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mini_httpd.sh ${STAGEDIR}${PREFIX}/etc/rc.d + ${INSTALL_MAN} ${WRKSRC}/htpasswd.1 ${STAGEDIR}${PREFIX}/man/man1/${PORTNAME}-htpasswd.1 + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${PREFIX}/man/man8 + ${INSTALL_DATA} ${WRKSRC}/mini_httpd.cnf ${STAGEDIR}${PREFIX}/etc/mini_httpd.cnf.sample .include Modified: head/www/mini_httpd/files/patch-Makefile ============================================================================== --- head/www/mini_httpd/files/patch-Makefile Fri Apr 18 02:53:13 2014 (r351515) +++ head/www/mini_httpd/files/patch-Makefile Fri Apr 18 03:12:16 2014 (r351516) @@ -24,13 +24,3 @@ #CFLAGS = -g ${CDEFS} LDFLAGS = -s #LDFLAGS = -g -@@ -76,9 +79,7 @@ - -mkdir -p ${BINDIR} - cp mini_httpd htpasswd ${BINDIR} - rm -f ${MANDIR}/man8/mini_httpd.8 ${MANDIR}/man1/htpasswd.1 -- -mkdir -p ${MANDIR}/man8 - cp mini_httpd.8 ${MANDIR}/man8 -- -mkdir -p ${MANDIR}/man1 - cp htpasswd.1 ${MANDIR}/man1 - - clean: Modified: head/www/mini_httpd/files/patch-mini_httpd.c ============================================================================== --- head/www/mini_httpd/files/patch-mini_httpd.c Fri Apr 18 02:53:13 2014 (r351515) +++ head/www/mini_httpd/files/patch-mini_httpd.c Fri Apr 18 03:12:16 2014 (r351516) @@ -1,4 +1,4 @@ ---- mini_httpd.c~ Wed Dec 3 19:27:22 2003 +--- mini_httpd.c.orig Wed Dec 3 19:27:22 2003 +++ mini_httpd.c Thu May 6 23:36:20 2004 @@ -816,7 +816,7 @@ } Modified: head/www/mini_httpd/pkg-plist ============================================================================== --- head/www/mini_httpd/pkg-plist Fri Apr 18 02:53:13 2014 (r351515) +++ head/www/mini_httpd/pkg-plist Fri Apr 18 03:12:16 2014 (r351516) @@ -1,5 +1,7 @@ etc/mini_httpd.cnf.sample etc/rc.d/mini_httpd.sh +man/man1/mini_httpd-htpasswd.1.gz +man/man8/mini_httpd.8.gz sbin/mini_httpd sbin/mini_httpd-htpasswd sbin/mini_httpd_wrapper