From: Alex Hornung <ahornung@gmail.com>
Date: Tue, 30 Mar 2010 19:23:39 +0000 (+0000)
Subject: mk.conf - back out part of the previous commit
X-Git-Url: https://gitweb.dragonflybsd.org/~lentferj/dragonfly.git/commitdiff_plain/42013442c1cc3108c10e9957574fe37221bb312c

mk.conf - back out part of the previous commit

* It seems that there's no real consensus on the correctness of this, so
  I'm keeping them as comments for users to easily enable.

Thanks-to: beket@
---

diff --git a/nrelease/root/etc/mk.conf b/nrelease/root/etc/mk.conf
index 0b1f4b8ecd..a96277bbcc 100644
--- a/nrelease/root/etc/mk.conf
+++ b/nrelease/root/etc/mk.conf
@@ -13,9 +13,9 @@ WRKOBJDIR=/usr/obj/pkgsrc
 
 PKG_DEFAULT_OPTIONS=	"dri"
 
-ACCEPTABLE_LICENSES+=	sun-jre6-license sun-jdk6-license
-ACCEPTABLE_LICENSES+=	flash-license
-ACCEPTABLE_LICENSES+=	adobe-acrobat-license
-ACCEPTABLE_LICENSES+=	opera-850-license
+# ACCEPTABLE_LICENSES+=	sun-jre6-license sun-jdk6-license
+# ACCEPTABLE_LICENSES+=	flash-license
+# ACCEPTABLE_LICENSES+=	adobe-acrobat-license
+# ACCEPTABLE_LICENSES+=	opera-850-license
 
 .endif