From 9ef5859996e5986f842b10ee8237822a784fb5b7 Mon Sep 17 00:00:00 2001 From: Ben Gras Date: Thu, 10 Feb 2011 15:05:18 +0000 Subject: [PATCH] take pkgsrc.conf out of the base system. . use bmake for pkgsrc instead, reads mk.conf from /usr/pkg/etc/mk.conf . tracking bmake from pkgsrc eases tracking pkgsrc . further disentangles pkgsrc from base system, reducing maintenance burden of pkgsrc --- etc/Makefile | 2 +- etc/make.conf | 4 +++- etc/pkgsrc.conf | 61 ------------------------------------------------ etc/usr/Makefile | 2 ++ 4 files changed, 6 insertions(+), 63 deletions(-) delete mode 100644 etc/pkgsrc.conf diff --git a/etc/Makefile b/etc/Makefile index 36b2c8074..9a65a6530 100644 --- 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 pkgsrc.conf system.conf + rs.inet rs.single make.conf system.conf FILES2=shadow FILES3=daily dhcptags.conf rc USRFILES=Makefile diff --git a/etc/make.conf b/etc/make.conf index 687fbd972..a9c745d0c 100644 --- a/etc/make.conf +++ b/etc/make.conf @@ -1,4 +1,6 @@ # which architecture to compile for ARCH=i386 -.include "pkgsrc.conf" +.ifdef BSD_PKG_MK +.error Please use bmake for pkgsrc instead of the base system make. +.endif diff --git a/etc/pkgsrc.conf b/etc/pkgsrc.conf deleted file mode 100644 index 3458bffa8..000000000 --- a/etc/pkgsrc.conf +++ /dev/null @@ -1,61 +0,0 @@ -.ifdef BSD_PKG_MK # begin pkgsrc settings - -CC= gcc -COMPILER_TYPE=gnu -AR=ar - -PKGSRC_COMPILER= gcc - -PKG_DBDIR= /usr/var/db/pkg -LOCALBASE= /usr/pkg -VARBASE= /usr/var -.if exists(/usr/sbin/pkg_add) -PKG_TOOLS_BIN= /usr/sbin -.else -PKG_TOOLS_BIN= /usr/pkg/sbin -.endif -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 -PKG_OPTIONS.scmgit=-python -scmgit-gui - -# no inet6 -PKG_DEFAULT_OPTIONS?= -inet6 - -# allow all licenses for external packages -SKIP_LICENSE_CHECK=yes - -# where will pkgsrc place startup scripts? -PKG_RCD_SCRIPTS=YES -RCD_SCRIPTS_DIR=/usr/pkg/etc/rc.d - -# no g- prefix for binutils -BINUTILS_PROGRAM_PREFIX= - -# where to keep binary packages -PACKAGES=${PKGSRCDIR}/packages/${OS_VERSION}/${MACHINE_ARCH} - -# minix3 local source archives and source archive backup -SITE_MINIX=http://www.minix3.org/ -MASTER_SITE_MINIX=${SITE_MINIX}/distfiles-minix/ -MASTER_SITE_BACKUP=${SITE_MINIX}/distfiles-backup/ - -.endif # end pkgsrc settings diff --git a/etc/usr/Makefile b/etc/usr/Makefile index 703c3f0cc..6b8934de9 100644 --- a/etc/usr/Makefile +++ b/etc/usr/Makefile @@ -34,9 +34,11 @@ pkgsrc-create: git pkgsrc-checkout: git cd ${.CURDIR}/pkgsrc && git checkout minix-master + cd ${.CURDIR}/pkgsrc/minix && sh minibootstrap.sh pkgsrc-update: git cd ${.CURDIR}/pkgsrc && git pull + cd ${.CURDIR}/pkgsrc/minix && sh minibootstrap.sh git: pkgin update -- 2.44.0