From 2080beb5a314731cd21790d9d67e13f813b771c1 Mon Sep 17 00:00:00 2001
From: Tim Kientzle <kientzle@gmail.com>
Date: Sat, 14 Jun 2008 23:00:35 -0400
Subject: [PATCH] IFC a couple of files

SVN-Revision: 119
---
 cpio/Makefile         | 7 +++++--
 cpio/config_freebsd.h | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/cpio/Makefile b/cpio/Makefile
index dab40a06d..cc5c1065f 100644
--- a/cpio/Makefile
+++ b/cpio/Makefile
@@ -1,15 +1,18 @@
 # $FreeBSD$
 
 PROG=	bsdcpio
-BSDCPIO_VERSION_STRING=0.9.10a
+BSDCPIO_VERSION_STRING=0.9.11b
 SRCS=	cpio.c cmdline.c err.c matching.c pathmatch.c
 WARNS?=	6
 DPADD=	${LIBARCHIVE} ${LIBZ} ${LIBBZ2}
 CFLAGS+= -DBSDCPIO_VERSION_STRING=\"${BSDCPIO_VERSION_STRING}\"
-CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\" -O0 -g
+CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
 LDADD+=	-larchive -lz -lbz2
+
+.if defined(WITH_BSDCPIO)
 SYMLINKS=bsdcpio ${BINDIR}/cpio
 MLINKS= bsdcpio.1 cpio.1
+.endif
 
 .PHONY: check test
 
diff --git a/cpio/config_freebsd.h b/cpio/config_freebsd.h
index 1776ca170..086b77a53 100644
--- a/cpio/config_freebsd.h
+++ b/cpio/config_freebsd.h
@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/usr.bin/tar/config_freebsd.h,v 1.1 2007/03/11 10:36:42 kientzle Exp $
+ * $FreeBSD$
  */
 
 /* A default configuration for FreeBSD, used if there is no config.h. */
-- 
2.47.3