Perl
diff --git a/‎Porting/Maintainers.pl
+1-1 b/‎Porting/Maintainers.pl
+1-1
diff --git a/‎cpan/Compress-Raw-Zlib/Makefile.PL
+62-27 b/‎cpan/Compress-Raw-Zlib/Makefile.PL
+62-27
@@ -216,7 +216,7 @@ package Maintainers;
     },
 
     'Compress::Raw::Zlib' => {
-        'DISTRIBUTION' => 'PMQS/Compress-Raw-Zlib-2.105.tar.gz',
+        'DISTRIBUTION' => 'PMQS/Compress-Raw-Zlib-2.202.tar.gz',
         'FILES'    => q[cpan/Compress-Raw-Zlib],
         'EXCLUDED' => [
             qr{^examples/},
 
@@ -12,6 +12,7 @@ use Config;
 my $ZLIB_LIB ;
 my $ZLIB_INCLUDE ;
 my $BUILD_ZLIB = 0 ;
+my $USE_ZLIB_NG = 0;
 my $OLD_ZLIB = '' ;
 my $WALL = '' ;
 my $GZIP_OS_CODE = -1 ;
@@ -74,6 +75,8 @@ UpDowngrade(getPerlFiles('MANIFEST'))
 my $OPT_Z_PREFIX =  '-DZ_PREFIX' ;
 my $OPT_ZLIB_INCLUDE = "-I$ZLIB_INCLUDE";
 my $OPT_ZLIB_LIB = "-L$ZLIB_LIB" ;
+my $OPT_SOLO = '-DZ_SOLO';
+my $OPT_USE_ZLIB_NG = "";
 
 if (! $BUILD_ZLIB)
 {
@@ -85,13 +88,21 @@ if (! $BUILD_ZLIB)
 
     $OPT_ZLIB_LIB = ''
         if $ZLIB_LIB eq './zlib-src' ;
+
+    $OPT_SOLO = '';
+}
+
+if ( $USE_ZLIB_NG)
+{
+    $OPT_USE_ZLIB_NG = '-DUSE_ZLIB_NG';
+    $ZLIB_LIBRARY_NAME = $^O eq 'MSWin32' ? 'zlib-ng' : 'z-ng' ;
 }
 
 WriteMakefile(
     NAME         => 'Compress::Raw::Zlib',
     VERSION_FROM => 'lib/Compress/Raw/Zlib.pm',
     INC          => $OPT_ZLIB_INCLUDE ,
-    DEFINE       => "-DNO_VIZ -DZ_SOLO $OLD_ZLIB $WALL $OPT_Z_PREFIX -DGZIP_OS_CODE=$GZIP_OS_CODE $USE_PPPORT_H -DPerl_crz_BUILD_ZLIB=$BUILD_ZLIB" ,
+    DEFINE       => "-DNO_VIZ $OPT_SOLO $OLD_ZLIB $WALL $OPT_Z_PREFIX $OPT_USE_ZLIB_NG -DGZIP_OS_CODE=$GZIP_OS_CODE $USE_PPPORT_H -DPerl_crz_BUILD_ZLIB=$BUILD_ZLIB" ,
     XS           => { 'Zlib.xs' => 'Zlib.c'},
     'depend'     => { 'Makefile'   => 'config.in' },
     'clean'      => { FILES        => '*.c constants.h constants.xs' },
@@ -177,7 +188,6 @@ my @names = qw(
     Z_NEED_DICT
     Z_NO_COMPRESSION
     Z_NO_FLUSH
-    Z_NULL
     Z_OK
     Z_PARTIAL_FLUSH
     Z_RLE
@@ -187,8 +197,13 @@ my @names = qw(
     Z_UNKNOWN
     Z_VERSION_ERROR
 
+    ZLIBNG_VERNUM
+    ZLIBNG_VER_MAJOR
+    ZLIBNG_VER_MINOR
+    ZLIBNG_VER_REVISION
+    ZLIBNG_VER_STATUS
+    ZLIBNG_VER_MODIFIED
 );
-    #ZLIB_VERNUM
 
 my %verSpecificNames = (
     Z_TREES => '1240',
@@ -226,6 +241,9 @@ if (eval {require ExtUtils::Constant; 1}) {
                      }
                  keys %verSpecificNames ;
 
+    push @names, { name => 'Z_NULL', type => 'UV' };
+    push @names, { name => 'ZLIBNG_VERSION', type => 'PV' };
+
     ExtUtils::Constant::WriteConstants(
                                      NAME => 'Zlib',
                                      NAMES => \@names,
@@ -244,12 +262,24 @@ else {
     }
 }
 
+sub getBoolean
+{
+    my $name = shift ;
+    my $info = shift;
+
+    my $x = defined $ENV{$name}
+                ? $ENV{$name}
+                : $info->{$name} ;
+
+    return ($x =~ /^yes|on|true|1$/i) ? 1 : 0;
+}
+
 sub ParseCONFIG
 {
     my ($k, $v) ;
     my @badkey = () ;
     my %Info = () ;
-    my @Options = qw( INCLUDE LIB BUILD_ZLIB OLD_ZLIB GZIP_OS_CODE ) ;
+    my @Options = qw( INCLUDE LIB BUILD_ZLIB OLD_ZLIB GZIP_OS_CODE USE_ZLIB_NG) ;
     my %ValidOption = map {$_, 1} @Options ;
     my %Parsed = %ValidOption ;
     my $CONFIG = 'config.in' ;
@@ -285,44 +315,48 @@ sub ParseCONFIG
     $ZLIB_INCLUDE = defined $ENV{'ZLIB_INCLUDE'}
                         ? $ENV{'ZLIB_INCLUDE'}
                         : $Info{'INCLUDE'} ;
+
     $ZLIB_LIB = defined $ENV{'ZLIB_LIB'}
                     ?$ENV{'ZLIB_LIB'}
                     : $Info{'LIB'} ;
 
+    $USE_ZLIB_NG = getBoolean('USE_ZLIB_NG', \%Info);
+
     if ($^O eq 'VMS') {
         $ZLIB_INCLUDE = VMS::Filespec::vmspath($ZLIB_INCLUDE);
         $ZLIB_LIB = VMS::Filespec::vmspath($ZLIB_LIB);
     }
 
-    my $y = defined $ENV{'OLD_ZLIB'}
-                ? $ENV{'OLD_ZLIB'}
-                : $Info{'OLD_ZLIB'} ;
-    $OLD_ZLIB = '-DOLD_ZLIB' if $y and $y =~ /^yes|on|true|1$/i;
-
-    my $x = defined $ENV{'BUILD_ZLIB'}
-                ? $ENV{'BUILD_ZLIB'}
-                : $Info{'BUILD_ZLIB'} ;
-
-    if ($x and $x =~ /^yes|on|true|1$/i ) {
+    $OLD_ZLIB = '-DOLD_ZLIB'
+        if getBoolean('OLD_ZLIB', \%Info);
 
-        $BUILD_ZLIB = 1 ;
+    $BUILD_ZLIB = getBoolean('BUILD_ZLIB', \%Info);
 
-	# ZLIB_LIB & ZLIB_INCLUDE must point to the same place when
-	# BUILD_ZLIB is specified.
-	die "INCLUDE & LIB must be the same when BUILD_ZLIB is True\n"
-	    if $ZLIB_LIB ne $ZLIB_INCLUDE ;
+    if ($BUILD_ZLIB ) {
 
-	# Check the zlib source directory exists
-	die "LIB/INCLUDE directory '$ZLIB_LIB' does not exits\n"
-	   unless -d $ZLIB_LIB ;
+        # ZLIB_LIB & ZLIB_INCLUDE must point to the same place when
+        # BUILD_ZLIB is specified.
+        die "INCLUDE & LIB must be the same when BUILD_ZLIB is True\n"
+            if $ZLIB_LIB ne $ZLIB_INCLUDE ;
 
-	# check for a well known file
-	die "LIB/INCLUDE directory, '$ZLIB_LIB', doesn't seem to have the zlib source files\n"
-	   unless -e catfile($ZLIB_LIB, 'zlib.h') ;
+        # Check the zlib source directory exists
+        die "LIB/INCLUDE directory '$ZLIB_LIB' does not exits\n"
+            unless -d $ZLIB_LIB ;
 
+        # check for a well known file
+        if ($USE_ZLIB_NG)
+        {
+            die "LIB/INCLUDE directory, '$ZLIB_LIB', doesn't seem to have the zlib-ng source files\n"
+                unless -e catfile($ZLIB_LIB, 'zlib-ng.h') ;
+        }
+        else
+        {
+            die "LIB/INCLUDE directory, '$ZLIB_LIB', doesn't seem to have the zlib source files\n"
+                unless -e catfile($ZLIB_LIB, 'zlib.h') ;
+        }
 
-	# write the Makefile
-	print "Building Zlib enabled\n" ;
+        # write the Makefile
+        print "Building Zlib enabled\n" ;
     }
 
     $GZIP_OS_CODE = defined $ENV{'GZIP_OS_CODE'}
@@ -348,6 +382,7 @@ sub ParseCONFIG
     GZIP_OS_CODE    [$GZIP_OS_CODE]
     OLD_ZLIB        [$OLD_ZLIB]
     BUILD_ZLIB      [$BUILD_ZLIB]
+    USE_ZLIB_NG     [$USE_ZLIB_NG]
 
 EOM