- remove pre-configure target

- convert patch-aa to a unified diff
- remove workaround for texinfo install-info bug
- move removal of wget.info* into wget's Makefile just before it gets
re-generated
- ${SH} -> sh

net/wget/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 1999/04/10 02:50:54 marc Exp $
+# $OpenBSD: Makefile,v 1.9 1999/12/14 03:59:09 brad Exp $
 
 DISTNAME=	wget-1.5.3
 CATEGORIES=	net
@@ -13,15 +13,9 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I/usr/local/include" \
 		LDFLAGS="-L/usr/local/lib"
 
-pre-configure:
-	@${RM} ${WRKSRC}/doc/wget.info*
-
 post-install:
-	@if [ ! -f ${PREFIX}/info/dir ]; then \
-		sed -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
-	fi
 	@install-info ${PREFIX}/info/wget.info ${PREFIX}/info/dir
-	@PKG_PREFIX="${PREFIX}" ${SH} ${PKGDIR}/INSTALL ${DISTNAME} POST-INSTALL
+	@PKG_PREFIX="${PREFIX}" sh ${PKGDIR}/INSTALL ${DISTNAME} POST-INSTALL
 
 
 .include <bsd.port.mk>

net/wget/patches/patch-aa

@@ -1,16 +1,14 @@
-*** doc/wget.texi.orig	Sat Jun 27 18:58:29 1998
---- doc/wget.texi	Sat Jun 27 18:58:08 1998
-***************
-*** 9,14 ****
---- 9,19 ----
-  @setchapternewpage on
-  @c %**end of header
-  
-+ @dircategory Networking tools
-+ @direntry
-+ * Wget: (wget.info).            A utility for network download.
-+ @end direntry
-+ 
-  @iftex
-  @c Remove this if you don't use A4 paper.
-  @afourpaper
+--- doc/wget.texi.orig	Thu Sep 10 20:34:56 1998
++++ doc/wget.texi	Mon Dec 13 22:43:14 1999
+@@ -9,6 +9,11 @@
+ @setchapternewpage on
+ @c %**end of header
+ 
++@dircategory Networking tools
++@direntry
++* Wget: (wget.info).            A utility for network download.
++@end direntry
++
+ @iftex
+ @c Remove this if you don't use A4 paper.
+ @afourpaper

net/wget/patches/patch-ab

@@ -1,5 +1,5 @@
---- doc/Makefile.in.orig	Sat May 23 19:40:42 1998
-+++ doc/Makefile.in	Fri Apr  9 18:49:50 1999
+--- doc/Makefile.in.orig	Sat May 23 22:40:42 1998
++++ doc/Makefile.in	Mon Dec 13 22:45:54 1999
 @@ -22,7 +22,7 @@
  SHELL = /bin/sh
  
@@ -18,7 +18,15 @@
  
  #
  # Dependencies for building
-@@ -99,19 +99,8 @@
+@@ -56,6 +56,7 @@
+ everything: all wget_us.ps wget_a4.ps wget_toc.html
+ 
+ wget.info: wget.texi
++	@rm -f wget.info*
+ 	-$(MAKEINFO)
+ 
+ #wget.cat: $(MAN)
+@@ -99,19 +100,8 @@
  
  # install sample.wgetrc
  install.wgetrc:

net/wget/pkg/PLIST

@@ -1,7 +1,6 @@
 bin/wget
 @unexec install-info --delete %D/info/wget.info %D/info/dir
 info/wget.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/wget.info %D/info/dir
 lib/wget/sample.wgetrc
 share/locale/cs/LC_MESSAGES/wget.mo