Remove a few files that are not needed for FreeBSD.

PR:		bin/171555
Approved by:	obrien

5 files changed, 3 insertions, 515 deletions

diff --git a/contrib/bzip2/FREEBSD-Xlist b/contrib/bzip2/FREEBSD-Xlist
index 2725621..6c3c9b2 100644
--- a/contrib/bzip2/FREEBSD-Xlist
+++ b/contrib/bzip2/FREEBSD-Xlist
@@ -1,4 +1,5 @@
 # $FreeBSD$
+*Makefile*
 *README.XML.STUFF
 *bz-common.xsl
 *bz-fo.xsl
@@ -12,10 +13,11 @@
 *bzip2.txt
 *bzmore
 *bzmore.1
-*dlltest.dsp
+*dlltest.*
 *entities.xml
 *format.pl
 *libbz2.dsp
+*makefile.msc
 *manual.html
 *manual.pdf
 *manual.ps
diff --git a/contrib/bzip2/Makefile b/contrib/bzip2/Makefile
deleted file mode 100644
index 9754ddf..0000000
--- a/contrib/bzip2/Makefile
+++ /dev/null
@@ -1,217 +0,0 @@
-# ------------------------------------------------------------------
-# This file is part of bzip2/libbzip2, a program and library for
-# lossless, block-sorting data compression.
-#
-# bzip2/libbzip2 version 1.0.6 of 6 September 2010
-# Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
-#
-# Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-# README file.
-#
-# This program is released under the terms of the license contained
-# in the file LICENSE.
-# ------------------------------------------------------------------
-
-SHELL=/bin/sh
-
-# To assist in cross-compiling
-CC=gcc
-AR=ar
-RANLIB=ranlib
-LDFLAGS=
-
-BIGFILES=-D_FILE_OFFSET_BITS=64
-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
-
-# Where you want it installed when you do 'make install'
-PREFIX=/usr/local
-
-
-OBJS= blocksort.o  \
-      huffman.o    \
-      crctable.o   \
-      randtable.o  \
-      compress.o   \
-      decompress.o \
-      bzlib.o
-
-all: libbz2.a bzip2 bzip2recover test
-
-bzip2: libbz2.a bzip2.o
-	$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2
-
-bzip2recover: bzip2recover.o
-	$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2recover bzip2recover.o
-
-libbz2.a: $(OBJS)
-	rm -f libbz2.a
-	$(AR) cq libbz2.a $(OBJS)
-	@if ( test -f $(RANLIB) -o -f /usr/bin/ranlib -o \
-		-f /bin/ranlib -o -f /usr/ccs/bin/ranlib ) ; then \
-		echo $(RANLIB) libbz2.a ; \
-		$(RANLIB) libbz2.a ; \
-	fi
-
-check: test
-test: bzip2
-	@cat words1
-	./bzip2 -1  < sample1.ref > sample1.rb2
-	./bzip2 -2  < sample2.ref > sample2.rb2
-	./bzip2 -3  < sample3.ref > sample3.rb2
-	./bzip2 -d  < sample1.bz2 > sample1.tst
-	./bzip2 -d  < sample2.bz2 > sample2.tst
-	./bzip2 -ds < sample3.bz2 > sample3.tst
-	cmp sample1.bz2 sample1.rb2 
-	cmp sample2.bz2 sample2.rb2
-	cmp sample3.bz2 sample3.rb2
-	cmp sample1.tst sample1.ref
-	cmp sample2.tst sample2.ref
-	cmp sample3.tst sample3.ref
-	@cat words3
-
-install: bzip2 bzip2recover
-	if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
-	if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
-	if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi
-	if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi
-	if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
-	cp -f bzip2 $(PREFIX)/bin/bzip2
-	cp -f bzip2 $(PREFIX)/bin/bunzip2
-	cp -f bzip2 $(PREFIX)/bin/bzcat
-	cp -f bzip2recover $(PREFIX)/bin/bzip2recover
-	chmod a+x $(PREFIX)/bin/bzip2
-	chmod a+x $(PREFIX)/bin/bunzip2
-	chmod a+x $(PREFIX)/bin/bzcat
-	chmod a+x $(PREFIX)/bin/bzip2recover
-	cp -f bzip2.1 $(PREFIX)/man/man1
-	chmod a+r $(PREFIX)/man/man1/bzip2.1
-	cp -f bzlib.h $(PREFIX)/include
-	chmod a+r $(PREFIX)/include/bzlib.h
-	cp -f libbz2.a $(PREFIX)/lib
-	chmod a+r $(PREFIX)/lib/libbz2.a
-	cp -f bzgrep $(PREFIX)/bin/bzgrep
-	ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
-	ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
-	chmod a+x $(PREFIX)/bin/bzgrep
-	cp -f bzmore $(PREFIX)/bin/bzmore
-	ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
-	chmod a+x $(PREFIX)/bin/bzmore
-	cp -f bzdiff $(PREFIX)/bin/bzdiff
-	ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
-	chmod a+x $(PREFIX)/bin/bzdiff
-	cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
-	chmod a+r $(PREFIX)/man/man1/bzgrep.1
-	chmod a+r $(PREFIX)/man/man1/bzmore.1
-	chmod a+r $(PREFIX)/man/man1/bzdiff.1
-	echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1
-	echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1
-	echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1
-	echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
-
-clean: 
-	rm -f *.o libbz2.a bzip2 bzip2recover \
-	sample1.rb2 sample2.rb2 sample3.rb2 \
-	sample1.tst sample2.tst sample3.tst
-
-blocksort.o: blocksort.c
-	@cat words0
-	$(CC) $(CFLAGS) -c blocksort.c
-huffman.o: huffman.c
-	$(CC) $(CFLAGS) -c huffman.c
-crctable.o: crctable.c
-	$(CC) $(CFLAGS) -c crctable.c
-randtable.o: randtable.c
-	$(CC) $(CFLAGS) -c randtable.c
-compress.o: compress.c
-	$(CC) $(CFLAGS) -c compress.c
-decompress.o: decompress.c
-	$(CC) $(CFLAGS) -c decompress.c
-bzlib.o: bzlib.c
-	$(CC) $(CFLAGS) -c bzlib.c
-bzip2.o: bzip2.c
-	$(CC) $(CFLAGS) -c bzip2.c
-bzip2recover.o: bzip2recover.c
-	$(CC) $(CFLAGS) -c bzip2recover.c
-
-
-distclean: clean
-	rm -f manual.ps manual.html manual.pdf
-
-DISTNAME=bzip2-1.0.6
-dist: check manual
-	rm -f $(DISTNAME)
-	ln -s -f . $(DISTNAME)
-	tar cvf $(DISTNAME).tar \
-	   $(DISTNAME)/blocksort.c \
-	   $(DISTNAME)/huffman.c \
-	   $(DISTNAME)/crctable.c \
-	   $(DISTNAME)/randtable.c \
-	   $(DISTNAME)/compress.c \
-	   $(DISTNAME)/decompress.c \
-	   $(DISTNAME)/bzlib.c \
-	   $(DISTNAME)/bzip2.c \
-	   $(DISTNAME)/bzip2recover.c \
-	   $(DISTNAME)/bzlib.h \
-	   $(DISTNAME)/bzlib_private.h \
-	   $(DISTNAME)/Makefile \
-	   $(DISTNAME)/LICENSE \
-	   $(DISTNAME)/bzip2.1 \
-	   $(DISTNAME)/bzip2.1.preformatted \
-	   $(DISTNAME)/bzip2.txt \
-	   $(DISTNAME)/words0 \
-	   $(DISTNAME)/words1 \
-	   $(DISTNAME)/words2 \
-	   $(DISTNAME)/words3 \
-	   $(DISTNAME)/sample1.ref \
-	   $(DISTNAME)/sample2.ref \
-	   $(DISTNAME)/sample3.ref \
-	   $(DISTNAME)/sample1.bz2 \
-	   $(DISTNAME)/sample2.bz2 \
-	   $(DISTNAME)/sample3.bz2 \
-	   $(DISTNAME)/dlltest.c \
-	   $(DISTNAME)/manual.html \
-	   $(DISTNAME)/manual.pdf \
-	   $(DISTNAME)/manual.ps \
-	   $(DISTNAME)/README \
-	   $(DISTNAME)/README.COMPILATION.PROBLEMS \
-	   $(DISTNAME)/README.XML.STUFF \
-	   $(DISTNAME)/CHANGES \
-	   $(DISTNAME)/libbz2.def \
-	   $(DISTNAME)/libbz2.dsp \
-	   $(DISTNAME)/dlltest.dsp \
-	   $(DISTNAME)/makefile.msc \
-	   $(DISTNAME)/unzcrash.c \
-	   $(DISTNAME)/spewG.c \
-	   $(DISTNAME)/mk251.c \
-	   $(DISTNAME)/bzdiff \
-	   $(DISTNAME)/bzdiff.1 \
-	   $(DISTNAME)/bzmore \
-	   $(DISTNAME)/bzmore.1 \
-	   $(DISTNAME)/bzgrep \
-	   $(DISTNAME)/bzgrep.1 \
-	   $(DISTNAME)/Makefile-libbz2_so \
-	   $(DISTNAME)/bz-common.xsl \
-	   $(DISTNAME)/bz-fo.xsl \
-	   $(DISTNAME)/bz-html.xsl \
-	   $(DISTNAME)/bzip.css \
-	   $(DISTNAME)/entities.xml \
-	   $(DISTNAME)/manual.xml \
-	   $(DISTNAME)/format.pl \
-	   $(DISTNAME)/xmlproc.sh
-	gzip -v $(DISTNAME).tar
-
-# For rebuilding the manual from sources on my SuSE 9.1 box
-
-MANUAL_SRCS= 	bz-common.xsl bz-fo.xsl bz-html.xsl bzip.css \
-		entities.xml manual.xml 
-
-manual: manual.html manual.ps manual.pdf
-
-manual.ps: $(MANUAL_SRCS)
-	./xmlproc.sh -ps manual.xml
-
-manual.pdf: $(MANUAL_SRCS)
-	./xmlproc.sh -pdf manual.xml
-
-manual.html: $(MANUAL_SRCS)
-	./xmlproc.sh -html manual.xml
diff --git a/contrib/bzip2/Makefile-libbz2_so b/contrib/bzip2/Makefile-libbz2_so
deleted file mode 100644
index e58791b..0000000
--- a/contrib/bzip2/Makefile-libbz2_so
+++ /dev/null
@@ -1,59 +0,0 @@
-
-# This Makefile builds a shared version of the library, 
-# libbz2.so.1.0.6, with soname libbz2.so.1.0,
-# at least on x86-Linux (RedHat 7.2), 
-# with gcc-2.96 20000731 (Red Hat Linux 7.1 2.96-98).  
-# Please see the README file for some important info 
-# about building the library like this.
-
-# ------------------------------------------------------------------
-# This file is part of bzip2/libbzip2, a program and library for
-# lossless, block-sorting data compression.
-#
-# bzip2/libbzip2 version 1.0.6 of 6 September 2010
-# Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
-#
-# Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-# README file.
-#
-# This program is released under the terms of the license contained
-# in the file LICENSE.
-# ------------------------------------------------------------------
-
-
-SHELL=/bin/sh
-CC=gcc
-BIGFILES=-D_FILE_OFFSET_BITS=64
-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
-
-OBJS= blocksort.o  \
-      huffman.o    \
-      crctable.o   \
-      randtable.o  \
-      compress.o   \
-      decompress.o \
-      bzlib.o
-
-all: $(OBJS)
-	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
-	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
-	rm -f libbz2.so.1.0
-	ln -s libbz2.so.1.0.6 libbz2.so.1.0
-
-clean: 
-	rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared
-
-blocksort.o: blocksort.c
-	$(CC) $(CFLAGS) -c blocksort.c
-huffman.o: huffman.c
-	$(CC) $(CFLAGS) -c huffman.c
-crctable.o: crctable.c
-	$(CC) $(CFLAGS) -c crctable.c
-randtable.o: randtable.c
-	$(CC) $(CFLAGS) -c randtable.c
-compress.o: compress.c
-	$(CC) $(CFLAGS) -c compress.c
-decompress.o: decompress.c
-	$(CC) $(CFLAGS) -c decompress.c
-bzlib.o: bzlib.c
-	$(CC) $(CFLAGS) -c bzlib.c
diff --git a/contrib/bzip2/dlltest.c b/contrib/bzip2/dlltest.c
deleted file mode 100644
index 03fa146..0000000
--- a/contrib/bzip2/dlltest.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/*

-   minibz2

-      libbz2.dll test program.

-      by Yoshioka Tsuneo (tsuneo@rr.iij4u.or.jp)

-      This file is Public Domain.  Welcome any email to me.

-

-   usage: minibz2 [-d] [-{1,2,..9}] [[srcfilename] destfilename]

-*/

