Date: Tue, 23 May 2006 18:45:15 +0200 (CEST) From: Herve Quiroz <hq@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: dan@algenta.com Subject: ports/97698: [PATCH] dns/crossip: Update to bsd.java.mk 2.0 and other improvements Message-ID: <200605231645.k4NGjFgC037301@arabica.esil.univ-mrs.fr> Resent-Message-ID: <200605231650.k4NGoFsC060835@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 97698
>Category: ports
>Synopsis: [PATCH] dns/crossip: Update to bsd.java.mk 2.0 and other improvements
>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: Tue May 23 16:50:15 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Herve Quiroz
>Release: FreeBSD 6.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD arabica.esil.univ-mrs.fr 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Tue May 9 17:19:22 CEST
>Description:
- Update to bsd.java.mk 2.0
- Use DISTVERSION to avoid complex substitutions in DISTNAME
- Use DATADIR=${JAVASHAREDIR}/${PORTNAME}
- Use SUB_FILES to configure launcher shell script
- Set JAVA_VERSION in launcher shell script
- Use 'exec' to launch JVM (as encouraged in the Porter's Handbook)
- Remove port name from COMMENT
- Do not mkdir ${JAVAJARDIR} (it is part of mtree now)
- Use %%DATADIR%% and %%JAVAJARDIR%% in pkg-plist
- Add $FreeBSD$ tags
NOTE 1: I don't know well enough this application to understand if the JAR file
is indeed needed in ${JAVAJARDIR}. The new launcher uses the JAR file in
${DATADIR} anyway and seems to run fine. I would be glad if we could remove all
JAR files from ${JAVAJARDIR} that are not needed because many ports include all
files from this directory in their CLASSPATH.
NOTE 2: I don't think having *.class and *.java files in ${DATADIR} is useful.
But that's up to the maintainer to decide.
Added file(s):
- files/crossip.sh.in
Removed file(s):
- files/wrapper.sh
Port maintainer (dan@algenta.com) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- crossip-1.2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/dns/crossip/Makefile,v
retrieving revision 1.1
diff -u -u -r1.1 Makefile
--- Makefile 2 Mar 2004 17:17:21 -0000 1.1
+++ Makefile 23 May 2006 16:38:25 -0000
@@ -6,33 +6,28 @@
#
PORTNAME= crossip
-PORTVERSION= 1.2
+DISTVERSION= 1.2
CATEGORIES= dns java
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME:L}
-DISTNAME= ${PORTNAME:L}-${PORTVERSION:S/.p/-pre/:S/.b/-beta/}
MAINTAINER= dan@algenta.com
-COMMENT= CrossIP is a java DNS update client for the ThatIP protocol
+COMMENT= Java DNS update client for the ThatIP protocol
-USE_JAVA= 1.2+
+USE_JAVA= yes
+JAVA_VERSION= 1.2+
USE_ZIP= yes
NO_BUILD= yes
-NO_BUILD_DEPENDS_JAVA= yes
-JAVA_VM= ${LOCALBASE}/bin/javavm
-TARGET_DIR= ${JAVASHAREDIR}/${PKGNAME}
+DATADIR= ${JAVASHAREDIR}/${PORTNAME}
-post-patch:
- @${SED} -e "s|%%JAR_DIR%%|${JAVAJARDIR}|;s|%%JAVAVM%%|${JAVA_VM}|" \
- ${FILESDIR}/wrapper.sh > ${WRKDIR}/wrapper.sh
+SUB_FILES= crossip.sh
do-install:
- ${MKDIR} ${JAVAJARDIR}
- ${MKDIR} ${TARGET_DIR}
- ${CP} -R ${WRKSRC}/* ${TARGET_DIR}
- ${LN} -sf ${TARGET_DIR}/lib/CrossIP.jar ${JAVAJARDIR}/CrossIP.jar
- @${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${PORTNAME:L}
+ ${MKDIR} ${DATADIR}
+ ${CP} -R ${WRKSRC}/* ${DATADIR}
+ ${LN} -sf ${DATADIR}/lib/CrossIP.jar ${JAVAJARDIR}/CrossIP.jar
+ @${INSTALL_SCRIPT} ${WRKDIR}/crossip.sh ${PREFIX}/bin/crossip
.include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/dns/crossip/pkg-plist,v
retrieving revision 1.1
diff -u -u -r1.1 pkg-plist
--- pkg-plist 2 Mar 2004 17:17:21 -0000 1.1
+++ pkg-plist 23 May 2006 16:38:25 -0000
@@ -1,27 +1,28 @@
+@comment $FreeBSD$
bin/crossip
-share/java/classes/CrossIP.jar
-share/java/crossip-1.2/LICENSE.txt
-share/java/crossip-1.2/README.txt
-share/java/crossip-1.2/bin/com/algenta/crossip/Actions.class
-share/java/crossip-1.2/bin/com/algenta/crossip/Config.class
-share/java/crossip-1.2/bin/com/algenta/crossip/ConfigFileException.class
-share/java/crossip-1.2/bin/com/algenta/crossip/CrossIP.class
-share/java/crossip-1.2/bin/com/algenta/crossip/CrossIPConstants.class
-share/java/crossip-1.2/bin/com/algenta/crossip/CrossIPException.class
-share/java/crossip-1.2/lib/CrossIP.jar
-share/java/crossip-1.2/src/com/algenta/crossip/Actions.java
-share/java/crossip-1.2/src/com/algenta/crossip/Config.java
-share/java/crossip-1.2/src/com/algenta/crossip/ConfigFileException.java
-share/java/crossip-1.2/src/com/algenta/crossip/CrossIP.java
-share/java/crossip-1.2/src/com/algenta/crossip/CrossIPConstants.java
-share/java/crossip-1.2/src/com/algenta/crossip/CrossIPException.java
-@dirrm share/java/crossip-1.2/src/com/algenta/crossip
-@dirrm share/java/crossip-1.2/src/com/algenta
-@dirrm share/java/crossip-1.2/src/com
-@dirrm share/java/crossip-1.2/src
-@dirrm share/java/crossip-1.2/lib
-@dirrm share/java/crossip-1.2/bin/com/algenta/crossip
-@dirrm share/java/crossip-1.2/bin/com/algenta
-@dirrm share/java/crossip-1.2/bin/com
-@dirrm share/java/crossip-1.2/bin
-@dirrm share/java/crossip-1.2
+%%JAVAJARDIR%%/CrossIP.jar
+%%DATADIR%%/LICENSE.txt
+%%DATADIR%%/README.txt
+%%DATADIR%%/bin/com/algenta/crossip/Actions.class
+%%DATADIR%%/bin/com/algenta/crossip/Config.class
+%%DATADIR%%/bin/com/algenta/crossip/ConfigFileException.class
+%%DATADIR%%/bin/com/algenta/crossip/CrossIP.class
+%%DATADIR%%/bin/com/algenta/crossip/CrossIPConstants.class
+%%DATADIR%%/bin/com/algenta/crossip/CrossIPException.class
+%%DATADIR%%/lib/CrossIP.jar
+%%DATADIR%%/src/com/algenta/crossip/Actions.java
+%%DATADIR%%/src/com/algenta/crossip/Config.java
+%%DATADIR%%/src/com/algenta/crossip/ConfigFileException.java
+%%DATADIR%%/src/com/algenta/crossip/CrossIP.java
+%%DATADIR%%/src/com/algenta/crossip/CrossIPConstants.java
+%%DATADIR%%/src/com/algenta/crossip/CrossIPException.java
+@dirrm %%DATADIR%%/src/com/algenta/crossip
+@dirrm %%DATADIR%%/src/com/algenta
+@dirrm %%DATADIR%%/src/com
+@dirrm %%DATADIR%%/src
+@dirrm %%DATADIR%%/lib
+@dirrm %%DATADIR%%/bin/com/algenta/crossip
+@dirrm %%DATADIR%%/bin/com/algenta
+@dirrm %%DATADIR%%/bin/com
+@dirrm %%DATADIR%%/bin
+@dirrm %%DATADIR%%
Index: files/crossip.sh.in
===================================================================
RCS file: files/crossip.sh.in
diff -N files/crossip.sh.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/crossip.sh.in 23 May 2006 16:38:25 -0000
@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+JAVA_VERSION="%%JAVA_VERSION%%" \
+ exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/lib/CrossIP.jar" "${@}"
Index: files/wrapper.sh
===================================================================
RCS file: files/wrapper.sh
diff -N files/wrapper.sh
--- files/wrapper.sh 2 Mar 2004 17:17:21 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-JAVAVM="%%JAVAVM%%"
-JAR_DIR="%%JAR_DIR%%"
-
-${JAVAVM} -jar ${JAR_DIR}/CrossIP.jar "${@}"
--- crossip-1.2.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?200605231645.k4NGjFgC037301>