Date: Wed, 2 Oct 2013 22:56:00 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329122 - in head/www/chpasswd: . files Message-ID: <201310022256.r92Mu0c8043950@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Wed Oct 2 22:56:00 2013 New Revision: 329122 URL: http://svnweb.freebsd.org/changeset/ports/329122 Log: - Support staging Added: head/www/chpasswd/pkg-message (contents, props changed) Modified: head/www/chpasswd/Makefile head/www/chpasswd/files/patch-Makefile.in (contents, props changed) Modified: head/www/chpasswd/Makefile ============================================================================== --- head/www/chpasswd/Makefile Wed Oct 2 22:55:18 2013 (r329121) +++ head/www/chpasswd/Makefile Wed Oct 2 22:56:00 2013 (r329122) @@ -17,11 +17,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX}/etc/c --enable-language=English \ --enable-cgidir=${PREFIX}/www/cgi-bin -NO_STAGE= yes pre-install: - @${MKDIR} ${PREFIX}/www/cgi-bin - -post-install: - @${ECHO} 'Remember, passwd and log file must be owned by httpd user, or chmod 777' + @${MKDIR} ${STAGEDIR}${PREFIX}/www/cgi-bin .include <bsd.port.mk> Modified: head/www/chpasswd/files/patch-Makefile.in ============================================================================== --- head/www/chpasswd/files/patch-Makefile.in Wed Oct 2 22:55:18 2013 (r329121) +++ head/www/chpasswd/files/patch-Makefile.in Wed Oct 2 22:56:00 2013 (r329122) @@ -1,5 +1,5 @@ --- Makefile.in.orig 2009-02-16 18:04:20.000000000 +0100 -+++ Makefile.in 2012-04-04 11:40:46.773080089 +0200 ++++ Makefile.in 2013-09-24 14:43:03.683410883 +0200 @@ -1,13 +1,13 @@ # Makefile.in for chpasswd.cgi @@ -16,20 +16,42 @@ PREFIX = @prefix@ DEFS = -I. @DEFS@ -DPREFIX=\"@prefix@\" -@@ -37,13 +37,13 @@ - echo "cp $(PREFIX)/chpasswd.conf"; \ - cp chpasswd.conf $(PREFIX)/chpasswd.conf; \ - chmod 755 $(PREFIX)/chpasswd.conf; \ +@@ -27,27 +27,22 @@ + $(CC) $(OBJS) $(LIBCRYPT) -o $@ + + install: all +- $(INSTALL_PROGRAM) chpasswd.cgi $(CGIDIR)/chpasswd.cgi +- chmod 755 $(CGIDIR)/chpasswd.cgi +- -@if test ! -d $(PREFIX); then \ +- echo "mkdir $(PREFIX)"; \ +- mkdir $(PREFIX); \ ++ $(INSTALL_PROGRAM) chpasswd.cgi $(DESTDIR)$(CGIDIR)/chpasswd.cgi ++ chmod 755 $(DESTDIR)$(CGIDIR)/chpasswd.cgi ++ -@if test ! -d $(DESTDIR)$(PREFIX); then \ ++ echo "mkdir $(DESTDIR)$(PREFIX)"; \ ++ mkdir $(DESTDIR)$(PREFIX); \ + fi +- @if test ! -f $(PREFIX)/chpasswd.conf; then \ +- echo "cp $(PREFIX)/chpasswd.conf"; \ +- cp chpasswd.conf $(PREFIX)/chpasswd.conf; \ +- chmod 755 $(PREFIX)/chpasswd.conf; \ - else \ - cp chpasswd.conf $(PREFIX)/chpasswd.conf.orig; \ - fi -+ @echo "cp $(PREFIX)/chpasswd.conf.sample" -+ @cp chpasswd.conf $(PREFIX)/chpasswd.conf.sample - @if test ! -f $(PREFIX)/chpasswd.log; then \ +- fi +- @if test ! -f $(PREFIX)/chpasswd.log; then \ ++ @echo "cp $(DESTDIR)$(PREFIX)/chpasswd.conf.sample" ++ @cp chpasswd.conf $(DESTDIR)$(PREFIX)/chpasswd.conf.sample ++ @if test ! -f $(DESTDIR)$(PREFIX)/chpasswd.log; then \ echo "touch $(PREFIX)/chpasswd.log"; \ - touch $(PREFIX)/chpasswd.log; \ +- touch $(PREFIX)/chpasswd.log; \ - chmod 777 $(PREFIX)/chpasswd.log; \ -+ chmod 775 $(PREFIX)/chpasswd.log; \ ++ touch $(DESTDIR)$(PREFIX)/chpasswd.log; \ ++ chmod 775 $(DESTDIR)$(PREFIX)/chpasswd.log; \ fi uninstall: +- rm -f $(CGIDIR)/chpasswd.cgi ++ rm -f $(DESTDIR)$(CGIDIR)/chpasswd.cgi + + TAGS: $(SRCS) + etags $(SRCS) Added: head/www/chpasswd/pkg-message ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/chpasswd/pkg-message Wed Oct 2 22:56:00 2013 (r329122) @@ -0,0 +1 @@ +Remember, passwd and log file must be owned by httpd user.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310022256.r92Mu0c8043950>