-

-#define BZ_IMPORT

-#include <stdio.h>

-#include <stdlib.h>

-#include "bzlib.h"

-#ifdef _WIN32

-#include <io.h>

-#endif

-

-

-#ifdef _WIN32

-

-#define BZ2_LIBNAME "libbz2-1.0.2.DLL" 

-

-#include <windows.h>

-static int BZ2DLLLoaded = 0;

-static HINSTANCE BZ2DLLhLib;

-int BZ2DLLLoadLibrary(void)

-{

-   HINSTANCE hLib;

-

-   if(BZ2DLLLoaded==1){return 0;}

-   hLib=LoadLibrary(BZ2_LIBNAME);

-   if(hLib == NULL){

-      fprintf(stderr,"Can't load %s\n",BZ2_LIBNAME);

-      return -1;

-   }

-   BZ2_bzlibVersion=GetProcAddress(hLib,"BZ2_bzlibVersion");

-   BZ2_bzopen=GetProcAddress(hLib,"BZ2_bzopen");

-   BZ2_bzdopen=GetProcAddress(hLib,"BZ2_bzdopen");

-   BZ2_bzread=GetProcAddress(hLib,"BZ2_bzread");

-   BZ2_bzwrite=GetProcAddress(hLib,"BZ2_bzwrite");

-   BZ2_bzflush=GetProcAddress(hLib,"BZ2_bzflush");

-   BZ2_bzclose=GetProcAddress(hLib,"BZ2_bzclose");

-   BZ2_bzerror=GetProcAddress(hLib,"BZ2_bzerror");

-

-   if (!BZ2_bzlibVersion || !BZ2_bzopen || !BZ2_bzdopen

-       || !BZ2_bzread || !BZ2_bzwrite || !BZ2_bzflush

-       || !BZ2_bzclose || !BZ2_bzerror) {

-      fprintf(stderr,"GetProcAddress failed.\n");

-      return -1;

-   }

-   BZ2DLLLoaded=1;

-   BZ2DLLhLib=hLib;

-   return 0;

-

-}

-int BZ2DLLFreeLibrary(void)

-{

-   if(BZ2DLLLoaded==0){return 0;}

-   FreeLibrary(BZ2DLLhLib);

-   BZ2DLLLoaded=0;

-}

-#endif /* WIN32 */

-

-void usage(void)

-{

-   puts("usage: minibz2 [-d] [-{1,2,..9}] [[srcfilename] destfilename]");

-}

-

-int main(int argc,char *argv[])

-{

-   int decompress = 0;

-   int level = 9;

-   char *fn_r = NULL;

-   char *fn_w = NULL;

-

-#ifdef _WIN32

-   if(BZ2DLLLoadLibrary()<0){

-      fprintf(stderr,"Loading of %s failed.  Giving up.\n", BZ2_LIBNAME);

-      exit(1);

-   }

-   printf("Loading of %s succeeded.  Library version is %s.\n",

-          BZ2_LIBNAME, BZ2_bzlibVersion() );

-#endif

-   while(++argv,--argc){

-      if(**argv =='-' || **argv=='/'){

-         char *p;

-

-         for(p=*argv+1;*p;p++){

-            if(*p=='d'){

-               decompress = 1;

-            }else if('1'<=*p && *p<='9'){

-               level = *p - '0';

-            }else{

-               usage();

-               exit(1);

-            }

-         }

-      }else{

-         break;

-      }

-   }

-   if(argc>=1){

-      fn_r = *argv;

-      argc--;argv++;

-   }else{

-      fn_r = NULL;

-   }

-   if(argc>=1){

-      fn_w = *argv;

-      argc--;argv++;

-   }else{

-      fn_w = NULL;

-   }

-   {

-      int len;

-      char buff[0x1000];

-      char mode[10];

-

-      if(decompress){

-         BZFILE *BZ2fp_r = NULL;

-         FILE *fp_w = NULL;

-

-         if(fn_w){

-            if((fp_w = fopen(fn_w,"wb"))==NULL){

-               printf("can't open [%s]\n",fn_w);

-               perror("reason:");

-               exit(1);

-            }

-         }else{

-            fp_w = stdout;

-         }

-         if((fn_r == NULL && (BZ2fp_r = BZ2_bzdopen(fileno(stdin),"rb"))==NULL)

-            || (fn_r != NULL && (BZ2fp_r = BZ2_bzopen(fn_r,"rb"))==NULL)){

-            printf("can't bz2openstream\n");

-            exit(1);

-         }

-         while((len=BZ2_bzread(BZ2fp_r,buff,0x1000))>0){

-            fwrite(buff,1,len,fp_w);

-         }

-         BZ2_bzclose(BZ2fp_r);

-         if(fp_w != stdout) fclose(fp_w);

-      }else{

-         BZFILE *BZ2fp_w = NULL;

-         FILE *fp_r = NULL;

-

-         if(fn_r){

-            if((fp_r = fopen(fn_r,"rb"))==NULL){

-               printf("can't open [%s]\n",fn_r);

-               perror("reason:");

-               exit(1);

-            }

-         }else{

-            fp_r = stdin;

-         }

-         mode[0]='w';

-         mode[1] = '0' + level;

-         mode[2] = '\0';

-

-         if((fn_w == NULL && (BZ2fp_w = BZ2_bzdopen(fileno(stdout),mode))==NULL)

-            || (fn_w !=NULL && (BZ2fp_w = BZ2_bzopen(fn_w,mode))==NULL)){

-            printf("can't bz2openstream\n");

-            exit(1);

-         }

-         while((len=fread(buff,1,0x1000,fp_r))>0){

-            BZ2_bzwrite(BZ2fp_w,buff,len);

-         }

-         BZ2_bzclose(BZ2fp_w);

-         if(fp_r!=stdin)fclose(fp_r);

-      }

-   }

-#ifdef _WIN32

-   BZ2DLLFreeLibrary();

-#endif

-   return 0;

-}

