- Update to 2.4.6

PR:		ports/124760
Submitted by:	Piotr Rybicki <meritus@innervision.pl> (maintainer)

3 files changed, 17 insertions, 25 deletions

diff --git a/www/openx/Makefile b/www/openx/Makefile
index 53dfece06336..9601f4e29f50 100644
--- a/www/openx/Makefile
+++ b/www/openx/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	openx
-PORTVERSION=	2.4.4
+PORTVERSION=	2.4.6
 CATEGORIES=	www
 MASTER_SITES=	http://download.openx.org/
 
@@ -17,9 +17,6 @@ USE_ZIP=	yes
 NO_BUILD=	yes
 SUB_LIST+=	PKGNAME=${PKGNAME}
 SUB_FILES+=	pkg-message
-PORTDOCS=	INSTALL.txt LICENSE.txt POLICY.txt README.txt \
-		RELEASE_NOTES.txt UPGRADE.txt KNOWN_ISSUES.txt TRANSLATIONS.txt
-EXTDOCS=	KNOWN_ISSUES.txt TRANSLATIONS.txt
 
 .include <bsd.port.pre.mk>
 
@@ -27,12 +24,6 @@ EXTDOCS=	KNOWN_ISSUES.txt TRANSLATIONS.txt
 USE_PHP=	xml pcre zlib mysql ftp
 .endif
 
-post-extract:
-	@${INSTALL} -d ${WRKDIR}/docs
-	@cd ${WRKSRC}/docs && ${MV} ${EXTDOCS} ${WRKSRC}/
-	@cd ${WRKSRC} && ${MV} ${PORTDOCS} ${WRKDIR}/docs/
-	@cd ${WRKSRC} && ${RM} -rf docs
-
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${WWWDIR}
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
@@ -41,10 +32,6 @@ do-install:
 	@${ECHO_CMD} '@exec ${CHMOD} -R 755 ${WWWDIR}' >> ${TMPPLIST}
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${INSTALL} -d ${DOCSDIR}
-	@cd ${WRKDIR}/docs && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/openx/distinfo b/www/openx/distinfo
index 611d631c25b1..2fe6da7fbd86 100644
--- a/www/openx/distinfo
+++ b/www/openx/distinfo
@@ -1,3 +1,3 @@
-MD5 (openx-2.4.4.zip) = 3b0b10d3790d059632f97e9c9d131ffe
-SHA256 (openx-2.4.4.zip) = be888eb97a8f241270066ba8624b6387b60b5df66750f6c807d51aa28138547e
-SIZE (openx-2.4.4.zip) = 6978035
+MD5 (openx-2.4.6.zip) = 150445e1294a514d583916ca7963399b
+SHA256 (openx-2.4.6.zip) = bd02ddc9e2b42d124be66826da36a5a36e3f4ade0961045f4ac7812bd0406737
+SIZE (openx-2.4.6.zip) = 6857193
diff --git a/www/openx/pkg-plist b/www/openx/pkg-plist
index 19d7b88dde8f..b42c654a96c6 100644
--- a/www/openx/pkg-plist
+++ b/www/openx/pkg-plist
@@ -9,6 +9,7 @@
 %%WWWDIR%%/adx.js
 %%WWWDIR%%/adxmlrpc.php
 %%WWWDIR%%/constants.php
+%%WWWDIR%%/docs/KNOWN_ISSUES.txt
 %%WWWDIR%%/etc/.htaccess
 %%WWWDIR%%/etc/changes/ConfigMigration.php
 %%WWWDIR%%/etc/changes/StatMigration.php
@@ -365,6 +366,7 @@
 %%WWWDIR%%/lib/OA/Maintenance.php
 %%WWWDIR%%/lib/OA/Maintenance/Auto.php
 %%WWWDIR%%/lib/OA/Maintenance/Distributed.php
+%%WWWDIR%%/lib/OA/Maintenance/Status.php
 %%WWWDIR%%/lib/OA/Sync.php
 %%WWWDIR%%/lib/OA/Task.php
 %%WWWDIR%%/lib/OA/Task/Runner.php
@@ -565,13 +567,7 @@
 %%WWWDIR%%/lib/max/core/ServiceLocator.php
 %%WWWDIR%%/lib/max/data/data.entities.php
 %%WWWDIR%%/lib/max/deliverycache/cache-file.inc.php
-%%WWWDIR%%/lib/max/language/Default.php
-%%WWWDIR%%/lib/max/language/Invocation.php
-%%WWWDIR%%/lib/max/language/Maintenance.php
-%%WWWDIR%%/lib/max/language/Report.php
-%%WWWDIR%%/lib/max/language/Settings.php
-%%WWWDIR%%/lib/max/language/SettingsHelp.php
-%%WWWDIR%%/lib/max/language/Userlog.php
+%%WWWDIR%%/lib/max/language/Loader.php
 %%WWWDIR%%/lib/max/language/chinese_big5/default.lang.php
 %%WWWDIR%%/lib/max/language/chinese_big5/index.lang.php
 %%WWWDIR%%/lib/max/language/chinese_big5/invocation.lang.php
@@ -1941,6 +1937,7 @@
 %%WWWDIR%%/www/admin/maintenance-updates-js.php
 %%WWWDIR%%/www/admin/md5.js
 %%WWWDIR%%/www/admin/password-recovery.php
+%%WWWDIR%%/www/admin/privacy-policy.html
 %%WWWDIR%%/www/admin/report-generate.php
 %%WWWDIR%%/www/admin/report-generation.php
 %%WWWDIR%%/www/admin/report-index.php
@@ -1980,6 +1977,7 @@
 %%WWWDIR%%/www/admin/templates/logo.gif
 %%WWWDIR%%/www/admin/templates/welcome-advertiser.html
 %%WWWDIR%%/www/admin/templates/welcome-publisher.html
+%%WWWDIR%%/www/admin/terms-and-conditions.html
 %%WWWDIR%%/www/admin/tracker-append.php
 %%WWWDIR%%/www/admin/tracker-campaigns.php
 %%WWWDIR%%/www/admin/tracker-delete.php
@@ -2027,6 +2025,14 @@
 %%WWWDIR%%/www/images/robots.txt
 %%WWWDIR%%/www/index.php
 %%WWWDIR%%/www/robots.txt
+%%WWWDIR%%/LICENSE.txt
+%%WWWDIR%%/POLICY.txt
+%%WWWDIR%%/README.txt
+%%WWWDIR%%/RELEASE_NOTES.txt
+%%WWWDIR%%/UPGRADE.txt
+%%WWWDIR%%/TERMS.txt
+%%WWWDIR%%/TRANSLATIONS.txt
+@dirrm %%WWWDIR%%/docs
 @dirrm %%WWWDIR%%/www/images/layerstyles/simple
 @dirrm %%WWWDIR%%/www/images/layerstyles/geocities
 @dirrm %%WWWDIR%%/www/images/layerstyles
@@ -2317,7 +2323,6 @@
 @dirrm %%WWWDIR%%/lib/OA/Upgrade
 @dirrm %%WWWDIR%%/lib/OA/Task
 @dirrm %%WWWDIR%%/lib/OA/Maintenance
-@dirrm %%WWWDIR%%/lib/OA/Delivery
 @dirrm %%WWWDIR%%/lib/OA/Dal/Maintenance/Statistics/Tracker
 @dirrm %%WWWDIR%%/lib/OA/Dal/Maintenance/Statistics/AdServer
 @dirrm %%WWWDIR%%/lib/OA/Dal/Maintenance/Statistics