aboutsummaryrefslogtreecommitdiffstats
path: root/usr.bin/cpio/Makefile
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2012-02-25 10:58:02 +0000
committerMartin Matuska <mm@FreeBSD.org>2012-02-25 10:58:02 +0000
commit6c95142e7977d720e7f1c70672b358aa09fa6bfa (patch)
tree117e869a99c6fa7f789c6d9a87cf7eac26ae69e3 /usr.bin/cpio/Makefile
parent662c901c5429a3d06e28f5ce05df481159fb74c0 (diff)
parent17993d47e9beebea021707962fcdf2387b27cae9 (diff)
downloadsrc-6c95142e7977d720e7f1c70672b358aa09fa6bfa.tar.gz
src-6c95142e7977d720e7f1c70672b358aa09fa6bfa.zip
Update libarchive to 3.0.3
Some of new features: - New readers: RAR, LHA/LZH, CAB reader, 7-Zip - New writers: ISO9660, XAR - Improvements to many formats, especially including ISO9660 and Zip - Stackable write filters to write, e.g., tar.gz.uu in a single pass - Exploit seekable input; new "seekable" Zip reader can exploit the Zip Central Directory when it's available; the old "streamable" Zip reader is still fully supported for cases where seeking is not possible. Full release notes available at: https://github.com/libarchive/libarchive/wiki/ReleaseNotes
Notes
Notes: svn path=/head/; revision=232153
Diffstat (limited to 'usr.bin/cpio/Makefile')
-rw-r--r--usr.bin/cpio/Makefile9
1 files changed, 7 insertions, 2 deletions
diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile
index f13b626a3cfd..13579c11ad6b 100644
--- a/usr.bin/cpio/Makefile
+++ b/usr.bin/cpio/Makefile
@@ -3,9 +3,10 @@
.include <bsd.own.mk>
LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive
+LIBARCHIVECONFDIR= ${.CURDIR}/../../lib/libarchive
PROG= bsdcpio
-BSDCPIO_VERSION_STRING=2.8.5
+BSDCPIO_VERSION_STRING= 3.0.3
.PATH: ${LIBARCHIVEDIR}/cpio
SRCS= cpio.c cmdline.c
@@ -14,7 +15,7 @@ SRCS= cpio.c cmdline.c
SRCS+= err.c line_reader.c matching.c pathmatch.c
CFLAGS+= -DBSDCPIO_VERSION_STRING=\"${BSDCPIO_VERSION_STRING}\"
-CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/config_freebsd.h\"
+CFLAGS+= -DPLATFORM_CONFIG_H=\"${LIBARCHIVECONFDIR}/config_freebsd.h\"
CFLAGS+= -I${LIBARCHIVEDIR}/cpio -I${LIBARCHIVEDIR}/libarchive_fe
.ifdef RELEASE_CRUNCH
@@ -32,6 +33,10 @@ DPADD+= ${LIBMD}
LDADD+= -lmd
.endif
+.if ${MK_ICONV} != "no"
+CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const
+.endif
+
SYMLINKS=bsdcpio ${BINDIR}/cpio
MLINKS= bsdcpio.1 cpio.1