ports/169644: ftp/proftpd: unmark as broken on sparcv9

[Dmitry Afanasiev]

>Number:         169644
>Category:       ports
>Synopsis:       ftp/proftpd: unmark as broken on sparcv9
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 04 13:50:08 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Dmitry Afanasiev
>Release:        FreeBSD 9.0-STABLE sparc64
>Organization:
>Environment:
FreeBSD sunrise.elcom.spb.ru 9.0-STABLE FreeBSD 9.0-STABLE #27: Tue Jul  3 00:26:59 MSK 2012     root at sunrise:/usr/obj/usr/src/sys/sunrise  sparc64
>Description:
ftp/proftpd currently marked as broken on sparc64 platform.

Attached patch solves a problem with 'utx'.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- ftp/proftpd/Makefile	2012-07-04 17:24:23.658119408 +0400
+++ ftp/proftpd/Makefile.orig	2012-07-04 17:27:05.612121724 +0400
@@ -143,10 +143,6 @@
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-8-src-fsio.c
 .endif
 
-.if ${ARCH} == "sparc64" && ${OSVERSION} > 900000
-BROKEN=	Does not compile on sparc64-9: storage size of 'utx' isn't known
-.endif
-
 .if !defined(WITHOUT_RATIO)
 MODULES:=${MODULES}:mod_ratio
 PLIST_SUB+=	MOD_RATIO=""
--- ftp/proftpd/files/patch-src-wtmp.c.orig	2012-07-04 16:24:23.633120256 +0400
+++ ftp/proftpd/files/patch-src-wtmp.c	2012-07-04 16:33:43.074120690 +0400
@@ -1,5 +1,23 @@
 --- src/wtmp.c.orig	2010-07-05 09:52:50.147213835 +0200
 +++ src/wtmp.c	2010-07-05 09:53:25.075513542 +0200
+@@ -42,7 +42,7 @@
+     !(defined(LINUX) || defined(__hpux) || defined (_AIX))
+   /* This "auxilliary" utmp doesn't exist under linux. */
+ 
+-#if defined(__sparcv9) && !defined(__NetBSD__)
++#if defined(__sparcv9) && !defined(__NetBSD__) && !defined(__FreeBSD__)
+   struct futmpx utx;
+   time_t t;
+ 
+@@ -97,7 +97,7 @@
+ #else /* SVR4 */
+     utx.ut_syslen = strlen(utx.ut_host)+1;
+ 
+-#  ifdef __sparcv9
++#  ifdef __sparcv9 && !defined(__FreeBSD__)
+     time(&t);
+     utx.ut_tv.tv_sec = (time32_t)t;
+ #  else
 @@ -126,7 +126,9 @@
    }
  


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