From owner-svn-ports-head@FreeBSD.ORG  Tue Nov 20 03:51:01 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id D52C437A;
 Tue, 20 Nov 2012 03:51:01 +0000 (UTC)
 (envelope-from adamw@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9F6198FC08;
 Tue, 20 Nov 2012 03:51:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAK3p1r5016804;
 Tue, 20 Nov 2012 03:51:01 GMT (envelope-from adamw@svn.freebsd.org)
Received: (from adamw@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAK3p1kS016802;
 Tue, 20 Nov 2012 03:51:01 GMT (envelope-from adamw@svn.freebsd.org)
Message-Id: <201211200351.qAK3p1kS016802@svn.freebsd.org>
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Tue, 20 Nov 2012 03:51:01 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r307577 - head/www/mini_httpd
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.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Nov 2012 03:51:01 -0000

Author: adamw
Date: Tue Nov 20 03:51:01 2012
New Revision: 307577
URL: http://svnweb.freebsd.org/changeset/ports/307577

Log:
  This port installs its own version of htpasswd(1),  but rather than
  registering CONFLICTS between it and the various apache versions,
  just call mini_httpd's htpasswd by another name. Bundled manpages
  updated for this as well. Also, htpasswd was being moved to man8,
  but I'm putting it back into man1 where apache's htpasswd is.
  
  Feature safe:	yes

Modified:
  head/www/mini_httpd/Makefile
  head/www/mini_httpd/pkg-plist

Modified: head/www/mini_httpd/Makefile
==============================================================================
--- head/www/mini_httpd/Makefile	Tue Nov 20 01:20:35 2012	(r307576)
+++ head/www/mini_httpd/Makefile	Tue Nov 20 03:51:01 2012	(r307577)
@@ -17,20 +17,20 @@ COMMENT=	Small HTTP server with support 
 MAKE_ARGS+=	-DUSE_OPENSSL
 .endif
 
-MAN8=		mini_httpd.8 htpasswd.8
+MAN1=	${PORTNAME}-htpasswd.1
+MAN8=	${PORTNAME}.8
 
-post-build:
-	-${MV} ${WRKSRC}/htpasswd.1 ${WRKSRC}/htpasswd.8
+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/
+	${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/
-	@for file in ${MAN8}; \
-	do \
-		${INSTALL_MAN} ${WRKSRC}/$$file ${PREFIX}/man/man8/; \
-	done
+	${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
 
 .include <bsd.port.mk>

Modified: head/www/mini_httpd/pkg-plist
==============================================================================
--- head/www/mini_httpd/pkg-plist	Tue Nov 20 01:20:35 2012	(r307576)
+++ head/www/mini_httpd/pkg-plist	Tue Nov 20 03:51:01 2012	(r307577)
@@ -1,5 +1,5 @@
 etc/mini_httpd.cnf.sample
 etc/rc.d/mini_httpd.sh
-sbin/htpasswd
 sbin/mini_httpd
+sbin/mini_httpd-htpasswd
 sbin/mini_httpd_wrapper