diff --git a/contrib/bzip2/makefile.msc b/contrib/bzip2/makefile.msc
deleted file mode 100644
index 799a18a..0000000
--- a/contrib/bzip2/makefile.msc
+++ /dev/null
@@ -1,63 +0,0 @@
-# Makefile for Microsoft Visual C++ 6.0

-# usage: nmake -f makefile.msc

-# K.M. Syring (syring@gsf.de)

-# Fixed up by JRS for bzip2-0.9.5d release.

-

-CC=cl

-CFLAGS= -DWIN32 -MD -Ox -D_FILE_OFFSET_BITS=64 -nologo

-

-OBJS= blocksort.obj  \

-      huffman.obj    \

-      crctable.obj   \

-      randtable.obj  \

-      compress.obj   \

-      decompress.obj \

-      bzlib.obj

-

-all: lib bzip2 test

-

-bzip2: lib

-	$(CC) $(CFLAGS) -o bzip2 bzip2.c libbz2.lib setargv.obj

-	$(CC) $(CFLAGS) -o bzip2recover bzip2recover.c

-

-lib: $(OBJS)

-	lib /out:libbz2.lib $(OBJS)

-

-test: bzip2

-	type words1

-	.\\bzip2 -1  < sample1.ref > sample1.rb2

-	.\\bzip2 -2  < sample2.ref > sample2.rb2

