diff options
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/sun-jre13/Makefile.common | 25 | ||||
| -rw-r--r-- | lang/sun-jre14/Makefile.common | 24 | ||||
| -rw-r--r-- | lang/sun-jre15/Makefile.common | 23 |
3 files changed, 37 insertions, 35 deletions
diff --git a/lang/sun-jre13/Makefile.common b/lang/sun-jre13/Makefile.common index 31c573cc3fc..c62e29b6ce7 100644 --- a/lang/sun-jre13/Makefile.common +++ b/lang/sun-jre13/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.25 2005/09/28 19:04:44 rillig Exp $ +# $NetBSD: Makefile.common,v 1.26 2005/12/12 14:43:25 joerg Exp $ # MASTER_SITES is very special, and must end in "=": CATEGORIES= lang java @@ -39,7 +39,19 @@ PLIST_SRC= ${PKGDIR}/PLIST.Darwin NO_MTREE= yes # since we change PREFIX LDD= ${TRUE} -ONLY_FOR_PLATFORM= NetBSD-*-i386 Linux-*-i[3-6]86 Darwin-*-* +ONLY_FOR_PLATFORM= *-*-i386 Darwin-*-* + +.if ${OPSYS} != "Darwin" +. include "../../emulators/suse_linux/Makefile.application" + +. if !defined(USE_NATIVE_LINUX) +. if ${SUSE_DIR_PREFIX} == "suse91" +DEPENDS+= suse_locale-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_locale +. endif +DEPENDS+= suse_compat-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_compat +DEPENDS+= suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11 +. endif +.endif _FETCH_MESSAGE= \ ${ECHO} "======================================================================"; \ @@ -80,14 +92,5 @@ do-install: cd ${WRKSRC} && ${PAX} -rwp ma . ${JAVA_HOME} .endif -.if ${OPSYS} == "NetBSD" -. include "../../emulators/suse_linux/Makefile.application" -. if ${SUSE_DIR_PREFIX} == "suse91" -DEPENDS+= suse_locale-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_locale -. endif -DEPENDS+= suse_compat-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_compat -DEPENDS+= suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11 -.endif - .include "../../mk/java-env.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/sun-jre14/Makefile.common b/lang/sun-jre14/Makefile.common index ab3886712d8..d68666e1862 100644 --- a/lang/sun-jre14/Makefile.common +++ b/lang/sun-jre14/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.26 2005/08/14 10:15:55 dillo Exp $ +# $NetBSD: Makefile.common,v 1.27 2005/12/12 14:43:25 joerg Exp $ CATEGORIES= lang java EXTRACT_SUFX= .bin @@ -28,8 +28,17 @@ MESSAGE_SUBST+= JAVA_HOME="${JAVA_HOME}" NO_MTREE= yes # since we change PREFIX LDD= ${TRUE} -ONLY_FOR_PLATFORM= NetBSD-1.6[U-Z]*-i386 NetBSD-[2-9]*-i386 -ONLY_FOR_PLATFORM+= Linux-*-i[3-6]86 +ONLY_FOR_PLATFORM= *-*-i386 + +.include "../../emulators/suse_linux/Makefile.application" + +.if !defined(USE_NATIVE_LINUX) +. if ${SUSE_DIR_PREFIX} == "suse91" +DEPENDS+= suse_locale-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_locale +. endif +DEPENDS+= suse_compat-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_compat +DEPENDS+= suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11 +.endif _FETCH_MESSAGE= \ ${ECHO} "======================================================================"; \ @@ -65,14 +74,5 @@ do-install: ${INSTALL_PROGRAM_DIR} ${JAVA_HOME} cd ${WRKSRC} && ${PAX} -rwp ma . ${JAVA_HOME} -.if ${OPSYS} == "NetBSD" -. include "../../emulators/suse_linux/Makefile.application" -. if ${SUSE_DIR_PREFIX} == "suse91" -DEPENDS+= suse_locale-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_locale -. endif -DEPENDS+= suse_compat-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_compat -DEPENDS+= suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11 -.endif - .include "../../mk/java-env.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/sun-jre15/Makefile.common b/lang/sun-jre15/Makefile.common index 40daef074cf..1c0e5f7651b 100644 --- a/lang/sun-jre15/Makefile.common +++ b/lang/sun-jre15/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2005/10/27 22:57:27 tv Exp $ +# $NetBSD: Makefile.common,v 1.9 2005/12/12 14:43:25 joerg Exp $ CATEGORIES= lang java COMMENT= Sun's Java(tm) 2 Standard Edition, ${DOWNLOAD_NAME} @@ -35,8 +35,16 @@ EXTRACT_ENV.bin+= UNPACK200_FLAGS=-Htrue NO_MTREE= yes # since we change PREFIX LDD= ${TRUE} -ONLY_FOR_PLATFORM= NetBSD-1.6[U-Z]*-i386 NetBSD-[2-9]*-i386 -ONLY_FOR_PLATFORM+= Linux-*-i[3-6]86 +.include "../../emulators/suse_linux/Makefile.application" + +.if !defined(USE_NATIVE_LINUX) +ONLY_FOR_PLATFORM= *-*-i386 +. if ${SUSE_DIR_PREFIX} == "suse91" +DEPENDS+= suse_locale-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_locale +. endif +DEPENDS+= suse_compat-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_compat +DEPENDS+= suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11 +.endif _FETCH_MESSAGE= \ ${ECHO} "======================================================================"; \ @@ -64,14 +72,5 @@ do-install: ${INSTALL_PROGRAM_DIR} ${JAVA_HOME} cd ${WRKSRC} && ${PAX} -rwp ma . ${JAVA_HOME} -.if ${OPSYS} == "NetBSD" -. include "../../emulators/suse_linux/Makefile.application" -. if ${SUSE_DIR_PREFIX} == "suse91" -DEPENDS+= suse_locale-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_locale -. endif -DEPENDS+= suse_compat-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_compat -DEPENDS+= suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11 -.endif - .include "../../mk/java-env.mk" .include "../../mk/bsd.pkg.mk" |