Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 31 Mar 2012 13:26:39 -0700
From:      Jason Helfman <jgh@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        shurd@sasktel.net
Subject:   ports/166542: [PATCH] misc/jbidwatcher: tighten do-install target, build from source
Message-ID:  <1333225599.713588.24550.nullmailer@experts-exchange.com>
Resent-Message-ID: <201203312030.q2VKUCkg020361@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         166542
>Category:       ports
>Synopsis:       [PATCH] misc/jbidwatcher: tighten do-install target, build from source
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 31 20:30:12 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Jason Helfman
>Release:        FreeBSD 8.2-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD dormouse.experts-exchange.com 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Thu Feb 17 02:41:51 UTC 2011
>Description:
This patch tightens install target with substituions, and builds from source.

>From Porter's Handbook 6.11.3 (Java Section):
"As for the choice of building Java ports from source or directly installing them from a binary distribution, there is no defined policy at the time of writing. However, people from the FreeBSD Java Project encourage porters to have their ports built from source whenever it is a trivial task."

Added file(s):
- files/jbidwatcher.in
- files/patch-build.xml

Removed file(s):
- files/jbidwatcher.sh

Port maintainer (shurd@sasktel.net) is cc'd.

Generated with FreeBSD Port Tools 0.99_5 (mode: change, diff: CVS)
>How-To-Repeat:
>Fix:

--- jbidwatcher-2.5_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/misc/jbidwatcher/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- Makefile	31 Mar 2012 18:50:10 -0000	1.27
+++ Makefile	31 Mar 2012 20:24:06 -0000
@@ -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>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/misc/jbidwatcher/distinfo,v
retrieving revision 1.24
diff -u -r1.24 distinfo
--- distinfo	31 Mar 2012 18:50:10 -0000	1.24
+++ distinfo	31 Mar 2012 20:24:06 -0000
@@ -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
Index: files/jbidwatcher.in
===================================================================
RCS file: files/jbidwatcher.in
diff -N files/jbidwatcher.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/jbidwatcher.in	31 Mar 2012 20:24:06 -0000
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/JBidwatcher-%%PORTVERSION%%.jar" "$@"
Index: files/jbidwatcher.sh
===================================================================
RCS file: files/jbidwatcher.sh
diff -N files/jbidwatcher.sh
--- files/jbidwatcher.sh	1 Feb 2005 00:59:11 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/misc/jbidwatcher/files/jbidwatcher.sh,v 1.2 2005/02/01 00:59:11 hq Exp $
-
-"%%LOCALBASE%%/bin/java" -jar "%%JAVAJARDIR%%/jbidwatcher.jar" "$@"
Index: files/patch-build.xml
===================================================================
RCS file: files/patch-build.xml
diff -N files/patch-build.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-build.xml	31 Mar 2012 20:24:06 -0000
@@ -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}">
--- jbidwatcher-2.5_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1333225599.713588.24550.nullmailer>