Index: jdk12/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/jdk12/Makefile,v
retrieving revision 1.12
diff -d -u -r1.12 Makefile
--- jdk12/Makefile 18 Sep 2002 10:12:03 -0000 1.12
+++ jdk12/Makefile 30 Sep 2002 18:02:35 -0000
@@ -43,7 +43,8 @@
ONLY_FOR_ARCHS= i386
USE_GMAKE= yes
-RESTRICTED= "Redistribution of pre-compiled binaries isn't permitted"
+RESTRICTED= "Redistribution of pre-compiled binaries is not permitted"
+NO_CDROM= "Redistribution of pre-compiled binaries is not permitted"
MAKEFILE= GNUmakefile
MAKE_ENV= HAVE_DPS="no" \
ALT_BOOTDIR="${JDK12DIR}" \
@@ -69,10 +70,6 @@
PKGNAMESUFFIX= -nodebug
.else
PLIST_SUB+= DEBUG:=""
-.endif
-
-.if defined(BATCH) || defined(PACKAGE_BUILDING)
-IGNORE= "You can not legally distribute pre-compiled binaries"
.endif
.include <bsd.port.pre.mk>
Index: jdk13-doc/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/jdk13-doc/Makefile,v
retrieving revision 1.19
diff -d -u -r1.19 Makefile
--- jdk13-doc/Makefile 27 Nov 2001 12:20:31 -0000 1.19
+++ jdk13-doc/Makefile 30 Sep 2002 18:02:35 -0000
@@ -14,11 +14,7 @@
MAINTAINER= znerd@FreeBSD.org
NO_CDROM= "License does not allow distribution with fee."
-RESTRICTED= "This software is under license and export control."
-
-.if defined(BATCH) || defined(PACKAGE_BUILDING)
-IGNORE= "You cannot legally distribute packages"
-.endif
+RESTRICTED= "This documentation is under license and export control."
PLIST_SUB+= T=${TARGET_DIR:S/^${PREFIX}\///}
TARGET_DIR?= ${PREFIX}/share/doc/jdk${JDK_MAJOR_VER}
Index: jdk13/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/jdk13/Makefile,v
retrieving revision 1.36
diff -d -u -r1.36 Makefile
--- jdk13/Makefile 10 Aug 2002 10:31:01 -0000 1.36
+++ jdk13/Makefile 30 Sep 2002 18:02:35 -0000
@@ -44,7 +44,8 @@
ONLY_FOR_ARCHS= i386
USE_GMAKE= yes
-RESTRICTED= "Redistribution of pre-compiled binaries isn't permitted"
+RESTRICTED= "Redistribution of pre-compiled binaries is not permitted"
+NO_CDROM= "Redistribution of pre-compiled binaries is not permitted"
MAKE_ENV= ALT_BOOTDIR="${JDK13DIR}" \
ALT_MOTIF_DIR="${X11BASE}" \
OPENWINHOME="${X11BASE}" \
@@ -88,10 +89,6 @@
PLIST_SUB+= PLUGIN:="@comment "
.else
PLIST_SUB+= PLUGIN:=""
-.endif
-
-.if defined(BATCH) || defined(PACKAGE_BUILDING)
-IGNORE= "You can not legally distribute pre-compiled binaries"
.endif
.include <bsd.port.pre.mk>
Index: jdk14-doc/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/jdk14-doc/Makefile,v
retrieving revision 1.22
diff -d -u -r1.22 Makefile
--- jdk14-doc/Makefile 24 May 2002 07:05:39 -0000 1.22
+++ jdk14-doc/Makefile 30 Sep 2002 18:02:35 -0000
@@ -14,11 +14,7 @@
MAINTAINER= znerd@FreeBSD.org
NO_CDROM= "License does not allow distribution with fee."
-RESTRICTED= "This software is under license and export control."
-
-.if defined(BATCH) || defined(PACKAGE_BUILDING)
-IGNORE= "You cannot legally distribute packages"
-.endif
+RESTRICTED= "This documentation is under license and export control."
PLIST_SUB+= T=${TARGET_DIR:S/^${PREFIX}\///}
TARGET_DIR?= ${PREFIX}/share/doc/jdk${JDK_MAJOR_VER}
Index: linux-ibm-jdk13/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/linux-ibm-jdk13/Makefile,v
retrieving revision 1.10
diff -d -u -r1.10 Makefile
--- linux-ibm-jdk13/Makefile 10 Aug 2002 11:12:35 -0000 1.10
+++ linux-ibm-jdk13/Makefile 30 Sep 2002 18:02:35 -0000
@@ -29,7 +29,7 @@
APP_HOME?= ${PREFIX}/${PKGBASE}${PORTVERSION}
LINUX_SH?= ${LINUXBASE}/bin/sh
-NO_CDROM= "License doesn\'t allow distribution with fee"
+NO_CDROM= "License does not allow distribution with fee"
RESTRICTED= "Redistribution of repackaged binaries not permitted"
DOWNLOAD_URL= http://www6.software.ibm.com/dl/dklx130/dklx130-i?S_PKG=ia32ww
@@ -42,15 +42,11 @@
PLIST_SUB+= JAPANESE="@comment "
.endif
-.if defined(BATCH) || defined(PACKAGE_BUILDING)
-IGNORE= "You can not legally distribute binaries"
-.endif
-
-.include <bsd.port.pre.mk>
-
.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
IGNORE=You must manually fetch the IBM Java SDK ${JDK_VERSION} for Linux archive (${DISTNAME}${EXTRACT_SUFX}) from ${DOWNLOAD_URL}, place it in ${DISTDIR} and then run make again.
.endif
+
+.include <bsd.port.pre.mk>
post-patch:
@for shfn in `${GREP} -r '^#!/bin/sh' ${WRKSRC}|${AWK} -F: '{print $$1}'`; do \
Index: linux-sun-jdk12/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/linux-sun-jdk12/Makefile,v
retrieving revision 1.8
diff -d -u -r1.8 Makefile
--- linux-sun-jdk12/Makefile 16 Aug 2002 19:06:13 -0000 1.8
+++ linux-sun-jdk12/Makefile 30 Sep 2002 18:02:36 -0000
@@ -25,12 +25,8 @@
JDK_VERSION= 1.2.2.013
ONLY_FOR_ARCHS= i386
-NO_CDROM= "License doesn\'t allow distribution with fee"
+NO_CDROM= "License does not allow distribution with fee"
RESTRICTED= "Redistribution of repackaged binaries not permitted"
-
-.if defined(BATCH) || defined(PACKAGE_BUILDING)
-IGNORE= "You can not legally distribute binaries"
-.endif
APP_HOME= ${PREFIX}/${PKGNAMEPREFIX}jdk1.2.2
DOWNLOAD_URL= http://java.sun.com/Download5?config-file=${PORTNAME}-${JDK_VERSION:S/./_/g}.config&platform=linux-i586
Index: linux-sun-jdk13/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/linux-sun-jdk13/Makefile,v
retrieving revision 1.19
diff -d -u -r1.19 Makefile
--- linux-sun-jdk13/Makefile 10 Aug 2002 10:31:06 -0000 1.19
+++ linux-sun-jdk13/Makefile 30 Sep 2002 18:02:36 -0000
@@ -19,12 +19,8 @@
BUILD_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper
-NO_CDROM= "License doesn\'t allow distribution with fee"
+NO_CDROM= "License does not allow distribution with fee"
RESTRICTED= "Redistribution of repackaged binaries not permitted"
-
-.if defined(BATCH) || defined(PACKAGE_BUILDING)
-IGNORE= "You can not legally distribute binaries"
-.endif
EXTRACT_CMD= # empty
EXTRACT_BEFORE_ARGS= # empty
Index: linux-sun-jdk14/Makefile
===================================================================
RCS file: /home/ncvs/ports/java/linux-sun-jdk14/Makefile,v
retrieving revision 1.18
diff -d -u -r1.18 Makefile
--- linux-sun-jdk14/Makefile 17 Sep 2002 09:43:43 -0000 1.18
+++ linux-sun-jdk14/Makefile 30 Sep 2002 18:02:36 -0000
@@ -18,12 +18,8 @@
BUILD_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper
-NO_CDROM= "License doesn\'t allow distribution with fee"
+NO_CDROM= "License does not allow distribution with fee"
RESTRICTED= "Redistribution of repackaged binaries not permitted"
-
-.if defined(BATCH) || defined(PACKAGE_BUILDING)
-IGNORE="You can not legally distribute binaries"
-.endif
EXTRACT_CMD= # empty
EXTRACT_BEFORE_ARGS= # empty