ports/117928: [patch] www/chpasswd : unbreak gcc42

[Philippe Audeoud]

>Number:         117928
>Category:       ports
>Synopsis:       [patch] www/chpasswd : unbreak gcc42
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 08 15:40:01 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Philippe Audeoud
>Release:        FreeBSD 6.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD huppa.tuxaco.net 6.2-RELEASE FreeBSD 6.2-RELEASE #0: Tue Mar 20 16:05:42 CET 2007 root@:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
	- unbreak gcc42
	- Bump PORTREVISION
	- update MASTER_SITES
>How-To-Repeat:
	
>Fix:

	

--- patch-chpasswd begins here ---
diff -ruN www/chpasswd/Makefile www/chpasswd.orig/Makefile
--- www/chpasswd/Makefile	2007-11-08 15:14:12.000000000 +0000
+++ www/chpasswd.orig/Makefile	2007-11-08 14:54:54.000000000 +0000
@@ -7,9 +7,9 @@
 
 PORTNAME=	chpasswd
 PORTVERSION=	2.2.3
-PORTREVISION=	3
+PORTREVISION=	2
 CATEGORIES=	www
-MASTER_SITES=	SF
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	orsochpasswd
 
 MAINTAINER=	jmelo at FreeBSD.org
@@ -21,10 +21,16 @@
 		--enable-language=English \
 		--enable-cgidir=${PREFIX}/www/cgi-bin
 
+.include <bsd.port.pre.mk>
+
+.if (${OSVERSION} >= 700000)
+BROKEN=		Does not compile on 7.X
+.endif
+
 pre-install:
 	@${MKDIR} ${PREFIX}/www/cgi-bin
 
 post-install:
 	@${ECHO} 'Remember, passwd and log file must be owned by httpd user, or chmod 777'
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN www/chpasswd/files/patch-chpasswd.c www/chpasswd.orig/files/patch-chpasswd.c
--- www/chpasswd/files/patch-chpasswd.c	2007-11-08 15:11:52.000000000 +0000
+++ www/chpasswd.orig/files/patch-chpasswd.c	2007-11-08 14:54:54.000000000 +0000
@@ -1,17 +1,8 @@
---- chpasswd.c.orig	2005-05-09 13:05:08.000000000 +0000
-+++ chpasswd.c	2007-11-08 15:10:11.000000000 +0000
-@@ -282,7 +282,7 @@
- }
- 
- 
--static int
-+int
- htoi(s)
-         unsigned char   *s;
- {
-@@ -664,6 +664,16 @@
- }
- 
+--- chpasswd.c.orig	Fri Apr 11 01:54:02 2003
++++ chpasswd.c	Wed Sep 22 15:46:47 2004
+@@ -23,6 +23,16 @@
+ static void vrfyauth(IpAuth,PwdLogFile,PwdFile,SmtpUser,SmtpSubject);
+ eperror(s);
  
 +void getword(char *, char *, char);
 +void Herror(char *);
--- patch-chpasswd ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: