Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 22 Jan 2010 23:19:48 +0000 (UTC)
From:      Xin LI <delphij@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r202843 - in head: . etc/mtree share/doc/usd share/doc/usd/05.dc share/doc/usd/06.bc usr.bin/bc usr.bin/bc/USD.doc usr.bin/dc usr.bin/dc/USD.doc
Message-ID:  <201001222319.o0MNJmaO019750@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: delphij
Date: Fri Jan 22 23:19:48 2010
New Revision: 202843
URL: http://svn.freebsd.org/changeset/base/202843

Log:
  Move USD documents from /usr/share/doc/papers to to /usr/share/doc/usd.
  
  Reviewed by:	gabor

Added:
  head/share/doc/usd/05.dc/
  head/share/doc/usd/05.dc/Makefile   (contents, props changed)
  head/share/doc/usd/06.bc/
  head/share/doc/usd/06.bc/Makefile   (contents, props changed)
Deleted:
  head/usr.bin/bc/USD.doc/Makefile
  head/usr.bin/dc/USD.doc/Makefile
Modified:
  head/ObsoleteFiles.inc
  head/etc/mtree/BSD.usr.dist
  head/share/doc/usd/Makefile
  head/usr.bin/bc/Makefile
  head/usr.bin/dc/Makefile

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Fri Jan 22 23:19:33 2010	(r202842)
+++ head/ObsoleteFiles.inc	Fri Jan 22 23:19:48 2010	(r202843)
@@ -14,6 +14,9 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20100122: move BSDL bc/dc USD documents to /usr/share/doc/usd
+OLD_FILES+=usr/share/doc/papers/bc.ascii.gz
+OLD_FILES+=usr/share/doc/papers/dc.ascii.gz
 # 20100120: replacing GNU bc/dc with BSDL versions
 OLD_FILES+=usr/share/examples/bc/ckbook.b
 OLD_FILES+=usr/share/examples/bc/pi.b

Modified: head/etc/mtree/BSD.usr.dist
==============================================================================
--- head/etc/mtree/BSD.usr.dist	Fri Jan 22 23:19:33 2010	(r202842)
+++ head/etc/mtree/BSD.usr.dist	Fri Jan 22 23:19:48 2010	(r202843)
@@ -160,6 +160,10 @@
             usd
                 04.csh
                 ..
+                05.dc
+                ..
+                06.bc
+                ..
                 07.mail
                 ..
                 10.exref

Added: head/share/doc/usd/05.dc/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/doc/usd/05.dc/Makefile	Fri Jan 22 23:19:48 2010	(r202843)
@@ -0,0 +1,9 @@
+#	@(#)Makefile	8.1 (Berkeley) 6/8/93
+# $FreeBSD$
+
+VOLUME=	usd/05.dc
+SRCS=	dc
+MACROS=	-ms
+SRCDIR=	${.CURDIR}/../../../../usr.bin/dc/USD.doc
+
+.include <bsd.doc.mk>

Added: head/share/doc/usd/06.bc/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/share/doc/usd/06.bc/Makefile	Fri Jan 22 23:19:48 2010	(r202843)
@@ -0,0 +1,9 @@
+#	@(#)Makefile	8.1 (Berkeley) 6/8/93
+# $FreeBSD$
+
+VOLUME=	usd/06.bc
+SRCS=	bc
+MACROS=	-ms
+SRCDIR=	${.CURDIR}/../../../../usr.bin/bc/USD.doc
+
+.include <bsd.doc.mk>

Modified: head/share/doc/usd/Makefile
==============================================================================
--- head/share/doc/usd/Makefile	Fri Jan 22 23:19:33 2010	(r202842)
+++ head/share/doc/usd/Makefile	Fri Jan 22 23:19:48 2010	(r202843)
@@ -7,6 +7,8 @@
 SUBDIR=	title \
 	contents \
 	04.csh \
+	05.dc \
+	06.bc \
 	07.mail \
 	10.exref \
 	11.vitut \

Modified: head/usr.bin/bc/Makefile
==============================================================================
--- head/usr.bin/bc/Makefile	Fri Jan 22 23:19:33 2010	(r202842)
+++ head/usr.bin/bc/Makefile	Fri Jan 22 23:19:48 2010	(r202843)
@@ -4,7 +4,6 @@
 PROG=		bc
 SRCS=		bc.y scan.l
 CFLAGS+=	-I. -I${.CURDIR}
-SUBDIR+=	USD.doc
 
 FILES+=		bc.library
 FILESDIR=	${SHAREDIR}/misc

Modified: head/usr.bin/dc/Makefile
==============================================================================
--- head/usr.bin/dc/Makefile	Fri Jan 22 23:19:33 2010	(r202842)
+++ head/usr.bin/dc/Makefile	Fri Jan 22 23:19:48 2010	(r202843)
@@ -6,6 +6,4 @@ SRCS=	dc.c bcode.c inout.c mem.c stack.c
 LDADD=	-lcrypto
 DPADD=	${LIBCRYPTO}
 
-SUBDIR+=	USD.doc
-
 .include <bsd.prog.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001222319.o0MNJmaO019750>