Date: Thu, 28 Oct 2004 14:41:56 +0200 (CEST) From: Herve Quiroz <hq@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: znerd@FreeBSD.org Subject: ports/73240: [PATCH] java/jlint: update to 3.0 and unbreak on 5.x Message-ID: <200410281241.i9SCfuSg023932@arabica.esil.univ-mrs.fr> Resent-Message-ID: <200410281250.i9SCoRMm052491@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 73240 >Category: ports >Synopsis: [PATCH] java/jlint: update to 3.0 and unbreak on 5.x >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: Thu Oct 28 12:50:27 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Herve Quiroz >Release: FreeBSD 5.2.1-RELEASE-p11 i386 >Organization: >Environment: System: FreeBSD arabica.esil.univ-mrs.fr 5.2.1-RELEASE-p11 FreeBSD 5.2.1-RELEASE-p11 #8: Fri Oct 15 15:12:37 CEST 2004 >Description: - Update to 3.0 [1] - Unbreak on 5.x [1] - Use PORTDOCS - Some minor cosmetic improvements [1] Patch submitted by Roman Kennke Added file(s): - files/patch-types.hh Removed file(s): - files/patch-field_desc.hh - files/patch-inlines.hh - files/patch-jlint.cc - files/patch-utf_string.hh Port maintainer (znerd@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- jlint-3.0.patch begins here --- Index: Makefile =================================================================== RCS file: /var/fcvs/ports/java/jlint/Makefile,v retrieving revision 1.9 diff -u -u -r1.9 Makefile --- Makefile 18 Sep 2004 18:16:07 -0000 1.9 +++ Makefile 28 Oct 2004 12:35:53 -0000 @@ -6,24 +6,24 @@ # PORTNAME= jlint -PORTVERSION= 2.3 -PORTREVISION= 1 +PORTVERSION= 3.0 CATEGORIES= java -MASTER_SITES= http://artho.com/jlint/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= znerd@FreeBSD.org COMMENT= Java program analyzer and checker USE_REINPLACE= YES -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 502126 -BROKEN= "Does not compile on FreeBSD >= 5.x" +.if !defined(NOPORTDOCS) +PORTDOCS= manual.pdf .endif +.include <bsd.port.pre.mk> + post-patch: - @${REINPLACE_CMD} -e 's,/bin/bash,/bin/sh,' ${WRKSRC}/jlint.sh + @${REINPLACE_CMD} -e '1s,/bin/bash,/bin/sh,' ${WRKSRC}/jlint.sh do-install: ${INSTALL_PROGRAM} ${WRKSRC}/jlint ${PREFIX}/bin @@ -31,7 +31,7 @@ ${INSTALL_SCRIPT} ${WRKSRC}/jlint.sh ${PREFIX}/bin .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/manual.pdf ${WRKSRC}/manual.html ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/manual.pdf ${DOCSDIR} .endif .include <bsd.port.post.mk> Index: distinfo =================================================================== RCS file: /var/fcvs/ports/java/jlint/distinfo,v retrieving revision 1.4 diff -u -u -r1.4 distinfo --- distinfo 18 Mar 2004 18:00:35 -0000 1.4 +++ distinfo 28 Oct 2004 12:11:38 -0000 @@ -1,2 +1,2 @@ -MD5 (jlint-2.3.tar.gz) = df11ba6c60527d3126d73d8692016bf5 -SIZE (jlint-2.3.tar.gz) = 246043 +MD5 (jlint-3.0.tar.gz) = 9f033660b63865046c34fb23e23fda63 +SIZE (jlint-3.0.tar.gz) = 303333 Index: pkg-plist =================================================================== RCS file: /var/fcvs/ports/java/jlint/pkg-plist,v retrieving revision 1.2 diff -u -u -r1.2 pkg-plist --- pkg-plist 3 Mar 2003 21:36:44 -0000 1.2 +++ pkg-plist 28 Oct 2004 12:32:53 -0000 @@ -1,6 +1,3 @@ bin/jlint bin/jlint.sh bin/antic -%%PORTDOCS%%share/doc/jlint/manual.pdf -%%PORTDOCS%%share/doc/jlint/manual.html -%%PORTDOCS%%@dirrm share/doc/jlint Index: files/patch-Makefile =================================================================== RCS file: /var/fcvs/ports/java/jlint/files/patch-Makefile,v retrieving revision 1.1 diff -u -u -r1.1 patch-Makefile --- files/patch-Makefile 3 Mar 2003 21:36:44 -0000 1.1 +++ files/patch-Makefile 28 Oct 2004 12:17:59 -0000 @@ -1,5 +1,7 @@ ---- Makefile.orig Wed Feb 19 17:20:06 2003 -+++ Makefile Wed Feb 19 17:21:13 2003 +$FreeBSD$ + +--- Makefile.orig Wed Jan 14 17:23:41 2004 ++++ Makefile Thu Oct 28 14:17:10 2004 @@ -3,8 +3,8 @@ # Makefile for Unix and GNU/Linux with gcc/g++ compiler # Edit here: @@ -11,12 +13,12 @@ # Hints: # if you use egcs-2.90.* version of GCC please add option -fno-exceptions -@@ -18,7 +18,7 @@ +@@ -20,7 +20,7 @@ # Optimized version --CFLAGS = -c -Wall -O2 -g -DSLIST -+CFLAGS += -c +-CFLAGS = -c -Wall -O2 -g ++CFLAGS+= -c -Wall -g + # -DSLIST removed because it wouldn't compile under gcc 3.x # add -DHASH_TABLE for extra speed (may sometimes produce inconsistent results) - # Optimized version with switched off asserts Index: files/patch-field_desc.hh =================================================================== RCS file: files/patch-field_desc.hh diff -N files/patch-field_desc.hh --- files/patch-field_desc.hh 3 Mar 2003 21:36:44 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ ---- field_desc.hh.orig Wed Feb 19 17:20:15 2003 -+++ field_desc.hh Wed Feb 19 17:22:10 2003 -@@ -1,10 +1,7 @@ - #ifndef FIELD_DESC_HH - #define FIELD_DESC_HH - --#ifdef VISUAL_CPP - using namespace std; --#pragma warning (disable : 4786) --#endif - - #include "component_desc.hh" - #include "utf_string.hh" Index: files/patch-inlines.hh =================================================================== RCS file: files/patch-inlines.hh diff -N files/patch-inlines.hh --- files/patch-inlines.hh 18 Jul 2003 04:20:16 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,10 +0,0 @@ ---- inlines.hh.orig Thu Jul 17 21:18:47 2003 -+++ inlines.hh Thu Jul 17 21:18:53 2003 -@@ -1,5 +1,7 @@ - // inline functions - -+#include <assert.h> -+ - #ifndef INLINES_HH - #define INLINES_HH - Index: files/patch-jlint.cc =================================================================== RCS file: files/patch-jlint.cc diff -N files/patch-jlint.cc --- files/patch-jlint.cc 25 Sep 2003 11:38:02 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- jlint.cc.orig Mon Aug 25 15:15:32 2003 -+++ jlint.cc Mon Aug 25 15:16:24 2003 -@@ -37,7 +37,7 @@ - - message_descriptor msg_table[] = { - #define MSG(category, code, position_dependent, format) \ --{cat_##category, MSG_LOCATION_PREFIX##format, #code, position_dependent, true}, -+{cat_##category, MSG_LOCATION_PREFIX format, #code, position_dependent, true}, - #include "jlint.msg" - {cat_all} - }; Index: files/patch-types.hh =================================================================== RCS file: files/patch-types.hh diff -N files/patch-types.hh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-types.hh 28 Oct 2004 12:25:20 -0000 @@ -0,0 +1,12 @@ +$FreeBSD$ + +--- types.hh.orig Fri Apr 4 20:29:43 2003 ++++ types.hh Thu Oct 28 14:24:56 2004 +@@ -31,7 +31,6 @@ + #endif + #endif + +-#define bool int + #define true 1 + #define false 0 + Index: files/patch-utf_string.hh =================================================================== RCS file: files/patch-utf_string.hh diff -N files/patch-utf_string.hh --- files/patch-utf_string.hh 18 Jul 2003 04:20:16 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,10 +0,0 @@ ---- utf_string.hh.orig Thu Jul 17 21:03:53 2003 -+++ utf_string.hh Thu Jul 17 21:04:03 2003 -@@ -1,6 +1,7 @@ - #ifndef UTF_STRING_HH - #define UTF_STRING_HH - -+#include <assert.h> - #include <string> - #include <stdio.h> - #include "functions.hh" --- jlint-3.0.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?200410281241.i9SCfuSg023932>