- Update to 3.0 [1]

- Unbreak on 5.x [1]
- Use PORTDOCS
- Some minor cosmetic improvements

Submitted by:	Roman Kennke <roman@ontographics.com> [1]

9 files changed, 31 insertions, 64 deletions

diff --git a/java/jlint/Makefile b/java/jlint/Makefile
index d5c1e5fe8ff1..85df5d4072cd 100644
--- a/java/jlint/Makefile
+++ b/java/jlint/Makefile
@@ -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 @@ do-install:
 	${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>
diff --git a/java/jlint/distinfo b/java/jlint/distinfo
index c5b8b0b94b3a..33b136226e2f 100644
--- a/java/jlint/distinfo
+++ b/java/jlint/distinfo
@@ -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
diff --git a/java/jlint/files/patch-Makefile b/java/jlint/files/patch-Makefile
index 9cae9f698201..1bb85508009a 100644
--- a/java/jlint/files/patch-Makefile
+++ b/java/jlint/files/patch-Makefile
@@ -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
diff --git a/java/jlint/files/patch-field_desc.hh b/java/jlint/files/patch-field_desc.hh
deleted file mode 100644
index 0781d51567c5..000000000000
--- a/java/jlint/files/patch-field_desc.hh
+++ /dev/null
@@ -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"
diff --git a/java/jlint/files/patch-inlines.hh b/java/jlint/files/patch-inlines.hh
deleted file mode 100644
index aabe88ab7c4a..000000000000
--- a/java/jlint/files/patch-inlines.hh
+++ /dev/null
@@ -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
- 
diff --git a/java/jlint/files/patch-jlint.cc b/java/jlint/files/patch-jlint.cc
deleted file mode 100644
index f66891b1d77e..000000000000
--- a/java/jlint/files/patch-jlint.cc
+++ /dev/null
@@ -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}
- };
diff --git a/java/jlint/files/patch-types.hh b/java/jlint/files/patch-types.hh
new file mode 100644
index 000000000000..898387e91d5a
--- /dev/null
+++ b/java/jlint/files/patch-types.hh
@@ -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
+ 
diff --git a/java/jlint/files/patch-utf_string.hh b/java/jlint/files/patch-utf_string.hh
deleted file mode 100644
index 7723b44e354d..000000000000
--- a/java/jlint/files/patch-utf_string.hh
+++ /dev/null
@@ -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"
diff --git a/java/jlint/pkg-plist b/java/jlint/pkg-plist
index a56afeeabbcc..51dd1d9ceb6d 100644
--- a/java/jlint/pkg-plist
+++ b/java/jlint/pkg-plist
@@ -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