- Tighten install target by using a SUB_FILE

- Build jar from source
- bump PORTREVISION

PR:	ports/166542
Submitted by:	jgh
Approved by:	maintainer, shurd@sasktel.net
Feature safe:	yes

5 files changed, 30 insertions, 19 deletions

diff --git a/misc/jbidwatcher/Makefile b/misc/jbidwatcher/Makefile
index 995683497961..53b08abf2bb6 100644
--- a/misc/jbidwatcher/Makefile
+++ b/misc/jbidwatcher/Makefile
@@ -6,29 +6,27 @@
 #
 
 PORTNAME=	jbidwatcher
-DISTVERSION=	2.5
+PORTVERSION=	2.5
+PORTREVISION=	1
 CATEGORIES=	misc java
 MASTER_SITES=	http://www.jbidwatcher.com/download/
-DISTNAME=	JBidwatcher-${DISTVERSION}
-EXTRACT_SUFX=	.jar
-EXTRACT_ONLY=
 
 MAINTAINER=	shurd@sasktel.net
 COMMENT=	A Java-based application allowing you to monitor eBay auctions
 
+USE_BZIP2=	yes
 USE_JAVA=	yes
+USE_ANT=	yes
+ALL_TARGET=	jar
 JAVA_VERSION=	1.5+
-NO_BUILD=	yes
 
-PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar \
+SUB_FILES=	jbidwatcher
+SUB_LIST+=	PORTVERSION=${PORTVERSION}
+PLIST_FILES=	%%JAVAJARDIR%%/JBidwatcher-${PORTVERSION}.jar \
 		bin/${PORTNAME}
 
 do-install:
-	@${INSTALL_DATA} ${DISTDIR}/${DISTFILES} ${JAVAJARDIR}/${PORTNAME}.jar
-	@${SED} -e "s:%%LOCALBASE%%:${LOCALBASE}:" \
-		-e "s:%%JAVAJARDIR%%:${JAVAJARDIR}:" \
-		${FILESDIR}/jbidwatcher.sh > ${PREFIX}/bin/${PORTNAME}
-	@${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/bin/${PORTNAME}
-	@${CHMOD} a+rx ${PREFIX}/bin/${PORTNAME}
+	@${INSTALL_DATA} ${WRKSRC}/JBidwatcher-${PORTVERSION}.jar ${JAVAJARDIR}
+	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/misc/jbidwatcher/distinfo b/misc/jbidwatcher/distinfo
index f967396d7f55..e4225e17c863 100644
--- a/misc/jbidwatcher/distinfo
+++ b/misc/jbidwatcher/distinfo
@@ -1,2 +1,2 @@
-SHA256 (JBidwatcher-2.5.jar) = 6e9294842dacde8b62cad14663fa81bf8f7039272e92b86eb18bf9a9fba67218
-SIZE (JBidwatcher-2.5.jar) = 14409608
+SHA256 (jbidwatcher-2.5.tar.bz2) = 9934f6ddf6825023a2c533fb6855a8af1068c942f1d3d604f597eabe2cf9ee30
+SIZE (jbidwatcher-2.5.tar.bz2) = 16082013
diff --git a/misc/jbidwatcher/files/jbidwatcher.in b/misc/jbidwatcher/files/jbidwatcher.in
new file mode 100644
index 000000000000..62e03be5efc6
--- /dev/null
+++ b/misc/jbidwatcher/files/jbidwatcher.in
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/JBidwatcher-%%PORTVERSION%%.jar" "$@"
diff --git a/misc/jbidwatcher/files/jbidwatcher.sh b/misc/jbidwatcher/files/jbidwatcher.sh
deleted file mode 100644
index c06ba5312e96..000000000000
--- a/misc/jbidwatcher/files/jbidwatcher.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-"%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/jbidwatcher.jar" "$@"
diff --git a/misc/jbidwatcher/files/patch-build.xml b/misc/jbidwatcher/files/patch-build.xml
new file mode 100644
index 000000000000..698034877b03
--- /dev/null
+++ b/misc/jbidwatcher/files/patch-build.xml
@@ -0,0 +1,13 @@
+--- ./build.xml.orig	2012-03-18 11:35:38.000000000 -0700
++++ ./build.xml	2012-03-25 16:08:00.000000000 -0700
+@@ -125,10 +125,6 @@
+     <echo level="info" message="Building primary .jar file." />
+     <copy todir="help/" file="COPYING.html" />
+ 
+-    <exec executable="git" outputproperty="GITVERSION">
+-      <arg line="describe --tags --long"/>
+-    </exec>
+-
+     <mkdir dir="META-INF"/>
+ 
+     <manifest file="${MANIFEST}">