- Update to 2.9.0

- Change MASTER_SITES to not break when a new release comes out [1]
- Follow changed name from jgnash2 to jgnash

Reported by:	pointyhat (via pav) [1]

4 files changed, 23 insertions, 17 deletions

diff --git a/finance/jgnash/Makefile b/finance/jgnash/Makefile
index 91032739e4f2..ffc774bfabe8 100644
--- a/finance/jgnash/Makefile
+++ b/finance/jgnash/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	jgnash
-PORTVERSION=	2.8.0
+PORTVERSION=	2.9.0
 CATEGORIES=	finance java
-MASTER_SITES=	SF/jgnash/Active%20Stable%202.x/2.8.x%20Releases
-DISTNAME=	jgnash2-${PORTVERSION}-bin
+MASTER_SITES=	SF/jgnash/Active%20Stable%202.x
+DISTNAME=	jgnash-${PORTVERSION}-bin
 
 MAINTAINER=	decke@FreeBSD.org
 COMMENT=	A free personal finance manager
 
-WRKSRC=		${WRKDIR}/jgnash2-${PORTVERSION}
+WRKSRC=		${WRKDIR}/jgnash-${PORTVERSION}
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
-SUB_FILES=	jgnash2.desktop
+SUB_FILES=	jgnash.desktop
 SUB_LIST=	JAVA="${JAVA}"
 PLIST_SUB+=	DESKTOPDIR=${DESKTOPDIR:S|^${PREFIX}/||}
 
@@ -32,6 +32,6 @@ do-install:
 	@${CP} ${WRKSRC}/jgnash2.jar ${DATADIR}
 	@${CP} -R ${WRKSRC}/lib ${DATADIR}
 	@${MKDIR} ${DESKTOPDIR}
-	@${CP} ${WRKDIR}/jgnash2.desktop ${DESKTOPDIR}
+	@${CP} ${WRKDIR}/jgnash.desktop ${DESKTOPDIR}
 
 .include <bsd.port.mk>
diff --git a/finance/jgnash/distinfo b/finance/jgnash/distinfo
index 20b24b2a6ddc..5bfb245da96b 100644
--- a/finance/jgnash/distinfo
+++ b/finance/jgnash/distinfo
@@ -1,2 +1,2 @@
-SHA256 (jgnash2-2.8.0-bin.zip) = b4ce93f97f741030b60b135d9cf6288022bf2127d7b0cffd19f742f95d7ee270
-SIZE (jgnash2-2.8.0-bin.zip) = 27355292
+SHA256 (jgnash-2.9.0-bin.zip) = b762ddcfec75eb6f1a6013f0f17f4b3e3d2c1ef593e0f185a2496ed5d6571e10
+SIZE (jgnash-2.9.0-bin.zip) = 27621658
diff --git a/finance/jgnash/files/jgnash2.desktop.in b/finance/jgnash/files/jgnash.desktop.in
index 75d14410b00b..75d14410b00b 100644
--- a/finance/jgnash/files/jgnash2.desktop.in
+++ b/finance/jgnash/files/jgnash.desktop.in
diff --git a/finance/jgnash/pkg-plist b/finance/jgnash/pkg-plist
index a58869367ff8..e9d30e00e4fc 100644
--- a/finance/jgnash/pkg-plist
+++ b/finance/jgnash/pkg-plist
@@ -12,23 +12,29 @@
 %%DATADIR%%/lib/db4o-nqopt-java5-6.4.54.jar
 %%DATADIR%%/lib/dom4j-1.6.1.jar
 %%DATADIR%%/lib/itext-2.1.7.jar
+%%DATADIR%%/lib/jasperreports-3.7.1.jar
 %%DATADIR%%/lib/javahelp-2.0.05.jar
+%%DATADIR%%/lib/jcommon-1.0.17.jar
 %%DATADIR%%/lib/jdtcore-3.1.0.jar
-%%DATADIR%%/lib/jgnash-help-2.8.0.jar
+%%DATADIR%%/lib/jfreechart-1.0.14.jar
+%%DATADIR%%/lib/jgnash-core-2.9.0.jar
+%%DATADIR%%/lib/jgnash-help-2.9.0.jar
+%%DATADIR%%/lib/jgnash-imports-2.9.0.jar
+%%DATADIR%%/lib/jgnash-resources-2.9.0.jar
 %%DATADIR%%/lib/jgoodies-common-1.3.0.jar
 %%DATADIR%%/lib/jgoodies-forms-1.5.0.jar
 %%DATADIR%%/lib/jgoodies-looks-2.5.0.jar
-%%DATADIR%%/lib/jasperreports-3.7.1.jar
-%%DATADIR%%/lib/jcommon-1.0.17.jar
-%%DATADIR%%/lib/jfreechart-1.0.14.jar
-%%DATADIR%%/lib/jxlayer-4.0.jar
+%%DATADIR%%/lib/jhlabs-2.9.0.jar
+%%DATADIR%%/lib/jidesoft-2.9.0.jar
+%%DATADIR%%/lib/jxlayer-2.9.0.jar
 %%DATADIR%%/lib/kxml2-2.3.0.jar
 %%DATADIR%%/lib/laf-plugin-7.1.jar
 %%DATADIR%%/lib/laf-widget-7.1.jar
 %%DATADIR%%/lib/mina-core-2.0.4.jar
-%%DATADIR%%/lib/poi-3.8-beta5.jar
-%%DATADIR%%/lib/poi-ooxml-3.8-beta5.jar
-%%DATADIR%%/lib/poi-ooxml-schemas-3.8-beta5.jar
+%%DATADIR%%/lib/plexus-utils-1.4.1.jar
+%%DATADIR%%/lib/poi-3.8.jar
+%%DATADIR%%/lib/poi-ooxml-3.8.jar
+%%DATADIR%%/lib/poi-ooxml-schemas-3.8.jar
 %%DATADIR%%/lib/slf4j-api-1.6.4.jar
 %%DATADIR%%/lib/slf4j-jdk14-1.6.4.jar
 %%DATADIR%%/lib/substance-7.1.jar
@@ -42,7 +48,7 @@
 %%DATADIR%%/lib/trident-7.1-swing.jar
 %%DATADIR%%/lib/xmlbeans-2.3.0.jar
 %%DATADIR%%/lib/xstream-1.4.2.jar
-%%DESKTOPDIR%%/jgnash2.desktop
+%%DESKTOPDIR%%/jgnash.desktop
 @dirrm %%DATADIR%%/lib
 @dirrm %%DATADIR%%
 @dirrmtry %%DESKTOPDIR%%