[Midnightbsd-cvs] src [12072] trunk/usr.bin/bsdcat: fix build

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Sep 22 10:17:41 EDT 2018


Revision: 12072
          http://svnweb.midnightbsd.org/src/?rev=12072
Author:   laffer1
Date:     2018-09-22 10:17:40 -0400 (Sat, 22 Sep 2018)
Log Message:
-----------
fix build

Modified Paths:
--------------
    trunk/usr.bin/bsdcat/Makefile

Added Paths:
-----------
    trunk/usr.bin/bsdcat/config_midnightbsd.h

Modified: trunk/usr.bin/bsdcat/Makefile
===================================================================
--- trunk/usr.bin/bsdcat/Makefile	2018-09-21 20:40:25 UTC (rev 12071)
+++ trunk/usr.bin/bsdcat/Makefile	2018-09-22 14:17:40 UTC (rev 12072)
@@ -4,7 +4,7 @@
 .include <bsd.own.mk>
 
 _LIBARCHIVEDIR=	${SRCTOP}/contrib/libarchive
-_LIBARCHIVECONFDIR=	${SRCTOP}/lib/libarchive
+LIBARCHIVECONFDIR=      ${.CURDIR}/../../lib/libarchive
 
 PROG=	bsdcat
 BSDCAT_VERSION_STRING=	3.3.2
@@ -16,7 +16,7 @@
 SRCS+=	err.c
 
 CFLAGS+= -DBSDCAT_VERSION_STRING=\"${BSDCAT_VERSION_STRING}\"
-CFLAGS+= -DPLATFORM_CONFIG_H=\"${_LIBARCHIVECONFDIR}/config_freebsd.h\"
+CFLAGS+= -DPLATFORM_CONFIG_H=\"${LIBARCHIVECONFDIR}/config_midnightbsd.h\"
 CFLAGS+= -I${_LIBARCHIVEDIR}/cat -I${_LIBARCHIVEDIR}/libarchive_fe
 
 DPADD=  ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA} ${LIBPTHREAD} ${LIBBSDXML}

Added: trunk/usr.bin/bsdcat/config_midnightbsd.h
===================================================================
--- trunk/usr.bin/bsdcat/config_midnightbsd.h	                        (rev 0)
+++ trunk/usr.bin/bsdcat/config_midnightbsd.h	2018-09-22 14:17:40 UTC (rev 12072)
@@ -0,0 +1,58 @@
+/* $MidnightBSD$ */
+/*-
+ * Copyright (c) 2003-2007 Tim Kientzle
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (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$
+ */
+
+/* A hand-tooled configuration for FreeBSD. */
+
+#include <sys/param.h>  /* __FreeBSD_version */
+
+#define	HAVE_DIRENT_H 1
+#define	HAVE_ERRNO_H 1
+#define	HAVE_FCNTL_H 1
+#define	HAVE_FUTIMES 1
+#define	HAVE_GRP_H 1
+#define	HAVE_LIBARCHIVE 1
+#define	HAVE_LINK 1
+#define	HAVE_LSTAT 1
+#define	HAVE_LUTIMES 1
+#define	HAVE_PWD_H 1
+#define	HAVE_READLINK 1
+#define	HAVE_STDARG_H 1
+#define	HAVE_STDLIB_H 1
+#define	HAVE_STRING_H 1
+#define	HAVE_SYMLINK 1
+#define	HAVE_SYS_CDEFS_H 1
+#define	HAVE_SYS_STAT_H 1
+#define	HAVE_SYS_TIME_H 1
+#define	HAVE_TIME_H 1
+#define	HAVE_UINTMAX_T 1
+#define	HAVE_UNISTD_H 1
+#define	HAVE_UNSIGNED_LONG_LONG 1
+#define	HAVE_UTIME_H 1
+#define	HAVE_UTIMES 1
+#define	HAVE_WCSCMP 1
+


Property changes on: trunk/usr.bin/bsdcat/config_midnightbsd.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property


More information about the Midnightbsd-cvs mailing list