3 files changed, 93 insertions, 132 deletions

diff --git a/mail/james/Makefile b/mail/james/Makefile
index 03c038939296..81a28994fd69 100644
--- a/mail/james/Makefile
+++ b/mail/james/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	james
-PORTVERSION=	2.3.0
-PORTREVISION=	1
+PORTVERSION=	2.3.1
 CATEGORIES=	mail java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	${PORTNAME}/server/binaries
+DISTNAME=	${PORTNAME}-binary-${PORTVERSION}
 
 MAINTAINER=	nemoliu@FreeBSD.org
 COMMENT=	Java SMTP and POP3 Mail server and NNTP News server
@@ -21,6 +21,7 @@ NO_BUILD=	YES
 
 USE_RC_SUBR=	james.sh
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 APP_HOME?=	${PREFIX}/${PKGBASE}${PORTVERSION}
 PID_FILE=	/var/run/${APP_SHORTNAME}.pid
 PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///}
diff --git a/mail/james/distinfo b/mail/james/distinfo
index 6ef9f380563a..36be41fad453 100644
--- a/mail/james/distinfo
+++ b/mail/james/distinfo
@@ -1,3 +1,3 @@
-MD5 (james-2.3.0.tar.gz) = a0b15c4d259185723a974353b9967126
-SHA256 (james-2.3.0.tar.gz) = a083a2552a081bdd7a468acccd32479260c530a23e4c82c1c082aa79e81e9250
-SIZE (james-2.3.0.tar.gz) = 7674091
+MD5 (james-binary-2.3.1.tar.gz) = 72a14b948e62a73cf414474c3ec9a1f5
+SHA256 (james-binary-2.3.1.tar.gz) = 280cca87c4a0f55504af9fcbaec5ab045a91a87359744bc7fc54a4bf20cf4122
+SIZE (james-binary-2.3.1.tar.gz) = 7570886
diff --git a/mail/james/pkg-plist b/mail/james/pkg-plist
index f9d5f3c9719d..01d4da8c3598 100644
--- a/mail/james/pkg-plist
+++ b/mail/james/pkg-plist
@@ -1,127 +1,87 @@
-%%T%%/LICENSE.txt
-%%T%%/NOTICE.txt
-%%T%%/README.txt
-%%T%%/UPGRADE.txt
-%%T%%/apps/dummy.txt
-%%T%%/apps/james.sar
-%%T%%/bin/Wrapper.LICENSE
-%%T%%/bin/Wrapper.dll
-%%T%%/bin/derby.properties
-%%T%%/bin/lib/excalibur-cli-1.0.jar
-%%T%%/bin/lib/excalibur-extension-1.0a.jar
-%%T%%/bin/lib/excalibur-instrument-manager-1.0.jar
-%%T%%/bin/lib/excalibur-io-1.1.jar
-%%T%%/bin/lib/excalibur-logger-2.1.jar
-%%T%%/bin/lib/excalibur-monitor-2.1.jar
-%%T%%/bin/lib/jakarta-oro-2.0.8.jar
-%%T%%/bin/lib/mx4j-jmx.jar
-%%T%%/bin/lib/mx4j-tools.jar
-%%T%%/bin/lib/mx4j.LICENSE
-%%T%%/bin/lib/phoenix-engine.jar
-%%T%%/bin/lib/spice-classman-1.0.jar
-%%T%%/bin/lib/spice-loggerstore-0.5.jar
-%%T%%/bin/lib/spice-salt-0.8.jar
-%%T%%/bin/lib/spice-xmlpolicy-1.0.jar
-%%T%%/bin/lib/spice.LICENSE
-%%T%%/bin/phoenix-loader.jar
-%%T%%/bin/phoenix.sh
-%%T%%/bin/run.sh
-%%T%%/bin/sendmail.py
-%%T%%/bin/wrapper.jar
-%%T%%/conf/kernel.xml
-%%T%%/conf/phoenix-service.xml
-%%T%%/conf/wrapper.conf
-%%T%%/docs/adding_users.html
-%%T%%/docs/announcement.html
-%%T%%/docs/architecture.html
-%%T%%/docs/build_instructions.html
-%%T%%/docs/changelog.html
-%%T%%/docs/custom_mailet.html
-%%T%%/docs/custom_matcher.html
-%%T%%/docs/design_objectives.html
-%%T%%/docs/dns_configuration.html
-%%T%%/docs/fetchmail_configuration.html
-%%T%%/docs/images/james-logo.jpg
-%%T%%/docs/images/james_config_load_balance.png
-%%T%%/docs/images/james_config_secondary.png
-%%T%%/docs/images/james_config_smart_host.png
-%%T%%/docs/images/void.gif
-%%T%%/docs/index.html
-%%T%%/docs/install.html
-%%T%%/docs/installation_instructions.html
-%%T%%/docs/mailet_api.html
-%%T%%/docs/mailing_lists.html
-%%T%%/docs/migrating_datasource.html
-%%T%%/docs/nntp_configuration.html
-%%T%%/docs/pop3_configuration.html
-%%T%%/docs/provided_mailets.html
-%%T%%/docs/provided_matchers.html
-%%T%%/docs/remotemanager_configuration.html
-%%T%%/docs/repositories.html
-%%T%%/docs/serverwide_configuration.html
-%%T%%/docs/smtp_auth.html
-%%T%%/docs/smtp_configuration.html
-%%T%%/docs/spoolmanager.html
-%%T%%/docs/spoolmanager_configuration.html
-%%T%%/docs/stylesheet.css
-%%T%%/docs/stylesheets/project.html
-%%T%%/docs/summary.html
-%%T%%/docs/upgrade_instructions.html
-%%T%%/docs/using_database.html
-%%T%%/ext/README.txt
-%%T%%/lib/avalon-framework-api-4.3.jar
-%%T%%/lib/avalon-framework-impl-4.3.jar
-%%T%%/lib/avalon-logkit-2.1.jar
-%%T%%/lib/commons-collections-2.1.1.jar
-%%T%%/lib/concurrent-1.3.4.jar
-%%T%%/lib/excalibur-cli-1.0.jar
-%%T%%/lib/excalibur-extension-1.0a.jar
-%%T%%/lib/excalibur-instrument-api-2.1.jar
-%%T%%/lib/excalibur-instrument-manager-1.0.jar
-%%T%%/lib/excalibur-io-1.1.jar
-%%T%%/lib/excalibur-logger-2.1.jar
-%%T%%/lib/excalibur-monitor-2.1.jar
-%%T%%/lib/excalibur-pool-api-2.1.jar
-%%T%%/lib/excalibur-pool-impl-2.1.jar
-%%T%%/lib/excalibur-thread-api-2.1.jar
-%%T%%/lib/excalibur-thread-impl-2.1.jar
-%%T%%/lib/jakarta-oro-2.0.8.jar
-%%T%%/lib/mx4j-jmx.jar
-%%T%%/lib/mx4j-tools.jar
-%%T%%/lib/mx4j.LICENSE
-%%T%%/lib/phoenix-client.jar
-%%T%%/lib/phoenix-engine.jar
-%%T%%/lib/spice-classman-1.0.jar
-%%T%%/lib/spice-loggerstore-0.5.jar
-%%T%%/lib/spice-salt-0.8.jar
-%%T%%/lib/spice-xmlpolicy-1.0.jar
-%%T%%/lib/spice.LICENSE
-%%T%%/lib/tools.jar
-%%T%%/logs/readme.txt
-%%T%%/tools/lib/excalibur-i18n-1.0.jar
-%%T%%/tools/lib/isorelax-20020414.jar
-%%T%%/tools/lib/isorelax.LICENSE
-%%T%%/tools/lib/msv-20020414.jar
-%%T%%/tools/lib/msv.LICENSE
-%%T%%/tools/lib/phoenix-tools.jar
-%%T%%/tools/lib/qdox-1.1.jar
-%%T%%/tools/lib/qdox.LICENSE
-%%T%%/tools/lib/relaxngDatatype-20020414.jar
-%%T%%/tools/lib/relaxngDatatype.LICENSE
-%%T%%/tools/lib/spice-configkit-1.1.2.jar
-%%T%%/tools/lib/spice.LICENSE
-%%T%%/tools/lib/xsdlib-20020414.jar
-%%T%%/tools/lib/xsdlib.LICENSE
-@dirrm %%T%%/tools/lib
-@dirrm %%T%%/tools
-@dirrm %%T%%/logs
-@dirrm %%T%%/lib
-@dirrm %%T%%/ext
-@dirrm %%T%%/docs/stylesheets
-@dirrm %%T%%/docs/images
-@dirrm %%T%%/docs
-@dirrm %%T%%/conf
-@dirrm %%T%%/bin/lib
-@dirrm %%T%%/bin
-@dirrm %%T%%/apps
-@dirrm %%T%%
+james2.3.1/LICENSE.txt
+james2.3.1/NOTICE.txt
+james2.3.1/README.txt
+james2.3.1/UPGRADE.txt
+james2.3.1/apps/dummy.txt
+james2.3.1/apps/james.sar
+james2.3.1/bin/Wrapper.LICENSE
+james2.3.1/bin/Wrapper.dll
+james2.3.1/bin/derby.properties
+james2.3.1/bin/lib/excalibur-cli-1.0.jar
+james2.3.1/bin/lib/excalibur-extension-1.0a.jar
+james2.3.1/bin/lib/excalibur-instrument-manager-1.0.jar
+james2.3.1/bin/lib/excalibur-io-1.1.jar
+james2.3.1/bin/lib/excalibur-logger-2.1.jar
+james2.3.1/bin/lib/excalibur-monitor-2.1.jar
+james2.3.1/bin/lib/jakarta-oro-2.0.8.jar
+james2.3.1/bin/lib/mx4j-jmx.jar
+james2.3.1/bin/lib/mx4j-tools.jar
+james2.3.1/bin/lib/mx4j.LICENSE
+james2.3.1/bin/lib/phoenix-engine.jar
+james2.3.1/bin/lib/spice-classman-1.0.jar
+james2.3.1/bin/lib/spice-loggerstore-0.5.jar
+james2.3.1/bin/lib/spice-salt-0.8.jar
+james2.3.1/bin/lib/spice-xmlpolicy-1.0.jar
+james2.3.1/bin/lib/spice.LICENSE
+james2.3.1/bin/phoenix-loader.jar
+james2.3.1/bin/phoenix.sh
+james2.3.1/bin/run.sh
+james2.3.1/bin/sendmail.py
+james2.3.1/bin/wrapper.jar
+james2.3.1/conf/kernel.xml
+james2.3.1/conf/phoenix-service.xml
+james2.3.1/conf/wrapper.conf
+james2.3.1/ext/README.txt
+james2.3.1/lib/avalon-framework-api-4.3.jar
+james2.3.1/lib/avalon-framework-impl-4.3.jar
+james2.3.1/lib/avalon-logkit-2.1.jar
+james2.3.1/lib/commons-collections-2.1.1.jar
+james2.3.1/lib/concurrent-1.3.4.jar
+james2.3.1/lib/excalibur-cli-1.0.jar
+james2.3.1/lib/excalibur-extension-1.0a.jar
+james2.3.1/lib/excalibur-instrument-api-2.1.jar
+james2.3.1/lib/excalibur-instrument-manager-1.0.jar
+james2.3.1/lib/excalibur-io-1.1.jar
+james2.3.1/lib/excalibur-logger-2.1.jar
+james2.3.1/lib/excalibur-monitor-2.1.jar
+james2.3.1/lib/excalibur-pool-api-2.1.jar
+james2.3.1/lib/excalibur-pool-impl-2.1.jar
+james2.3.1/lib/excalibur-thread-api-2.1.jar
+james2.3.1/lib/excalibur-thread-impl-2.1.jar
+james2.3.1/lib/jakarta-oro-2.0.8.jar
+james2.3.1/lib/mx4j-jmx.jar
+james2.3.1/lib/mx4j-tools.jar
+james2.3.1/lib/mx4j.LICENSE
+james2.3.1/lib/phoenix-client.jar
+james2.3.1/lib/phoenix-engine.jar
+james2.3.1/lib/spice-classman-1.0.jar
+james2.3.1/lib/spice-loggerstore-0.5.jar
+james2.3.1/lib/spice-salt-0.8.jar
+james2.3.1/lib/spice-xmlpolicy-1.0.jar
+james2.3.1/lib/spice.LICENSE
+james2.3.1/lib/tools.jar
+james2.3.1/logs/readme.txt
+james2.3.1/tools/lib/excalibur-i18n-1.0.jar
+james2.3.1/tools/lib/isorelax-20020414.jar
+james2.3.1/tools/lib/isorelax.LICENSE
+james2.3.1/tools/lib/msv-20020414.jar
+james2.3.1/tools/lib/msv.LICENSE
+james2.3.1/tools/lib/phoenix-tools.jar
+james2.3.1/tools/lib/qdox-1.1.jar
+james2.3.1/tools/lib/qdox.LICENSE
+james2.3.1/tools/lib/relaxngDatatype-20020414.jar
+james2.3.1/tools/lib/relaxngDatatype.LICENSE
+james2.3.1/tools/lib/spice-configkit-1.1.2.jar
+james2.3.1/tools/lib/spice.LICENSE
+james2.3.1/tools/lib/xsdlib-20020414.jar
+james2.3.1/tools/lib/xsdlib.LICENSE
+@dirrm james2.3.1/tools/lib
+@dirrm james2.3.1/tools
+@dirrm james2.3.1/logs
+@dirrm james2.3.1/lib
+@dirrm james2.3.1/ext
+@dirrm james2.3.1/conf
+@dirrm james2.3.1/bin/lib
+@dirrm james2.3.1/bin
+@dirrm james2.3.1/apps
+@dirrm james2.3.1