3 files changed, 39 insertions, 31 deletions

diff --git a/archivers/zip-ada/Makefile b/archivers/zip-ada/Makefile
index acaf93a88908..a9e344867d6f 100644
--- a/archivers/zip-ada/Makefile
+++ b/archivers/zip-ada/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	zip-ada
-PORTVERSION=	50
-PORTREVISION=	2
+PORTVERSION=	51
 CATEGORIES=	archivers
 MASTER_SITES=	SF/unzip-ada/
-DISTNAME=	zipada${PORTVERSION}_f1
+DISTNAME=	zipada${PORTVERSION}
 
 MAINTAINER=	marino@FreeBSD.org
 COMMENT=	Zip compressed archive file format library written in Ada
@@ -16,17 +15,15 @@ LICENSE=	MIT
 USES=		ada perl5 dos2unix zip
 USE_PERL5=	build
 WRKSRC=		${WRKDIR}/zip-ada
-MAKE_ENV+=	Build_Mode=Optimize
+MAKE_ENV+=	Build_Mode=Fast
 ZTOOLS=		bunzip comp_zip find_zip lz lzma_dec random_data rezip zipada
 DEMOS=		demo_csv_into_zip demo_unzip demo_zip test_chunk \
 		test_extract test_extract_tb test_lz_scramble \
 		test_stream_performance test_unz_streams \
 		test_zip_info_timing za_gnat zip_with_many_files ziptest
 
-PORTSCOUT=	ignore:50_f1	# Portscout currently showing false positive
-
 do-build:
-	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gnatmake -P zipada.gpr)
+	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gnatmake -p -P zipada.gpr)
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/bin \
diff --git a/archivers/zip-ada/distinfo b/archivers/zip-ada/distinfo
index 0b476fed0f94..d264ac018791 100644
--- a/archivers/zip-ada/distinfo
+++ b/archivers/zip-ada/distinfo
@@ -1,2 +1,3 @@
-SHA256 (zipada50_f1.zip) = d8962aeca991ecf46f61ddff9aa6993c3c8b26b0debe98c54e31f49aa13781ff
-SIZE (zipada50_f1.zip) = 397886
+TIMESTAMP = 1472265180
+SHA256 (zipada51.zip) = ae96c7d2bfafd4002f28483e513da88a2550fdd74e01ae515eed817fdba91cd9
+SIZE (zipada51.zip) = 607634
diff --git a/archivers/zip-ada/pkg-plist b/archivers/zip-ada/pkg-plist
index 7d3a1569fade..4fae20ad022b 100644
--- a/archivers/zip-ada/pkg-plist
+++ b/archivers/zip-ada/pkg-plist
@@ -1,3 +1,16 @@
+%%EXAMPLESDIR%%/demo_csv_into_zip
+%%EXAMPLESDIR%%/demo_unzip
+%%EXAMPLESDIR%%/demo_zip
+%%EXAMPLESDIR%%/test_chunk
+%%EXAMPLESDIR%%/test_extract
+%%EXAMPLESDIR%%/test_extract_tb
+%%EXAMPLESDIR%%/test_lz_scramble
+%%EXAMPLESDIR%%/test_stream_performance
+%%EXAMPLESDIR%%/test_unz_streams
+%%EXAMPLESDIR%%/test_zip_info_timing
+%%EXAMPLESDIR%%/za_gnat
+%%EXAMPLESDIR%%/zip_with_many_files
+%%EXAMPLESDIR%%/ziptest
 bin/comp_zip
 bin/debzip2
 bin/find_zip
@@ -6,12 +19,17 @@ bin/lzma_dec
 bin/random_data
 bin/rezip
 bin/zipada
-include/zip-ada/bzip2.adb
-include/zip-ada/bzip2.ads
+include/zip-ada/bzip2_decoding.adb
+include/zip-ada/bzip2_decoding.ads
 include/zip-ada/length_limited_huffman_code_lengths.adb
 include/zip-ada/length_limited_huffman_code_lengths.ads
-include/zip-ada/lzma_decoding.adb
-include/zip-ada/lzma_decoding.ads
+include/zip-ada/lz77.adb
+include/zip-ada/lz77.ads
+include/zip-ada/lzma-decoding.adb
+include/zip-ada/lzma-decoding.ads
+include/zip-ada/lzma-encoding.adb
+include/zip-ada/lzma-encoding.ads
+include/zip-ada/lzma.ads
 include/zip-ada/unzip-decompress-huffman.adb
 include/zip-ada/unzip-decompress-huffman.ads
 include/zip-ada/unzip-decompress.adb
@@ -22,35 +40,39 @@ include/zip-ada/unzip.adb
 include/zip-ada/unzip.ads
 include/zip-ada/zip-compress-deflate.adb
 include/zip-ada/zip-compress-deflate.ads
+include/zip-ada/zip-compress-lzma_e.adb
+include/zip-ada/zip-compress-lzma_e.ads
 include/zip-ada/zip-compress-reduce.adb
 include/zip-ada/zip-compress-reduce.ads
 include/zip-ada/zip-compress-shrink.adb
 include/zip-ada/zip-compress-shrink.ads
 include/zip-ada/zip-compress.adb
 include/zip-ada/zip-compress.ads
+include/zip-ada/zip-compress__no_unsigned_64.adb
 include/zip-ada/zip-crc_crypto.adb
 include/zip-ada/zip-crc_crypto.ads
 include/zip-ada/zip-create.adb
 include/zip-ada/zip-create.ads
 include/zip-ada/zip-headers.adb
 include/zip-ada/zip-headers.ads
-include/zip-ada/zip-lz77.adb
-include/zip-ada/zip-lz77.ads
 include/zip-ada/zip.adb
 include/zip-ada/zip.ads
 include/zip-ada/zip_streams.adb
 include/zip-ada/zip_streams.ads
 lib/gnat/zip-ada.gpr
-lib/zip-ada/bzip2.ali
+lib/zip-ada/bzip2_decoding.ali
 lib/zip-ada/comp_zip_prc.ali
 lib/zip-ada/dual_io.ali
 lib/zip-ada/flexible_temp_files.ali
 lib/zip-ada/length_limited_huffman_code_lengths.ali
 lib/zip-ada/libzip-ada.a
+lib/zip-ada/lz77.ali
 lib/zip-ada/lz77_stats.ali
 lib/zip-ada/lz_scramble.ali
 lib/zip-ada/lzh.ali
-lib/zip-ada/lzma_decoding.ali
+lib/zip-ada/lzma-decoding.ali
+lib/zip-ada/lzma-encoding.ali
+lib/zip-ada/lzma.ali
 lib/zip-ada/lzma_enc.ali
 lib/zip-ada/my_dots.ali
 lib/zip-ada/my_feedback.ali
@@ -59,30 +81,18 @@ lib/zip-ada/rw_file.ali
 lib/zip-ada/rz_gnat.ali
 lib/zip-ada/tb_wrap.ali
 lib/zip-ada/test_llhc.ali
+lib/zip-ada/test_lz77.ali
 lib/zip-ada/unzip-decompress-huffman.ali
 lib/zip-ada/unzip-decompress.ali
 lib/zip-ada/unzip-streams.ali
 lib/zip-ada/unzip.ali
 lib/zip-ada/zip-compress-deflate.ali
+lib/zip-ada/zip-compress-lzma_e.ali
 lib/zip-ada/zip-compress-reduce.ali
 lib/zip-ada/zip-compress-shrink.ali
 lib/zip-ada/zip-compress.ali
 lib/zip-ada/zip-crc_crypto.ali
 lib/zip-ada/zip-create.ali
 lib/zip-ada/zip-headers.ali
-lib/zip-ada/zip-lz77.ali
 lib/zip-ada/zip.ali
 lib/zip-ada/zip_streams.ali
-%%EXAMPLESDIR%%/demo_csv_into_zip
-%%EXAMPLESDIR%%/demo_unzip
-%%EXAMPLESDIR%%/demo_zip
-%%EXAMPLESDIR%%/test_chunk
-%%EXAMPLESDIR%%/test_extract
-%%EXAMPLESDIR%%/test_extract_tb
-%%EXAMPLESDIR%%/test_lz_scramble
-%%EXAMPLESDIR%%/test_stream_performance
-%%EXAMPLESDIR%%/test_unz_streams
-%%EXAMPLESDIR%%/test_zip_info_timing
-%%EXAMPLESDIR%%/za_gnat
-%%EXAMPLESDIR%%/zip_with_many_files
-%%EXAMPLESDIR%%/ziptest