2 files changed, 68 insertions, 64 deletions

diff --git a/www/mod_perl2/Makefile b/www/mod_perl2/Makefile
index 395c0f308e6f..beb02274cd3b 100644
--- a/www/mod_perl2/Makefile
+++ b/www/mod_perl2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mod_perl
 PORTVERSION=	2.0.8
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	www perl5
 MASTER_SITES=	APACHE/perl
@@ -76,6 +77,11 @@ post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/modules/perl/mod_perl.so \
 		${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_perl.so
 
+	-for f in `${FIND} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto -name \*.so` ; do \
+		${CHMOD} u+w $${f}; \
+		${STRIP_CMD} $${f}; \
+		${CHMOD} u-w $${f}; \
+	done;
 
 test:	build
 	-@(${MAKE} test -C ${WRKSRC})
diff --git a/www/mod_perl2/pkg-plist b/www/mod_perl2/pkg-plist
index cf1f903f681f..737a306c0841 100644
--- a/www/mod_perl2/pkg-plist
+++ b/www/mod_perl2/pkg-plist
@@ -327,69 +327,67 @@ bin/mp2bug
 @unexec echo "Don't forget to remove all mod_perl2-related directives in your httpd.conf"
 %%APACHEMODDIR%%/%%AP_MODULE%%
 @exec %D/sbin/apxs -e %%AP_MOD_EN%% -n %%AP_NAME%% %D/%F
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/mod_perl2
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Util
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Global
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Const
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Util
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/URI
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/SubRequest
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/SubProcess
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/ServerUtil
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/ServerRec
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Response
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/RequestUtil
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/RequestRec
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/RequestIO
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Process
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Module
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/MPM
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Log
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/HookRun
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/FilterRec
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Filter
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Directive
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Const
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/ConnectionUtil
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Connection
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Command
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/CmdParms
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Build
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Access
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Util
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/UUID
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/URI
-%%THREADRWLOCK%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/ThreadRWLock
-%%THREADMUTEX%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/ThreadMutex
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Table
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/String
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Status
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Socket
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/SockAddr
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Pool
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/PerlIO
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/OS
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/IpSubnet
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Finfo
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Error
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Date
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Const
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/BucketType
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/BucketAlloc
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Bucket
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Brigade
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Base64
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/ModPerl
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/PerlSections
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache2
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/SizeLimit
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/APR
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
 @dirrm %%APACHEINCLUDEDIR%%/modules/perl
 @dirrmtry %%APACHEINCLUDEDIR%%/modules
-@dirrmtry %%APACHEINCLUDEDIR%%
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/APR
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/SizeLimit
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/PerlSections
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache2
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/ModPerl
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Base64
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Brigade
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Bucket
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/BucketAlloc
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/BucketType
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Const
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Date
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Error
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Finfo
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/IpSubnet
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/OS
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/PerlIO
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Pool
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/SockAddr
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Socket
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Status
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/String
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Table
+%%THREADMUTEX%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/ThreadMutex
+%%THREADRWLOCK%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/ThreadRWLock
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/URI
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/UUID
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Util
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Access
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Build
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/CmdParms
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Command
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Connection
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/ConnectionUtil
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Const
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Directive
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Filter
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/FilterRec
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/HookRun
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Log
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/MPM
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Module
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Process
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/RequestIO
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/RequestRec
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/RequestUtil
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Response
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/ServerRec
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/ServerUtil
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/SubProcess
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/SubRequest
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/URI
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2/Util
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache2
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Const
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Global
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl/Util
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ModPerl
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/mod_perl2