5 files changed, 36 insertions, 47 deletions

diff --git a/converters/dumpasn1/Makefile b/converters/dumpasn1/Makefile
index 5e57341b7bc8..ed1c3e389885 100644
--- a/converters/dumpasn1/Makefile
+++ b/converters/dumpasn1/Makefile
@@ -11,15 +11,11 @@ CATEGORIES=	converters security
 MASTER_SITES=	http://www.cs.auckland.ac.nz/~pgut001/
 DISTFILES=	dumpasn1.c dumpasn1.cfg
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
-EXTRACT_ONLY=
+EXTRACT_ONLY=	yes
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Dumps the contents of an ASN.1 encoded file, e.g. an SSL certificate
 
-BROKEN=		Size mismatch
-
-.include <bsd.port.pre.mk>
-
 do-extract:
 	@${MKDIR} ${WRKSRC}
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/dumpasn1.c ${WRKSRC}
@@ -33,4 +29,4 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dumpasn1 ${PREFIX}/bin
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/dumpasn1.cfg ${PREFIX}/share/dumpasn1
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/converters/dumpasn1/distinfo b/converters/dumpasn1/distinfo
index 1af5f761a071..49d40da36946 100644
--- a/converters/dumpasn1/distinfo
+++ b/converters/dumpasn1/distinfo
@@ -1,4 +1,6 @@
-MD5 (dumpasn1-20030329/dumpasn1.c) = 720c630b4f4f17d4bf85b240eceeb8da
-SIZE (dumpasn1-20030329/dumpasn1.c) = 68281
-MD5 (dumpasn1-20030329/dumpasn1.cfg) = f1c0a5c1108b7aad85afe3c5111ff906
-SIZE (dumpasn1-20030329/dumpasn1.cfg) = 168139
+MD5 (dumpasn1-20030329/dumpasn1.c) = faba9cbad80fcc97ae566f97c2c85272
+SHA256 (dumpasn1-20030329/dumpasn1.c) = c21cc6da25c76e5706e39a425435ee8f9c0e095ef1dc9c9b2d0f3405626c002a
+SIZE (dumpasn1-20030329/dumpasn1.c) = 68310
+MD5 (dumpasn1-20030329/dumpasn1.cfg) = fffe09ac2fad6161b62a69b98f51e7d1
+SHA256 (dumpasn1-20030329/dumpasn1.cfg) = 92947896e802e24d89f101aac494d4ef5a9dffbcdf0d24f144deee6c7f2b9b76
+SIZE (dumpasn1-20030329/dumpasn1.cfg) = 171069
diff --git a/converters/dumpasn1/files/patch-ab b/converters/dumpasn1/files/patch-ab
deleted file mode 100644
index 94cec25b01c7..000000000000
--- a/converters/dumpasn1/files/patch-ab
+++ /dev/null
@@ -1,34 +0,0 @@
---- dumpasn1.c.orig	Sat Dec 14 15:13:32 2002
-+++ dumpasn1.c	Sat Dec 14 15:15:24 2002
-@@ -297,11 +297,13 @@
-    beginning with a '$' uses the appropriate environment variable.  In
-    addition under Unix we also walk down $PATH looking for it */
- 
-+#ifndef CONFIG_NAME
- #ifdef __TANDEM_NSK__
-   #define CONFIG_NAME		"asn1cfg"
- #else
-   #define CONFIG_NAME		"dumpasn1.cfg"
- #endif /* __TANDEM_NSK__ */
-+#endif
- 
- #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;
diff --git a/converters/dumpasn1/files/patch-dumpasn1.c b/converters/dumpasn1/files/patch-dumpasn1.c
new file mode 100644
index 000000000000..bd4d367d9de7
--- /dev/null
+++ b/converters/dumpasn1/files/patch-dumpasn1.c
@@ -0,0 +1,25 @@
+--- dumpasn1.c.orig	Tue Nov 15 12:12:53 2005
++++ dumpasn1.c	Tue Nov 15 12:13:06 2005
+@@ -297,11 +297,13 @@
+    beginning with a '$' uses the appropriate environment variable.  In
+    addition under Unix we also walk down $PATH looking for it */
+ 
++#ifndef CONFIG_NAME
+ #ifdef __TANDEM_NSK__
+   #define CONFIG_NAME		"asn1cfg"
+ #else
+   #define CONFIG_NAME		"dumpasn1.cfg"
+ #endif /* __TANDEM_NSK__ */
++#endif
+ 
+ #if defined( __TANDEM_NSK__ )
+ 
+@@ -1215,7 +1217,7 @@
+ 					lineLength++;
+ 					i++;	/* We've read two characters for a wchar_t */
+ #if defined( __WIN32__ ) || \
+-	( defined( __UNIX__ ) && !( defined( __MACH__ ) || defined( __OpenBSD__ ) ) )
++	( defined( __UNIX__ ) && !( defined( __FreeBSD__ ) && __FreeBSD__ < 5 ) && !( defined( __MACH__ ) || defined( __OpenBSD__ ) ) )
+ 
+ 					wprintf( L"%c", wCh );
+ #else
diff --git a/converters/dumpasn1/pkg-plist b/converters/dumpasn1/pkg-plist
index b0dbb134d214..9026939487a4 100644
--- a/converters/dumpasn1/pkg-plist
+++ b/converters/dumpasn1/pkg-plist
@@ -1,3 +1,3 @@
 bin/dumpasn1
-share/dumpasn1/dumpasn1.cfg
-@dirrm share/dumpasn1
+%%DATADIR%%/dumpasn1.cfg
+@dirrm %%DATADIR%%