- Update to bsd.java.mk 2.0 [1]

- Remove redundant PLIST_SUB entry
- Use %%JAVAJARDIR%% in pkg-plist
- Add $FreeBSD$ tags
- Some portlint tweaks

PR:		76036 [1]
Submitted by:	maintainer [1]

6 files changed, 17 insertions, 9 deletions

diff --git a/java/jmf/Makefile b/java/jmf/Makefile
index ff0003b..6e54779 100644
--- a/java/jmf/Makefile
+++ b/java/jmf/Makefile
@@ -15,13 +15,12 @@ DISTFILES=	${DISTNAME}.zip
 MAINTAINER=	toha@toha.org.ua
 COMMENT=	Java Media Framework
 
-USE_JAVA=	1.2+
+USE_JAVA=	yes
+JAVA_VERSION=	1.2+
 USE_ZIP=	YES
 USE_REINPLACE=	YES
 NO_BUILD=	YES
 
-PLIST_SUB+=	JAVAJARDIR=${JAVAJARDIR}
-
 WRKSRC=		${WRKDIR}/JMF-${PORTVERSION}
 
 RESTRICTED=	"Redistribution of pre-compiled binaries is not permitted"
@@ -37,7 +36,7 @@ PORTDOCS=	*
 # Check for JMF sources
 .if !exists(${DISTDIR}/${DISTFILES}) && !defined(PACKAGE_BUILDING)
 ECHO_MSG=/usr/bin/printf
-IGNORE= :\n\
+IGNORE=	:\n\
 Because of licensing restrictions, you must fetch the source distribution\n\
 manually.  Please access:\n\
 http://java.sun.com/products/java-media/jmf/2.1.1/download.html\n\
diff --git a/java/jmf/files/patch-jmfcustomizer b/java/jmf/files/patch-jmfcustomizer
index c346867..0dcb73d 100644
--- a/java/jmf/files/patch-jmfcustomizer
+++ b/java/jmf/files/patch-jmfcustomizer
@@ -1,3 +1,5 @@
+$FreeBSD$
+
 --- bin/jmfcustomizer.orig	Mon Jan 26 17:10:32 2004
 +++ bin/jmfcustomizer	Mon Jan 26 17:27:39 2004
 @@ -64,9 +64,9 @@
diff --git a/java/jmf/files/patch-jmfinit b/java/jmf/files/patch-jmfinit
index b3504ec..c6c0f02 100644
--- a/java/jmf/files/patch-jmfinit
+++ b/java/jmf/files/patch-jmfinit
@@ -1,3 +1,5 @@
+$FreeBSD$
+
 --- bin/jmfinit.orig	Mon Jan 26 17:10:39 2004
 +++ bin/jmfinit	Mon Jan 26 17:28:13 2004
 @@ -64,9 +64,9 @@
diff --git a/java/jmf/files/patch-jmfregistry b/java/jmf/files/patch-jmfregistry
index 18052dc..e5c1b65 100644
--- a/java/jmf/files/patch-jmfregistry
+++ b/java/jmf/files/patch-jmfregistry
@@ -1,3 +1,5 @@
+$FreeBSD$
+
 --- bin/jmfregistry.orig	Mon Jan 26 17:10:47 2004
 +++ bin/jmfregistry	Mon Jan 26 17:28:58 2004
 @@ -64,9 +64,9 @@
diff --git a/java/jmf/files/patch-jmstudio b/java/jmf/files/patch-jmstudio
index f0a1cb1..701f014 100644
--- a/java/jmf/files/patch-jmstudio
+++ b/java/jmf/files/patch-jmstudio
@@ -1,3 +1,5 @@
+$FreeBSD$
+
 --- bin/jmstudio.orig	Mon Jan 26 17:10:53 2004
 +++ bin/jmstudio	Mon Jan 26 17:15:31 2004
 @@ -64,9 +64,9 @@
diff --git a/java/jmf/pkg-plist b/java/jmf/pkg-plist
index f6a8938..8a5b43f 100644
--- a/java/jmf/pkg-plist
+++ b/java/jmf/pkg-plist
@@ -1,9 +1,10 @@
+@comment $FreeBSD$
 bin/jmfcustomizer
 bin/jmfinit
 bin/jmfregistry
 bin/jmstudio
-share/java/classes/customizer.jar
-share/java/classes/jmf.jar
-share/java/classes/jmf.properties
-share/java/classes/mediaplayer.jar
-share/java/classes/multiplayer.jar
+%%JAVAJARDIR%%/customizer.jar
+%%JAVAJARDIR%%/jmf.jar
+%%JAVAJARDIR%%/jmf.properties
+%%JAVAJARDIR%%/mediaplayer.jar
+%%JAVAJARDIR%%/multiplayer.jar