pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/archivers/xmill Update xmill to v0.9.1 and remove unne...
details: https://anonhg.NetBSD.org/pkgsrc/rev/90ea34eec985
branches: trunk
changeset: 471549:90ea34eec985
user: ben <ben%pkgsrc.org@localhost>
date: Mon Mar 29 05:12:00 2004 +0000
description:
Update xmill to v0.9.1 and remove unnecessary patches. Notable changes:
* portability fixes for makefiles and for newer C++ compilers
* configuration options to build xmill without included zlib/bzlib
* will work with libbz2 as well as libbz
diffstat:
archivers/xmill/Makefile | 47 ++++-------
archivers/xmill/PLIST | 8 +-
archivers/xmill/distinfo | 20 +----
archivers/xmill/patches/patch-aa | 64 ----------------
archivers/xmill/patches/patch-ab | 152 ---------------------------------------
archivers/xmill/patches/patch-ac | 22 -----
archivers/xmill/patches/patch-ad | 12 ---
archivers/xmill/patches/patch-ae | 30 -------
archivers/xmill/patches/patch-af | 12 ---
archivers/xmill/patches/patch-ag | 25 ------
archivers/xmill/patches/patch-ah | 12 ---
archivers/xmill/patches/patch-ai | 21 -----
archivers/xmill/patches/patch-aj | 12 ---
archivers/xmill/patches/patch-ak | 21 -----
archivers/xmill/patches/patch-al | 39 ----------
archivers/xmill/patches/patch-am | 9 --
archivers/xmill/patches/patch-an | 9 --
17 files changed, 25 insertions(+), 490 deletions(-)
diffs (truncated from 609 to 300 lines):
diff -r eb209892dd25 -r 90ea34eec985 archivers/xmill/Makefile
--- a/archivers/xmill/Makefile Mon Mar 29 05:10:54 2004 +0000
+++ b/archivers/xmill/Makefile Mon Mar 29 05:12:00 2004 +0000
@@ -1,20 +1,13 @@
-# $NetBSD: Makefile,v 1.9 2004/01/22 07:18:44 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/03/29 05:12:01 ben Exp $
-DISTNAME= xmill-0-7
-PKGNAME= xmill-0.7
+DISTNAME= xmill-0.9.1
CATEGORIES= archivers
-MASTER_SITES= # empty
-EXTRACT_SUFX= .zip
+MASTER_SITES= http://www.cs.washington.edu/homes/suciu/XMILL/
MAINTAINER= ben%NetBSD.org@localhost
-HOMEPAGE= http://www.research.att.com/sw/tools/xmill/
+HOMEPAGE= ${MASTER_SITES}
COMMENT= Specialized compressor for XML
-BUILD_DEPENDS= unzip-[0-9]*:../../archivers/unzip
-
-EXTRACT_CMD= ${LOCALBASE}/bin/unzip -aq ${DOWNLOADED_DISTFILE}
-
-WRKSRC= ${WRKDIR}
USE_GNU_TOOLS+= make
MAKEFILE= makefile
@@ -24,26 +17,20 @@
NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
-DOWNLOAD= http://www.research.att.com/sw/tools/xmill/download.html
-#DOWNLOAD= http://www.research.att.com/~mff/XMILL/xmill-0-7.zip
-
-_FETCH_MESSAGE= \
- ${ECHO} "==============================================================="; \
- ${ECHO} " XMILL distribution package must be fetched"; \
- ${ECHO} " into ${DISTDIR} from"; \
- ${ECHO} " ${DOWNLOAD}"; \
- ${ECHO} "==============================================================="
-
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xmill
- ${INSTALL_DATA} ${WRKSRC}/COPYRIGHT.txt ${PREFIX}/share/doc/xmill
- ${INSTALL_DATA} ${WRKSRC}/LICENSE.txt ${PREFIX}/share/doc/xmill
- ${INSTALL_DATA} ${WRKSRC}/MANUAL.txt ${PREFIX}/share/doc/xmill
- ${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/xmill
- ${INSTALL_DATA} ${WRKSRC}/paper/xmill.ps.gz ${PREFIX}/share/doc/xmill
- ${INSTALL_PROGRAM} ${WRKSRC}/unix/xmill ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/unix/xdemill ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/unix/xbmill ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/unix/xbdemill ${PREFIX}/bin
+ ${INSTALL_DATA} ${WRKSRC}/documentation/COPYRIGHT.txt \
+ ${WRKSRC}/documentation/LICENSE.txt \
+ ${WRKSRC}/documentation/MANUAL.txt \
+ ${WRKSRC}/documentation/README.txt \
+ ${WRKSRC}/documentation/xmill.ps.gz \
+ ${WRKSRC}/documentation/xmill-09-doc.txt \
+ ${PREFIX}/share/doc/xmill
+ ${INSTALL_PROGRAM} ${WRKSRC}/unix/xmill \
+ ${WRKSRC}/unix/xdemill \
+ ${WRKSRC}/unix/xmillexample \
+ ${WRKSRC}/unix/xmillinspect \
+ ${WRKSRC}/unix/xmilltest \
+ ${PREFIX}/bin
.include "../../mk/bsd.pkg.mk"
diff -r eb209892dd25 -r 90ea34eec985 archivers/xmill/PLIST
--- a/archivers/xmill/PLIST Mon Mar 29 05:10:54 2004 +0000
+++ b/archivers/xmill/PLIST Mon Mar 29 05:12:00 2004 +0000
@@ -1,11 +1,13 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/02/17 09:20:25 grant Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/03/29 05:12:01 ben Exp $
bin/xmill
bin/xdemill
-bin/xbmill
-bin/xbdemill
+bin/xmillexample
+bin/xmillinspect
+bin/xmilltest
share/doc/xmill/COPYRIGHT.txt
share/doc/xmill/LICENSE.txt
share/doc/xmill/MANUAL.txt
share/doc/xmill/README.txt
+share/doc/xmill/xmill-09-doc.txt
share/doc/xmill/xmill.ps.gz
@dirrm share/doc/xmill
diff -r eb209892dd25 -r 90ea34eec985 archivers/xmill/distinfo
--- a/archivers/xmill/distinfo Mon Mar 29 05:10:54 2004 +0000
+++ b/archivers/xmill/distinfo Mon Mar 29 05:12:00 2004 +0000
@@ -1,18 +1,4 @@
-$NetBSD: distinfo,v 1.2 2003/10/07 03:45:13 rtr Exp $
+$NetBSD: distinfo,v 1.3 2004/03/29 05:12:01 ben Exp $
-SHA1 (xmill-0-7.zip) = d4771e8fc860936e0d7360e5df4fce01152469c7
-Size (xmill-0-7.zip) = 1315864 bytes
-SHA1 (patch-aa) = 0c93f9dc66b283f9de7b12ad159023d94675126a
-SHA1 (patch-ab) = 1103d1d987fa070b80490e7a891a6869d32e7f0d
-SHA1 (patch-ac) = 33d8a8e1950de7e55bcdf579a2fbb3dc24709cc4
-SHA1 (patch-ad) = 13651a968e31e5aba1187e2cbb861812b8c288bc
-SHA1 (patch-ae) = 03dfca559d992b75d423bda40b8574d46c285c03
-SHA1 (patch-af) = 9e842cc608b9c111fc3235da1a6a3268ccf6f330
-SHA1 (patch-ag) = f9bbb4eb7970970dd88e7a13ba71798f1860da8a
-SHA1 (patch-ah) = 7428812657158714b6da2ff0fba34503fc1a477c
-SHA1 (patch-ai) = 6fedcc072a0b19dd98bd78126dda40b789cd889d
-SHA1 (patch-aj) = eda74f61fb265dfa33eba820aefa7c5b10259fd5
-SHA1 (patch-ak) = 5035bbf3f43886ae40b362658c5ce77cb413c613
-SHA1 (patch-al) = 47c9ab58135dacfe9a581ddd300363d907935189
-SHA1 (patch-am) = f1fdd4b0c06cc31526337d6c09e5fcc0d5166564
-SHA1 (patch-an) = c0dc3b3d58ebe018ca88611bd65198cb01bda1d9
+SHA1 (xmill-0.9.1.tar.gz) = 491e44ea9a66293af6837db4dc54ed63065c0d67
+Size (xmill-0.9.1.tar.gz) = 1021363 bytes
diff -r eb209892dd25 -r 90ea34eec985 archivers/xmill/patches/patch-aa
--- a/archivers/xmill/patches/patch-aa Mon Mar 29 05:10:54 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/02/17 09:20:26 grant Exp $
-
---- makefile.orig Mon Nov 29 16:37:20 1999
-+++ makefile
-@@ -34,20 +34,17 @@ TMP = ./tmp
- SRC = ./src
-
- CPP = g++
--CPPFLAGS_XMILL = -O3 -c -Izlib -DXMILL
--CPPFLAGS_XDEMILL = -O3 -c -Izlib -DXDEMILL
-+CPPFLAGS_XMILL = -c -DXMILL
-+CPPFLAGS_XDEMILL = -c -DXDEMILL
-
- CC = gcc
--CFLAGS = -O3 -c
-+CFLAGS = -c
- LINK=g++
- # LINK_FLAGS = -L.
-
--ZLIB_OBJS = $(TMP)/adler32.o $(TMP)/crc32.o $(TMP)/deflate.o $(TMP)/trees.o $(TMP)/uncompr.o \
-- $(TMP)/inffast.o $(TMP)/inflate.o $(TMP)/inftrees.o $(TMP)/infutil.o $(TMP)/infblock.o \
-- $(TMP)/infcodes.o $(TMP)/zutil.o
-+ZLIB_OBJS = -lz
-
--BZLIB_OBJS= $(TMP)/blocksort.o $(TMP)/bzlib.o $(TMP)/compress_b.o $(TMP)/crctable.o $(TMP)/decompress.o \
-- $(TMP)/huffman.o $(TMP)/randtable.o
-+BZLIB_OBJS = -lbz2
-
- XMILL_OBJSPART = $(TMP)/CompressMan.o $(TMP)/ContMan.o $(TMP)/PathDict.o $(TMP)/PathTree.o \
- $(TMP)/RepeatCompress.o $(TMP)/RunLenCompress.o $(TMP)/SAXClient.o \
-@@ -61,11 +58,11 @@ XDEMILL_OBJSPART = $(TMP)/CompressMan_u.
- $(TMP)/DivCompress_u.o $(TMP)/EnumCompress_u.o $(TMP)/Error_u.o \
- $(TMP)/Options_u.o $(TMP)/MemStreamer_u.o
-
--XMILLOBJS = $(ZLIB_OBJS) $(XMILL_OBJSPART) $(TMP)/ZLib.o
--XBMILLOBJS = $(BZLIB_OBJS) $(XMILL_OBJSPART) $(TMP)/ZLib_b.o
-+XMILLOBJS = $(XMILL_OBJSPART) $(TMP)/ZLib.o $(ZLIB_OBJS)
-+XBMILLOBJS = $(XMILL_OBJSPART) $(TMP)/ZLib_b.o $(BZLIB_OBJS)
-
--XDEMILLOBJS = $(ZLIB_OBJS) $(XDEMILL_OBJSPART) $(TMP)/ZLib_u.o
--XBDEMILLOBJS = $(BZLIB_OBJS) $(XDEMILL_OBJSPART) $(TMP)/ZLib_bu.o
-+XDEMILLOBJS = $(XDEMILL_OBJSPART) $(TMP)/ZLib_u.o $(ZLIB_OBJS)
-+XBDEMILLOBJS = $(XDEMILL_OBJSPART) $(TMP)/ZLib_bu.o $(BZLIB_OBJS)
-
- $(BIN)/xmill : $(XMILLOBJS)
- $(LINK) -o $(BIN)/xmill $(LINK_FLAGS) $(XMILLOBJS)
-@@ -146,7 +143,7 @@ $(TMP)/ZLib.o : $(SRC)/ZLib.cp
- $(CPP) -o $*.o $(CPPFLAGS_XMILL) $(SRC)/ZLib.cpp
-
- $(TMP)/ZLib_b.o : $(SRC)/ZLib.cpp
-- $(CPP) -o $*.o -I./bzlib $(CPPFLAGS_XMILL) -DUSE_BZIP $(SRC)/ZLib.cpp
-+ $(CPP) -o $*.o $(CPPFLAGS_XMILL) -DUSE_BZIP $(SRC)/ZLib.cpp
-
- #********************************************************************
-
-@@ -199,7 +196,7 @@ $(TMP)/ZLib_u.o : $(SRC)/ZLib.
- $(CPP) -o $*.o $(CPPFLAGS_XDEMILL) $(SRC)/ZLib.cpp
-
- $(TMP)/ZLib_bu.o : $(SRC)/ZLib.cpp
-- $(CPP) -o $*.o -I./bzlib $(CPPFLAGS_XDEMILL) -DUSE_BZIP $(SRC)/ZLib.cpp
-+ $(CPP) -o $*.o $(CPPFLAGS_XDEMILL) -DUSE_BZIP $(SRC)/ZLib.cpp
-
- #********************************************************************
-
diff -r eb209892dd25 -r 90ea34eec985 archivers/xmill/patches/patch-ab
--- a/archivers/xmill/patches/patch-ab Mon Mar 29 05:10:54 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,152 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/02/17 09:20:26 grant Exp $
-
---- src/ZLib.cpp.orig Sat Feb 15 02:54:15 2003
-+++ src/ZLib.cpp
-@@ -125,7 +125,7 @@ Compressor::~Compressor()
- // We finish compression, if there has been some data in the queue
- {
- #ifdef USE_BZIP
-- bzCompressEnd(&state);
-+ BZ2_bzCompressEnd(&state);
- #else
- deflateEnd(&state);
- #endif
-@@ -175,7 +175,7 @@ void Compressor::CompressMemStream(MemSt
- if(isinitialized==0)
- {
- #ifdef USE_BZIP
-- if(bzCompressInit(&state,7,0,0)!=BZ_OK)
-+ if(BZ2_bzCompressInit(&state,7,0,0)!=BZ_OK)
- #else
- if(deflateInit(&state,zlib_compressidx)!=Z_OK)
- #endif
-@@ -183,8 +183,15 @@ void Compressor::CompressMemStream(MemSt
- Error("Error while compressing container!");
- Exit();
- }
-+#ifdef USE_BZIP
-+ state.total_out_lo32=0;
-+ state.total_out_hi32=0;
-+ state.total_in_lo32=0;
-+ state.total_in_hi32=0;
-+#else
- state.total_out=0;
- state.total_in=0;
-+#endif
-
- isinitialized=1;
- }
-@@ -205,7 +212,7 @@ void Compressor::CompressMemStream(MemSt
- saveavail=state.avail_out;
-
- #ifdef USE_BZIP
-- if(bzCompress(&state,BZ_RUN)!=BZ_RUN_OK)
-+ if(BZ2_bzCompress(&state,BZ_RUN)!=BZ_RUN_OK)
- #else
- if(deflate(&state,Z_NO_FLUSH)!=Z_OK)
- #endif
-@@ -259,7 +266,7 @@ void Compressor::CompressData(unsigned c
- if(isinitialized==0)
- {
- #ifdef USE_BZIP
-- if(bzCompressInit(&state,7,0,0)!=BZ_OK)
-+ if(BZ2_bzCompressInit(&state,7,0,0)!=BZ_OK)
- #else
- if(deflateInit(&state,zlib_compressidx)!=Z_OK)
- #endif
-@@ -267,8 +274,15 @@ void Compressor::CompressData(unsigned c
- Error("Error while compressing container!");
- Exit();
- }
-+#ifdef USE_BZIP
-+ state.total_out_lo32=0;
-+ state.total_out_hi32=0;
-+ state.total_in_lo32=0;
-+ state.total_in_hi32=0;
-+#else
- state.total_out=0;
- state.total_in=0;
-+#endif
- isinitialized=1;
- }
-
-@@ -278,7 +292,7 @@ void Compressor::CompressData(unsigned c
-
- // The actual compression
- #ifdef USE_BZIP
-- if(bzCompress(&state,BZ_RUN)!=BZ_RUN_OK)
-+ if(BZ2_bzCompress(&state,BZ_RUN)!=BZ_RUN_OK)
- #else
- if(deflate(&state,Z_NO_FLUSH)!=Z_OK)
- #endif
-@@ -326,7 +340,7 @@ void Compressor::FinishCompress(unsigned
- saveavail=state.avail_out;
-
- #ifdef USE_BZIP
-- err=bzCompress(&state,BZ_FINISH);
-+ err=BZ2_bzCompress(&state,BZ_FINISH);
- #else
- err=deflate(&state,Z_FINISH);
- #endif
-@@ -353,15 +367,25 @@ void Compressor::FinishCompress(unsigned
- while(1);
-
- // Let's store the input and output size
-+#ifdef USE_BZIP
-+ if(uncompressedsize!=NULL) *uncompressedsize =state.total_in_lo32;
-+ if(compressedsize!=NULL) *compressedsize =state.total_out_lo32;
-+
-+ state.total_out_lo32=0;
-+ state.total_out_hi32=0;
-+ state.total_in_lo32=0;
-+ state.total_in_hi32=0;
-+#else
- if(uncompressedsize!=NULL) *uncompressedsize =state.total_in;
- if(compressedsize!=NULL) *compressedsize =state.total_out;
-
- state.total_out=0;
- state.total_in=0;
-+#endif
-
- // Finally, we release the internal memory
- #ifdef USE_BZIP
-- if(bzCompressEnd(&state)!=BZ_OK)
-+ if(BZ2_bzCompressEnd(&state)!=BZ_OK)
- #else
Home |
Main Index |
Thread Index |
Old Index