Update to version 0.6

PR: 22764
Submitted by: MAINTAINER

5 files changed, 106 insertions, 91 deletions

diff --git a/graphics/xzgv/Makefile b/graphics/xzgv/Makefile
index 8a52243ab9dd..ff6ce81ca295 100644
--- a/graphics/xzgv/Makefile
+++ b/graphics/xzgv/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xzgv
-PORTVERSION=	0.5
+PORTVERSION=	0.6
 CATEGORIES=	graphics
 MASTER_SITES=	http://xzgv.browser.org/ \
 			${MASTER_SITE_SUNSITE}
@@ -21,11 +21,7 @@ USE_X_PREFIX=	yes
 MAN1=		xzgv.1
 
 post-patch:
-	@${PERL} -pi -e "s:usr/local:${PREFIX}:g" ${WRKSRC}/config.mk
+	@${PERL} -pi -e "s:/usr/local:${PREFIX}:g" ${WRKSRC}/config.mk
 
-post-install:
-	${ECHO} ${PREFIX}
-	strip -s ${PREFIX}/bin/xzgv
-	install-info ${PREFIX}/info/xzgv ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/graphics/xzgv/distinfo b/graphics/xzgv/distinfo
index 974e2bfabd64..0f53388a61a6 100644
--- a/graphics/xzgv/distinfo
+++ b/graphics/xzgv/distinfo
@@ -1 +1 @@
-MD5 (xzgv-0.5.tar.gz) = e357639c95fc0b660f3b47fe93a00dc7
+MD5 (xzgv-0.6.tar.gz) = 10e084593c2e8e4f9d92eefb35a02162
diff --git a/graphics/xzgv/files/patch-aa b/graphics/xzgv/files/patch-aa
index b89d7f5c47bd..0ef061f722cc 100644
--- a/graphics/xzgv/files/patch-aa
+++ b/graphics/xzgv/files/patch-aa
@@ -1,74 +1,27 @@
-diff -ur xzgv-0.5/Makefile work/xzgv-0.5/Makefile
---- Makefile	Sat May  6 23:49:52 2000
-+++ Makefile	Sun Oct  8 05:56:44 2000
-@@ -24,9 +24,10 @@
+diff -urN ../../xzgv-0.6.orig/Makefile ./Makefile
+--- ../../xzgv-0.6.orig/Makefile	Wed Nov  8 21:52:49 2000
++++ ./Makefile	Sat Nov 11 14:28:52 2000
+@@ -24,9 +24,9 @@
  
  
  
 -all: src man infowarn
-+#all: src man infowarn
-+all: src man info
++all: src man info #infowarn
  
 -src: xzgv src/install-info
 +src: xzgv #src/install-info
  
  # We try this the whole time, as the dependancies are a bit
  # complicated to duplicate here.
