Index: branches/2015Q2/security/libtasn1/Makefile
===================================================================
--- branches/2015Q2/security/libtasn1/Makefile	(revision 390712)
+++ branches/2015Q2/security/libtasn1/Makefile	(revision 390713)
@@ -1,28 +1,29 @@
 # Created by: Sergei Kolobov <sergei@kolobov.com>
 # $FreeBSD$
 
 PORTNAME=	libtasn1
-PORTVERSION=	4.2
+PORTVERSION=	4.5
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	libtasn1
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	ASN.1 structure parser library
 
 USE_LDCONFIG=	yes
 USES=		cpe pkgconfig pathfix gmake libtool
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 CPE_VENDOR=	gnu
 
 OPTIONS_DEFINE=	DOCS
 
 DOCS=		AUTHORS NEWS README THANKS doc/TODO \
 		doc/libtasn1.html doc/libtasn1.pdf doc/libtasn1.ps
+INFO=		libtasn1
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: branches/2015Q2/security/libtasn1/distinfo
===================================================================
--- branches/2015Q2/security/libtasn1/distinfo	(revision 390712)
+++ branches/2015Q2/security/libtasn1/distinfo	(revision 390713)
@@ -1,2 +1,2 @@
-SHA256 (libtasn1-4.2.tar.gz) = 693b41cb36c2ac02d5990180b0712a79a591168e93d85f7fcbb75a0a0be4cdbb
-SIZE (libtasn1-4.2.tar.gz) = 1866192
+SHA256 (libtasn1-4.5.tar.gz) = 89b3b5dce119273431544ecb305081f3530911001bb12e5d76588907edb71bda
+SIZE (libtasn1-4.5.tar.gz) = 1850279
Index: branches/2015Q2/security/libtasn1/pkg-plist
===================================================================
--- branches/2015Q2/security/libtasn1/pkg-plist	(revision 390712)
+++ branches/2015Q2/security/libtasn1/pkg-plist	(revision 390713)
@@ -1,60 +1,59 @@
 bin/asn1Coding
 bin/asn1Decoding
 bin/asn1Parser
 include/libtasn1.h
-info/libtasn1.info
 lib/libtasn1.a
 lib/libtasn1.so
 lib/libtasn1.so.6
-lib/libtasn1.so.6.3.2
+lib/libtasn1.so.6.4.2
 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_ber.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_delete_structure2.3.gz
 man/man3/asn1_der_coding.3.gz
 man/man3/asn1_der_decoding.3.gz
 man/man3/asn1_der_decoding2.3.gz
 man/man3/asn1_der_decoding_element.3.gz
 man/man3/asn1_der_decoding_startEnd.3.gz
 man/man3/asn1_dup_node.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
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/libtasn1.html
 %%PORTDOCS%%%%DOCSDIR%%/libtasn1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/libtasn1.ps
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: branches/2015Q2
===================================================================
--- branches/2015Q2	(revision 390712)
+++ branches/2015Q2	(revision 390713)

Property changes on: branches/2015Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r385082,386705,386950