Module Name: src
Committed By: joerg
Date: Thu Apr 20 13:18:47 UTC 2017
Modified Files:
src/external/bsd/pkg_install/sbin: Makefile.inc
src/external/bsd/pkg_install/sbin/pkg_add: Makefile
Log Message:
Update build system for pkg_install-20170419.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/sbin/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/sbin/pkg_add/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/pkg_install/sbin/Makefile.inc
diff -u src/external/bsd/pkg_install/sbin/Makefile.inc:1.3 src/external/bsd/pkg_install/sbin/Makefile.inc:1.4
--- src/external/bsd/pkg_install/sbin/Makefile.inc:1.3 Fri Nov 5 09:09:01 2010
+++ src/external/bsd/pkg_install/sbin/Makefile.inc Thu Apr 20 13:18:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2010/11/05 09:09:01 he Exp $
+# $NetBSD: Makefile.inc,v 1.4 2017/04/20 13:18:47 joerg Exp $
.include <bsd.own.mk>
@@ -12,8 +12,8 @@ CPPFLAGS+= -DBINDIR='"${BINDIR}"'
DPADD+= ${LIBINSTALL}/libinstall.a
LDADD+= -L${LIBINSTALL} -linstall -ltermcap
-DPADD+= ${LIBFETCH} ${LIBSSL} ${LIBCRYPTO}
-LDADD+= -lfetch -lssl -lcrypto
+DPADD+= ${LIBNETPGPVERIFY} ${LIBFETCH} ${LIBSSL} ${LIBCRYPTO}
+LDADD+= -lnetpgpverify -lfetch -lssl -lcrypto
DPADD+= ${LIBARCHIVE}
LDADD+= -larchive
Index: src/external/bsd/pkg_install/sbin/pkg_add/Makefile
diff -u src/external/bsd/pkg_install/sbin/pkg_add/Makefile:1.2 src/external/bsd/pkg_install/sbin/pkg_add/Makefile:1.3
--- src/external/bsd/pkg_install/sbin/pkg_add/Makefile:1.2 Mon Feb 2 20:47:21 2009
+++ src/external/bsd/pkg_install/sbin/pkg_add/Makefile Thu Apr 20 13:18:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/02/02 20:47:21 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2017/04/20 13:18:47 joerg Exp $
# Original from FreeBSD, no rcs id.
PROG= pkg_add
@@ -8,6 +8,6 @@ SRCS= main.c perform.c
.PATH: ${DIST}/add
-CPPFLAGS+= -DMACHINE_ARCH=\"${MACHINE_ARCH}\"
+CPPFLAGS+= -DPKGSRC_MACHINE_ARCH=\"${MACHINE_ARCH}\"
.include <bsd.prog.mk>
