Index: head/www/chpasswd/Makefile =================================================================== --- head/www/chpasswd/Makefile (revision 329121) +++ head/www/chpasswd/Makefile (revision 329122) @@ -1,27 +1,23 @@ # Created by: Jean Milanez Melo # $FreeBSD$ PORTNAME= chpasswd PORTVERSION= 2.2.4 PORTREVISION= 1 CATEGORIES= www #MASTER_SITES= SF/orsochpasswd/orsochpasswd/chpasswd-2.2.4/ MASTER_SITES= SF/orso${PORTNAME}/orso${PORTNAME}/${PORTNAME}-${PORTVERSION}/ MAINTAINER= madpilot@FreeBSD.org COMMENT= Allow users to change their Squid or Web password using the browser HAS_CONFIGURE= yes 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 Index: head/www/chpasswd/files/patch-Makefile.in =================================================================== --- head/www/chpasswd/files/patch-Makefile.in (revision 329121) +++ head/www/chpasswd/files/patch-Makefile.in (revision 329122) @@ -1,35 +1,57 @@ --- 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 -CC = gcc +CC ?= gcc LANGUAGE = @LANGUAGE@ CGIDIR = @CGIDIR@ SRCDIR = . VPATH = . INSTALL = cp LIBCRYPT = @CRYPTLIB@ -CFLAGS = -O2 -w $(DEFINES) +CFLAGS += -w $(DEFINES) 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) Property changes on: head/www/chpasswd/files/patch-Makefile.in ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chpasswd/pkg-message =================================================================== --- head/www/chpasswd/pkg-message (nonexistent) +++ head/www/chpasswd/pkg-message (revision 329122) @@ -0,0 +1 @@ +Remember, passwd and log file must be owned by httpd user. Property changes on: head/www/chpasswd/pkg-message ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property