From 4d09d7f727e0ddc7e6d79b04c6e6de53ae1bc80a Mon Sep 17 00:00:00 2001
From: olgeni <olgeni@FreeBSD.org>
Date: Mon, 13 Feb 2006 18:52:12 +0000
Subject: Upgrade to current bsd.java.mk syntax, fix portlint issues, cleanup
 whitespace.

---
 java/netbeans4/Makefile  | 15 ++++++++-------
 java/netbeans5/Makefile  | 15 ++++++++-------
 java/netbeans55/Makefile | 15 ++++++++-------
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/java/netbeans4/Makefile b/java/netbeans4/Makefile
index 4829ce8aa5ff..21e2353b8347 100644
--- a/java/netbeans4/Makefile
+++ b/java/netbeans4/Makefile
@@ -15,9 +15,10 @@ MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	A full-featured integrated environment for Java
 
 USE_BZIP2=	yes
-USE_JAVA=	1.4+
+USE_JAVA=	yes
+JAVA_VERSION=	1.4+
 NO_BUILD=	yes
-RESTRICTED=	"Restrictive license"
+RESTRICTED=	Restrictive license
 
 WRKSRC=		${WRKDIR}/netbeans
 
@@ -26,13 +27,13 @@ DOWNLOAD_URL?=	http://www.netbeans.info/downloads/download.php?p=1&a=bd&os=1&lan
 .include <bsd.port.pre.mk>
 
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE=	You must manually fetch the source distribution (${DISTFILES}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
+IGNORE=		you must manually fetch the source distribution (${DISTFILES}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
 .endif
 
 do-install:
-		@${MKDIR} ${PREFIX}/netbeans
-		@${CP} -r ${WRKSRC}/* ${PREFIX}/netbeans
-		@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/netbeans
-		@${LN} -sf ${PREFIX}/netbeans/bin/netbeans ${PREFIX}/bin/netbeans
+	@${MKDIR} ${PREFIX}/netbeans
+	@${CP} -r ${WRKSRC}/* ${PREFIX}/netbeans
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/netbeans
+	@${LN} -sf ${PREFIX}/netbeans/bin/netbeans ${PREFIX}/bin/netbeans
 
 .include <bsd.port.post.mk>
diff --git a/java/netbeans5/Makefile b/java/netbeans5/Makefile
index 4829ce8aa5ff..21e2353b8347 100644
--- a/java/netbeans5/Makefile
+++ b/java/netbeans5/Makefile
@@ -15,9 +15,10 @@ MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	A full-featured integrated environment for Java
 
 USE_BZIP2=	yes
-USE_JAVA=	1.4+
+USE_JAVA=	yes
+JAVA_VERSION=	1.4+
 NO_BUILD=	yes
-RESTRICTED=	"Restrictive license"
+RESTRICTED=	Restrictive license
 
 WRKSRC=		${WRKDIR}/netbeans
 
@@ -26,13 +27,13 @@ DOWNLOAD_URL?=	http://www.netbeans.info/downloads/download.php?p=1&a=bd&os=1&lan
 .include <bsd.port.pre.mk>
 
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE=	You must manually fetch the source distribution (${DISTFILES}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
+IGNORE=		you must manually fetch the source distribution (${DISTFILES}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
 .endif
 
 do-install:
-		@${MKDIR} ${PREFIX}/netbeans
-		@${CP} -r ${WRKSRC}/* ${PREFIX}/netbeans
-		@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/netbeans
-		@${LN} -sf ${PREFIX}/netbeans/bin/netbeans ${PREFIX}/bin/netbeans
+	@${MKDIR} ${PREFIX}/netbeans
+	@${CP} -r ${WRKSRC}/* ${PREFIX}/netbeans
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/netbeans
+	@${LN} -sf ${PREFIX}/netbeans/bin/netbeans ${PREFIX}/bin/netbeans
 
 .include <bsd.port.post.mk>
diff --git a/java/netbeans55/Makefile b/java/netbeans55/Makefile
index 4829ce8aa5ff..21e2353b8347 100644
--- a/java/netbeans55/Makefile
+++ b/java/netbeans55/Makefile
@@ -15,9 +15,10 @@ MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	A full-featured integrated environment for Java
 
 USE_BZIP2=	yes
-USE_JAVA=	1.4+
+USE_JAVA=	yes
+JAVA_VERSION=	1.4+
 NO_BUILD=	yes
-RESTRICTED=	"Restrictive license"
+RESTRICTED=	Restrictive license
 
 WRKSRC=		${WRKDIR}/netbeans
 
@@ -26,13 +27,13 @@ DOWNLOAD_URL?=	http://www.netbeans.info/downloads/download.php?p=1&a=bd&os=1&lan
 .include <bsd.port.pre.mk>
 
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE=	You must manually fetch the source distribution (${DISTFILES}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
+IGNORE=		you must manually fetch the source distribution (${DISTFILES}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again
 .endif
 
 do-install:
-		@${MKDIR} ${PREFIX}/netbeans
-		@${CP} -r ${WRKSRC}/* ${PREFIX}/netbeans
-		@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/netbeans
-		@${LN} -sf ${PREFIX}/netbeans/bin/netbeans ${PREFIX}/bin/netbeans
+	@${MKDIR} ${PREFIX}/netbeans
+	@${CP} -r ${WRKSRC}/* ${PREFIX}/netbeans
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/netbeans
+	@${LN} -sf ${PREFIX}/netbeans/bin/netbeans ${PREFIX}/bin/netbeans
 
 .include <bsd.port.post.mk>
-- 
cgit