-diff -ur xzgv-0.5/config.mk work/xzgv-0.5/config.mk
---- config.mk	Fri Aug  4 20:02:12 2000
-+++ xzgv-0.5/config.mk	Sun Oct  8 05:58:05 2000
-@@ -60,7 +60,7 @@
- #
- # If you don't know what to do, leave it as-is.
- #
--#INFO_DIR_UPDATE=no
-+INFO_DIR_UPDATE=no
- 
- 
- # -------------------- Miscellaneous options -----------------------
-diff -ur xzgv-0.5/src/Makefile work/xzgv-0.5/src/Makefile
---- src/Makefile	Sat Mar 11 02:44:29 2000
-+++ src/Makefile	Sun Oct  8 05:56:44 2000
-@@ -19,7 +19,7 @@
- # compile when you do `make install'. :-)
- # (It would also be weird to have it made by the `doc' Makefile, IMHO.)
- 
--all: xzgv install-info
-+all: xzgv #install-info
- 
- OBJS=	main.o \
- 	filedetails.o gotodir.o updatetn.o confirm.o \
-@@ -43,14 +43,14 @@
- installdirs:
- 	/bin/sh ../mkinstalldirs $(BINDIR)
- 
--install: xzgv installdirs
-+install: xzgv #installdirs
- 	install -m 511 xzgv $(BINDIR)
- 
- uninstall:
- 	$(RM) $(BINDIR)/xzgv
- 
- clean:
--	$(RM) *~ *.o xzgv install-info
-+	$(RM) *~ *.o xzgv #install-info
- 	$(RM) rcfile_opt.h rcfile_var.h rcfile_short.h
- 	$(RM) logodata.h logoconv
- 
-@@ -63,7 +63,7 @@
- getopt.o: getopt.c
- getopt1.o: getopt1.c getopt.h
- gotodir.o: gotodir.c main.h gotodir.h
--install-info.o: install-info.c
-+#install-info.o: install-info.c
- logo.o: logo.c logodata.h
- logoconv.o: logoconv.c
- main.o: main.c readmrf.h readgif.h readjpegtn.h resizepic.h rcfile.h \
---- doc/makeman.awk.orig	Sun Apr 23 02:51:12 2000
-+++ doc/makeman.awk	Thu Oct 19 11:36:45 2000
-@@ -1,4 +1,4 @@
--#!/usr/bin/gawk -f
-+#!/usr/bin/awk -f
- #
- # makeman - make xzgv man page from texinfo file.
- # Public domain by Russell Marks.
+@@ -45,9 +45,9 @@
+ # as I don't want to assume everyone has texinfo's `makeinfo' handy.
+ # So the `infowarn' below is mainly to warn me if the info gets
+ # out of date. :-)
+-info: doc/xzgv.gz
++info: doc/xzgv
+ 
+-doc/xzgv.gz: doc/xzgv.texi
++doc/xzgv: doc/xzgv.texi
+ 	cd doc && $(MAKE) info
+ 
+ # Warn if the info is out of date. This *is* automatically done.
diff --git a/graphics/xzgv/files/patch-ab b/graphics/xzgv/files/patch-ab
index eeb5ec342eda..5c4bd7c757e1 100644
--- a/graphics/xzgv/files/patch-ab
+++ b/graphics/xzgv/files/patch-ab
@@ -1,5 +1,6 @@
---- doc/Makefile.orig	Mon Nov 22 17:23:34 1999
-+++ doc/Makefile	Thu Oct 19 12:58:50 2000
+diff -urN ../../xzgv-0.6.orig/doc/Makefile ./doc/Makefile
+--- ../../xzgv-0.6.orig/doc/Makefile	Wed Nov  8 21:52:49 2000
++++ ./doc/Makefile	Sat Nov 11 14:30:57 2000
 @@ -10,12 +10,11 @@
  
  all: info man
@@ -16,41 +17,67 @@
  
  # `-c' removes the huge number of associated files created by TeX.
  # This saves doing a `make clean' from hell. :-)
-@@ -27,24 +26,25 @@
+@@ -31,7 +30,7 @@
  man: xzgv.1
  xzgv.1: xzgv.texi makeman.awk
  	@echo 'Making man page from xzgv.texi...'
 -	gawk -f makeman.awk <xzgv.texi >xzgv.1
-+	awk -f makeman.awk <xzgv.texi >xzgv.1
++	$(AWK) -f makeman.awk <xzgv.texi >xzgv.1
  
  installdirs:
  	/bin/sh ../mkinstalldirs $(INFODIR) $(MANDIR)
- 
- # I think this one's getting just a tiny bit confusing :-}
+@@ -40,25 +39,26 @@
  ifeq ($(INFO_DIR_UPDATE),no)
--install: installdirs
-+install:
+ install: installdirs
  else
- install: ../src/install-info installdirs
+-install: ../src/install-info installdirs
++install:
  endif
-+	gzip -dc xzgv.gz > xzgv
  	install -m 444 xzgv.1 $(MANDIR)
 -	install -m 444 xzgv.gz xzgv-?.gz $(INFODIR)
 +	install -m 444 xzgv $(INFODIR)
++	install-info $(INFODIR)/xzgv $(INFODIR)/dir
  # Update info `dir' file.
  # Info always uses a dir file in preference to a dir.gz, so we don't use
  # dir.gz unless it's the only game in town.
- ifneq ($(INFO_DIR_UPDATE),no)
+-ifneq ($(INFO_DIR_UPDATE),no)
 -	gzip -d xzgv.gz
