Use the new PLATFORM_CONFIG_H mechanism rather than maintaining patches
authorPeter Avalos <pavalos@dragonflybsd.org>
Sat, 28 Apr 2007 16:16:31 +0000 (16:16 +0000)
committerPeter Avalos <pavalos@dragonflybsd.org>
Sat, 28 Apr 2007 16:16:31 +0000 (16:16 +0000)
against contrib/.

Reminded-by: joerg
lib/libarchive/Makefile
lib/libarchive/patches/archive_platform.h.patch [deleted file]
usr.bin/tar/Makefile
usr.bin/tar/patches/bsdtar_platform.h.patch [deleted file]

index 37102e1..5a2a011 100644 (file)
@@ -1,9 +1,8 @@
 # $FreeBSD: src/lib/libarchive/Makefile,v 1.50 2006/09/05 05:59:45 kientzle Exp $
-# $DragonFly: src/lib/libarchive/Makefile,v 1.9 2007/04/27 22:56:18 pavalos Exp $
+# $DragonFly: src/lib/libarchive/Makefile,v 1.10 2007/04/28 16:16:31 pavalos Exp $
 
 LIB=   archive
 
-PATCHES!=      echo ${.CURDIR}/patches/*.patch
 CONTRIBDIR=    ${.CURDIR}/../../contrib/libarchive-2.1/libarchive
 .PATH: ${CONTRIBDIR}
 
@@ -11,7 +10,7 @@ VERSION!=     cat ${CONTRIBDIR}/../version
 ARCHIVE_API_MAJOR!=    echo ${VERSION} | sed -e 's/[^0-9]/./g' -e 's/\..*//'
 ARCHIVE_API_MINOR!=    echo ${VERSION} | sed -e 's/[^0-9]/./g' -e 's/[0-9]*\.//' -e 's/\..*//'
 SHLIB_MAJOR=   5
-CFLAGS+=       -DHAVE_CONFIG_H
+CFLAGS+=       -DPLATFORM_CONFIG_H=\"config.h\"
 CFLAGS+=       -I${.OBJDIR} -I${.CURDIR} -I${CONTRIBDIR} -I-
 WARNS?=        6
 
@@ -65,8 +64,6 @@ SRCS= archive.h                                       \
        archive_write_set_format_ustar.c                \
        filter_fork.c
 
-SRCS+= ${PATCHES}
-
 MAN=   archive_entry.3                                 \
        archive_read.3                                  \
        archive_util.3                                  \
diff --git a/lib/libarchive/patches/archive_platform.h.patch b/lib/libarchive/patches/archive_platform.h.patch
deleted file mode 100644 (file)
index 1b46d51..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-$DragonFly: src/lib/libarchive/patches/Attic/archive_platform.h.patch,v 1.5 2007/04/27 22:56:18 pavalos Exp $
---- archive_platform.h.orig    2007-04-22 16:12:59.000000000 -0400
-+++ archive_platform.h 2007-04-22 16:13:09.000000000 -0400
-@@ -41,7 +41,7 @@
- #include PLATFORM_CONFIG_H
- #elif defined(HAVE_CONFIG_H)
- /* Most POSIX platforms use the 'configure' script to build config.h */
--#include "../config.h"
-+#include "config.h"
- #else
- /* Warn if the library hasn't been (automatically or manually) configured. */
- #error Oops: No config.h and no pre-built configuration in archive_platform.h.
index 0088506..eaf5b34 100644 (file)
@@ -1,4 +1,4 @@
-# $DragonFly: src/usr.bin/tar/Makefile,v 1.8 2007/04/27 22:56:18 pavalos Exp $
+# $DragonFly: src/usr.bin/tar/Makefile,v 1.9 2007/04/28 16:16:31 pavalos Exp $
 
 PROG=  bsdtar
 SRCS=  bsdtar.c getdate.y matching.c read.c tree.c util.c write.c
@@ -7,12 +7,10 @@ DPADD=        ${LIBARCHIVE} ${LIBBZ2} ${LIBZ}
 LDADD= -larchive -lbz2 -lz
 NOSHARED?=     yes
 
-PATCHES!=      echo ${.CURDIR}/patches/*.patch
 CONTRIBDIR=    ${.CURDIR}/../../contrib/libarchive-2.1/tar
 .PATH: ${CONTRIBDIR}
-SRCS+= ${PATCHES}
 CFLAGS+=       -I${.OBJDIR} -I${.CURDIR}/../../lib/libarchive -I${CONTRIBDIR} -I-
-CFLAGS+=       -DHAVE_CONFIG_H
+CFLAGS+=       -DPLATFORM_CONFIG_H=\"config.h\"
 
 SYMLINKS=      ${BINDIR}/bsdtar ${BINDIR}/tar
 MLINKS=        bsdtar.1 tar.1
diff --git a/usr.bin/tar/patches/bsdtar_platform.h.patch b/usr.bin/tar/patches/bsdtar_platform.h.patch
deleted file mode 100644 (file)
index 7832992..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-$DragonFly: src/usr.bin/tar/patches/Attic/bsdtar_platform.h.patch,v 1.2 2007/04/27 22:56:18 pavalos Exp $
---- bsdtar_platform.h.orig     2007-04-22 16:19:24.000000000 -0400
-+++ bsdtar_platform.h  2007-04-22 16:19:35.000000000 -0400
-@@ -39,7 +39,7 @@
- #include PLATFORM_CONFIG_H
- #elif defined(HAVE_CONFIG_H)
- /* Most POSIX platforms use the 'configure' script to build config.h */
--#include "../config.h"
-+#include "config.h"
- #else
- /* Warn if bsdtar hasn't been (automatically or manually) configured. */
- #error Oops: No config.h and no built-in configuration in bsdtar_platform.h.