Separate the license mess into it's own .mk file so it can be shared with

jdk16. Also, fix MOTIF_TYPE definition broken by previous commit.
This commit is contained in:
Tobias Nygren 2008-01-19 09:49:27 +00:00 committed by Thomas Klausner
parent d9fb3886f7
commit 2d4653e3d3
4 changed files with 30 additions and 24 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.37 2008/01/19 08:19:04 tnn2 Exp $
# $NetBSD: Makefile,v 1.38 2008/01/19 09:49:27 tnn2 Exp $
.include "../../wip/jdk16/Makefile.common"
@ -24,6 +24,8 @@ ONLY_FOR_PLATFORM= NetBSD-[2-9]*-i386 DragonFly-*-i386
.include "../../mk/bsd.prefs.mk"
MOTIF_TYPE= openmotif
JVM_HOME= ${LOCALBASE}/java/jdk-1.4.2
JAVA_HOME= ${JVM_HOME}
JAVA_NAME= jdk14

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.21 2008/01/19 08:19:05 tnn2 Exp $
# $NetBSD: Makefile,v 1.22 2008/01/19 09:49:27 tnn2 Exp $
.include "../../wip/jdk16/Makefile.common"
@ -25,6 +25,8 @@ ONLY_FOR_PLATFORM= NetBSD-[2-9]*-i386
.include "../../mk/bsd.prefs.mk"
MOTIF_TYPE=openmotif
JVM_HOME= ${LOCALBASE}/java/jdk-${JDK_VERSION}
JAVA_HOME= ${JVM_HOME}
JAVA_NAME= jdk15
@ -135,26 +137,7 @@ PLIST_SRC+= PLIST.common_end
INTERACTIVE_STAGE+= extract
post-extract:
@${CHMOD} -R u+w ${WRKSRC}
@cp ${FILESDIR}/x_x2zip.c ${WRKSRC}
@cd ${WRKSRC} && ${CC} -o x_x2zip x_x2zip.c
@echo ""
@echo "=> You will now be shown two licenses. If you accept the terms"
@echo "=> of each license agreement, type "yes" followed by ENTER to"
@echo "=> continue. Press ENTER now to continue or CTRL-C at any time"
@echo "=> to abort."
@sh -c 'read ANS'
cd ${WRKSRC} && unzip ${JRL_BINFILE} LICENSE
more ${WRKSRC}/LICENSE
@sh -c 'echo -n "=> Do you accept the terms of the license agreement? "; read ANS; if [ "$$ANS" != "yes" ]; then exit 1; fi'
rm -f ${WRKSRC}/LICENSE
cd ${WRKSRC} && unzip ${JRL_SRCFILE} LICENSE
more ${WRKSRC}/LICENSE
@sh -c 'echo -n "=> Do you accept the terms of the license agreement? "; read ANS; if [ "$$ANS" != "yes" ]; then exit 1; fi'
cd ${WRKSRC} && unzip ${JRL_BINFILE} X_X && ./x_x2zip 'YES I ACCEPT THE CLICK THROUGH LICENSE. ' X_X && unzip X_X.zip
rm -f ${WRKSRC}/X_X
cd ${WRKSRC} && unzip ${JRL_SRCFILE} X_X && ./x_x2zip 'YES I ACCEPT THE CLICK THROUGH LICENSE. ' X_X && unzip X_X.zip
.include "../../wip/jdk16/license-extract.mk"
pre-patch:
cd ${WRKSRC} && ${PATCH} -p0 -E -s <jdk15.patches

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.1 2008/01/19 08:19:05 tnn2 Exp $
# $NetBSD: Makefile.common,v 1.2 2008/01/19 09:49:27 tnn2 Exp $
CATEGORIES= lang java
MAINTAINER= pkgsrc-users@NetBSD.org
@ -23,7 +23,6 @@ BUILD_TARGET= all # added to below
BUILD_DIRS= control/make
CHECK_SHLIBS= no # scripts set LD_LIBRARY_PATH
MOTIF_TYPE= openmotif
UNLIMIT_RESOURCES= datasize
INTERACTIVE_STAGE+= fetch

22
jdk16/license-extract.mk Normal file
View file

@ -0,0 +1,22 @@
# $NetBSD: license-extract.mk,v 1.1 2008/01/19 09:49:27 tnn2 Exp $
post-extract:
@${CHMOD} -R u+w ${WRKSRC}
@cp ${PKGSRCDIR}/wip/jdk15/files/x_x2zip.c ${WRKSRC}
@cd ${WRKSRC} && ${CC} -o x_x2zip x_x2zip.c
@echo ""
@echo "=> You will now be shown two licenses. If you accept the terms"
@echo "=> of each license agreement, type "yes" followed by ENTER to"
@echo "=> continue. Press ENTER now to continue or CTRL-C at any time"
@echo "=> to abort."
@sh -c 'read ANS'
cd ${WRKSRC} && unzip ${JRL_BINFILE} LICENSE
more ${WRKSRC}/LICENSE
@sh -c 'echo -n "=> Do you accept the terms of the license agreement? "; read ANS; if [ "$$ANS" != "yes" ]; then exit 1; fi'
rm -f ${WRKSRC}/LICENSE
cd ${WRKSRC} && unzip ${JRL_SRCFILE} LICENSE
more ${WRKSRC}/LICENSE
@sh -c 'echo -n "=> Do you accept the terms of the license agreement? "; read ANS; if [ "$$ANS" != "yes" ]; then exit 1; fi'
cd ${WRKSRC} && unzip ${JRL_BINFILE} X_X && ./x_x2zip 'YES I ACCEPT THE CLICK THROUGH LICENSE. ' X_X && unzip X_X.zip
rm -f ${WRKSRC}/X_X
cd ${WRKSRC} && unzip ${JRL_SRCFILE} X_X && ./x_x2zip 'YES I ACCEPT THE CLICK THROUGH LICENSE. ' X_X && unzip X_X.zip