ports/50957: [PATCH]: unbreak port converters/dumpasn1 on FreeBSD 4.x

[Oliver Eikemeier]

>Number:         50957
>Category:       ports
>Synopsis:       [PATCH]: unbreak port converters/dumpasn1 on FreeBSD 4.x
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 14 12:50:00 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Oliver Eikemeier
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
Fillmore Labs - http://www.fillmore-labs.com
>Environment:
System: FreeBSD nuuk.fillmore-labs.com 4.8-STABLE FreeBSD 4.8-STABLE #0: Sun Apr 6 14:21:01 CEST 2003 root at nuuk.fillmore-labs.com:/usr/obj/usr/src/sys/FILLMORE-LABS i386

>Description:
Unbreak the converters/dumpasn1 port on FreeBSD 4.x

>How-To-Repeat:
>Fix:

Perhaps DIST_SUBDIR should be set to ${PORTNAME}-${PORTVERSION}_${PORTREVISION},
the distribution files seem to change without a version bump.

--- dumpasn1.patch begins here ---
diff -Nur dumpasn1/Makefile.orig dumpasn1/Makefile
--- dumpasn1/Makefile.orig	Fri Mar 28 13:51:15 2003
+++ dumpasn1/Makefile	Mon Apr 14 21:23:46 2003
@@ -7,6 +7,7 @@
 
 PORTNAME=	dumpasn1
 PORTVERSION=	20030222
+PORTREVISION=	1
 CATEGORIES=	converters security
 MASTER_SITES=	http://www.cs.auckland.ac.nz/~pgut001/
 DISTFILES=	dumpasn1.c dumpasn1.cfg
@@ -17,10 +18,6 @@
 COMMENT=	Dumps the contents of an ASN.1 encoded file, e.g. an SSL certificate
 
 .include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=		"Needs wprintf(), which isn't available on FreeBSD <5"
-.endif
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
diff -Nur dumpasn1/distinfo.orig dumpasn1/distinfo
--- dumpasn1/distinfo.orig	Fri Mar 28 13:51:15 2003
+++ dumpasn1/distinfo	Mon Apr 14 21:17:44 2003
@@ -1,2 +1,2 @@
-MD5 (dumpasn1-20030222/dumpasn1.c) = fb4aab1f9c5153cb50bdac031086da50
-MD5 (dumpasn1-20030222/dumpasn1.cfg) = e0469908e15de921909a844b0f6fa5f5
+MD5 (dumpasn1-20030222/dumpasn1.c) = 720c630b4f4f17d4bf85b240eceeb8da
+MD5 (dumpasn1-20030222/dumpasn1.cfg) = f1c0a5c1108b7aad85afe3c5111ff906
diff -Nur dumpasn1/files/patch-ab.orig dumpasn1/files/patch-ab
--- dumpasn1/files/patch-ab.orig	Sun Dec 15 01:10:53 2002
+++ dumpasn1/files/patch-ab	Mon Apr 14 21:16:20 2003
@@ -1,6 +1,6 @@
 --- dumpasn1.c.orig	Sat Dec 14 15:13:32 2002
 +++ dumpasn1.c	Sat Dec 14 15:15:24 2002
-@@ -292,11 +292,13 @@
+@@ -297,11 +297,13 @@
     beginning with a '$' uses the appropriate environment variable.  In
     addition under Unix we also walk down $PATH looking for it */
  
@@ -14,3 +14,21 @@
  
  #if defined( __TANDEM_NSK__ )
  
+@@ -1215,14 +1217,14 @@
+ 					{
+ 					lineLength++;
+ 					i++;	/* We've read two characters for a wchar_t */
+-#if defined( __WIN32__ ) || ( defined( __UNIX__ ) && !defined( __MACH__ ) )
++#if defined( __WIN32__ ) || ( !( defined( __FreeBSD__ ) && __FreeBSD__ < 5 ) && defined( __UNIX__ ) && !defined( __MACH__ ) )
+ 					wprintf( L"%c", wCh );
+ #else
+ 					/* This could use some improvement */
+-  #ifndef __MACH__
++  #if !defined( __MACH__ ) && !defined( __FreeBSD__ )
+ 					for( p = outBuf; *p != '\0'; p++ )
+ 						*p = asciiToEbcdic( *p );
+-  #endif /* OS X */
++  #endif /* OS X  || FreeBSD */
+ 					fprintf( output, "%s", outBuf );
+ #endif /* OS-specific charset handling */
+ 					fPos += 2;
--- dumpasn1.patch ends here ---

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