make.conf: make pkgsrc.conf separate.

diff --git a/etc/Makefile b/etc/Makefile
index 7a43a1c7f8ccfab43341c99ab8f9cf6665e82871..21952134be224b9026530dd16ac1106654b58e3d 100644 (file)
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -4,7 +4,7 @@ USRETC=/usr/etc/
 FILES1=fstab group hostname.file inet.conf motd.install mtab passwd profile \
        protocols rc services termcap ttytab utmp rc.cd binary_sizes \
        binary_sizes.big binary_sizes.xxl syslog.conf rc.daemons.dist \
-       rs.inet rs.single make.conf system.conf 
+       rs.inet rs.single make.conf pkgsrc.conf system.conf 
 FILES2=shadow
 FILES3=daily dhcptags.conf rc 
 USRFILES=Makefile

diff --git a/etc/make.conf b/etc/make.conf
index 5f02038d268593679a7fb29ff38b32ae7bb21ab9..687fbd972a5551af959c084447ca049b4bc2485e 100644 (file)
--- a/etc/make.conf
+++ b/etc/make.conf
@@ -1,40 +1,4 @@
 # which architecture to compile for
 ARCH=i386
 
-.ifdef BSD_PKG_MK    # begin pkgsrc settings
-
-CC= gcc
-COMPILER_TYPE=gnu
-AR=gar
-NM=gnm
-
-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
+.include "pkgsrc.conf"

diff --git a/etc/pkgsrc.conf b/etc/pkgsrc.conf
new file mode 100644 (file)
index 0000000..7ca32fa
--- /dev/null
+++ b/etc/pkgsrc.conf
@@ -0,0 +1,39 @@
+.ifdef BSD_PKG_MK    # begin pkgsrc settings
+
+CC= gcc
+COMPILER_TYPE=gnu
+AR=gar
+NM=gnm
+
+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
+
+PKG_OPTIONS.groff=-x11 -groff-docs
+
+.endif            # end pkgsrc settings