-+gzip -dc xzgv.gz > xzgv
- 	if [ -f $(INFODIR)/dir.gz -a ! -f $(INFODIR)/dir ]; then \
- 	  gzip -d $(INFODIR)/dir.gz; \
- 	  ../src/install-info xzgv $(INFODIR)/dir; \
-@@ -53,7 +53,6 @@
- 	  ../src/install-info xzgv $(INFODIR)/dir; \
- 	fi
- 	chmod a+r $(INFODIR)/dir
+-	if [ -f $(INFODIR)/dir.gz -a ! -f $(INFODIR)/dir ]; then \
+-	  gzip -d $(INFODIR)/dir.gz; \
+-	  ../src/install-info xzgv $(INFODIR)/dir; \
+-	  gzip $(INFODIR)/dir; \
+-	else \
+-	  ../src/install-info xzgv $(INFODIR)/dir; \
+-	fi
+-	chmod a+r $(INFODIR)/dir
 -	gzip xzgv
- endif
+-endif
++#ifneq ($(INFO_DIR_UPDATE),no)
++#	gzip -d xzgv.gz
++#	if [ -f $(INFODIR)/dir.gz -a ! -f $(INFODIR)/dir ]; then \
++#	  gzip -d $(INFODIR)/dir.gz; \
++#	  ../src/install-info xzgv $(INFODIR)/dir; \
++#	  gzip $(INFODIR)/dir; \
++#	else \
++#	  ../src/install-info xzgv $(INFODIR)/dir; \
++#	fi
++#	chmod a+r $(INFODIR)/dir
++#	gzip xzgv
++#endif
  
  ../src/install-info: ../src/install-info.c
+ 	cd ../src && $(MAKE) install-info
+@@ -66,10 +66,11 @@
+ # can't easily fix dir :-/, but do remove the files.
+ uninstall:
+ 	$(RM) $(MANDIR)/xzgv.1
+-	$(RM) $(INFODIR)/{xzgv.gz,xzgv-?.gz}
++	install-info --delete $(INFODIR)/xzgv $(INFODIR)/dir
++	$(RM) $(INFODIR)/xzgv
+ 
+ # This *doesn't* remove the Info files, which should stick around to
+ # be included in the distribution. Ditto for the man page, since
+ # building it requires gawk.
+ clean:
+-	$(RM) *~ xzgv.dvi
++	$(RM) *~ xzgv.dvi xzgv
diff --git a/graphics/xzgv/files/patch-ac b/graphics/xzgv/files/patch-ac
new file mode 100644
index 000000000000..10e192079813
--- /dev/null
+++ b/graphics/xzgv/files/patch-ac
@@ -0,0 +1,39 @@
+diff -urN ../../xzgv-0.6.orig/src/Makefile ./src/Makefile
+--- ../../xzgv-0.6.orig/src/Makefile	Wed Nov  8 21:52:49 2000
++++ ./src/Makefile	Sat Nov 11 14:32:17 2000
+@@ -19,7 +19,7 @@
+ # compile when you do `make install'. :-)
+ # (It would also be weird to have it made by the `doc' Makefile, IMHO.)
+ 
+-all: xzgv install-info
++all: xzgv #install-info
+ 
+ OBJS=	main.o \
+ 	filedetails.o gotodir.o updatetn.o confirm.o \
+@@ -43,14 +43,14 @@
+ installdirs:
+ 	/bin/sh ../mkinstalldirs $(BINDIR)
+ 
+-install: xzgv installdirs
+-	install -m 511 xzgv $(BINDIR)
++install: xzgv #installdirs
++	install -s -m 511 xzgv $(BINDIR)
+ 
+ uninstall:
+ 	$(RM) $(BINDIR)/xzgv
+ 
+ clean:
+-	$(RM) *~ *.o xzgv install-info
++	$(RM) *~ *.o xzgv
+ 	$(RM) rcfile_opt.h rcfile_var.h rcfile_short.h
+ 	$(RM) logodata.h logoconv
+ 
+@@ -63,7 +63,7 @@
+ getopt.o: getopt.c
+ getopt1.o: getopt1.c getopt.h
+ gotodir.o: gotodir.c main.h gotodir.h
+-install-info.o: install-info.c getopt.h
++#install-info.o: install-info.c getopt.h
+ logo.o: logo.c logodata.h
+ logoconv.o: logoconv.c
+ main.o: main.c readmrf.h readgif.h readpng.h readjpegtn.h resizepic.h \