ports/154969: Update to net/socks5 (unbreak for -current)

[Udo Schweigert]

>Number:         154969
>Category:       ports
>Synopsis:       Update to net/socks5 (unbreak for -current)
>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:   Wed Feb 23 11:30:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Udo Schweigert
>Release:        FreeBSD 8.2-RELEASE i386
>Organization:
>Environment:


>Description:

Unbreak port net/socks5 for recent -current (after utmpx update).
Patch has been tested on recent -current.

>How-To-Repeat:
>Fix:

Committer: new file (cvs add) files/extra-patch-clients::ftp::ruserpass.c-freebsd-9

diff -ruN socks5.orig/Makefile socks5/Makefile
--- socks5.orig/Makefile	2010-03-20 16:37:53.000000000 +0100
+++ socks5/Makefile	2011-02-23 11:56:39.000000000 +0100
@@ -47,7 +47,8 @@
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} > 900007
-BROKEN=		fails to build with new utmpx
+post-patch::
+	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-clients::ftp::ruserpass.c-freebsd-9
 .endif
 
 post-install:
diff -ruN socks5.orig/files/extra-patch-clients::ftp::ruserpass.c-freebsd-9 socks5/files/extra-patch-clients::ftp::ruserpass.c-freebsd-9
--- socks5.orig/files/extra-patch-clients::ftp::ruserpass.c-freebsd-9	1970-01-01 01:00:00.000000000 +0100
+++ socks5/files/extra-patch-clients::ftp::ruserpass.c-freebsd-9	2011-02-23 11:57:04.000000000 +0100
@@ -0,0 +1,20 @@
+--- clients/ftp/ruserpass.c.orig	2000-08-16 17:38:44.000000000 +0200
++++ clients/ftp/ruserpass.c	2011-02-22 08:28:23.000000000 +0100
+@@ -46,7 +46,7 @@
+ #endif
+ 
+ #include <stdio.h>
+-#include <utmp.h>
++#include <utmpx.h>
+ #include <ctype.h>
+ #include <errno.h>
+ 
+@@ -55,7 +55,7 @@
+ #endif
+ 
+ char	*renvlook(), *getlogin();
+-struct	utmp *getutmp();
++struct	utmpx *getutmp();
+ static	FILE *cfile;
+ 
+ #define	DEFAULT	1

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