aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2000-04-12 14:21:15 +0800
committerobrien <obrien@FreeBSD.org>2000-04-12 14:21:15 +0800
commit279d0c568395b4252ea7d025ef414367c67379c0 (patch)
tree8f72921d00682487baa00cb9380ca8975f5469ce /java
parent98e3a046d36f9f73a339aeedddb8c7f75429c5fe (diff)
downloadfreebsd-ports-gnome-279d0c568395b4252ea7d025ef414367c67379c0.tar.gz
freebsd-ports-gnome-279d0c568395b4252ea7d025ef414367c67379c0.tar.zst
freebsd-ports-gnome-279d0c568395b4252ea7d025ef414367c67379c0.zip
Convert to the PORTNAME - PORTVERSION syntax.
Diffstat (limited to 'java')
-rw-r--r--java/collections/Makefile6
-rw-r--r--java/cos/Makefile6
-rw-r--r--java/cryptix-jce/Makefile4
-rw-r--r--java/guavac/Makefile4
-rw-r--r--java/infobus/Makefile6
-rw-r--r--java/jaf/Makefile6
-rw-r--r--java/java-cup/Makefile6
-rw-r--r--java/java-tutorial/Makefile14
-rw-r--r--java/javamail/Makefile8
-rw-r--r--java/jce-aba/Makefile4
-rw-r--r--java/jdbcpool/Makefile4
-rw-r--r--java/jdk-doc/Makefile15
-rw-r--r--java/jdk-tutorial/Makefile14
-rw-r--r--java/jdk/Makefile4
-rw-r--r--java/jdk11-doc/Makefile15
-rw-r--r--java/jdk11/Makefile4
-rw-r--r--java/jdk12-doc/Makefile15
-rw-r--r--java/jdk13-doc/Makefile15
-rw-r--r--java/jdk14-doc/Makefile15
-rw-r--r--java/jfc/Makefile6
-rw-r--r--java/jikes/Makefile4
-rw-r--r--java/jlex/Makefile6
-rw-r--r--java/jsdk/Makefile6
-rw-r--r--java/kaffe/Makefile4
-rw-r--r--java/netrexx/Makefile6
-rw-r--r--java/shujit/Makefile4
-rw-r--r--java/tya/Makefile5
27 files changed, 101 insertions, 105 deletions
diff --git a/java/collections/Makefile b/java/collections/Makefile
index 76c03a305380..f51477e21c4d 100644
--- a/java/collections/Makefile
+++ b/java/collections/Makefile
@@ -1,14 +1,14 @@
# New ports collection makefile for: JDK1.1 Collections package
-# Version required: 1.1
# Date created: 1999/08/08
# Whom: Jose Marques
#
# $FreeBSD$
#
-DISTNAME= collections1_1
-PKGNAME= collections-1.1
+PORTNAME= collections
+PORTVERSION= 1.1
CATEGORIES= java
+DISTNAME= collections1_1
EXTRACT_SUFX= .zip
MAINTAINER= noway@nohow.demon.co.uk
diff --git a/java/cos/Makefile b/java/cos/Makefile
index a0eea94ed954..17f4b8f1fb2d 100644
--- a/java/cos/Makefile
+++ b/java/cos/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: cos
-# Version required: 1.0
# Date created: 1999/07/05
# Whom: Jose Marques <noway@nohow.demon.co.uk>
#
# $FreeBSD$
#
-DISTNAME= cos
-PKGNAME= cos-1.0
+PORTNAME= cos
+PORTVERSION= 1.0
CATEGORIES= java
MASTER_SITES= http://www.servlets.com/resources/com.oreilly.servlet/
+DISTNAME= cos
MAINTAINER= noway@nohow.demon.co.uk
diff --git a/java/cryptix-jce/Makefile b/java/cryptix-jce/Makefile
index 57ca139a043b..4efd3f829f2f 100644
--- a/java/cryptix-jce/Makefile
+++ b/java/cryptix-jce/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: Java Cryptograph Extension by Cryptix
-# Version required: 2000-02-11
# Date created: 2000/02/19
# Whom: Kensaku Masuda <greg@greg.rim.or.jp>
#
# $FreeBSD$
#
-DISTNAME= cryptix-jce-20000211
+PORTNAME= cryptix-jce
+PORTVESION= 20000211
CATEGORIES= java security
MASTER_SITES= http://cvs.cryptix.org/~gelderen/
diff --git a/java/guavac/Makefile b/java/guavac/Makefile
index ac2cbba25707..d99f9be4e5f3 100644
--- a/java/guavac/Makefile
+++ b/java/guavac/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: guavac
-# Version required: 1.2
# Date created: 10 October 1996
# Whom: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= guavac-1.2
+PORTNAME= guavac
+PORTVERSION= 1.2
CATEGORIES= java
MASTER_SITES= ftp://ftp.yggdrasil.com/pub/dist/devel/compilers/guavac/
diff --git a/java/infobus/Makefile b/java/infobus/Makefile
index 856c443a67a5..bb54591f9025 100644
--- a/java/infobus/Makefile
+++ b/java/infobus/Makefile
@@ -1,14 +1,14 @@
# New ports collection makefile for: Infobus 1.2
-# Version required: 1.2
# Date created: 1999/08/08
# Whom: Jose Marques
#
# $FreeBSD$
#
-DISTNAME= ib12
-PKGNAME= infobus-1.2
+PORTNAME= infobus
+PORTVERSION= 1.2
CATEGORIES= java
+DISTNAME= ib12
EXTRACT_SUFX= .zip
MAINTAINER= noway@nohow.demon.co.uk
diff --git a/java/jaf/Makefile b/java/jaf/Makefile
index 7590bc5803b7..f42751517f6d 100644
--- a/java/jaf/Makefile
+++ b/java/jaf/Makefile
@@ -1,14 +1,14 @@
# New ports collection makefile for: JavaBeans Activation Framework (JAF)
-# Version required: 1.0.1
# Date created: 1999/08/08
# Whom: Jose Marques
#
# $FreeBSD$
#
-DISTNAME= jaf1_0_1
-PKGNAME= jaf-1.0.1
+PORTNAME= jaf
+PORTVERSION= 1.0.1
CATEGORIES= java
+DISTNAME= jaf1_0_1
EXTRACT_SUFX= .zip
MAINTAINER= noway@nohow.demon.co.uk
diff --git a/java/java-cup/Makefile b/java/java-cup/Makefile
index 266b91ba1e65..cfeb13a88b0b 100644
--- a/java/java-cup/Makefile
+++ b/java/java-cup/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: cup
-# Version required: 0.10g
# Date created: 10 May 1998
# Whom: nordwick@xcf.berkeley.edu
#
# $FreeBSD$
#
-DISTNAME= java_cup_v10g
-PKGNAME= java_cup-10.g
+PORTNAME= java_cup
+PORTVERSION= 10.g
CATEGORIES= java
MASTER_SITES= http://www.cs.princeton.edu/~appel/modern/java/CUP/
+DISTNAME= java_cup_v10g
MAINTAINER= nordwick@xcf.berkeley.edu
diff --git a/java/java-tutorial/Makefile b/java/java-tutorial/Makefile
index 31352a52e785..be69532ad868 100644
--- a/java/java-tutorial/Makefile
+++ b/java/java-tutorial/Makefile
@@ -1,31 +1,31 @@
# New ports collection makefile for: JDK tutorial
-# Version required: 1.1.8
# Date created: Tue Mar 23 10:18:20 EET 1999
# Whom: Martti Kuparinen <martti.kuparinen@ericsson.com>
#
# $FreeBSD$
#
-DISTNAME= tutorial
-PKGNAME= jdk-tutorial-1.1.8
+PORTNAME= jdk-tutorial
+PORTVERSION= 1.1.8
CATEGORIES= java
MASTER_SITES= ftp://ftp.javasoft.com/docs/
+DISTNAME= tutorial
MAINTAINER= martti.kuparinen@ericsson.com
-VERSION= 1.1.8
WRKSRC= ${WRKDIR}
RESTRICTED= "This software is under license and export control."
NO_BUILD= yes
-PLIST_SUB+= VERSION=${VERSION}
+PLIST_SUB+= VERSION=${PORTVERSION}
PKGMESSAGE= ${WRKDIR}/MESSAGE
.include <bsd.port.pre.mk>
do-install:
- ${MKDIR} ${PREFIX}/jdk${VERSION}/docs/books/tutorial
+ ${MKDIR} ${PREFIX}/jdk${PORTVERSION}/docs/books/tutorial
(cd ${WRKSRC} && ${TAR} -cf - * ) \
- | (cd ${PREFIX}/jdk${VERSION}/docs/books/tutorial && ${TAR} -xf -)
+ | (cd ${PREFIX}/jdk${PORTVERSION}/docs/books/tutorial \
+ && ${TAR} -xf -)
@${SED} s+!!PREFIX!!+${PREFIX}+g < ${PKGDIR}/MESSAGE > ${PKGMESSAGE}
@${CAT} ${PKGMESSAGE}
@${RM} ${PKGMESSAGE}
diff --git a/java/javamail/Makefile b/java/javamail/Makefile
index 32c1a10c2350..711f746139bd 100644
--- a/java/javamail/Makefile
+++ b/java/javamail/Makefile
@@ -1,14 +1,14 @@
# New ports collection makefile for: JavaMail API Implementation Version 1.1.2
-# Version required: 1.1.2
# Date created: 1999/08/08
# Whom: Jose Marques
#
# $FreeBSD$
#
-DISTNAME= javamail1_1_2
-PKGNAME= javamail-1.1.2
+PORTNAME= javamail
+PORTVERSION= 1.1.2
CATEGORIES= java
+DISTNAME= javamail1_1_2
EXTRACT_SUFX= .zip
MAINTAINER= noway@nohow.demon.co.uk
@@ -18,7 +18,7 @@ RUN_DEPENDS= ${PREFIX}/jdk${JDK_VERSION}/bin/java:${PORTSDIR}/java/jdk \
USE_ZIP= YES
-WRKSRC= ${WRKDIR}/javamail-1.1.2
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
JDK_VERSION= 1.1.8
NO_BUILD= yes
NO_CDROM= "See the license"
diff --git a/java/jce-aba/Makefile b/java/jce-aba/Makefile
index 51ceb1909bcc..02a85497fbd6 100644
--- a/java/jce-aba/Makefile
+++ b/java/jce-aba/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: Java Cryptograph Extension
-# Version required: 1.1
# Date created: 2000/02/11
# Whom: Kensaku Masuda <greg@greg.rim.or.jp>
#
# $FreeBSD$
#
-DISTNAME= jce-aba-1.1
+PORTNAME= jce-aba
+PORTVERSION= 1.1
CATEGORIES= java
MASTER_SITES= http://www.openjce.org/
diff --git a/java/jdbcpool/Makefile b/java/jdbcpool/Makefile
index 7366623ba970..4e93fa18243f 100644
--- a/java/jdbcpool/Makefile
+++ b/java/jdbcpool/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: JDBC connection pool
-# Version required: 0.94
# Date created: 1999/07/04
# Whom: Jose Marques
#
# $FreeBSD$
#
-DISTNAME= jdbcpool-0.94
+PORTNAME= jdbcpool
+PORTVERSION= 0.94
CATEGORIES= java
MASTER_SITES= http://www.bitmechanic.com/projects/jdbcpool/dist/
diff --git a/java/jdk-doc/Makefile b/java/jdk-doc/Makefile
index a1c346ac60d8..ba40cf003dd5 100644
--- a/java/jdk-doc/Makefile
+++ b/java/jdk-doc/Makefile
@@ -1,23 +1,22 @@
# New ports collection makefile for: JDK documentation
-# Version required: 1.1.8
# Date created: Mon Mar 8 10:10:42 EET 1999
# Whom: Martti Kuparinen <martti.kuparinen@ericsson.com>
#
# $FreeBSD$
#
-DISTNAME= jdk118-doc
-PKGNAME= jdk-doc-1.1.8
+PORTNAME= jdk-doc
+PORTVERSION= 1.1.8
CATEGORIES= java
+DISTNAME= jdk118-doc
MAINTAINER= martti.kuparinen@ericsson.com
RESTRICTED= "This software is under license and export control."
IS_INTERACTIVE= "Requires manual fetch"
-VERSION= 1.1.8
-WRKSRC= ${WRKDIR}/jdk${VERSION}
+WRKSRC= ${WRKDIR}/jdk${PORTVERSION}
NO_BUILD= yes
-PLIST_SUB+= VERSION=${VERSION}
+PLIST_SUB+= VERSION=${PORTVERSION}
.include <bsd.port.pre.mk>
@@ -37,9 +36,9 @@ do-fetch:
.endif
do-install:
- ${MKDIR} ${PREFIX}/jdk${VERSION}
+ ${MKDIR} ${PREFIX}/jdk${PORTVERSION}
(cd ${WRKSRC} && ${TAR} -cf - docs) \
- | (cd ${PREFIX}/jdk${VERSION} && ${TAR} -xf -)
+ | (cd ${PREFIX}/jdk${PORTVERSION} && ${TAR} -xf -)
@${CAT} ${PKGMESSAGE} | ${SED} s+!!PREFIX!!+${PREFIX}+g
.include <bsd.port.post.mk>
diff --git a/java/jdk-tutorial/Makefile b/java/jdk-tutorial/Makefile
index 31352a52e785..be69532ad868 100644
--- a/java/jdk-tutorial/Makefile
+++ b/java/jdk-tutorial/Makefile
@@ -1,31 +1,31 @@
# New ports collection makefile for: JDK tutorial
-# Version required: 1.1.8
# Date created: Tue Mar 23 10:18:20 EET 1999
# Whom: Martti Kuparinen <martti.kuparinen@ericsson.com>
#
# $FreeBSD$
#
-DISTNAME= tutorial
-PKGNAME= jdk-tutorial-1.1.8
+PORTNAME= jdk-tutorial
+PORTVERSION= 1.1.8
CATEGORIES= java
MASTER_SITES= ftp://ftp.javasoft.com/docs/
+DISTNAME= tutorial
MAINTAINER= martti.kuparinen@ericsson.com
-VERSION= 1.1.8
WRKSRC= ${WRKDIR}
RESTRICTED= "This software is under license and export control."
NO_BUILD= yes
-PLIST_SUB+= VERSION=${VERSION}
+PLIST_SUB+= VERSION=${PORTVERSION}
PKGMESSAGE= ${WRKDIR}/MESSAGE
.include <bsd.port.pre.mk>
do-install:
- ${MKDIR} ${PREFIX}/jdk${VERSION}/docs/books/tutorial
+ ${MKDIR} ${PREFIX}/jdk${PORTVERSION}/docs/books/tutorial
(cd ${WRKSRC} && ${TAR} -cf - * ) \
- | (cd ${PREFIX}/jdk${VERSION}/docs/books/tutorial && ${TAR} -xf -)
+ | (cd ${PREFIX}/jdk${PORTVERSION}/docs/books/tutorial \
+ && ${TAR} -xf -)
@${SED} s+!!PREFIX!!+${PREFIX}+g < ${PKGDIR}/MESSAGE > ${PKGMESSAGE}
@${CAT} ${PKGMESSAGE}
@${RM} ${PKGMESSAGE}
diff --git a/java/jdk/Makefile b/java/jdk/Makefile
index 130068296c09..72eb66a593ef 100644
--- a/java/jdk/Makefile
+++ b/java/jdk/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: jdk
-# Version required: 1.1.8
# Date created: Feb, 8, 1998
# Whom: Nate Williams <nate@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= jdk-${JDK_VERSION}
+PORTNAME= jdk
+PORTVERSION= ${JDK_VERSION}
CATEGORIES= java devel
MASTER_SITES= ftp://ftp.sc.sri.com/pub/FreeBSD/JDK/ \
http://www.freebsd.org/java/
diff --git a/java/jdk11-doc/Makefile b/java/jdk11-doc/Makefile
index a1c346ac60d8..ba40cf003dd5 100644
--- a/java/jdk11-doc/Makefile
+++ b/java/jdk11-doc/Makefile
@@ -1,23 +1,22 @@
# New ports collection makefile for: JDK documentation
-# Version required: 1.1.8
# Date created: Mon Mar 8 10:10:42 EET 1999
# Whom: Martti Kuparinen <martti.kuparinen@ericsson.com>
#
# $FreeBSD$
#
-DISTNAME= jdk118-doc
-PKGNAME= jdk-doc-1.1.8
+PORTNAME= jdk-doc
+PORTVERSION= 1.1.8
CATEGORIES= java
+DISTNAME= jdk118-doc
MAINTAINER= martti.kuparinen@ericsson.com
RESTRICTED= "This software is under license and export control."
IS_INTERACTIVE= "Requires manual fetch"
-VERSION= 1.1.8
-WRKSRC= ${WRKDIR}/jdk${VERSION}
+WRKSRC= ${WRKDIR}/jdk${PORTVERSION}
NO_BUILD= yes
-PLIST_SUB+= VERSION=${VERSION}
+PLIST_SUB+= VERSION=${PORTVERSION}
.include <bsd.port.pre.mk>
@@ -37,9 +36,9 @@ do-fetch:
.endif
do-install:
- ${MKDIR} ${PREFIX}/jdk${VERSION}
+ ${MKDIR} ${PREFIX}/jdk${PORTVERSION}
(cd ${WRKSRC} && ${TAR} -cf - docs) \
- | (cd ${PREFIX}/jdk${VERSION} && ${TAR} -xf -)
+ | (cd ${PREFIX}/jdk${PORTVERSION} && ${TAR} -xf -)
@${CAT} ${PKGMESSAGE} | ${SED} s+!!PREFIX!!+${PREFIX}+g
.include <bsd.port.post.mk>
diff --git a/java/jdk11/Makefile b/java/jdk11/Makefile
index 130068296c09..72eb66a593ef 100644
--- a/java/jdk11/Makefile
+++ b/java/jdk11/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: jdk
-# Version required: 1.1.8
# Date created: Feb, 8, 1998
# Whom: Nate Williams <nate@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= jdk-${JDK_VERSION}
+PORTNAME= jdk
+PORTVERSION= ${JDK_VERSION}
CATEGORIES= java devel
MASTER_SITES= ftp://ftp.sc.sri.com/pub/FreeBSD/JDK/ \
http://www.freebsd.org/java/
diff --git a/java/jdk12-doc/Makefile b/java/jdk12-doc/Makefile
index a1c346ac60d8..ba40cf003dd5 100644
--- a/java/jdk12-doc/Makefile
+++ b/java/jdk12-doc/Makefile
@@ -1,23 +1,22 @@
# New ports collection makefile for: JDK documentation
-# Version required: 1.1.8
# Date created: Mon Mar 8 10:10:42 EET 1999
# Whom: Martti Kuparinen <martti.kuparinen@ericsson.com>
#
# $FreeBSD$
#
-DISTNAME= jdk118-doc
-PKGNAME= jdk-doc-1.1.8
+PORTNAME= jdk-doc
+PORTVERSION= 1.1.8
CATEGORIES= java
+DISTNAME= jdk118-doc
MAINTAINER= martti.kuparinen@ericsson.com
RESTRICTED= "This software is under license and export control."
IS_INTERACTIVE= "Requires manual fetch"
-VERSION= 1.1.8
-WRKSRC= ${WRKDIR}/jdk${VERSION}
+WRKSRC= ${WRKDIR}/jdk${PORTVERSION}
NO_BUILD= yes
-PLIST_SUB+= VERSION=${VERSION}
+PLIST_SUB+= VERSION=${PORTVERSION}
.include <bsd.port.pre.mk>
@@ -37,9 +36,9 @@ do-fetch:
.endif
do-install:
- ${MKDIR} ${PREFIX}/jdk${VERSION}
+ ${MKDIR} ${PREFIX}/jdk${PORTVERSION}
(cd ${WRKSRC} && ${TAR} -cf - docs) \
- | (cd ${PREFIX}/jdk${VERSION} && ${TAR} -xf -)
+ | (cd ${PREFIX}/jdk${PORTVERSION} && ${TAR} -xf -)
@${CAT} ${PKGMESSAGE} | ${SED} s+!!PREFIX!!+${PREFIX}+g
.include <bsd.port.post.mk>
diff --git a/java/jdk13-doc/Makefile b/java/jdk13-doc/Makefile
index a1c346ac60d8..ba40cf003dd5 100644
--- a/java/jdk13-doc/Makefile
+++ b/java/jdk13-doc/Makefile
@@ -1,23 +1,22 @@
# New ports collection makefile for: JDK documentation
-# Version required: 1.1.8
# Date created: Mon Mar 8 10:10:42 EET 1999
# Whom: Martti Kuparinen <martti.kuparinen@ericsson.com>
#
# $FreeBSD$
#
-DISTNAME= jdk118-doc
-PKGNAME= jdk-doc-1.1.8
+PORTNAME= jdk-doc
+PORTVERSION= 1.1.8
CATEGORIES= java
+DISTNAME= jdk118-doc
MAINTAINER= martti.kuparinen@ericsson.com
RESTRICTED= "This software is under license and export control."
IS_INTERACTIVE= "Requires manual fetch"
-VERSION= 1.1.8
-WRKSRC= ${WRKDIR}/jdk${VERSION}
+WRKSRC= ${WRKDIR}/jdk${PORTVERSION}
NO_BUILD= yes
-PLIST_SUB+= VERSION=${VERSION}
+PLIST_SUB+= VERSION=${PORTVERSION}
.include <bsd.port.pre.mk>
@@ -37,9 +36,9 @@ do-fetch:
.endif
do-install:
- ${MKDIR} ${PREFIX}/jdk${VERSION}
+ ${MKDIR} ${PREFIX}/jdk${PORTVERSION}
(cd ${WRKSRC} && ${TAR} -cf - docs) \
- | (cd ${PREFIX}/jdk${VERSION} && ${TAR} -xf -)
+ | (cd ${PREFIX}/jdk${PORTVERSION} && ${TAR} -xf -)
@${CAT} ${PKGMESSAGE} | ${SED} s+!!PREFIX!!+${PREFIX}+g
.include <bsd.port.post.mk>
diff --git a/java/jdk14-doc/Makefile b/java/jdk14-doc/Makefile
index a1c346ac60d8..ba40cf003dd5 100644
--- a/java/jdk14-doc/Makefile
+++ b/java/jdk14-doc/Makefile
@@ -1,23 +1,22 @@
# New ports collection makefile for: JDK documentation
-# Version required: 1.1.8
# Date created: Mon Mar 8 10:10:42 EET 1999
# Whom: Martti Kuparinen <martti.kuparinen@ericsson.com>
#
# $FreeBSD$
#
-DISTNAME= jdk118-doc
-PKGNAME= jdk-doc-1.1.8
+PORTNAME= jdk-doc
+PORTVERSION= 1.1.8
CATEGORIES= java
+DISTNAME= jdk118-doc
MAINTAINER= martti.kuparinen@ericsson.com
RESTRICTED= "This software is under license and export control."
IS_INTERACTIVE= "Requires manual fetch"
-VERSION= 1.1.8
-WRKSRC= ${WRKDIR}/jdk${VERSION}
+WRKSRC= ${WRKDIR}/jdk${PORTVERSION}
NO_BUILD= yes
-PLIST_SUB+= VERSION=${VERSION}
+PLIST_SUB+= VERSION=${PORTVERSION}
.include <bsd.port.pre.mk>
@@ -37,9 +36,9 @@ do-fetch:
.endif
do-install:
- ${MKDIR} ${PREFIX}/jdk${VERSION}
+ ${MKDIR} ${PREFIX}/jdk${PORTVERSION}
(cd ${WRKSRC} && ${TAR} -cf - docs) \
- | (cd ${PREFIX}/jdk${VERSION} && ${TAR} -xf -)
+ | (cd ${PREFIX}/jdk${PORTVERSION} && ${TAR} -xf -)
@${CAT} ${PKGMESSAGE} | ${SED} s+!!PREFIX!!+${PREFIX}+g
.include <bsd.port.post.mk>
diff --git a/java/jfc/Makefile b/java/jfc/Makefile
index 8a9bf8509514..41c7b76af42c 100644
--- a/java/jfc/Makefile
+++ b/java/jfc/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: Java Foundation Classes with Swing
-# Version required: 1.1.1
# Date created: 17 May 1999
# Whom: Jun Kuriyama <kuriyama@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= swing1_1_1
-PKGNAME= jfc-1.1.1
+PORTNAME= jfc
+PORTVERSION= 1.1.1
CATEGORIES= java
MASTER_SITES= http://java.sun.com/products/jfc/
+DISTNAME= swing1_1_1
EXTRACT_SUFX= .zip
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/java/jikes/Makefile b/java/jikes/Makefile
index d1eedcaef633..94fcd4610ce3 100644
--- a/java/jikes/Makefile
+++ b/java/jikes/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: jikes
-# Version required: 0.41
# Date created: 09 December 1998
# Whom: Matthew Dillon <dillon@backplane.com>
#
# $FreeBSD$
#
-DISTNAME= jikes-1.11
+PORTNAME= jikes
+PORTVERSION= 1.11
CATEGORIES= java
MASTER_SITES= ftp://ftp.whistle.com/pub/archie/misc/
diff --git a/java/jlex/Makefile b/java/jlex/Makefile
index a20f6cef2149..5e88e2fd7d03 100644
--- a/java/jlex/Makefile
+++ b/java/jlex/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: jlex
-# Version required: 1.2.3
# Date created: 1 June 1999
# Whom: jake@checker.org
#
# $FreeBSD$
#
-DISTNAME= Main
-PKGNAME= jlex-1.2.3
+PORTNAME= jlex
+PORTVERSION= 1.2.3
CATEGORIES= java
MASTER_SITES= http://www.cs.princeton.edu/~appel/modern/java/JLex/Archive/1.2.3/
+DISTNAME= Main
EXTRACT_SUFX= .java
MAINTAINER= jake@checker.org
diff --git a/java/jsdk/Makefile b/java/jsdk/Makefile
index e2a66d3ebfd2..3105380a471b 100644
--- a/java/jsdk/Makefile
+++ b/java/jsdk/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: Java Servlet Developpers Kit
-# Version required: 2.0
# Date created: 1999/05/29
# Whom: Kensaku Masuda <greg@greg.rim.or.jp>
#
# $FreeBSD$
#
-DISTNAME= jsdk20-solaris2-sparc
-PKGNAME= jsdk-2.0
+PORTNAME= jsdk
+PORTVERSION= 2.0
CATEGORIES= java
MASTER_SITES=
+DISTNAME= jsdk20-solaris2-sparc
EXTRACT_SUFX= .tar.Z
MAINTAINER= greg@greg.rim.or.jp
diff --git a/java/kaffe/Makefile b/java/kaffe/Makefile
index a81eea8ef4a3..ab3b70fa9ebf 100644
--- a/java/kaffe/Makefile
+++ b/java/kaffe/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kaffe
-# Version required: 1.0.b4
# Date created: 20 February 1995
# Whom: Tim Wilkinson <tim@sarc.city.ac.uk>
#
# $FreeBSD$
#
-DISTNAME= kaffe-1.0.5
+PORTNAME= kaffe
+PORTVERSION= 1.0.5
CATEGORIES= java
MASTER_SITES= ftp://ftp.kaffe.org/pub/kaffe/
diff --git a/java/netrexx/Makefile b/java/netrexx/Makefile
index 37ff1b9e9d9e..d3bd809a174f 100644
--- a/java/netrexx/Makefile
+++ b/java/netrexx/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: NetRexx
-# Version required: 1.160
# Date created: Feb 8, 1999
# Whom: Pedro Giffuni
#
# $FreeBSD$
#
-DISTNAME= NetRexx
-PKGNAME= netrexx-1.160
+PORTNAME= netrexx
+PORTVERSION= 1.160
CATEGORIES= java lang
MASTER_SITES= http://www.ibm.com/technology/NetRexx/
+DISTNAME= NetRexx
EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
diff --git a/java/shujit/Makefile b/java/shujit/Makefile
index aa899794cd89..c06c193353fc 100644
--- a/java/shujit/Makefile
+++ b/java/shujit/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: shujit
-# Version required: 0.4.2
# Date created: 30 April 1999
# Whom: jake@checker.org
#
# $FreeBSD$
#
-DISTNAME= shujit-0.4.2
+PORTNAME= shujit
+PORTVERSION= 0.4.2
CATEGORIES= java
MASTER_SITES= http://www.shudo.net/jit/dist/
diff --git a/java/tya/Makefile b/java/tya/Makefile
index c393250bb3ed..fe94c4c4ade9 100644
--- a/java/tya/Makefile
+++ b/java/tya/Makefile
@@ -5,10 +5,11 @@
# $FreeBSD$
#
-DISTNAME= tya17
-PKGNAME= tya-1.7
+PORTNAME= tya
+PORTVERSION= 1.7
CATEGORIES= java
MASTER_SITES= http://sax.sax.de/~adlibit/
+DISTNAME= tya17
EXTRACT_SUFX= .tgz
MAINTAINER= jburkhol@home.com