Date: Tue, 20 Nov 2012 03:51:01 +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: r307577 - head/www/mini_httpd Message-ID: <201211200351.qAK3p1kS016802@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211200351.qAK3p1kS016802>