Module Name: src
Committed By: wiz
Date: Mon May 7 00:35:35 UTC 2012
Modified Files:
src/doc: 3RDPARTY
src/lib/libbz2: Makefile
src/tests/usr.bin/bzip2: Makefile
src/usr.bin/bzip2: Makefile
src/usr.bin/bzip2recover: Makefile
Removed Files:
src/dist/bzip2: CHANGES LICENSE Makefile Makefile-libbz2_so README
README.COMPILATION.PROBLEMS README.XML.STUFF blocksort.c
bz-common.xsl bz-fo.xsl bz-html.xsl bzdiff bzdiff.1 bzgrep bzgrep.1
bzip.css bzip2.1 bzip2.c bzip2netbsd bzip2recover.c bzlib.c bzlib.h
bzlib_private.h bzmore bzmore.1 compress.c crctable.c decompress.c
dlltest.c dlltest.dsp entities.xml format.pl huffman.c libbz2.def
libbz2.dsp makefile.msc manual.html manual.xml mk251.c randtable.c
sample1.bz2 sample1.ref sample2.bz2 sample2.ref sample3.bz2
sample3.ref spewG.c unzcrash.c words0 words1 words2 words3
xmlproc.sh
Log Message:
Finish move of bzip2 from dist/bzip2 to external/bsd/bzip2.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r0 src/dist/bzip2/CHANGES src/dist/bzip2/LICENSE \
src/dist/bzip2/Makefile src/dist/bzip2/Makefile-libbz2_so \
src/dist/bzip2/README src/dist/bzip2/README.COMPILATION.PROBLEMS \
src/dist/bzip2/blocksort.c src/dist/bzip2/bzlib.h \
src/dist/bzip2/compress.c src/dist/bzip2/crctable.c \
src/dist/bzip2/dlltest.c src/dist/bzip2/huffman.c \
src/dist/bzip2/randtable.c src/dist/bzip2/words3
cvs rdiff -u -r1.1.1.1 -r0 src/dist/bzip2/README.XML.STUFF \
src/dist/bzip2/bz-common.xsl src/dist/bzip2/bz-fo.xsl \
src/dist/bzip2/bz-html.xsl src/dist/bzip2/bzip.css src/dist/bzip2/bzmore \
src/dist/bzip2/dlltest.dsp src/dist/bzip2/entities.xml \
src/dist/bzip2/format.pl src/dist/bzip2/libbz2.def \
src/dist/bzip2/libbz2.dsp src/dist/bzip2/manual.xml \
src/dist/bzip2/sample1.bz2 src/dist/bzip2/sample1.ref \
src/dist/bzip2/sample2.bz2 src/dist/bzip2/sample2.ref \
src/dist/bzip2/sample3.bz2 src/dist/bzip2/sample3.ref \
src/dist/bzip2/words1 src/dist/bzip2/xmlproc.sh
cvs rdiff -u -r1.1.1.2 -r0 src/dist/bzip2/bzdiff src/dist/bzip2/bzdiff.1 \
src/dist/bzip2/bzgrep src/dist/bzip2/bzgrep.1 src/dist/bzip2/bzmore.1 \
src/dist/bzip2/makefile.msc src/dist/bzip2/manual.html \
src/dist/bzip2/mk251.c src/dist/bzip2/spewG.c src/dist/bzip2/unzcrash.c \
src/dist/bzip2/words0 src/dist/bzip2/words2
cvs rdiff -u -r1.9 -r0 src/dist/bzip2/bzip2.1 src/dist/bzip2/bzip2.c \
src/dist/bzip2/bzip2recover.c
cvs rdiff -u -r1.3 -r0 src/dist/bzip2/bzip2netbsd
cvs rdiff -u -r1.4 -r0 src/dist/bzip2/bzlib.c
cvs rdiff -u -r1.2 -r0 src/dist/bzip2/bzlib_private.h \
src/dist/bzip2/decompress.c
cvs rdiff -u -r1.935 -r1.936 src/doc/3RDPARTY
cvs rdiff -u -r1.15 -r1.16 src/lib/libbz2/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/bzip2/Makefile
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/bzip2/Makefile
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/bzip2recover/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.935 src/doc/3RDPARTY:1.936
--- src/doc/3RDPARTY:1.935 Wed May 2 02:44:20 2012
+++ src/doc/3RDPARTY Mon May 7 00:35:25 2012
@@ -1,4 +1,4 @@
-# $NetBSD: 3RDPARTY,v 1.935 2012/05/02 02:44:20 christos Exp $
+# $NetBSD: 3RDPARTY,v 1.936 2012/05/07 00:35:25 wiz Exp $
#
# This file contains a list of the software that has been integrated into
# NetBSD where we are not the primary maintainer.
@@ -188,16 +188,16 @@ See /usr/src/external/bsd/byacc/byacc2ne
Package: bzip2
Version: 1.0.5
-Current Vers: 1.0.5
+Current Vers: 1.0.6
Maintainer: Julian Seward <[email protected]>
Archive Site: http://sources.redhat.com/bzip2/
Home Page: http://www.bzip.org/
Mailing List:
Responsible:
License: BSD (4-clause)
-Location: dist/bzip2
+Location: external/bsd/bzip2
Notes:
-See /usr/src/dist/bzip2/bzip2netbsd for update instructions.
+See /usr/src/external/bsd/bzip2/bzip2netbsd for update instructions.
Package: Citrus XPG4DL
Version:
Index: src/lib/libbz2/Makefile
diff -u src/lib/libbz2/Makefile:1.15 src/lib/libbz2/Makefile:1.16
--- src/lib/libbz2/Makefile:1.15 Mon Jun 20 06:52:37 2011
+++ src/lib/libbz2/Makefile Mon May 7 00:35:26 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2011/06/20 06:52:37 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2012/05/07 00:35:26 wiz Exp $
USE_FORT?= yes # data driven bugs?
@@ -7,7 +7,7 @@ NOMAN= # defined
.include <bsd.own.mk>
LIB= bz2
-DIST= ${NETBSDSRCDIR}/dist/bzip2
+DIST= ${NETBSDSRCDIR}/external/bsd/bzip2
.PATH: ${DIST}
SRCS= blocksort.c huffman.c crctable.c randtable.c compress.c \
Index: src/tests/usr.bin/bzip2/Makefile
diff -u src/tests/usr.bin/bzip2/Makefile:1.1 src/tests/usr.bin/bzip2/Makefile:1.2
--- src/tests/usr.bin/bzip2/Makefile:1.1 Sat Mar 17 16:33:12 2012
+++ src/tests/usr.bin/bzip2/Makefile Mon May 7 00:35:26 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:12 jruoho Exp $
+# $NetBSD: Makefile,v 1.2 2012/05/07 00:35:26 wiz Exp $
NOMAN= # defined
@@ -8,7 +8,7 @@ TESTSDIR= ${TESTSBASE}/usr.bin/bzip2
TESTS_SH= t_bzip2
-DIST= ${NETBSDSRCDIR}/dist/bzip2
+DIST= ${NETBSDSRCDIR}/external/bsd/bzip2
.PATH: ${DIST}
FILESDIR= ${TESTSDIR}
Index: src/usr.bin/bzip2/Makefile
diff -u src/usr.bin/bzip2/Makefile:1.10 src/usr.bin/bzip2/Makefile:1.11
--- src/usr.bin/bzip2/Makefile:1.10 Mon May 28 12:06:24 2007
+++ src/usr.bin/bzip2/Makefile Mon May 7 00:35:26 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/05/28 12:06:24 tls Exp $
+# $NetBSD: Makefile,v 1.11 2012/05/07 00:35:26 wiz Exp $
.include <bsd.own.mk> # for MKDYNAMICROOT definition
@@ -17,7 +17,7 @@ LDSTATIC?= -static
CPPFLAGS+= -DSMALL
.endif
-DIST= ${NETBSDSRCDIR}/dist/bzip2
+DIST= ${NETBSDSRCDIR}/external/bsd/bzip2
.PATH: ${DIST}
MLINKS+= bzip2.1 bunzip2.1\
Index: src/usr.bin/bzip2recover/Makefile
diff -u src/usr.bin/bzip2recover/Makefile:1.8 src/usr.bin/bzip2recover/Makefile:1.9
--- src/usr.bin/bzip2recover/Makefile:1.8 Mon May 28 12:06:25 2007
+++ src/usr.bin/bzip2recover/Makefile Mon May 7 00:35:26 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/05/28 12:06:25 tls Exp $
+# $NetBSD: Makefile,v 1.9 2012/05/07 00:35:26 wiz Exp $
USE_FORT?= yes # data-driven bugs?
NOMAN= # defined
@@ -11,7 +11,7 @@ PROG= bzip2recover
LDSTATIC?= -static
.endif
-DIST= ${NETBSDSRCDIR}/dist/bzip2
+DIST= ${NETBSDSRCDIR}/external/bsd/bzip2
.PATH: ${DIST}
.include <bsd.prog.mk>
