Update to 2.3.20

PR:		54974
Submitted by:	maintainer
Approved by:	fjoe (mentor) (implicit)

10 files changed, 34 insertions, 26 deletions

diff --git a/www/eaccelerator/Makefile b/www/eaccelerator/Makefile
index d555859fbeb7..ebe4bb777621 100644
--- a/www/eaccelerator/Makefile
+++ b/www/eaccelerator/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	turck-mmcache
-PORTVERSION=	2.3.19
+PORTVERSION=	2.3.20
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -40,6 +40,7 @@ do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/encoder ${PREFIX}/bin
 	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/mmcache.php ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/mmcache_password.php ${EXAMPLESDIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
diff --git a/www/eaccelerator/distinfo b/www/eaccelerator/distinfo
index 060fb56c50a7..b6fd10768285 100644
--- a/www/eaccelerator/distinfo
+++ b/www/eaccelerator/distinfo
@@ -1 +1 @@
-MD5 (turck-mmcache-2.3.19.tar.bz2) = 358bf1bc0b53289d6387426ba03b8fe4
+MD5 (turck-mmcache-2.3.20.tar.bz2) = 88f1de430f91c4095bc90a2ee011ff3e
diff --git a/www/eaccelerator/files/patch-encoder.php b/www/eaccelerator/files/patch-encoder.php
index b4e5c05fd0c9..7ff9b0ce984f 100644
--- a/www/eaccelerator/files/patch-encoder.php
+++ b/www/eaccelerator/files/patch-encoder.php
@@ -1,10 +1,11 @@
---- encoder.php.orig	Wed May 28 15:12:59 2003
-+++ encoder.php	Thu May 29 16:19:28 2003
-@@ -1,10 +1,10 @@
--#! /usr/bin/php -f
-+#! %%LOCALBASE%%/bin/php -f
- 
+--- encoder.php.orig	Fri Jul 25 10:21:09 2003
++++ encoder.php	Mon Jul 28 13:04:19 2003
+@@ -1,10 +1,12 @@
++#!%%LOCALBASE%%/bin/php -f
++
  <?php
+ $web_error = "";
+ 
  function mmcache_encoder_usage() {
 -  echo "Usage:\tphp -q encoder.php [options] source_file_name\n";
 -  echo       "\tphp -q encoder.php [options] source_file_name...\n";
@@ -15,7 +16,7 @@
    echo "Options:\n";
    echo "\t-s suffix\n\t\tencode files only with following suffix (default is \"php\")\n";
    echo "\t-a\n\t\tencode all files (no by default)\n";
-@@ -16,10 +16,10 @@
+@@ -16,10 +18,10 @@
    echo               "\t\tfile name. If you encode directory or several files at once\n";
    echo               "\t\tthen 'target' specifyes an output directory name.\n";
    echo "\nExamples:\n";
diff --git a/www/eaccelerator/pkg-message b/www/eaccelerator/pkg-message
index 0a420d9c5235..819c0f487a7b 100644
--- a/www/eaccelerator/pkg-message
+++ b/www/eaccelerator/pkg-message
@@ -16,5 +16,6 @@ mmcache.filter=""
 mmcache.shm_max="0"
 mmcache.shm_ttl="0"
 mmcache.shm_prune_period="0"
+mmcache.compress="1"
 
 *****************************************************************************
diff --git a/www/eaccelerator/pkg-plist b/www/eaccelerator/pkg-plist
index 20039e334dca..02366f6de8bd 100644
--- a/www/eaccelerator/pkg-plist
+++ b/www/eaccelerator/pkg-plist
@@ -1,7 +1,8 @@
 bin/encoder
 lib/php/%%PHP_EXT_DIR%%/mmcache.so
-%%PORTDOCS%%share/doc/turck-mmcache/README
+%%PORTDOCS%%%%DOCSDIR%%/README
 @unexec rmdir %D/lib/php/%%PHP_EXT_DIR%% 2> /dev/null || true
-share/examples/turck-mmcache/mmcache.php
-%%PORTDOCS%%@dirrm share/doc/turck-mmcache
-@dirrm share/examples/turck-mmcache
+%%EXAMPLESDIR%%/mmcache.php
+%%EXAMPLESDIR%%/mmcache_password.php
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%EXAMPLESDIR%%
diff --git a/www/turck-mmcache/Makefile b/www/turck-mmcache/Makefile
index d555859fbeb7..ebe4bb777621 100644
--- a/www/turck-mmcache/Makefile
+++ b/www/turck-mmcache/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	turck-mmcache
-PORTVERSION=	2.3.19
+PORTVERSION=	2.3.20
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -40,6 +40,7 @@ do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/encoder ${PREFIX}/bin
 	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/mmcache.php ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/mmcache_password.php ${EXAMPLESDIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
diff --git a/www/turck-mmcache/distinfo b/www/turck-mmcache/distinfo
index 060fb56c50a7..b6fd10768285 100644
--- a/www/turck-mmcache/distinfo
+++ b/www/turck-mmcache/distinfo
@@ -1 +1 @@
-MD5 (turck-mmcache-2.3.19.tar.bz2) = 358bf1bc0b53289d6387426ba03b8fe4
+MD5 (turck-mmcache-2.3.20.tar.bz2) = 88f1de430f91c4095bc90a2ee011ff3e
diff --git a/www/turck-mmcache/files/patch-encoder.php b/www/turck-mmcache/files/patch-encoder.php
index b4e5c05fd0c9..7ff9b0ce984f 100644
--- a/www/turck-mmcache/files/patch-encoder.php
+++ b/www/turck-mmcache/files/patch-encoder.php
@@ -1,10 +1,11 @@
---- encoder.php.orig	Wed May 28 15:12:59 2003
-+++ encoder.php	Thu May 29 16:19:28 2003
-@@ -1,10 +1,10 @@
--#! /usr/bin/php -f
-+#! %%LOCALBASE%%/bin/php -f
- 
+--- encoder.php.orig	Fri Jul 25 10:21:09 2003
++++ encoder.php	Mon Jul 28 13:04:19 2003
+@@ -1,10 +1,12 @@
++#!%%LOCALBASE%%/bin/php -f
++
  <?php
+ $web_error = "";
+ 
  function mmcache_encoder_usage() {
 -  echo "Usage:\tphp -q encoder.php [options] source_file_name\n";
 -  echo       "\tphp -q encoder.php [options] source_file_name...\n";
@@ -15,7 +16,7 @@
    echo "Options:\n";
    echo "\t-s suffix\n\t\tencode files only with following suffix (default is \"php\")\n";
    echo "\t-a\n\t\tencode all files (no by default)\n";
-@@ -16,10 +16,10 @@
+@@ -16,10 +18,10 @@
    echo               "\t\tfile name. If you encode directory or several files at once\n";
    echo               "\t\tthen 'target' specifyes an output directory name.\n";
    echo "\nExamples:\n";
diff --git a/www/turck-mmcache/pkg-message b/www/turck-mmcache/pkg-message
index 0a420d9c5235..819c0f487a7b 100644
--- a/www/turck-mmcache/pkg-message
+++ b/www/turck-mmcache/pkg-message
@@ -16,5 +16,6 @@ mmcache.filter=""
 mmcache.shm_max="0"
 mmcache.shm_ttl="0"
 mmcache.shm_prune_period="0"
+mmcache.compress="1"
 
 *****************************************************************************
diff --git a/www/turck-mmcache/pkg-plist b/www/turck-mmcache/pkg-plist
index 20039e334dca..02366f6de8bd 100644
--- a/www/turck-mmcache/pkg-plist
+++ b/www/turck-mmcache/pkg-plist
@@ -1,7 +1,8 @@
 bin/encoder
 lib/php/%%PHP_EXT_DIR%%/mmcache.so
-%%PORTDOCS%%share/doc/turck-mmcache/README
+%%PORTDOCS%%%%DOCSDIR%%/README
 @unexec rmdir %D/lib/php/%%PHP_EXT_DIR%% 2> /dev/null || true
-share/examples/turck-mmcache/mmcache.php
-%%PORTDOCS%%@dirrm share/doc/turck-mmcache
-@dirrm share/examples/turck-mmcache
+%%EXAMPLESDIR%%/mmcache.php
+%%EXAMPLESDIR%%/mmcache_password.php
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%EXAMPLESDIR%%