- Add an OPTION to turn on/off the installation of bundled plugins

- Bump PORTREVISION

2 files changed, 210 insertions, 196 deletions

diff --git a/net-im/openfire/Makefile b/net-im/openfire/Makefile
index 619bb2cf3034..1bbd4448e844 100644
--- a/net-im/openfire/Makefile
+++ b/net-im/openfire/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	openfire
 PORTVERSION=	3.8.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net-im java
 MASTER_SITES=	http://download.igniterealtime.org/openfire/
@@ -16,6 +17,10 @@ LICENSE=	AL2
 RUN_DEPENDS=	classpath:${PORTSDIR}/java/javavmwrapper \
    		${JAVAJARDIR}/slf4j-api.jar:${PORTSDIR}/devel/slf4j
 
+OPTIONS_DEFINE=	PLUGINS
+OPTIONS_DEFAULT=PLUGINS
+PLUGINS_DESC=	Install bundled plugins
+
 USE_ZIP=	yes
 USE_LDCONFIG=	yes
 USE_ANT=	yes
@@ -24,7 +29,7 @@ JAVA_VERSION=	1.6+
 
 CONFLICTS=	wildfire-[0-9]*
 
-ALL_TARGET=	openfire plugins
+ALL_TARGET=	openfire
 USE_RC_SUBR=	openfire
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_src
@@ -39,6 +44,13 @@ GROUPS=		${USERS}
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MPLUGINS}
+ALL_TARGET+=	plugins
+PLIST_SUB+=	PLUGINS=""
+.else
+PLIST_SUB+=	PLUGINS="@comment "
+.endif
+
 post-patch:
 	(cd ${WRKSRC} && ${MV} \
 	    ./src/plugins/jingleNodes/src/i18n/jingleNodes_i18n.properties \
@@ -55,8 +67,10 @@ do-install:
 	(cd ${INSTALL_WRKSRC}/resources && ${FIND} . \! -path ./security\* \
 	| ${CPIO} -pvdmu -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}/resources)
 
+.if ${PORT_OPTIONS:MPLUGINS}
 	(cd ${INSTALL_WRKSRC}/plugins && ${FIND} . \
 	| ${CPIO} -pvdmu -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}/plugins)
+.endif
 
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
diff --git a/net-im/openfire/pkg-plist b/net-im/openfire/pkg-plist
index 955403607b11..98716b2341cf 100644
--- a/net-im/openfire/pkg-plist
+++ b/net-im/openfire/pkg-plist
@@ -23,190 +23,190 @@
 %%DATADIR%%/conf
 %%DATADIR%%/embedded-db
 %%DATADIR%%/logs
