mk.conf - back out part of the previous commit
authorAlex Hornung <ahornung@gmail.com>
Tue, 30 Mar 2010 19:23:39 +0000 (19:23 +0000)
committerAlex Hornung <ahornung@gmail.com>
Tue, 30 Mar 2010 19:23:39 +0000 (19:23 +0000)
* 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@

nrelease/root/etc/mk.conf

index 0b1f4b8..a96277b 100644 (file)
@@ -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