new dirs for pkgsrc; new $PATH for pkg root and llvm

diff --git a/etc/ast/.ashrc b/etc/ast/.ashrc
index 24eb74d84ea15ee4e547768109628cd98aa6678e..72c8c5e4c4e32be52aa6a03542d592ae51f5022a 100644 (file)
--- a/etc/ast/.ashrc
+++ b/etc/ast/.ashrc
@@ -7,7 +7,7 @@ umask 022
 # Favourite editor and pager, search path for binaries, etc.
 export EDITOR=vi
 export PAGER=more
-export PATH=$HOME/bin:/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin
+export PATH=$HOME/bin:/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin:/usr/pkg/bin:/usr/llvm/bin
 
 } # End of no-repeat.
 

diff --git a/etc/make.conf b/etc/make.conf
index 890f9eb07fd32da8c78fc4acd25033cdba13017a..4cd19bf81a57954857702aeb859f38dd9b0e35fe 100644 (file)
--- a/etc/make.conf
+++ b/etc/make.conf
@@ -1,3 +1,38 @@
 # which architecture to compile for
 ARCH=i386
 
+.ifdef BSD_PKG_MK    # begin pkgsrc settings
+
+CC= gcc
+COMPILER_TYPE=gnu
+
+PATH:= ${PATH}:/usr/gnu/bin
+.export PATH
+
+PKGSRC_COMPILER=    gcc
+
+PKG_DBDIR=        /usr/db/pkg
+LOCALBASE=        /usr/pkg
+VARBASE=        /var
+PKG_TOOLS_BIN=        /usr/sbin
+PKGMANDIR=        man
+
+FETCH_USING?=        fetch
+EXTRACT_USING?=    bsdtar
+
+# This is where binary packages are stored.
+# PACKAGES?= /usr/tmp/packages
+
+# This is where packages will be extracted and compiled
+WRKOBJDIR?=    /usr/tmp/work
+
+# This hack is required because, pkgsrc insists on having a working dlopen
+# even for packages that build and work okay when we don't have one (perl,
+# libtool, etc). This will cause packages that really require dlopen to fail
+# during the build/configure stage. But considering the number of packages
+# that work, this is okay
+IS_BUILTIN.dl?=    yes
+
+CURSES_DEFAULT?= ncurses
+
+.endif            # end pkgsrc settings

diff --git a/etc/rc b/etc/rc
index e2dab26b7f919a3527b09e9903dfceb8264ba6d9..b123b9b5e47a7a6b4855647b4d3d8e4779af695e 100755 (executable)
--- a/etc/rc
+++ b/etc/rc
@@ -6,7 +6,7 @@ exec </dev/null
 
 umask 022
 TERM="${TERM-minix}"
-PATH=/usr/local/bin:/bin:/usr/bin:/usr/sbin
+PATH=/usr/local/bin:/bin:/usr/bin:/usr/sbin:/usr/pkg/bin:/usr/llvm/bin
 RC_TZ=/etc/rc.timezone
 export TERM PATH