-%%DATADIR%%/plugins/admin/plugin.xml
-%%DATADIR%%/plugins/admin/webapp/WEB-INF/admin.tld
-%%DATADIR%%/plugins/admin/webapp/WEB-INF/decorators.xml
-%%DATADIR%%/plugins/admin/webapp/WEB-INF/dwr.xml
-%%DATADIR%%/plugins/admin/webapp/WEB-INF/lib/admin-jsp.jar
-%%DATADIR%%/plugins/admin/webapp/WEB-INF/lib/commons-fileupload.jar
-%%DATADIR%%/plugins/admin/webapp/WEB-INF/lib/commons-io.jar
-%%DATADIR%%/plugins/admin/webapp/WEB-INF/lib/dwr.jar
-%%DATADIR%%/plugins/admin/webapp/WEB-INF/sitemesh.xml
-%%DATADIR%%/plugins/admin/webapp/WEB-INF/web.xml
-%%DATADIR%%/plugins/admin/webapp/favicon.ico
-%%DATADIR%%/plugins/admin/webapp/images/add-16x16.gif
-%%DATADIR%%/plugins/admin/webapp/images/aim-gray.gif
-%%DATADIR%%/plugins/admin/webapp/images/aim.gif
-%%DATADIR%%/plugins/admin/webapp/images/arrow_right_blue.gif
-%%DATADIR%%/plugins/admin/webapp/images/blank.gif
-%%DATADIR%%/plugins/admin/webapp/images/both_32x16.gif
-%%DATADIR%%/plugins/admin/webapp/images/bullet-green-14x14.gif
-%%DATADIR%%/plugins/admin/webapp/images/bullet-red-14x14.gif
-%%DATADIR%%/plugins/admin/webapp/images/bullet-yellow-14x14.gif
-%%DATADIR%%/plugins/admin/webapp/images/bullet.gif
-%%DATADIR%%/plugins/admin/webapp/images/cache-16x16.gif
-%%DATADIR%%/plugins/admin/webapp/images/certificate_ok-16x16.png
-%%DATADIR%%/plugins/admin/webapp/images/certificate_warning-16x16.png
-%%DATADIR%%/plugins/admin/webapp/images/check-16x16.gif
-%%DATADIR%%/plugins/admin/webapp/images/check.gif
-%%DATADIR%%/plugins/admin/webapp/images/clearspace.gif
-%%DATADIR%%/plugins/admin/webapp/images/connection-manager_16x16.gif
-%%DATADIR%%/plugins/admin/webapp/images/delete-16x16.gif
-%%DATADIR%%/plugins/admin/webapp/images/doc-changelog-16x16.gif
-%%DATADIR%%/plugins/admin/webapp/images/doc-down-16x16.gif
-%%DATADIR%%/plugins/admin/webapp/images/doc-readme-16x16.gif
-%%DATADIR%%/plugins/admin/webapp/images/edit-16x16.gif
-%%DATADIR%%/plugins/admin/webapp/images/enterprise-info-btn.gif
-%%DATADIR%%/plugins/admin/webapp/images/enterprise.png
-%%DATADIR%%/plugins/admin/webapp/images/error-16x16.gif
-%%DATADIR%%/plugins/admin/webapp/images/feed-icon-16x16.gif
-%%DATADIR%%/plugins/admin/webapp/images/forbidden-16x16.gif
-%%DATADIR%%/plugins/admin/webapp/images/greenlight-24x24.gif
-%%DATADIR%%/plugins/admin/webapp/images/header-background_new.gif
-%%DATADIR%%/plugins/admin/webapp/images/header-help_new.gif
-%%DATADIR%%/plugins/admin/webapp/images/header-title_new.gif
-%%DATADIR%%/plugins/admin/webapp/images/icon_update-16x16.gif
-%%DATADIR%%/plugins/admin/webapp/images/icon_warning-small.gif
-%%DATADIR%%/plugins/admin/webapp/images/icq-gray.gif
-%%DATADIR%%/plugins/admin/webapp/images/icq.gif
-%%DATADIR%%/plugins/admin/webapp/images/im_available.gif
-%%DATADIR%%/plugins/admin/webapp/images/im_away.gif
-%%DATADIR%%/plugins/admin/webapp/images/im_dnd.gif
-%%DATADIR%%/plugins/admin/webapp/images/im_free_chat.gif
-%%DATADIR%%/plugins/admin/webapp/images/im_unavailable.gif
-%%DATADIR%%/plugins/admin/webapp/images/incoming_32x16.gif
-%%DATADIR%%/plugins/admin/webapp/images/info-16x16.gif
-%%DATADIR%%/plugins/admin/webapp/images/irc-gray.gif
-%%DATADIR%%/plugins/admin/webapp/images/irc.gif
-%%DATADIR%%/plugins/admin/webapp/images/jive-body-bg.gif
-%%DATADIR%%/plugins/admin/webapp/images/jive-body-contentbox-bg.gif
-%%DATADIR%%/plugins/admin/webapp/images/jive-login-bg.gif
-%%DATADIR%%/plugins/admin/webapp/images/jive-login-form-bg-gray.gif
-%%DATADIR%%/plugins/admin/webapp/images/jive-login-form-bg.gif
-%%DATADIR%%/plugins/admin/webapp/images/jive-nav-bg-left.gif
-%%DATADIR%%/plugins/admin/webapp/images/jive-nav-bg-on.gif
-%%DATADIR%%/plugins/admin/webapp/images/jive-nav-bg-over.gif
-%%DATADIR%%/plugins/admin/webapp/images/jive-nav-bg-right.gif
-%%DATADIR%%/plugins/admin/webapp/images/jive-nav-bg.gif
-%%DATADIR%%/plugins/admin/webapp/images/jive-nav-div.gif
-%%DATADIR%%/plugins/admin/webapp/images/jive-subnav-bg.gif
-%%DATADIR%%/plugins/admin/webapp/images/jive-subnav-div.gif
-%%DATADIR%%/plugins/admin/webapp/images/jive-tertnav-arrow.gif
-%%DATADIR%%/plugins/admin/webapp/images/jive-tertnav-top.gif
-%%DATADIR%%/plugins/admin/webapp/images/language_zh_CN.gif
-%%DATADIR%%/plugins/admin/webapp/images/lock.gif
-%%DATADIR%%/plugins/admin/webapp/images/login_background.png
-%%DATADIR%%/plugins/admin/webapp/images/login_boxbg.gif
-%%DATADIR%%/plugins/admin/webapp/images/login_header.gif
-%%DATADIR%%/plugins/admin/webapp/images/login_logo.gif
-%%DATADIR%%/plugins/admin/webapp/images/mark-16x16.gif
-%%DATADIR%%/plugins/admin/webapp/images/msn-gray.gif
-%%DATADIR%%/plugins/admin/webapp/images/msn.gif
-%%DATADIR%%/plugins/admin/webapp/images/outgoing_32x16.gif
-%%DATADIR%%/plugins/admin/webapp/images/page-background_new.gif
-%%DATADIR%%/plugins/admin/webapp/images/percent-bar-left.gif
-%%DATADIR%%/plugins/admin/webapp/images/percent-bar-used-high.gif
-%%DATADIR%%/plugins/admin/webapp/images/percent-bar-used-low.gif
-%%DATADIR%%/plugins/admin/webapp/images/plugin-16x16.gif
-%%DATADIR%%/plugins/admin/webapp/images/redlight-24x24.gif
-%%DATADIR%%/plugins/admin/webapp/images/refresh-16x16.gif
-%%DATADIR%%/plugins/admin/webapp/images/server-network-24x24.gif
-%%DATADIR%%/plugins/admin/webapp/images/server_16x16.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup-header.png
-%%DATADIR%%/plugins/admin/webapp/images/setup-sidebar-bottom.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup-sidebar-top.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_btn_bg-bigblue.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_btn_bg-grey.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_btn_bg-orange.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_btn_closetestx.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_btn_gearplay.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_contentbox_bg.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_header_bg.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_header_logo.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_helpicon.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_language_zh_CN.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_nextprofile.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_bg-top.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_bg.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_check.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_progress0.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_progress1.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_progress2.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_progress3.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_progress4.gif
-%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_progress5.gif
-%%DATADIR%%/plugins/admin/webapp/images/sidebar_top.gif
-%%DATADIR%%/plugins/admin/webapp/images/sort_ascending.gif
-%%DATADIR%%/plugins/admin/webapp/images/sort_descending.gif
-%%DATADIR%%/plugins/admin/webapp/images/star-16x16.gif
-%%DATADIR%%/plugins/admin/webapp/images/success-16x16.gif
-%%DATADIR%%/plugins/admin/webapp/images/tape.gif
-%%DATADIR%%/plugins/admin/webapp/images/twisty_closed_9x9.gif
-%%DATADIR%%/plugins/admin/webapp/images/twisty_inactive_9x9.gif
-%%DATADIR%%/plugins/admin/webapp/images/twisty_opened_9x9.gif
-%%DATADIR%%/plugins/admin/webapp/images/user-clear-16x16.gif
-%%DATADIR%%/plugins/admin/webapp/images/user-green-16x16.gif
-%%DATADIR%%/plugins/admin/webapp/images/user-red-16x16.gif
-%%DATADIR%%/plugins/admin/webapp/images/user-yellow-16x16.gif
-%%DATADIR%%/plugins/admin/webapp/images/user.gif
-%%DATADIR%%/plugins/admin/webapp/images/wait24trans.gif
-%%DATADIR%%/plugins/admin/webapp/images/warning-16x16.gif
-%%DATADIR%%/plugins/admin/webapp/images/working-16x16.gif
-%%DATADIR%%/plugins/admin/webapp/images/x.gif
-%%DATADIR%%/plugins/admin/webapp/images/yahoo-gray.gif
-%%DATADIR%%/plugins/admin/webapp/images/yahoo.gif
-%%DATADIR%%/plugins/admin/webapp/index.html
-%%DATADIR%%/plugins/admin/webapp/js/behaviour.js
-%%DATADIR%%/plugins/admin/webapp/js/builder.js
-%%DATADIR%%/plugins/admin/webapp/js/controls.js
-%%DATADIR%%/plugins/admin/webapp/js/cookies.js
-%%DATADIR%%/plugins/admin/webapp/js/dragdrop.js
-%%DATADIR%%/plugins/admin/webapp/js/effects.js
-%%DATADIR%%/plugins/admin/webapp/js/jscalendar/calendar-setup.js
-%%DATADIR%%/plugins/admin/webapp/js/jscalendar/calendar-win2k-1.css
-%%DATADIR%%/plugins/admin/webapp/js/jscalendar/calendar-win2k-cold-1.css
-%%DATADIR%%/plugins/admin/webapp/js/jscalendar/calendar.js
-%%DATADIR%%/plugins/admin/webapp/js/lightbox.js
-%%DATADIR%%/plugins/admin/webapp/js/pngfix.js
-%%DATADIR%%/plugins/admin/webapp/js/prototype.js
-%%DATADIR%%/plugins/admin/webapp/js/scriptaculous.js
-%%DATADIR%%/plugins/admin/webapp/js/setup.js
-%%DATADIR%%/plugins/admin/webapp/js/slider.js
-%%DATADIR%%/plugins/admin/webapp/js/tooltips/domLib.js
-%%DATADIR%%/plugins/admin/webapp/js/tooltips/domTT.js
-%%DATADIR%%/plugins/admin/webapp/js/tooltips/domTT_drag.js
-%%DATADIR%%/plugins/admin/webapp/js/tooltips/fadomatic.js
-%%DATADIR%%/plugins/admin/webapp/js/unittest.js
-%%DATADIR%%/plugins/admin/webapp/setup/setup-style.css
-%%DATADIR%%/plugins/admin/webapp/style/global.css
-%%DATADIR%%/plugins/admin/webapp/style/ldap.css
-%%DATADIR%%/plugins/admin/webapp/style/lightbox.css
-%%DATADIR%%/plugins/admin/webapp/style/login.css
-%%DATADIR%%/plugins/admin/webapp/style/setup.css
-%%DATADIR%%/plugins/broadcast.jar
-%%DATADIR%%/plugins/clientControl.jar
-%%DATADIR%%/plugins/contentFilter.jar
-%%DATADIR%%/plugins/dbaccess.jar
-%%DATADIR%%/plugins/emailListener.jar
-%%DATADIR%%/plugins/gojara.jar
-%%DATADIR%%/plugins/hazelcast.jar
-%%DATADIR%%/plugins/jingleNodes.jar
-%%DATADIR%%/plugins/justmarried.jar
-%%DATADIR%%/plugins/kraken.jar
-%%DATADIR%%/plugins/loadStats.jar
-%%DATADIR%%/plugins/monitoring.jar
-%%DATADIR%%/plugins/motd.jar
-%%DATADIR%%/plugins/packetFilter.jar
-%%DATADIR%%/plugins/presence.jar
-%%DATADIR%%/plugins/registration.jar
-%%DATADIR%%/plugins/search.jar
-%%DATADIR%%/plugins/sip.jar
-%%DATADIR%%/plugins/stunserver.jar
-%%DATADIR%%/plugins/subscription.jar
-%%DATADIR%%/plugins/userCreation.jar
-%%DATADIR%%/plugins/userImportExport.jar
-%%DATADIR%%/plugins/userservice.jar
-%%DATADIR%%/plugins/xmldebugger.jar
+%%PLUGINS%%%%DATADIR%%/plugins/admin/plugin.xml
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/WEB-INF/admin.tld
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/WEB-INF/decorators.xml
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/WEB-INF/dwr.xml
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/WEB-INF/lib/admin-jsp.jar
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/WEB-INF/lib/commons-fileupload.jar
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/WEB-INF/lib/commons-io.jar
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/WEB-INF/lib/dwr.jar
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/WEB-INF/sitemesh.xml
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/WEB-INF/web.xml
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/favicon.ico
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/add-16x16.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/aim-gray.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/aim.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/arrow_right_blue.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/blank.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/both_32x16.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/bullet-green-14x14.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/bullet-red-14x14.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/bullet-yellow-14x14.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/bullet.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/cache-16x16.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/certificate_ok-16x16.png
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/certificate_warning-16x16.png
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/check-16x16.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/check.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/clearspace.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/connection-manager_16x16.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/delete-16x16.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/doc-changelog-16x16.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/doc-down-16x16.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/doc-readme-16x16.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/edit-16x16.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/enterprise-info-btn.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/enterprise.png
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/error-16x16.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/feed-icon-16x16.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/forbidden-16x16.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/greenlight-24x24.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/header-background_new.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/header-help_new.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/header-title_new.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/icon_update-16x16.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/icon_warning-small.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/icq-gray.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/icq.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/im_available.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/im_away.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/im_dnd.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/im_free_chat.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/im_unavailable.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/incoming_32x16.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/info-16x16.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/irc-gray.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/irc.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/jive-body-bg.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/jive-body-contentbox-bg.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/jive-login-bg.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/jive-login-form-bg-gray.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/jive-login-form-bg.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/jive-nav-bg-left.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/jive-nav-bg-on.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/jive-nav-bg-over.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/jive-nav-bg-right.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/jive-nav-bg.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/jive-nav-div.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/jive-subnav-bg.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/jive-subnav-div.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/jive-tertnav-arrow.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/jive-tertnav-top.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/language_zh_CN.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/lock.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/login_background.png
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/login_boxbg.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/login_header.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/login_logo.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/mark-16x16.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/msn-gray.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/msn.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/outgoing_32x16.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/page-background_new.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/percent-bar-left.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/percent-bar-used-high.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/percent-bar-used-low.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/plugin-16x16.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/redlight-24x24.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/refresh-16x16.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/server-network-24x24.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/server_16x16.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/setup-header.png
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/setup-sidebar-bottom.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/setup-sidebar-top.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/setup_btn_bg-bigblue.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/setup_btn_bg-grey.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/setup_btn_bg-orange.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/setup_btn_closetestx.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/setup_btn_gearplay.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/setup_contentbox_bg.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/setup_header_bg.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/setup_header_logo.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/setup_helpicon.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/setup_language_zh_CN.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/setup_nextprofile.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_bg-top.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_bg.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_check.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_progress0.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_progress1.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_progress2.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_progress3.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_progress4.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/setup_sidebar_progress5.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/sidebar_top.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/sort_ascending.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/sort_descending.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/star-16x16.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/success-16x16.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/tape.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/twisty_closed_9x9.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/twisty_inactive_9x9.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/twisty_opened_9x9.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/user-clear-16x16.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/user-green-16x16.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/user-red-16x16.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/user-yellow-16x16.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/user.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/wait24trans.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/warning-16x16.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/working-16x16.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/x.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/yahoo-gray.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/images/yahoo.gif
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/index.html
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/js/behaviour.js
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/js/builder.js
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/js/controls.js
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/js/cookies.js
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/js/dragdrop.js
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/js/effects.js
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/js/jscalendar/calendar-setup.js
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/js/jscalendar/calendar-win2k-1.css
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/js/jscalendar/calendar-win2k-cold-1.css
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/js/jscalendar/calendar.js
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/js/lightbox.js
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/js/pngfix.js
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/js/prototype.js
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/js/scriptaculous.js
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/js/setup.js
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/js/slider.js
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/js/tooltips/domLib.js
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/js/tooltips/domTT.js
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/js/tooltips/domTT_drag.js
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/js/tooltips/fadomatic.js
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/js/unittest.js
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/setup/setup-style.css
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/style/global.css
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/style/ldap.css
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/style/lightbox.css
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/style/login.css
+%%PLUGINS%%%%DATADIR%%/plugins/admin/webapp/style/setup.css
+%%PLUGINS%%%%DATADIR%%/plugins/broadcast.jar
+%%PLUGINS%%%%DATADIR%%/plugins/clientControl.jar
+%%PLUGINS%%%%DATADIR%%/plugins/contentFilter.jar
+%%PLUGINS%%%%DATADIR%%/plugins/dbaccess.jar
+%%PLUGINS%%%%DATADIR%%/plugins/emailListener.jar
+%%PLUGINS%%%%DATADIR%%/plugins/gojara.jar
+%%PLUGINS%%%%DATADIR%%/plugins/hazelcast.jar
+%%PLUGINS%%%%DATADIR%%/plugins/jingleNodes.jar
+%%PLUGINS%%%%DATADIR%%/plugins/justmarried.jar
+%%PLUGINS%%%%DATADIR%%/plugins/kraken.jar
+%%PLUGINS%%%%DATADIR%%/plugins/loadStats.jar
+%%PLUGINS%%%%DATADIR%%/plugins/monitoring.jar
+%%PLUGINS%%%%DATADIR%%/plugins/motd.jar
+%%PLUGINS%%%%DATADIR%%/plugins/packetFilter.jar
+%%PLUGINS%%%%DATADIR%%/plugins/presence.jar
+%%PLUGINS%%%%DATADIR%%/plugins/registration.jar
+%%PLUGINS%%%%DATADIR%%/plugins/search.jar
+%%PLUGINS%%%%DATADIR%%/plugins/sip.jar
+%%PLUGINS%%%%DATADIR%%/plugins/stunserver.jar
+%%PLUGINS%%%%DATADIR%%/plugins/subscription.jar
+%%PLUGINS%%%%DATADIR%%/plugins/userCreation.jar
+%%PLUGINS%%%%DATADIR%%/plugins/userImportExport.jar
+%%PLUGINS%%%%DATADIR%%/plugins/userservice.jar
+%%PLUGINS%%%%DATADIR%%/plugins/xmldebugger.jar
 %%DATADIR%%/resources/database/openfire_db2.sql
 %%DATADIR%%/resources/database/openfire_hsqldb.sql
 %%DATADIR%%/resources/database/openfire_mysql.sql
