Tue Apr 21 00:28:19 2015 UTC ()
Since CONFIG_*_OVERRIDE replaces the automatic list, add ${WRKSRC}
manually.


(joerg)
diff -r1.207 -r1.208 pkgsrc/pkgtools/pkg_install/Makefile
cvs diff -r1.207 -r1.208 pkgsrc/pkgtools/pkg_install/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_install/Makefile 2015/04/02 23:06:34 1.207
+++ pkgsrc/pkgtools/pkg_install/Makefile 2015/04/21 00:28:19 1.208
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.207 2015/04/02 23:06:34 jperkin Exp $ 1# $NetBSD: Makefile,v 1.208 2015/04/21 00:28:19 joerg Exp $
2 2
3# Notes to package maintainers: 3# Notes to package maintainers:
4# 4#
5# Updating this package does not automatically necessitate bumping 5# Updating this package does not automatically necessitate bumping
6# PKGTOOLS_REQD in bsd.pkg.mk. Do so if and only if there is a critical 6# PKGTOOLS_REQD in bsd.pkg.mk. Do so if and only if there is a critical
7# change in the pkg_* tools that pkgsrc relies on for proper operation. 7# change in the pkg_* tools that pkgsrc relies on for proper operation.
8 8
9PKGNAME= pkg_install-${VERSION} 9PKGNAME= pkg_install-${VERSION}
10CATEGORIES= pkgtools 10CATEGORIES= pkgtools
11 11
12MAINTAINER= agc@NetBSD.org 12MAINTAINER= agc@NetBSD.org
13HOMEPAGE= http://www.pkgsrc.org/ 13HOMEPAGE= http://www.pkgsrc.org/
14COMMENT= Package management and administration tools for pkgsrc 14COMMENT= Package management and administration tools for pkgsrc
@@ -141,28 +141,30 @@ LDFLAGS+= -L${WRKDIR}/zlib @@ -141,28 +141,30 @@ LDFLAGS+= -L${WRKDIR}/zlib
141CPPFLAGS+= -I${WRKDIR}/libarchive/libarchive 141CPPFLAGS+= -I${WRKDIR}/libarchive/libarchive
142LDFLAGS+= -L${WRKDIR}/libarchive/.libs 142LDFLAGS+= -L${WRKDIR}/libarchive/.libs
143 143
144# Until we support pkgsrc openssl at bootstrap time, disable it completely 144# Until we support pkgsrc openssl at bootstrap time, disable it completely
145# if asked to avoid the builtin. 145# if asked to avoid the builtin.
146. if empty(USE_BUILTIN.openssl:M[Yy][Ee][Ss]) 146. if empty(USE_BUILTIN.openssl:M[Yy][Ee][Ss])
147LIBARCHIVE_CONFIGURE_ARGS= --without-openssl 147LIBARCHIVE_CONFIGURE_ARGS= --without-openssl
148. endif 148. endif
149 149
150LIBARCHIVE_LIBS= ${SED} -n -e 's/^Libs.private://p' \ 150LIBARCHIVE_LIBS= ${SED} -n -e 's/^Libs.private://p' \
151 ${WRKDIR}/libarchive/build/pkgconfig/libarchive.pc 2>/dev/null || echo 151 ${WRKDIR}/libarchive/build/pkgconfig/libarchive.pc 2>/dev/null || echo
152LIBS+= ${LIBARCHIVE_LIBS:sh} 152LIBS+= ${LIBARCHIVE_LIBS:sh}
153 153
154CONFIG_GUESS_OVERRIDE+= ${WRKDIR}/libarchive/build/autoconf/config.guess 154CONFIG_GUESS_OVERRIDE+= ${WRKDIR}/libarchive/build/autoconf/config.guess \
155CONFIG_SUB_OVERRIDE+= ${WRKDIR}/libarchive/build/autoconf/config.sub 155 ${WRKSRC}/config.guess
 156CONFIG_SUB_OVERRIDE+= ${WRKDIR}/libarchive/build/autoconf/config.sub \
 157 ${WRKSRC}/config.sub
156 158
157. if ${OPSYS} == "Cygwin" 159. if ${OPSYS} == "Cygwin"
158CPPFLAGS+= -DLIBARCHIVE_STATIC 160CPPFLAGS+= -DLIBARCHIVE_STATIC
159. endif 161. endif
160 162
161. if ${OPSYS} == "Darwin" 163. if ${OPSYS} == "Darwin"
162# Make sure that the linker used our static library instead of the 164# Make sure that the linker used our static library instead of the
163# (outdated) dynamic library "/usr/lib/libarchive.dylib". 165# (outdated) dynamic library "/usr/lib/libarchive.dylib".
164LDFLAGS+= -Wl,-search_paths_first 166LDFLAGS+= -Wl,-search_paths_first
165. endif 167. endif
166 168
167. if ${OPSYS} == "SunOS" 169. if ${OPSYS} == "SunOS"
168# workaround for pkg/45491 170# workaround for pkg/45491