Date: Thu, 29 Aug 2013 00:38:25 +0000 (UTC) From: "Pedro F. Giffuni" <pfg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255014 - in head: gnu/usr.bin/patch share/mk tools/build/options usr.bin/patch Message-ID: <201308290038.r7T0cPXZ005138@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pfg Date: Thu Aug 29 00:38:24 2013 New Revision: 255014 URL: http://svnweb.freebsd.org/changeset/base/255014 Log: Drop build option switch for the older GNU patch. As promised, drop the option to make the older GNU patch the default. GNU patch is still being built but something drastic may happen to it to it before Release. Deleted: head/tools/build/options/WITH_GNU_PATCH Modified: head/gnu/usr.bin/patch/Makefile head/share/mk/bsd.own.mk head/usr.bin/patch/Makefile Modified: head/gnu/usr.bin/patch/Makefile ============================================================================== --- head/gnu/usr.bin/patch/Makefile Wed Aug 28 23:59:38 2013 (r255013) +++ head/gnu/usr.bin/patch/Makefile Thu Aug 29 00:38:24 2013 (r255014) @@ -1,16 +1,10 @@ # $FreeBSD$ -.include <bsd.own.mk> - -.if ${MK_GNU_PATCH} == "yes" -PROG= patch -.else PROG= gnupatch CLEANFILES+= gnupatch.1 gnupatch.1: patch.1 cp ${.ALLSRC} ${.TARGET} -.endif SRCS= backupfile.c inp.c patch.c pch.c util.c version.c CFLAGS+=-DHAVE_CONFIG_H Modified: head/share/mk/bsd.own.mk ============================================================================== --- head/share/mk/bsd.own.mk Wed Aug 28 23:59:38 2013 (r255013) +++ head/share/mk/bsd.own.mk Thu Aug 29 00:38:24 2013 (r255014) @@ -373,7 +373,6 @@ __DEFAULT_NO_OPTIONS = \ CLANG_EXTRAS \ CTF \ DEBUG_FILES \ - GNU_PATCH \ GPL_DTC \ HESIOD \ LIBICONV_COMPAT \ Modified: head/usr.bin/patch/Makefile ============================================================================== --- head/usr.bin/patch/Makefile Wed Aug 28 23:59:38 2013 (r255013) +++ head/usr.bin/patch/Makefile Thu Aug 29 00:38:24 2013 (r255014) @@ -1,17 +1,7 @@ # $OpenBSD: Makefile,v 1.4 2005/05/16 15:22:46 espie Exp $ # $FreeBSD$ -.include <bsd.own.mk> - -.if ${MK_GNU_PATCH} == "yes" -PROG= bsdpatch -CLEANFILES+= bsdpatch.1 - -bsdpatch.1: patch.1 - cp ${.ALLSRC} ${.TARGET} -.else PROG= patch -.endif SRCS= backupfile.c inp.c mkpath.c patch.c pch.c util.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308290038.r7T0cPXZ005138>