pkgsrc: minor changes to paths, options.

diff --git a/etc/mtree/minix.tree b/etc/mtree/minix.tree
index 985f0895bb8e1d955658e29214d8cc1d6fa7838e..9864cae9395cce3589346bc4901fd5c344940067 100644 (file)
--- a/etc/mtree/minix.tree
+++ b/etc/mtree/minix.tree
@@ -15,8 +15,6 @@
 755 ast     other    /usr/ast
 755 root    operator /usr/bin
 755 root    operator /usr/etc
-755 root    operator /usr/db
-755 root    operator /usr/db/pkg
 755 root    operator /usr/pkg
 755 root    operator /home
 755 root    operator /usr/include
@@ -90,4 +88,7 @@
 755  root    operator  /var
 /var/log -> /usr/log
 755  root    operator  /usr/log
+755  root    operator  /usr/var
+755  root    operator  /usr/var/db
+755  root    operator  /usr/var/db/pkg
 755  root    operator  /var/run

diff --git a/etc/pkgsrc.conf b/etc/pkgsrc.conf
index 7ca32fafbfd313e665b2c4968d2e934f72e30973..82b5a46b1fbd62aa784be658f2210f3f966fa244 100644 (file)
--- a/etc/pkgsrc.conf
+++ b/etc/pkgsrc.conf
@@ -10,9 +10,9 @@ PATH:= ${PATH}:/usr/gnu/bin
 
 PKGSRC_COMPILER=    gcc
 
-PKG_DBDIR=        /usr/db/pkg
+PKG_DBDIR=        /usr/var/db/pkg
 LOCALBASE=        /usr/pkg
-VARBASE=        /var
+VARBASE=        /usr/var
 PKG_TOOLS_BIN=        /usr/sbin
 PKGMANDIR=        man
 
@@ -36,4 +36,10 @@ CURSES_DEFAULT?= ncurses
 
 PKG_OPTIONS.groff=-x11 -groff-docs
 
+# no inet6
+PKG_DEFAULT_OPTIONS?= -inet6
+
+# allow all licenses for external packages
+SKIP_LICENSE_CHECK=yes
+
 .endif            # end pkgsrc settings