Date: Tue, 14 Feb 2006 14:55:30 +0100 (CET) From: Herve Quiroz <hq@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: dave@glowacki.org Subject: ports/93339: [PATCH] java/java-checkstyle: update to 4.1 and improvements Message-ID: <200602141355.k1EDtUJp040115@arabica.esil.univ-mrs.fr> Resent-Message-ID: <200602141400.k1EE0KQK088149@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 93339
>Category: ports
>Synopsis: [PATCH] java/java-checkstyle: update to 4.1 and improvements
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Feb 14 14:00:20 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Herve Quiroz
>Release: FreeBSD 6.1-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD arabica.esil.univ-mrs.fr 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #0: Thu Feb 2 17:19:01 CET
>Description:
- Update to 4.1
- Use SUB_FILES to configure the launcher shell script
- Set JAVA_VERSION in the launcher
- STYLEDIR -> DATADIR (%%DATADIR%% already in SUB_LIST and PLIST_SUB)
Added file(s):
- files/checkstyle.sh.in
Removed file(s):
- files/checkstyle.sh
Port maintainer (dave@glowacki.org) is cc'd.
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- java-checkstyle-4.1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/java/java-checkstyle/Makefile,v
retrieving revision 1.15
diff -u -u -r1.15 Makefile
--- Makefile 10 Oct 2005 04:43:53 -0000 1.15
+++ Makefile 14 Feb 2006 13:55:08 -0000
@@ -6,8 +6,7 @@
#
PORTNAME= checkstyle
-PORTVERSION= 3.5
-PORTREVISION= 1
+PORTVERSION= 4.1
CATEGORIES= java devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -27,26 +26,24 @@
PLIST= ${WRKDIR}/PLIST
-STYLEDIR= ${JAVASHAREDIR}/${PORTNAME}
+DATADIR= ${JAVASHAREDIR}/${PORTNAME}
PLIST_FILES= bin/checkstyle %%JAVAJARDIR%%/${PORTNAME}.jar %%JAVAJARDIR%%/${PORTNAME}-optional.jar \
- ${STYLEDIR:S,${PREFIX}/,,}/examples/conf/sun_checks.xml
+ %%DATADIR%%/examples/conf/sun_checks.xml
.if !defined(NOPORTDOCS)
BUILDDIR= ${WRKSRC}/target/dist/${PORTNAME}-${PORTVERSION}
-PORTDOCS= README LICENSE* TODO RIGHTS* docs
+PORTDOCS= README LICENSE* RIGHTS* docs
.endif
-do-configure:
- @${SED} -e 's,%%LOCALBASE%%,${LOCALBASE},g ; s,%%JAVAJARDIR%%,${JAVAJARDIR},g' \
- ${FILESDIR}/checkstyle.sh > ${WRKSRC}/checkstyle
+SUB_FILES= checkstyle.sh
pre-install:
@${RM} -f ${PLIST}
@${TOUCH} ${PLIST}
@${FIND} ${BUILDDIR}/contrib/ -type f -print | \
- ${SED} "s,^${BUILDDIR}/contrib,${STYLEDIR:S,${PREFIX}/,,}," >> ${PLIST}
+ ${SED} "s,^${BUILDDIR}/contrib,${DATADIR:S,${PREFIX}/,,}," >> ${PLIST}
@${FIND} ${BUILDDIR}/contrib/ -type d -print | ${SORT} -r | \
- ${SED} -e "s,^${BUILDDIR}/contrib,@dirrm ${STYLEDIR:S,${PREFIX}/,,}," >> ${PLIST}
+ ${SED} -e "s,^${BUILDDIR}/contrib,@dirrm ${DATADIR:S,${PREFIX}/,,}," >> ${PLIST}
do-install: do-install-jar do-install-data do-install-apidocs \
do-install-script
@@ -57,10 +54,10 @@
@${INSTALL_DATA} ${BUILDDIR}/${PORTNAME}-optional-${PORTVERSION}.jar ${JAVAJARDIR}/${PORTNAME}-optional.jar
do-install-data:
- @${MKDIR} ${STYLEDIR}
- @${CP} -r ${BUILDDIR}/contrib/* ${STYLEDIR}
- @${CHOWN} -h -R ${SHAREOWN}:${SHAREGRP} ${STYLEDIR}
- @${INSTALL_DATA} ${WRKSRC}/sun_checks.xml ${STYLEDIR}/examples/conf/
+ @${MKDIR} ${DATADIR}
+ @${CP} -r ${BUILDDIR}/contrib/* ${DATADIR}
+ @${CHOWN} -h -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
+ @${INSTALL_DATA} ${WRKSRC}/sun_checks.xml ${DATADIR}/examples/conf/
do-install-apidocs:
.if !defined(NOPORTDOCS)
@@ -72,6 +69,6 @@
.endif
do-install-script:
- @${INSTALL_SCRIPT} ${WRKSRC}/checkstyle ${PREFIX}/bin/checkstyle
+ @${INSTALL_SCRIPT} ${WRKDIR}/checkstyle.sh ${PREFIX}/bin/checkstyle
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/java/java-checkstyle/distinfo,v
retrieving revision 1.8
diff -u -u -r1.8 distinfo
--- distinfo 22 Jan 2006 12:39:54 -0000 1.8
+++ distinfo 14 Feb 2006 13:55:08 -0000
@@ -1,3 +1,3 @@
-MD5 (checkstyle-src-3.5.tar.gz) = 868736a6617d58bbc4efcf85984423fd
-SHA256 (checkstyle-src-3.5.tar.gz) = f72fc6724699c617b544cc9b4925a0e568106c8c445da43775d5451becccf2d2
-SIZE (checkstyle-src-3.5.tar.gz) = 1962069
+MD5 (checkstyle-src-4.1.tar.gz) = 96b430fe5087b4f62fa78804475ee2ea
+SHA256 (checkstyle-src-4.1.tar.gz) = 0ea1c7fea315a8321a826ccf8e4fa9b12542d79a9d6da5f79def8c77f9e5fddb
+SIZE (checkstyle-src-4.1.tar.gz) = 2877441
Index: files/checkstyle.sh
===================================================================
RCS file: files/checkstyle.sh
diff -N files/checkstyle.sh
--- files/checkstyle.sh 25 Nov 2004 03:28:11 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/java/java-checkstyle/files/checkstyle.sh,v 1.1 2004/11/25 03:28:11 hq Exp $
-
-%%LOCALBASE%%/bin/java -cp "%%JAVAJARDIR%%/checkstyle.jar:%%JAVAJARDIR%%/checkstyle-optional.jar" com.puppycrawl.tools.checkstyle.Main "$@"
Index: files/checkstyle.sh.in
===================================================================
RCS file: files/checkstyle.sh.in
diff -N files/checkstyle.sh.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/checkstyle.sh.in 14 Feb 2006 13:55:08 -0000
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+JAVA_VERSION="%%JAVA_VERSION%%" "%%LOCALBASE%%/bin/java" -cp "%%JAVAJARDIR%%/checkstyle.jar:%%JAVAJARDIR%%/checkstyle-optional.jar" com.puppycrawl.tools.checkstyle.Main "$@"
--- java-checkstyle-4.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?200602141355.k1EDtUJp040115>