diff options
| author | gjb <gjb@FreeBSD.org> | 2013-10-09 17:07:20 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2013-10-09 17:07:20 +0000 |
| commit | c5342bffee8407caeac0b651549206d534dfccb9 (patch) | |
| tree | ca04a5cf90c8299963a38ecf5beb3ec437b5f1b1 /share | |
| parent | b33524a23e69ae8f48928d5b941a9a25a4609f30 (diff) | |
| download | FreeBSD-src-c5342bffee8407caeac0b651549206d534dfccb9.zip FreeBSD-src-c5342bffee8407caeac0b651549206d534dfccb9.tar.gz | |
Revert r256095, r256120 (partial), r256121:
r256095:
- Add gnu/usr.bin/rcs back to the base system.
r256120:
- Add WITHOUT_RCS back to src.conf.5.
r256121:
- Remove UPDATING entry regarding gnu/usr.bin/rcs removal.
Requested by: many
Approved by: re (marius)
Discussed with: core
Diffstat (limited to 'share')
| -rw-r--r-- | share/doc/psd/13.rcs/Makefile | 6 | ||||
| -rw-r--r-- | share/doc/psd/13.rcs/Makefile.inc | 5 | ||||
| -rw-r--r-- | share/doc/psd/13.rcs/rcs/Makefile | 7 | ||||
| -rw-r--r-- | share/doc/psd/13.rcs/rcs_func/Makefile | 6 | ||||
| -rw-r--r-- | share/doc/psd/Makefile | 1 | ||||
| -rw-r--r-- | share/man/man5/src.conf.5 | 5 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 1 |
7 files changed, 31 insertions, 0 deletions
diff --git a/share/doc/psd/13.rcs/Makefile b/share/doc/psd/13.rcs/Makefile new file mode 100644 index 0000000..ed497da --- /dev/null +++ b/share/doc/psd/13.rcs/Makefile @@ -0,0 +1,6 @@ +# $FreeBSD$ + +SUBDIR= rcs rcs_func + +.include <bsd.subdir.mk> + diff --git a/share/doc/psd/13.rcs/Makefile.inc b/share/doc/psd/13.rcs/Makefile.inc new file mode 100644 index 0000000..666dbd8 --- /dev/null +++ b/share/doc/psd/13.rcs/Makefile.inc @@ -0,0 +1,5 @@ +# $FreeBSD$ + +VOLUME= psd/13.rcs +MACROS= -ms +SRCDIR= ${.CURDIR}/../../../../../gnu/usr.bin/rcs/doc diff --git a/share/doc/psd/13.rcs/rcs/Makefile b/share/doc/psd/13.rcs/rcs/Makefile new file mode 100644 index 0000000..6d94aed --- /dev/null +++ b/share/doc/psd/13.rcs/rcs/Makefile @@ -0,0 +1,7 @@ +# $FreeBSD$ + +SRCS= rcs.ms +USE_PIC= +USE_TBL= + +.include <bsd.doc.mk> diff --git a/share/doc/psd/13.rcs/rcs_func/Makefile b/share/doc/psd/13.rcs/rcs_func/Makefile new file mode 100644 index 0000000..09e5a9b --- /dev/null +++ b/share/doc/psd/13.rcs/rcs_func/Makefile @@ -0,0 +1,6 @@ +# $FreeBSD$ + +DOC= rcs_func +SRCS= rcs_func.ms + +.include <bsd.doc.mk> diff --git a/share/doc/psd/Makefile b/share/doc/psd/Makefile index 0222c64..243ba99 100644 --- a/share/doc/psd/Makefile +++ b/share/doc/psd/Makefile @@ -20,6 +20,7 @@ SUBDIR= title \ 05.sysman \ 06.Clang \ 12.make \ + 13.rcs \ 15.yacc \ 16.lex \ 17.m4 \ diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index a176bb7..aad4004 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -909,6 +909,11 @@ This includes .Xr rlogin 1 , .Xr rsh 1 , etc. +.It Va WITHOUT_RCS +.\" from FreeBSD: head/tools/build/options/WITHOUT_RCS 156932 2006-03-21 07:50:50Z ru +Set to not build +.Xr rcs 1 +and related utilities. .It Va WITHOUT_RESCUE .\" from FreeBSD: head/tools/build/options/WITHOUT_RESCUE 156932 2006-03-21 07:50:50Z ru Set to not build diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 5642c6e..a1b6c44 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -334,6 +334,7 @@ __DEFAULT_YES_OPTIONS = \ PROFILE \ QUOTAS \ RCMDS \ + RCS \ RESCUE \ ROUTED \ SENDMAIL \ |
