diff options
| author | bapt <bapt@FreeBSD.org> | 2013-03-05 13:31:06 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2013-03-05 13:31:06 +0000 |
| commit | 94bcfee7d03e5cb5f1dcc2ad73cea265c42f8dcc (patch) | |
| tree | e64f6994c4e29f7642d77ef29d6261923ef6d8cc /usr.sbin/pkg/Makefile | |
| parent | 75fa845336bfbd8edfd6c7babd608b10ca5fe89c (diff) | |
| download | FreeBSD-src-94bcfee7d03e5cb5f1dcc2ad73cea265c42f8dcc.zip FreeBSD-src-94bcfee7d03e5cb5f1dcc2ad73cea265c42f8dcc.tar.gz | |
Add the ability to correctly read pkg.conf is exists.
Only look for boostrap useful options:
- PACKAGESITE
- ABI
- MIRROR_TYPE
- ASSUME_ALWAYS_YES
While here makes PACKAGESITE expand the ${ABI} variable.
Allow to deactivate any SRV record look up (MIRROR_TYPE=none)
Use the same mechanism as for pkgng itself: first get configuration out of
environment variable and fallback on pkg.conf if exists.
Reviewed by: bdrewery
Diffstat (limited to 'usr.sbin/pkg/Makefile')
| -rw-r--r-- | usr.sbin/pkg/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/pkg/Makefile b/usr.sbin/pkg/Makefile index c2ca0a3..0e1c2d8 100644 --- a/usr.sbin/pkg/Makefile +++ b/usr.sbin/pkg/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ PROG= pkg -SRCS= pkg.c dns_utils.c +SRCS= pkg.c dns_utils.c config.c NO_MAN= yes -DPADD= ${LIBARCHIVE} ${LIBELF} ${LIBFETCH} -LDADD= -larchive -lelf -lfetch +DPADD= ${LIBARCHIVE} ${LIBELF} ${LIBFETCH} ${LIBBSDYML} ${LIBSUBF} +LDADD= -larchive -lelf -lfetch -lbsdyml -lsbuf .include <bsd.prog.mk> |
