From 93fce1234e0061be140b3256ae17165721dbcf1b Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Mon, 20 Sep 2004 22:03:17 +0000 Subject: [PATCH] Hook the new bc and dc into the tree. Unhook the old gnu bc/dc and add entries to the upgrade target to remove obsolete examples and documentation. Submitted-by: Sascha Wildner --- etc/Makefile | 10 +++++++++- etc/mtree/BSD.usr.dist | 8 +++++--- gnu/usr.bin/Makefile | 6 +++--- share/doc/usd/Makefile | 12 ++++++------ usr.bin/Makefile | 6 ++++-- 5 files changed, 27 insertions(+), 15 deletions(-) diff --git a/etc/Makefile b/etc/Makefile index 82ffdb9491..5e9c3b2ed5 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,6 +1,6 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 # $FreeBSD: src/etc/Makefile,v 1.219.2.38 2003/03/04 09:49:00 ru Exp $ -# $DragonFly: src/etc/Makefile,v 1.26 2004/08/13 05:30:02 dillon Exp $ +# $DragonFly: src/etc/Makefile,v 1.27 2004/09/20 22:03:11 dillon Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -141,6 +141,14 @@ upgrade_etc: rm -f ${DESTDIR}/usr/sbin/prebind ldconfig -R .endif +.if exists(${DESTDIR}/usr/share/examples/bc) + rm -rf ${DESTDIR}/usr/share/examples/bc +.endif +.if exists(${DESTDIR}/usr/share/info/dc.info.gz) + gzip -d ${DESTDIR}/usr/share/info/dc.info.gz + install-info --delete ${DESTDIR}/usr/share/info/dc.info ${DESTDIR}/usr/share/info/dir + rm -f ${DESTDIR}/usr/share/info/dc.info ${DESTDIR}/usr/share/info/dc.info.gz +.endif distribution: cd ${.CURDIR}; \ diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 3b2fe60b06..9cd61b214f 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -1,5 +1,5 @@ # $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.188.2.40 2003/02/14 22:38:14 nectar Exp $ -# $DragonFly: src/etc/mtree/BSD.usr.dist,v 1.17 2004/08/30 06:17:16 asmodai Exp $ +# $DragonFly: src/etc/mtree/BSD.usr.dist,v 1.18 2004/09/20 22:03:12 dillon Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -267,6 +267,10 @@ usd 04.csh .. + 05.dc + .. + 06.bc + .. 07.mail .. 10.exref @@ -298,8 +302,6 @@ .. atm .. - bc - .. bootforth .. cvs diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index 9373d805c6..ccdf809954 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -1,11 +1,11 @@ # $FreeBSD: src/gnu/usr.bin/Makefile,v 1.51 2000/01/16 00:11:34 obrien Exp $ -# $DragonFly: src/gnu/usr.bin/Makefile,v 1.10 2004/06/26 02:56:48 drhodus Exp $ +# $DragonFly: src/gnu/usr.bin/Makefile,v 1.11 2004/09/20 22:03:14 dillon Exp $ # # Note that gcc2 is only built under the i386 architecture. Other # architectures require gcc3. -SUBDIR= bc cpio dc dialog diff diff3 gperf grep groff gzip man patch ptx rcs \ - sdiff send-pr sort tar texinfo +SUBDIR= cpio dialog diff diff3 gperf grep groff gzip man patch ptx rcs sdiff \ + send-pr sort tar texinfo .if !defined(NO_CVS) SUBDIR+=cvs diff --git a/share/doc/usd/Makefile b/share/doc/usd/Makefile index ac0ffe3546..a2aaca0b6c 100644 --- a/share/doc/usd/Makefile +++ b/share/doc/usd/Makefile @@ -1,17 +1,17 @@ # From: @(#)Makefile 8.2 (Berkeley) 4/20/94 # $FreeBSD: src/share/doc/usd/Makefile,v 1.8.2.2 2002/07/24 12:48:41 ru Exp $ -# $DragonFly: src/share/doc/usd/Makefile,v 1.2 2003/06/17 04:36:57 dillon Exp $ +# $DragonFly: src/share/doc/usd/Makefile,v 1.3 2004/09/20 22:03:16 dillon Exp $ # The following modules are encumbered: -# 01.begin 02.learn 03.shell 05.dc 06.bc 09.edtut 10.edadv 15.sed 16.awk -# 17.msmacros 21.troff 22.trofftut 23.eqn 24.eqnguide 25.tbl 26.refer -# 27.invert 28.bib 29.diction +# 01.begin 02.learn 03.shell 09.edtut 10.edadv 15.sed 16.awk 17.msmacros +# 21.troff 22.trofftut 23.eqn 24.eqnguide 25.tbl 26.refer 27.invert +# 28.bib 29.diction # The following modules are not provided: # 14.jove -SUBDIR= title contents 04.csh 07.mail 10.exref 11.vitut 12.vi 13.viref \ - 18.msdiffs 19.memacros 20.meref +SUBDIR= title contents 04.csh 05.dc 06.bc 07.mail 10.exref 11.vitut 12.vi \ + 13.viref 18.msdiffs 19.memacros 20.meref .if exists(${.CURDIR}/../../../games) && !defined(NOGAMES) SUBDIR+=30.rogue 31.trek diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 25bdd23385..34e93b0496 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -1,11 +1,11 @@ # From: @(#)Makefile 8.3 (Berkeley) 1/7/94 # $FreeBSD: src/usr.bin/Makefile,v 1.144.2.17 2003/01/04 17:17:07 obrien Exp $ -# $DragonFly: src/usr.bin/Makefile,v 1.18 2004/09/04 04:00:39 dillon Exp $ +# $DragonFly: src/usr.bin/Makefile,v 1.19 2004/09/20 22:03:17 dillon Exp $ # XXX MISSING: deroff diction graph learn plot # spell spline struct xsend # XXX broken: tconv -# XXX Use GNU versions: apropos bc dc diff grep ld man patch ptx uucp whatis +# XXX Use GNU versions: apropos diff grep ld man patch ptx uucp whatis # Moved to secure: bdes # SUBDIR= alias \ @@ -15,6 +15,7 @@ SUBDIR= alias \ asa \ banner \ basename \ + bc \ biff \ brandelf \ bzip2 \ @@ -43,6 +44,7 @@ SUBDIR= alias \ csplit \ ctags \ cut \ + dc \ dirname \ du \ ee \ -- 2.41.0