diff options
| -rw-r--r-- | www/chpasswd/Makefile | 6 | ||||
| -rw-r--r-- | www/chpasswd/files/patch-Makefile.in | 44 | ||||
| -rw-r--r-- | www/chpasswd/pkg-message | 1 |
3 files changed, 35 insertions, 16 deletions
diff --git a/www/chpasswd/Makefile b/www/chpasswd/Makefile index 8e1ab0110459..be48e37713a9 100644 --- a/www/chpasswd/Makefile +++ b/www/chpasswd/Makefile @@ -17,11 +17,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX}/etc/chpasswd \ --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> diff --git a/www/chpasswd/files/patch-Makefile.in b/www/chpasswd/files/patch-Makefile.in index 8680caec9ebc..75a0bd203dae 100644 --- a/www/chpasswd/files/patch-Makefile.in +++ b/www/chpasswd/files/patch-Makefile.in @@ -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) diff --git a/www/chpasswd/pkg-message b/www/chpasswd/pkg-message new file mode 100644 index 000000000000..798d1882809f --- /dev/null +++ b/www/chpasswd/pkg-message @@ -0,0 +1 @@ +Remember, passwd and log file must be owned by httpd user. |