-	.\\bzip2 -3  < sample3.ref > sample3.rb2

-	.\\bzip2 -d  < sample1.bz2 > sample1.tst

-	.\\bzip2 -d  < sample2.bz2 > sample2.tst

-	.\\bzip2 -ds < sample3.bz2 > sample3.tst

-	@echo All six of the fc's should find no differences.

-	@echo If fc finds an error on sample3.bz2, this could be

-	@echo because WinZip's 'TAR file smart CR/LF conversion'

-	@echo is too clever for its own good.  Disable this option.

-	@echo The correct size for sample3.ref is 120,244.  If it

-	@echo is 150,251, WinZip has messed it up.

-	fc sample1.bz2 sample1.rb2 

-	fc sample2.bz2 sample2.rb2

-	fc sample3.bz2 sample3.rb2

-	fc sample1.tst sample1.ref

-	fc sample2.tst sample2.ref

-	fc sample3.tst sample3.ref

-

-

-

-clean: 

-	del *.obj

-	del libbz2.lib 

-	del bzip2.exe

-	del bzip2recover.exe

-	del sample1.rb2 

-	del sample2.rb2 

-	del sample3.rb2

-	del sample1.tst 

-	del sample2.tst

-	del sample3.tst

-

-.c.obj: 

-	$(CC) $(CFLAGS) -c $*.c -o $*.obj

-