diff options
| -rw-r--r-- | mk/mk.conf.example | 8 | ||||
| -rw-r--r-- | www/navigator/Makefile.common | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/mk/mk.conf.example b/mk/mk.conf.example index 92e05625341..ef6728b7681 100644 --- a/mk/mk.conf.example +++ b/mk/mk.conf.example @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf.example,v 1.233 2001/07/10 15:07:35 tron Exp $ +# $NetBSD: mk.conf.example,v 1.234 2001/07/23 18:30:24 wiz Exp $ # # Sample /etc/mk.conf file, which can be used to set specific values @@ -721,6 +721,12 @@ # Possible: not defined, YES # Default: not defined +#NS_NO_FLASH= +# Used by navigator/communicator package to decide if flash should be +# installed or not. By default, flash is installed. +# Possible: not defined, defined +# Default: not defined + #NS_USE_BSDI= YES # Used to decide if i386 BSDi Netscape binary should be used in preference # to linux version. diff --git a/www/navigator/Makefile.common b/www/navigator/Makefile.common index 4cbd4a055a2..0e73f00b8ad 100644 --- a/www/navigator/Makefile.common +++ b/www/navigator/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.37 2001/05/11 09:15:43 wiz Exp $ +# $NetBSD: Makefile.common,v 1.38 2001/07/23 18:30:26 wiz Exp $ # # Common include file for communicator and navigator packages @@ -28,7 +28,9 @@ DISTUNAME= sparc-sun-solaris2.5.1 DIST_DIR_NAME= supported/sunos551 WRKNAME= sparc-sun-solaris2.5.1 VENDOR_NAME= Solaris 2.5.1 +.if !defined(NS_NO_FLASH) DEPENDS+= ns-flash>4.0:../../graphics/ns-flash +.endif # .elif (${MACHINE_ARCH} == "alpha") .if !exists(/emul/osf1/sbin/loader) @@ -56,7 +58,9 @@ DISTUNAME= x86-unknown-linux2.2 DIST_DIR_NAME= supported/linux22 WRKNAME= x86-unknown-linux2.2 VENDOR_NAME= Linux 2.2 +.if !defined(NS_NO_FLASH) DEPENDS+= ns-flash>4.0:../../graphics/ns-flash +.endif # .elif (${MACHINE_ARCH} == "sparc") .if !exists(/emul/sunos/usr/lib/ld.so) |