Date: Tue, 29 Jan 2013 17:38:58 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246078 - in projects/physbio: . gnu/usr.bin/patch share/man/man5 share/mk sys/arm/conf tools/build/options tools/regression/bin/sh/errors usr.bin usr.bin/patch usr.sbin/bsdinstall/part... Message-ID: <201301291738.r0THcw4S088379@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kib Date: Tue Jan 29 17:38:58 2013 New Revision: 246078 URL: http://svnweb.freebsd.org/changeset/base/246078 Log: MFH Added: projects/physbio/tools/build/options/WITH_BSD_PATCH - copied unchanged from r246077, head/tools/build/options/WITH_BSD_PATCH projects/physbio/usr.bin/patch/ - copied from r246077, head/usr.bin/patch/ Modified: projects/physbio/UPDATING projects/physbio/gnu/usr.bin/patch/Makefile projects/physbio/share/man/man5/src.conf.5 projects/physbio/share/mk/bsd.own.mk projects/physbio/usr.bin/Makefile Directory Properties: projects/physbio/ (props changed) projects/physbio/sys/ (props changed) projects/physbio/sys/arm/conf/VERSATILEPB (props changed) projects/physbio/tools/regression/bin/sh/errors/write-error1.0 (props changed) projects/physbio/usr.sbin/bsdinstall/partedit/sade.8 (props changed) projects/physbio/usr.sbin/pkg/dns_utils.c (props changed) Modified: projects/physbio/UPDATING ============================================================================== --- projects/physbio/UPDATING Tue Jan 29 17:22:53 2013 (r246077) +++ projects/physbio/UPDATING Tue Jan 29 17:38:58 2013 (r246078) @@ -26,6 +26,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20130129: + A BSD-licensed patch(1) variant has been added and is installed + as bsdpatch, being the GNU version the default patch. + To inverse the logic and use the BSD-licensed one as default, + while having the GNU version installed as gnupatch, rebuild + ans install world with the WITH_BSD_PATCH knob set. + 20130118: The install(1) option -M has changed meaning and now takes an argument that is a file or path to append logs to. In the Modified: projects/physbio/gnu/usr.bin/patch/Makefile ============================================================================== --- projects/physbio/gnu/usr.bin/patch/Makefile Tue Jan 29 17:22:53 2013 (r246077) +++ projects/physbio/gnu/usr.bin/patch/Makefile Tue Jan 29 17:38:58 2013 (r246078) @@ -1,6 +1,17 @@ # $FreeBSD$ -PROG= patch +.include <bsd.own.mk> + +.if ${MK_BSD_PATCH} == "yes" +PROG= gnupatch +CLEANFILES+= gnupatch.1 + +gnupatch.1: patch.1 + cp ${.ALLSRC} ${.TARGET} +.else +PROG= patch +.endif + SRCS= backupfile.c inp.c patch.c pch.c util.c version.c CFLAGS+=-DHAVE_CONFIG_H Modified: projects/physbio/share/man/man5/src.conf.5 ============================================================================== --- projects/physbio/share/man/man5/src.conf.5 Tue Jan 29 17:22:53 2013 (r246077) +++ projects/physbio/share/man/man5/src.conf.5 Tue Jan 29 17:38:58 2013 (r246078) @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 236279 2012-05-30 02:37:20Z gjb .\" $FreeBSD$ -.Dd January 17, 2013 +.Dd January 29, 2013 .Dt SRC.CONF 5 .Os .Sh NAME @@ -100,6 +100,9 @@ Set to not build .Xr apm 8 , .Xr apmd 8 and related programs. +.It Va WITH_ARM_EABI +.\" from FreeBSD: head/tools/build/options/WITH_ARM_EABI 245539 2013-01-17 05:56:28Z andrew +Set the ARM ABI to EABI. .It Va WITHOUT_ASSERT_DEBUG .\" from FreeBSD: head/tools/build/options/WITHOUT_ASSERT_DEBUG 162215 2006-09-11 13:55:27Z ru Set to compile programs and libraries without the @@ -242,6 +245,9 @@ Set to not build the BSD licensed versio .It Va WITH_BSD_GREP .\" from FreeBSD: head/tools/build/options/WITH_BSD_GREP 222273 2011-05-25 01:04:12Z obrien Install BSD-licensed grep as '[ef]grep' instead of GNU grep. +.It Va WITH_BSD_PATCH +.\" from FreeBSD: head/tools/build/options/WITH_BSD_PATCH 246074 2013-01-29 17:03:18Z gabor +Install BSD-licensed patch as 'patch' instead of GNU patch. .It Va WITHOUT_BSNMP .\" from FreeBSD: head/tools/build/options/WITHOUT_BSNMP 183306 2008-09-23 16:15:42Z sam Set to not build or install @@ -476,9 +482,6 @@ Set to not build GPIB bus support. Set to not build .Xr gpioctl 8 as part of the base system. -.It Va WITH_GPL_DTC -Set to build the GPL'd version of the device tree compiler from elinux.org, -instead of the BSD licensed one. .It Va WITHOUT_GROFF .\" from FreeBSD: head/tools/build/options/WITHOUT_GROFF 218941 2011-02-22 08:13:49Z uqs Set to not build @@ -888,6 +891,11 @@ Set to build some programs without PAM s .Xr ftpd 8 and .Xr ppp 8 . +.It Va WITHOUT_PC_SYSINSTALL +.\" from FreeBSD: head/tools/build/options/WITHOUT_PC_SYSINSTALL 245606 2013-01-18 15:57:09Z eadler +Set to not build +.Xr pc-sysinstall 8 +and related programs. .It Va WITHOUT_PF .\" from FreeBSD: head/tools/build/options/WITHOUT_PF 156932 2006-03-21 07:50:50Z ru Set to not build PF firewall package. Modified: projects/physbio/share/mk/bsd.own.mk ============================================================================== --- projects/physbio/share/mk/bsd.own.mk Tue Jan 29 17:22:53 2013 (r246077) +++ projects/physbio/share/mk/bsd.own.mk Tue Jan 29 17:38:58 2013 (r246078) @@ -354,6 +354,7 @@ __DEFAULT_YES_OPTIONS = \ __DEFAULT_NO_OPTIONS = \ ARM_EABI \ + BSD_PATCH \ BIND_IDN \ BIND_LARGE_FILE \ BIND_LIBS \ Copied: projects/physbio/tools/build/options/WITH_BSD_PATCH (from r246077, head/tools/build/options/WITH_BSD_PATCH) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/physbio/tools/build/options/WITH_BSD_PATCH Tue Jan 29 17:38:58 2013 (r246078, copy of r246077, head/tools/build/options/WITH_BSD_PATCH) @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Install BSD-licensed patch as 'patch' instead of GNU patch. Modified: projects/physbio/usr.bin/Makefile ============================================================================== --- projects/physbio/usr.bin/Makefile Tue Jan 29 17:22:53 2013 (r246077) +++ projects/physbio/usr.bin/Makefile Tue Jan 29 17:38:58 2013 (r246078) @@ -123,6 +123,7 @@ SUBDIR= alias \ pagesize \ passwd \ paste \ + patch \ pathchk \ perror \ pr \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301291738.r0THcw4S088379>