upgrade to ircII 20040216

net/ircII/Makefile

@@ -1,16 +1,11 @@
-# $OpenBSD: Makefile,v 1.25 2003/10/18 11:41:22 naddy Exp $
-# $FreeBSD: Makefile,v 1.15 1998/01/25 20:40:00 torstenb Exp $
+# $OpenBSD: Makefile,v 1.26 2004/06/06 02:27:46 brad Exp $
 
 COMMENT=	"Internet Relay Chat client"
 
-VERSION=	20030709
+VERSION=	20040216
 DISTNAME=	ircii-${VERSION}
 PKGNAME=	ircII-${VERSION}
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.warped.com/pub/ircII/ \
-		ftp://ircftp.au.eterna.com.au/pub/ircII/ \
-		ftp://ftp.warped.com/pub/ircII/old/ \
-		ftp://ircftp.au.eterna.com.au/pub/ircII/old/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	Brad Smith <brad@openbsd.org>
@@ -23,16 +18,22 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+MASTER_SITES=	ftp://ftp.warped.com/pub/ircII/ \
+		ftp://ircftp.au.eterna.com.au/pub/ircII/ \
+		ftp://ftp.warped.com/pub/ircII/old/ \
+		ftp://ircftp.au.eterna.com.au/pub/ircII/old/
+
 SUBST_VARS=	VERSION
 
-FAKE_FLAGS=	DESTDIR="${WRKINST}" INSTALL_IRC='$${bindir}/ircII' \
+FAKE_FLAGS=	DESTDIR="${WRKINST}" INSTALL_IRC_NAME="ircII" \
 		INSTALL="${INSTALL_PROGRAM}" INSTALL_DATA="${INSTALL_DATA}"
 
-NO_REGRESS=	Yes
-
 SEPARATE_BUILD=	simple
-CONFIGURE_STYLE=gnu
+CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS=	--enable-ipv6 --exec-prefix="${PREFIX}"
+CONFIGURE_ENV+=	IRCLIB='$$(DESTDIR)${PREFIX}/share/ircII'
+
+NO_REGRESS=	Yes
 
 post-install:
 	@mv ${PREFIX}/bin/ircII-${VERSION} ${PREFIX}/bin/ircII

net/ircII/distinfo

@@ -1,3 +1,3 @@
-MD5 (ircii-20030709.tar.bz2) = b84fa6426dc60b2aaa9961ed17dfaef2
-RMD160 (ircii-20030709.tar.bz2) = 9b76bf2d2db17fee32034f8f271f2ef490b5edb8
-SHA1 (ircii-20030709.tar.bz2) = 8cbc17529a373d11dc28d5636e060b2a0ead185c
+MD5 (ircii-20040216.tar.bz2) = b67e963977ffd1a4181e8f493966c66e
+RMD160 (ircii-20040216.tar.bz2) = 646abd6d4b2d84ccbc981055ae8077dd435b58f3
+SHA1 (ircii-20040216.tar.bz2) = 45810bc1b8ae12c884df469936d37fa1a5b7468c

net/ircII/patches/patch-doc_ircII_1

@@ -1,6 +1,6 @@
-$OpenBSD: patch-doc_ircII_1,v 1.1 2002/12/08 23:21:34 brad Exp $
---- doc/ircII.1.orig	Wed Oct 30 08:57:51 2002
-+++ doc/ircII.1	Sun Dec  8 18:02:52 2002
+$OpenBSD: patch-doc_ircII_1,v 1.2 2004/06/06 02:27:47 brad Exp $
+--- doc/ircII.1.orig	2003-12-07 21:15:41.000000000 -0500
++++ doc/ircII.1	2004-06-05 21:50:23.000000000 -0400
 @@ -3,7 +3,7 @@
  .SH NAME
  ircII \- interface to the Internet Relay Chat system
@@ -92,7 +92,7 @@ $OpenBSD: patch-doc_ircII_1,v 1.1 2002/12/08 23:21:34 brad Exp $
  with a program called
 @@ -243,7 +243,7 @@ with a program called
  .br
- .B "setenv IRCNAME \"The one and only :)\""
+ .B "setenv IRCNAME ""The one and only :)"""
  .TP
 -.B irc
 +.B ircII

net/ircII/pkg/MESSAGE

@@ -1,2 +0,0 @@
-The ircII executable has been installed as ${PREFIX}/bin/ircII
-to avoid conflict with another IRC package.