- Update to 1.0.3

PR:		ports/83694
Submitted by:	Vsevolod Stakhov <vsevolod@highsecure.ru>
Approved by:	Jason Harris <jharris@widomaker.com> (maintainer)

5 files changed, 14 insertions, 23 deletions

diff --git a/archivers/bzip2/Makefile b/archivers/bzip2/Makefile
index aca531b8c853..b3b084074f07 100644
--- a/archivers/bzip2/Makefile
+++ b/archivers/bzip2/Makefile
@@ -7,10 +7,9 @@
 #
 
 PORTNAME=	bzip2
-PORTVERSION=	1.0.2
+PORTVERSION=	1.0.3
 CATEGORIES=	archivers
-MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR=	bzip2/v102
+MASTER_SITES=	http://www.bzip.org/${PORTVERSION}/
 
 MAINTAINER=	jharris@widomaker.com
 COMMENT=	A block-sorting file compressor
diff --git a/archivers/bzip2/distinfo b/archivers/bzip2/distinfo
index 40bd0fde66f8..6d49921fb66d 100644
--- a/archivers/bzip2/distinfo
+++ b/archivers/bzip2/distinfo
@@ -1,2 +1,2 @@
-MD5 (bzip2-1.0.2.tar.gz) = ee76864958d568677f03db8afad92beb
-SIZE (bzip2-1.0.2.tar.gz) = 665198
+MD5 (bzip2-1.0.3.tar.gz) = 8a716bebecb6e647d2e8a29ea5d8447f
+SIZE (bzip2-1.0.3.tar.gz) = 669075
diff --git a/archivers/bzip2/files/patch-aa b/archivers/bzip2/files/patch-aa
index 66368aedfde9..5496acf507a6 100644
--- a/archivers/bzip2/files/patch-aa
+++ b/archivers/bzip2/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile	2002/02/14 03:34:07	1.1
-+++ Makefile	2002/02/14 03:53:34
-@@ -2,14 +2,16 @@
+--- Makefile.orig	Thu Feb 17 14:28:24 2005
++++ Makefile	Tue Jul 19 02:39:56 2005
+@@ -2,13 +2,15 @@
  SHELL=/bin/sh
  
  # To assist in cross-compiling
@@ -10,16 +10,15 @@
  RANLIB=ranlib
  LDFLAGS=
  
- # Suitably paranoid flags to avoid bugs in gcc-2.7
  BIGFILES=-D_FILE_OFFSET_BITS=64
--CFLAGS=-Wall -Winline -O2 -fomit-frame-pointer -fno-strength-reduce $(BIGFILES)
+-CFLAGS=-Wall -Winline -O -g $(BIGFILES)
 +CFLAGS?=-O2
 +CFLAGS+=-Wall -Winline -fomit-frame-pointer -fno-strength-reduce $(BIGFILES)
 +SOFLAGS=-fPIC -fpic -DPIC
  
  # Where you want it installed when you do 'make install'
  PREFIX=/usr
-@@ -23,10 +25,18 @@
+@@ -22,10 +24,18 @@
        decompress.o \
        bzlib.o
  
@@ -41,7 +40,7 @@
  
  bzip2recover: bzip2recover.o
  	$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2recover bzip2recover.o
-@@ -40,6 +50,10 @@
+@@ -39,6 +49,10 @@
  		$(RANLIB) libbz2.a ; \
  	fi
  
@@ -52,9 +51,9 @@
  check: test
  test: bzip2
  	@cat words1
-@@ -98,9 +112,25 @@
+@@ -96,9 +110,25 @@
+ 	echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
  
- distclean: clean
  clean: 
 -	rm -f *.o libbz2.a bzip2 bzip2recover \
 +	rm -f *.o *.so libbz2.a libbz2.so.1 bzip2 bzip2recover \
diff --git a/archivers/bzip2/pkg-descr b/archivers/bzip2/pkg-descr
index da3f03594b3b..1b629d33184d 100644
--- a/archivers/bzip2/pkg-descr
+++ b/archivers/bzip2/pkg-descr
@@ -1,4 +1,4 @@
 This is bzip2, a advanced block-sorting file compressor.  It is
 believed to be free from any patents.
 
-WWW: http://sources.redhat.com/bzip2/
+WWW: http://www.bzip.org
diff --git a/archivers/bzip2/pkg-plist b/archivers/bzip2/pkg-plist
index fb95326b3911..623628c27bfe 100644
--- a/archivers/bzip2/pkg-plist
+++ b/archivers/bzip2/pkg-plist
@@ -14,15 +14,8 @@ lib/libbz2.a
 lib/libbz2.so
 lib/libbz2.so.1
 %%PORTDOCS%%%%DOCSDIR%%/manual.ps.bz2
-%%PORTDOCS%%%%DOCSDIR%%/manual.texi
-%%PORTDOCS%%%%DOCSDIR%%/manual_1.html
-%%PORTDOCS%%%%DOCSDIR%%/manual_2.html
-%%PORTDOCS%%%%DOCSDIR%%/manual_3.html
-%%PORTDOCS%%%%DOCSDIR%%/manual_4.html
-%%PORTDOCS%%%%DOCSDIR%%/manual_toc.html
+%%PORTDOCS%%%%DOCSDIR%%/manual.xml
 %%PORTDOCS%%%%DOCSDIR%%/manual.html
-%%PORTDOCS%%%%DOCSDIR%%/manual_abt.html
-%%PORTDOCS%%%%DOCSDIR%%/manual_ovr.html
 %%PORTDOCS%%%%DOCSDIR%%/manual.pdf
 %%PORTDOCS%%%%DOCSDIR%%/bzip2.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%