4 files changed, 54 insertions, 53 deletions

diff --git a/security/libtasn1/Makefile b/security/libtasn1/Makefile
index 35c896d55dfd..271535a06116 100644
--- a/security/libtasn1/Makefile
+++ b/security/libtasn1/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libtasn1
-PORTVERSION=	2.14
+PORTVERSION=	3.3
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	libtasn1
@@ -11,56 +11,18 @@ MAINTAINER=	novel@FreeBSD.org
 COMMENT=	ASN.1 structure parser library
 
 USE_LDCONFIG=	yes
-USES=		pkgconfig pathfix
+USES=		pkgconfig pathfix gmake
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-NO_STAGE=	yes
+
+OPTIONS_DEFINE=	DOCS
 
 DOCS=		AUTHORS NEWS README THANKS doc/TODO \
 		doc/libtasn1.html doc/libtasn1.pdf doc/libtasn1.ps
-INFO=		libtasn1
-MAN1=		asn1Parser.1 \
-		asn1Coding.1 \
-		asn1Decoding.1
-MAN3=		asn1_array2tree.3 \
-		asn1_bit_der.3 \
-		asn1_check_version.3 \
-		asn1_copy_node.3 \
-		asn1_create_element.3 \
-		asn1_delete_element.3 \
-		asn1_delete_structure.3 \
-		asn1_der_coding.3 \
-		asn1_der_decoding.3 \
-		asn1_der_decoding_element.3 \
-		asn1_der_decoding_startEnd.3 \
-		asn1_expand_any_defined_by.3 \
-		asn1_expand_octet_string.3 \
-		asn1_find_node.3 \
-		asn1_find_structure_from_oid.3 \
-		asn1_get_bit_der.3 \
-		asn1_get_length_ber.3 \
-		asn1_get_length_der.3 \
-		asn1_get_octet_der.3 \
-		asn1_get_tag_der.3 \
-		asn1_length_der.3 \
-		asn1_number_of_elements.3 \
-		asn1_octet_der.3 \
-		asn1_parser2array.3 \
-		asn1_parser2tree.3 \
-		asn1_perror.3 \
-		asn1_print_structure.3 \
-		asn1_read_node_value.3 \
-		asn1_read_tag.3 \
-		asn1_read_value.3 \
-		asn1_strerror.3 \
-		asn1_write_value.3 \
-		libtasn1_perror.3 \
-		libtasn1_strerror.3
 
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
 post-install:
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/security/libtasn1/distinfo b/security/libtasn1/distinfo
index 27942c5bac54..eb1c83b24121 100644
--- a/security/libtasn1/distinfo
+++ b/security/libtasn1/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libtasn1-2.14.tar.gz) = bc2936cd20267859278145e563427c274d27aaae30ecdf50a04cdd4ec0153d54
-SIZE (libtasn1-2.14.tar.gz) = 1977010
+SHA256 (libtasn1-3.3.tar.gz) = 92652a2cd10f63c56984b5e5cee46ecadf2292e2262fff99278f7ee46ff93ac0
+SIZE (libtasn1-3.3.tar.gz) = 2039225
diff --git a/security/libtasn1/pkg-descr b/security/libtasn1/pkg-descr
index 4777efbeb9d5..ab16342c4e6b 100644
--- a/security/libtasn1/pkg-descr
+++ b/security/libtasn1/pkg-descr
@@ -8,6 +8,6 @@ The main features of this library are:
 - off-line ASN1 structure management with C code file generation 
   containing an array;
 - DER (Distinguish Encoding Rules) encoding;
-- no limits for INTEGER and ENUMERATED values 
-	
-WWW:	http://www.gnu.org/software/libtasn1/
+- no limits for INTEGER and ENUMERATED values
+
+WWW: http://www.gnu.org/software/libtasn1/
diff --git a/security/libtasn1/pkg-plist b/security/libtasn1/pkg-plist
index 70c3be2347d8..016467a4ad55 100644
--- a/security/libtasn1/pkg-plist
+++ b/security/libtasn1/pkg-plist
@@ -1,13 +1,52 @@
 @comment $FreeBSD$
-bin/asn1Parser
 bin/asn1Coding
 bin/asn1Decoding
+bin/asn1Parser
 include/libtasn1.h
+info/libtasn1.info
 lib/libtasn1.a
 lib/libtasn1.la
 lib/libtasn1.so
-lib/libtasn1.so.5
+lib/libtasn1.so.7
 libdata/pkgconfig/libtasn1.pc
+man/man1/asn1Coding.1.gz
+man/man1/asn1Decoding.1.gz
+man/man1/asn1Parser.1.gz
+man/man3/asn1_array2tree.3.gz
+man/man3/asn1_bit_der.3.gz
+man/man3/asn1_check_version.3.gz
+man/man3/asn1_copy_node.3.gz
+man/man3/asn1_create_element.3.gz
+man/man3/asn1_decode_simple_der.3.gz
+man/man3/asn1_delete_element.3.gz
+man/man3/asn1_delete_structure.3.gz
+man/man3/asn1_der_coding.3.gz
+man/man3/asn1_der_decoding.3.gz
+man/man3/asn1_der_decoding_element.3.gz
+man/man3/asn1_der_decoding_startEnd.3.gz
+man/man3/asn1_encode_simple_der.3.gz
+man/man3/asn1_expand_any_defined_by.3.gz
+man/man3/asn1_expand_octet_string.3.gz
+man/man3/asn1_find_node.3.gz
+man/man3/asn1_find_structure_from_oid.3.gz
+man/man3/asn1_get_bit_der.3.gz
+man/man3/asn1_get_length_ber.3.gz
+man/man3/asn1_get_length_der.3.gz
+man/man3/asn1_get_octet_der.3.gz
+man/man3/asn1_get_tag_der.3.gz
+man/man3/asn1_length_der.3.gz
+man/man3/asn1_number_of_elements.3.gz
+man/man3/asn1_octet_der.3.gz
+man/man3/asn1_parser2array.3.gz
+man/man3/asn1_parser2tree.3.gz
+man/man3/asn1_perror.3.gz
+man/man3/asn1_print_structure.3.gz
+man/man3/asn1_read_node_value.3.gz
+man/man3/asn1_read_tag.3.gz
+man/man3/asn1_read_value.3.gz
+man/man3/asn1_read_value_type.3.gz
+man/man3/asn1_strerror.3.gz
+man/man3/asn1_write_value.3.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README