Don't define "NS_ENCRYPTION" before including "pkgsrc/mk/bsd.prefs.mk" so

that a "NS_ENCRYPTION?= ..." in "/etc/mk.conf" will work.

3 files changed, 8 insertions, 7 deletions

diff --git a/www/communicator/Makefile b/www/communicator/Makefile
index c527238d7e3..7b67d107704 100644
--- a/www/communicator/Makefile
+++ b/www/communicator/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2000/01/05 15:43:36 abs Exp $
+# $NetBSD: Makefile,v 1.26 2000/05/09 07:12:57 tron Exp $
 #
 
 BINNAME=	communicator
 DIST_SDIR_NAME=	complete_install
-NS_ENCRYPTION?=	export
-#
+
 .include "../navigator/Makefile.common"
diff --git a/www/navigator/Makefile b/www/navigator/Makefile
index 994540b9a85..b49b32b04d9 100644
--- a/www/navigator/Makefile
+++ b/www/navigator/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2000/01/05 15:43:34 abs Exp $
+# $NetBSD: Makefile,v 1.24 2000/05/09 07:12:58 tron Exp $
 #
 
 BINNAME=	navigator
 DIST_SDIR_NAME=	navigator_standalone
-NS_ENCRYPTION?=	export
-#
+
 .include "../navigator/Makefile.common"
diff --git a/www/navigator/Makefile.common b/www/navigator/Makefile.common
index 7133d81a40d..0ab1e310f03 100644
--- a/www/navigator/Makefile.common
+++ b/www/navigator/Makefile.common
@@ -1,9 +1,12 @@
-# $NetBSD: Makefile.common,v 1.8 2000/04/30 17:03:20 wiz Exp $
+# $NetBSD: Makefile.common,v 1.9 2000/05/09 07:12:58 tron Exp $
 #
 # Common include file for communicator and navigator packages
 
 .include "../../mk/bsd.prefs.mk"
 
+# Use export version by default.
+NS_ENCRYPTION?=	export
+
 # Note - the version will be overridden for certain architectures which
 #	 do not have the latest version available (eg: SunOS sparc)
 NS_VERS=	4.7