@@ -389,19 +389,19 @@
 @dirrm %%DATADIR%%/resources/database/upgrade
 @dirrm %%DATADIR%%/resources/database
 @dirrm %%DATADIR%%/resources
-@dirrm %%DATADIR%%/plugins/admin/webapp/style
-@dirrm %%DATADIR%%/plugins/admin/webapp/setup
-@dirrm %%DATADIR%%/plugins/admin/webapp/js/tooltips
-@dirrm %%DATADIR%%/plugins/admin/webapp/js/jscalendar
-@dirrm %%DATADIR%%/plugins/admin/webapp/js
-@dirrm %%DATADIR%%/plugins/admin/webapp/images
-@dirrm %%DATADIR%%/plugins/admin/webapp/WEB-INF/lib
-@dirrm %%DATADIR%%/plugins/admin/webapp/WEB-INF
-@dirrm %%DATADIR%%/plugins/admin/webapp
-@dirrm %%DATADIR%%/plugins/admin
+%%PLUGINS%%@dirrm %%DATADIR%%/plugins/admin/webapp/style
+%%PLUGINS%%@dirrm %%DATADIR%%/plugins/admin/webapp/setup
+%%PLUGINS%%@dirrm %%DATADIR%%/plugins/admin/webapp/js/tooltips
+%%PLUGINS%%@dirrm %%DATADIR%%/plugins/admin/webapp/js/jscalendar
+%%PLUGINS%%@dirrm %%DATADIR%%/plugins/admin/webapp/js
+%%PLUGINS%%@dirrm %%DATADIR%%/plugins/admin/webapp/images
+%%PLUGINS%%@dirrm %%DATADIR%%/plugins/admin/webapp/WEB-INF/lib
+%%PLUGINS%%@dirrm %%DATADIR%%/plugins/admin/webapp/WEB-INF
+%%PLUGINS%%@dirrm %%DATADIR%%/plugins/admin/webapp
+%%PLUGINS%%@dirrm %%DATADIR%%/plugins/admin
+%%PLUGINS%%@dirrm %%DATADIR%%/plugins
 @dirrm %%DATADIR%%/lib
 @dirrm %%EXAMPLESDIR%%
-@unexec rmdir %D/%%DATADIR%%/plugins 2> /dev/null || echo "If permanently deleting this package, %D/%%DATADIR%%/plugins must be removed manually"
 @unexec rmdir %D/%%DATADIR%% 2> /dev/null
 @unexec rmdir %D/%%ETCDIR%% 2> /dev/null || echo "If permanently deleting this package, %D/%%ETCDIR%% must be removed manually"
 @unexec rmdir /var/db/openfire 2> /dev/null || echo "If permanently deleting this package, /var/db/openfire must be removed manually"