Move more stuff to common handling.
Move all options handling to the corresponding options.mk. Silence unzip progress.
This commit is contained in:
Tobias Nygren
Thomas Klausner
parent
24a335b9d2
commit
6079abbf3e
7 changed files with 45 additions and 64 deletions
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.39 2008/01/19 15:26:35 tnn2 Exp $
|
||||
# $NetBSD: Makefile,v 1.40 2008/01/20 15:23:08 tnn2 Exp $
|
||||
|
||||
.include "../../wip/jdk16/Makefile.common"
|
||||
|
||||
|
|
@ -22,10 +22,7 @@ PLIST_SRC= PLIST.common
|
|||
|
||||
ONLY_FOR_PLATFORM= NetBSD-[2-9]*-i386 DragonFly-*-i386
|
||||
|
||||
JVM_HOME= ${LOCALBASE}/java/jdk-1.4.2
|
||||
JAVA_HOME= ${JVM_HOME}
|
||||
JAVA_NAME= jdk14
|
||||
JAVA_UNLIMIT= datasize
|
||||
JAVA_WRAPPERS= appletviewer jar java javac javadoc javah javap
|
||||
|
||||
# Let an installed version of this package bootstrap a later version
|
||||
|
|
@ -57,9 +54,6 @@ MAKE_ENV+= DEV_ONLY=YES
|
|||
MAKE_ENV+= SYS_CFLAGS=${CFLAGS:M*:Q}
|
||||
MAKE_ENV+= LD_LIBRARY_PATH=
|
||||
|
||||
BUILDLINK_PASSTHRU_DIRS+= ${JVM_HOME}
|
||||
BUILDLINK_PASSTHRU_RPATHDIRS+= ${JAVA_HOME}/jre/lib/i386/server
|
||||
|
||||
SCSL_SRCFILE= j2sdk-${JDK_VERSION:S/./_/g}-src-scsl.zip
|
||||
SCSL_BINFILE= j2sdk-${JDK_VERSION:S/./_/g}-bin-scsl.zip
|
||||
PATCHSETFILE= bsd-jdk14-patches-${JDK_PATCHSET_VERSION}.tar.gz
|
||||
|
|
@ -112,8 +106,6 @@ SUBST_STAGE.cr= post-extract
|
|||
SUBST_FILES.cr= jdk14.patches
|
||||
SUBST_SED.cr= -e 's,
,,'
|
||||
|
||||
BUILDLINK_PASSTHRU_DIRS+= ${JAVA_HOME}
|
||||
|
||||
# Needed to get dynamically linked programs to work
|
||||
.if !defined(LD_LIBRARY_PATH) || empty(LD_LIBRARY_PATH)
|
||||
MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/control/build/bsd-i586/lib/i386:${WRKSRC}/control/build/bsd-i586/lib/i386/server
|
||||
|
|
@ -151,5 +143,4 @@ do-install:
|
|||
.include "../../mk/java-env.mk"
|
||||
.include "../../devel/gettext-lib/buildlink3.mk"
|
||||
.include "../../mk/pthread.buildlink3.mk"
|
||||
.include "../../mk/motif.buildlink3.mk"
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.24 2008/01/20 02:07:37 obache Exp $
|
||||
# $NetBSD: Makefile,v 1.25 2008/01/20 15:23:09 tnn2 Exp $
|
||||
|
||||
.include "../../wip/jdk16/Makefile.common"
|
||||
|
||||
|
|
@ -23,10 +23,7 @@ PLIST_SRC= PLIST.common
|
|||
|
||||
ONLY_FOR_PLATFORM= NetBSD-[2-9]*-i386
|
||||
|
||||
JVM_HOME= ${LOCALBASE}/java/jdk-${JDK_VERSION}
|
||||
JAVA_HOME= ${JVM_HOME}
|
||||
JAVA_NAME= jdk15
|
||||
JAVA_UNLIMIT= datasize
|
||||
JAVA_WRAPPERS= appletviewer jar java javac javadoc javah javap
|
||||
|
||||
# Let an installed version of this package bootstrap a later version
|
||||
|
|
@ -55,14 +52,6 @@ MAKE_ENV+= SKIP_COMPARE_IMAGES=YES
|
|||
|
||||
# MAKE_ENV+= WRAPPER_DEBUG=yes
|
||||
|
||||
.if empty(PKG_OPTIONS:Minet6)
|
||||
MAKE_ENV+= DONT_ENABLE_IPV6=YES
|
||||
.endif
|
||||
|
||||
|
||||
BUILDLINK_PASSTHRU_DIRS+= ${JVM_HOME}
|
||||
BUILDLINK_PASSTHRU_RPATHDIRS+= ${JAVA_HOME}/jre/lib/i386/server
|
||||
|
||||
JRL_SRCFILE= ${DISTNAME}-fcs-src-${JDK_VERSION_STRING}.jar
|
||||
JRL_BINFILE= ${DISTNAME}-fcs-bin-${JDK_VERSION_STRING}.jar
|
||||
PATCHSETFILE= bsd-jdk15-patches-${JDK_PATCHSET_VERSION}.tar.bz2
|
||||
|
|
@ -122,12 +111,10 @@ SUBST_SED.paths= -e 's,%%LOCALBASE%%,${LOCALBASE},g'
|
|||
SUBST_SED.paths+= -e 's,%%X11BASE%%,${X11BASE},g'
|
||||
SUBST_SED.paths+= -e 's,%%JVM_HOME%%,${JVM_HOME},g'
|
||||
|
||||
BUILDLINK_PASSTHRU_DIRS+= ${JAVA_HOME}
|
||||
|
||||
.include "options.mk"
|
||||
|
||||
INSTALL_TEMPLATES+= ${PKGDIR}/INSTALL.tmpl
|
||||
DEINSTALL_TEMPLATES+= ${PKGDIR}/DEINSTALL.tmpl
|
||||
INSTALL_TEMPLATES+= ${PKGDIR}/INSTALL.tmpl
|
||||
DEINSTALL_TEMPLATES+= ${PKGDIR}/DEINSTALL.tmpl
|
||||
|
||||
PLIST_SRC+= PLIST.common_end
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: options.mk,v 1.8 2007/12/08 01:32:35 heidnes Exp $
|
||||
# $NetBSD: options.mk,v 1.9 2008/01/20 15:23:09 tnn2 Exp $
|
||||
|
||||
PKG_OPTIONS_VAR= PKG_OPTIONS.jdk15
|
||||
PKG_SUPPORTED_OPTIONS= jdk15-jce jdk15-plugin inet6
|
||||
|
|
@ -8,6 +8,10 @@ PKG_OPTIONS_LEGACY_VARS+= JDK15_USE_JCE:jdk15-jce
|
|||
.include "../../www/seamonkey/gecko-options.mk"
|
||||
.include "../../mk/bsd.options.mk"
|
||||
|
||||
.if empty(PKG_OPTIONS:Minet6)
|
||||
MAKE_ENV+= DONT_ENABLE_IPV6=YES
|
||||
.endif
|
||||
|
||||
###
|
||||
### Java(TM) Cryptography Extension (JCE)
|
||||
###
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.5 2008/01/20 14:04:55 tnn2 Exp $
|
||||
# $NetBSD: Makefile,v 1.6 2008/01/20 15:23:09 tnn2 Exp $
|
||||
|
||||
.include "../../wip/jdk16/Makefile.common"
|
||||
|
||||
|
|
@ -23,10 +23,7 @@ PLIST_SRC= PLIST.common
|
|||
|
||||
ONLY_FOR_PLATFORM= NetBSD-[2-9]*-i386
|
||||
|
||||
JVM_HOME= ${LOCALBASE}/java/jdk-${JDK_VERSION}
|
||||
JAVA_HOME= ${JVM_HOME}
|
||||
JAVA_NAME= jdk16
|
||||
JAVA_UNLIMIT= datasize
|
||||
JAVA_WRAPPERS= appletviewer jar java javac javadoc javah javap
|
||||
|
||||
# Let an installed version of this package bootstrap a later version
|
||||
|
|
@ -58,25 +55,6 @@ MAKE_ENV+= SKIP_COMPARE_IMAGES=YES
|
|||
|
||||
# MAKE_ENV+= WRAPPER_DEBUG=yes
|
||||
|
||||
.if empty(PKG_OPTIONS:Minet6)
|
||||
MAKE_ENV+= DONT_ENABLE_IPV6=YES
|
||||
.endif
|
||||
|
||||
.if empty(PKG_OPTIONS:Mdebug)
|
||||
MAKE_ENV+= SKIP_DEBUG_BUILD=true
|
||||
.else
|
||||
MAKE_ENV+= SKIP_DEBUG_BUILD=false
|
||||
.endif
|
||||
|
||||
.if empty(PKG_OPTIONS:Mfastdebug)
|
||||
MAKE_ENV+= SKIP_FASTDEBUG_BUILD=true
|
||||
.else
|
||||
MAKE_ENV+= SKIP_FASTDEBUG_BUILD=false
|
||||
.endif
|
||||
|
||||
BUILDLINK_PASSTHRU_DIRS+= ${JVM_HOME}
|
||||
BUILDLINK_PASSTHRU_RPATHDIRS+= ${JAVA_HOME}/jre/lib/i386/server
|
||||
|
||||
JRL_SRCFILE= ${DISTNAME}-fcs-src-${JDK_VERSION_STRING}.jar
|
||||
JRL_BINFILE= ${DISTNAME}-fcs-bin-${JDK_VERSION_STRING}.jar
|
||||
PATCHSETFILE= bsd-jdk16-patches-${JDK_PATCHSET_VERSION}.tar.bz2
|
||||
|
|
@ -136,12 +114,10 @@ SUBST_SED.paths= -e 's,%%LOCALBASE%%,${LOCALBASE},g'
|
|||
SUBST_SED.paths+= -e 's,%%X11BASE%%,${X11BASE},g'
|
||||
SUBST_SED.paths+= -e 's,%%JVM_HOME%%,${JVM_HOME},g'
|
||||
|
||||
BUILDLINK_PASSTHRU_DIRS+= ${JAVA_HOME}
|
||||
|
||||
.include "options.mk"
|
||||
|
||||
INSTALL_TEMPLATES+= ${PKGDIR}/INSTALL.tmpl
|
||||
DEINSTALL_TEMPLATES+= ${PKGDIR}/DEINSTALL.tmpl
|
||||
INSTALL_TEMPLATES+= ${PKGDIR}/INSTALL.tmpl
|
||||
DEINSTALL_TEMPLATES+= ${PKGDIR}/DEINSTALL.tmpl
|
||||
|
||||
PLIST_SRC+= PLIST.common_end
|
||||
|
||||
|
|
@ -180,8 +156,8 @@ do-install:
|
|||
GROSS_HACKS+= --param max-inline-insns-single=20000 \
|
||||
--param large-function-growth=20000 \
|
||||
--param inline-unit-growth=20000
|
||||
_WRAP_EXTRA_ARGS.CC+= ${GROSS_HACKS}
|
||||
_WRAP_EXTRA_ARGS.CXX+= ${GROSS_HACKS}
|
||||
_WRAP_EXTRA_ARGS.CC+= ${GROSS_HACKS}
|
||||
_WRAP_EXTRA_ARGS.CXX+= ${GROSS_HACKS}
|
||||
|
||||
MAKE_ENV+= ALT_CUPS_HEADERS_PATH=${PREFIX}/include
|
||||
BUILDLINK_DEPMETHOD.cups?= build
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
# $NetBSD: Makefile.common,v 1.5 2008/01/20 03:53:06 tnn2 Exp $
|
||||
# $NetBSD: Makefile.common,v 1.6 2008/01/20 15:23:09 tnn2 Exp $
|
||||
|
||||
CATEGORIES= lang java
|
||||
MAINTAINER= pkgsrc-users@NetBSD.org
|
||||
HOMEPAGE= http://www.eyesbeyond.com/freebsddom/java/
|
||||
EXTRACT_SUFX= .zip
|
||||
|
||||
BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip
|
||||
BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip
|
||||
BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip
|
||||
BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip
|
||||
|
||||
PKG_DESTDIR_SUPPORT= user-destdir
|
||||
|
||||
|
|
@ -23,10 +23,17 @@ BUILD_TARGET= all # added to below
|
|||
BUILD_DIRS= control/make
|
||||
CHECK_SHLIBS= no # scripts set LD_LIBRARY_PATH
|
||||
|
||||
JVM_HOME= ${PREFIX}/java/jdk-${JDK_VERSION}
|
||||
JAVA_HOME= ${JVM_HOME}
|
||||
JAVA_UNLIMIT= datasize
|
||||
UNLIMIT_RESOURCES= datasize
|
||||
|
||||
INTERACTIVE_STAGE+= fetch
|
||||
|
||||
BUILDLINK_PASSTHRU_DIRS+= ${JAVA_HOME}
|
||||
BUILDLINK_PASSTHRU_DIRS+= ${JVM_HOME}
|
||||
BUILDLINK_PASSTHRU_RPATHDIRS+= ${JAVA_HOME}/jre/lib/i386/server
|
||||
|
||||
.include "../../mk/bsd.prefs.mk"
|
||||
|
||||
MOTIF_TYPE= openmotif
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: license-extract.mk,v 1.3 2008/01/19 15:26:35 tnn2 Exp $
|
||||
# $NetBSD: license-extract.mk,v 1.4 2008/01/20 15:23:09 tnn2 Exp $
|
||||
|
||||
post-extract:
|
||||
@${CHMOD} -R u+w ${WRKSRC}
|
||||
|
|
@ -14,6 +14,6 @@ post-extract:
|
|||
@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 -p ${JRL_BINFILE} LICENSE | more
|
||||
@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
|
||||
cd ${WRKSRC} && unzip -q ${JRL_BINFILE} X_X && ./x_x2zip 'YES I ACCEPT THE CLICK THROUGH LICENSE. ' X_X && unzip -q 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
|
||||
cd ${WRKSRC} && unzip -q ${JRL_SRCFILE} X_X && ./x_x2zip 'YES I ACCEPT THE CLICK THROUGH LICENSE. ' X_X && unzip -q X_X.zip
|
||||
|
|
|
|||
|
|
@ -1,14 +1,30 @@
|
|||
# $NetBSD: options.mk,v 1.2 2008/01/20 14:04:55 tnn2 Exp $
|
||||
# $NetBSD: options.mk,v 1.3 2008/01/20 15:23:09 tnn2 Exp $
|
||||
|
||||
PKG_OPTIONS_VAR= PKG_OPTIONS.jdk16
|
||||
PKG_SUPPORTED_OPTIONS= jdk16-jce inet6 debug fastdebug # jdk16-plugin
|
||||
PKG_SUGGESTED_OPTIONS= # jdk16-plugin
|
||||
PKG_SUGGESTED_OPTIONS= # jdk16-plugin
|
||||
PKG_OPTIONS_LEGACY_VARS+= JDK16_USE_JCE:jdk16-jce
|
||||
|
||||
# fixme
|
||||
#.include "../../www/seamonkey/gecko-options.mk"
|
||||
.include "../../mk/bsd.options.mk"
|
||||
|
||||
.if empty(PKG_OPTIONS:Minet6)
|
||||
MAKE_ENV+= DONT_ENABLE_IPV6=YES
|
||||
.endif
|
||||
|
||||
.if empty(PKG_OPTIONS:Mdebug)
|
||||
MAKE_ENV+= SKIP_DEBUG_BUILD=true
|
||||
.else
|
||||
MAKE_ENV+= SKIP_DEBUG_BUILD=false
|
||||
.endif
|
||||
|
||||
.if empty(PKG_OPTIONS:Mfastdebug)
|
||||
MAKE_ENV+= SKIP_FASTDEBUG_BUILD=true
|
||||
.else
|
||||
MAKE_ENV+= SKIP_FASTDEBUG_BUILD=false
|
||||
.endif
|
||||
|
||||
###
|
||||
### Java(TM) Cryptography Extension (JCE)
|
||||
###
|
||||
|
|
|
|||
Loading…
Reference in a new issue