update to ircII 4.4U. mainly a bug-fix release.

6 files changed, 16 insertions, 39 deletions

diff --git a/net/ircII/Makefile b/net/ircII/Makefile
index 9788da5e677..ba316c1aa61 100644
--- a/net/ircII/Makefile
+++ b/net/ircII/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.30 2000/05/04 04:03:54 itojun Exp $
+# $NetBSD: Makefile,v 1.31 2000/05/11 04:32:43 mrg Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/05/14 10:35:13 torstenb Exp
 #
 
-DISTNAME=		ircii-4.4S
-PKGNAME=		ircII-4.4S
-WRKSRC=			${WRKDIR}/ircii-4.4S
+DISTNAME=		ircii-4.4U
+PKGNAME=		ircII-4.4U
+WRKSRC=			${WRKDIR}/ircii-4.4U
 CATEGORIES=		net
 MASTER_SITES=		ftp://ircftp.au.eterna.com.au/pub/ircII/
+EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		packages@netbsd.org
 
@@ -17,8 +18,6 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-default-server=${DEFAULT_IRC_SERVER}
 .endif
 
-BUILD_DEPENDS+=		autoreconf:../../devel/autoconf
-
 BUILD_DEFS+=		USE_INET6
 
 # Note: this pkg auto-detects IPv6 without regarding USE_INET6.
@@ -37,9 +36,6 @@ DEPENDS+=               socks5-1.0.2:../../net/socks5
 .endif
 .endif
 
-post-patch:
-	@(cd ${WRKSRC}; autoreconf)
-
 pre-install:
 	@(if [ "X${MANZ}" != X"" ]; then \
 		GZSUFFIX=.gz; \
diff --git a/net/ircII/files/md5 b/net/ircII/files/md5
index dcea39e7da9..c4187c48277 100644
--- a/net/ircII/files/md5
+++ b/net/ircII/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.11 2000/03/18 09:45:02 itojun Exp $
+$NetBSD: md5,v 1.12 2000/05/11 04:32:44 mrg Exp $
 
-MD5 (ircii-4.4S.tar.gz) = 26a5c15a3a2f0abfc07a8b64e4553434
+MD5 (ircii-4.4U.tar.bz2) = a9783e703394e7ad871b3cfcad9aac41
diff --git a/net/ircII/files/patch-sum b/net/ircII/files/patch-sum
index dd87d490c4d..c830dee8bd1 100644
--- a/net/ircII/files/patch-sum
+++ b/net/ircII/files/patch-sum
@@ -1,4 +1,3 @@
-$NetBSD: patch-sum,v 1.14 2000/03/18 09:45:02 itojun Exp $
+$NetBSD: patch-sum,v 1.15 2000/05/11 04:32:44 mrg Exp $
 
-MD5 (patch-ac) = a1297cc8a4c19898983e2420c8307160
-MD5 (patch-ad) = cbe93c8a97c8480f8e3d8cc4ed38eba1
+MD5 (patch-ac) = 704f52d365e4f35aa8d569ca02abe25e
diff --git a/net/ircII/patches/patch-ac b/net/ircII/patches/patch-ac
index 0d5497ec8ab..91d8712e423 100644
--- a/net/ircII/patches/patch-ac
+++ b/net/ircII/patches/patch-ac
@@ -1,9 +1,6 @@
-$NetBSD: patch-ac,v 1.9 2000/01/31 23:00:48 mrg Exp $
-
-Index: Makefile.in
---- Makefile.in.orig	Mon Aug 23 13:46:48 1999
-+++ Makefile.in	Mon Nov 29 01:33:06 1999
-@@ -176,8 +176,8 @@
+--- Makefile.in.orig	Sun Apr 16 02:04:02 2000
++++ Makefile.in	Thu May 11 13:56:05 2000
+@@ -158,8 +158,8 @@
  CP = cp
  MV = mv
  SED = sed
@@ -14,7 +11,7 @@ Index: Makefile.in
  
  VERSION = @VERSION@
  
-@@ -196,11 +196,9 @@
+@@ -178,11 +178,9 @@
  
  installirc: irc installdirs
  	$(INSTALL) irc $(INSTALL_IRC)-$(VERSION)
@@ -23,7 +20,7 @@ Index: Makefile.in
 -	@if test -f $(INSTALL_IRC); then $(MV) $(INSTALL_IRC) $(INSTALL_IRC).old; fi
 +	$(BSD_INSTALL_SCRIPT) ircbug $(bindir)/ircbug
  	$(RM) $(INSTALL_IRC)
--	$(LN) $(INSTALL_IRC)-$(VERSION) $(INSTALL_IRC)
+-	$(LN) $(INSTALL_IRC_NAME)-$(VERSION) $(INSTALL_IRC)
 +	cd ${bindir}; $(LN) irc-$(VERSION) irc
  
  installscript: installdirs
diff --git a/net/ircII/patches/patch-ad b/net/ircII/patches/patch-ad
deleted file mode 100644
index 690ce16f9d1..00000000000
--- a/net/ircII/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2000/03/18 09:45:02 itojun Exp $
-
---- configure.in-	Sat Mar 18 18:19:09 2000
-+++ configure.in	Sat Mar 18 18:19:25 2000
-@@ -1128,7 +1128,9 @@
-     }
-   }
- 
--  if (inet6 != 2 || inet4 != 2)
-+  if (inet4 != 0 && inet4 != 2)
-+    goto bad;
-+  if (inet6 != 0 && inet6 != 2)
-     goto bad;
- 
-   if (aitop)
diff --git a/net/ircII/pkg/PLIST b/net/ircII/pkg/PLIST
index 00c2b412d41..dad7a8c19e9 100644
--- a/net/ircII/pkg/PLIST
+++ b/net/ircII/pkg/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.23 2000/03/18 11:45:30 tron Exp $
+@comment $NetBSD: PLIST,v 1.24 2000/05/11 04:32:44 mrg Exp $
 bin/irc
-bin/irc-4.4S
+bin/irc-4.4U
 bin/ircbug
 bin/ircflush
 bin/ircio