Thu Jun 13 21:36:46 2013 UTC ()
Only disable OpenSSL if not using a builtin implementation.


(jperkin)
diff -r1.19 -r1.20 pkgsrc/archivers/bsdtar/Makefile
cvs diff -r1.19 -r1.20 pkgsrc/archivers/bsdtar/Makefile (expand / switch to unified diff)

--- pkgsrc/archivers/bsdtar/Makefile 2013/06/13 16:25:19 1.19
+++ pkgsrc/archivers/bsdtar/Makefile 2013/06/13 21:36:46 1.20
@@ -1,51 +1,56 @@ @@ -1,51 +1,56 @@
1# $NetBSD: Makefile,v 1.19 2013/06/13 16:25:19 jperkin Exp $ 1# $NetBSD: Makefile,v 1.20 2013/06/13 21:36:46 jperkin Exp $
2# 2#
3 3
4DISTNAME= bsdtar-2.8.4 4DISTNAME= bsdtar-2.8.4
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= archivers 6CATEGORIES= archivers
7MASTER_SITES= # empty 7MASTER_SITES= # empty
8DISTFILES= # empty 8DISTFILES= # empty
9 9
10MAINTAINER= joerg@NetBSD.org 10MAINTAINER= joerg@NetBSD.org
11HOMEPAGE= http://code.google.com/p/libarchive/ 11HOMEPAGE= http://code.google.com/p/libarchive/
12COMMENT= Fast multi-format tape archiver 12COMMENT= Fast multi-format tape archiver
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15# Explicitly do not depend on libtool as this can be used 15# Explicitly do not depend on libtool as this can be used
16# as bootstrap dependency. 16# as bootstrap dependency.
17# 17#
18#USE_LIBTOOL= yes 18#USE_LIBTOOL= yes
19 19
20.include "../../archivers/bzip2/builtin.mk" 20.include "../../archivers/bzip2/builtin.mk"
21.include "../../devel/zlib/builtin.mk" 21.include "../../devel/zlib/builtin.mk"
 22CHECK_BUILTIN.openssl:= yes
 23.include "../../security/openssl/builtin.mk"
 24CHECK_BUILTIN.openssl:= no
22 25
23.if empty(USE_BUILTIN.bzip2:M[yY][eE][sS]) 26.if empty(USE_BUILTIN.bzip2:M[yY][eE][sS])
24CPPFLAGS+= -I${WRKDIR}/bzip2 27CPPFLAGS+= -I${WRKDIR}/bzip2
25LDFLAGS+= -L${WRKDIR}/bzip2 28LDFLAGS+= -L${WRKDIR}/bzip2
26.endif 29.endif
27.if empty(USE_BUILTIN.zlib:M[yY][eE][sS]) 30.if empty(USE_BUILTIN.zlib:M[yY][eE][sS])
28CPPFLAGS+= -I${WRKDIR}/zlib 31CPPFLAGS+= -I${WRKDIR}/zlib
29LDFLAGS+= -L${WRKDIR}/zlib 32LDFLAGS+= -L${WRKDIR}/zlib
30.endif 33.endif
 34.if empty(USE_BUILTIN.openssl:M[yY][eE][sS])
 35CONFIGURE_ARGS+= --without-openssl
 36.endif
31 37
32FILESDIR.bzip2?= ${.CURDIR}/../../archivers/bzip2/files 38FILESDIR.bzip2?= ${.CURDIR}/../../archivers/bzip2/files
33FILESDIR.libarchive?= ${.CURDIR}/../../archivers/libarchive/files 39FILESDIR.libarchive?= ${.CURDIR}/../../archivers/libarchive/files
34FILESDIR.zlib?= ${.CURDIR}/../../devel/zlib/files 40FILESDIR.zlib?= ${.CURDIR}/../../devel/zlib/files
35 41
36CONFIGURE_ARGS+= --enable-bsdtar=static --disable-cpio \ 42CONFIGURE_ARGS+= --enable-bsdtar=static --disable-cpio \
37 --disable-shared --without-xml2 --without-expat \ 43 --disable-shared --without-xml2 --without-expat
38 --without-openssl 
39 44
40INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 45INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
41 46
42do-extract: 47do-extract:
43.if empty(USE_BUILTIN.bzip2:M[yY][eE][sS]) 48.if empty(USE_BUILTIN.bzip2:M[yY][eE][sS])
44 ${RUN}${CP} -R ${FILESDIR.bzip2} ${WRKDIR}/bzip2 49 ${RUN}${CP} -R ${FILESDIR.bzip2} ${WRKDIR}/bzip2
45.endif 50.endif
46.if empty(USE_BUILTIN.zlib:M[yY][eE][sS]) 51.if empty(USE_BUILTIN.zlib:M[yY][eE][sS])
47 ${RUN}${CP} -R ${FILESDIR.zlib} ${WRKDIR}/zlib 52 ${RUN}${CP} -R ${FILESDIR.zlib} ${WRKDIR}/zlib
48.endif 53.endif
49 ${RUN}${CP} -R ${FILESDIR.libarchive} ${WRKSRC} 54 ${RUN}${CP} -R ${FILESDIR.libarchive} ${WRKSRC}
50 55
51pre-configure: 56pre-configure: