diff options
| -rw-r--r-- | chat/bnc/Makefile | 10 | ||||
| -rw-r--r-- | chat/bnc/distinfo | 11 | ||||
| -rw-r--r-- | chat/bnc/patches/patch-aa | 20 | ||||
| -rw-r--r-- | chat/bnc/patches/patch-ab | 31 |
4 files changed, 19 insertions, 53 deletions
diff --git a/chat/bnc/Makefile b/chat/bnc/Makefile index 4053a5a763b..bb6ccfb5a7b 100644 --- a/chat/bnc/Makefile +++ b/chat/bnc/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.11 2005/06/16 06:57:41 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/25 14:48:45 zuntum Exp $ -DISTNAME= bnc2.8.6 +DISTNAME= bnc2.9.4 PKGNAME= ${DISTNAME:S/bnc/&-/} -PKGREVISION= 1 CATEGORIES= chat -MASTER_SITES= http://www.gotbnc.com/files/ \ +MASTER_SITES= http://www.gotbnc.com/ \ ftp://ftp.ircadmin.net/bnc/ MAINTAINER= zuntum@NetBSD.org @@ -15,6 +14,8 @@ DEPENDS+= dialog-[0-9]*:../../misc/dialog GNU_CONFIGURE= YES +CONFIGURE_ARGS= --with-ssl + INSTALLATION_DIRS= bin post-patch: @@ -34,4 +35,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/example.conf \ ${PREFIX}/share/examples/bnc/bnc.conf +.include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/bnc/distinfo b/chat/bnc/distinfo index 72816ff9796..7cc9db53e2b 100644 --- a/chat/bnc/distinfo +++ b/chat/bnc/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.6 2005/02/23 15:59:10 agc Exp $ +$NetBSD: distinfo,v 1.7 2005/06/25 14:48:46 zuntum Exp $ -SHA1 (bnc2.8.6.tar.gz) = 19544b83c4e8d558d56621b5001590432de2b4d0 -RMD160 (bnc2.8.6.tar.gz) = e8d0598a22d1c2b324fc087fc9a373398bc4db2d -Size (bnc2.8.6.tar.gz) = 52569 bytes -SHA1 (patch-aa) = 089c7ee2523d55404c68ca7ad6f551f6e69f1392 -SHA1 (patch-ab) = 74554135c60b7c18c467e674e1e22778b1fa3b95 +SHA1 (bnc2.9.4.tar.gz) = 4665c7b740dd37fe01a1ff82328600c9963dfd08 +RMD160 (bnc2.9.4.tar.gz) = 47065d7b9b6044f7eb9a3820201d64a7d682a7c9 +Size (bnc2.9.4.tar.gz) = 76896 bytes +SHA1 (patch-aa) = cf40e78385dce1a22c3215413a3e18f045348ba1 diff --git a/chat/bnc/patches/patch-aa b/chat/bnc/patches/patch-aa index ca56b3770b1..f127af34f7d 100644 --- a/chat/bnc/patches/patch-aa +++ b/chat/bnc/patches/patch-aa @@ -1,19 +1,15 @@ -$NetBSD: patch-aa,v 1.3 2004/02/02 09:05:20 grant Exp $ +$NetBSD: patch-aa,v 1.4 2005/06/25 14:48:46 zuntum Exp $ ---- Makefile.in.orig 2002-07-12 01:58:29.000000000 +1000 +--- Makefile.in.orig 2005-01-26 05:15:06.000000000 +0100 +++ Makefile.in -@@ -1,11 +1,10 @@ - LIBS = @LIBS@ --OPTS = -O3 --COPT = -Wall -+OPTS = ${CFLAGS} -+COPT = - OOPT = - STRIP = strip --CC = gcc +@@ -1,8 +1,8 @@ + LIBS=@LIBS@ +-CFLAGS=-O3 -Wall -include config.h ++CFLAGS+=-include config.h + CC=@CC@ -ALL: bnc mkpasswd +all: bnc mkpasswd mkpasswd:mkpasswd.c - ${CC} ${OPTS} ${COPT} ${LIBS} -o mkpasswd mkpasswd.c + ${CC} ${CFLAGS} -o mkpasswd mkpasswd.c ${LIBS} diff --git a/chat/bnc/patches/patch-ab b/chat/bnc/patches/patch-ab deleted file mode 100644 index ee2f5cd9791..00000000000 --- a/chat/bnc/patches/patch-ab +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2004/06/16 16:09:39 minskim Exp $ - ---- send.c.orig 2002-07-11 10:58:54.000000000 -0500 -+++ send.c -@@ -175,7 +175,7 @@ reschar: - sign = '\0'; - src = buf; - eos = src + 1; -- *src = va_arg(ap, char); -+ *src = va_arg(ap, int); - goto writeout; - case 's': - src = va_arg(ap, char *); -@@ -211,7 +211,7 @@ reschar: - goto nosign; - nosign: - ulval = flags & flaglongint ? va_arg(ap, long) -- : flags & flagshortint ? (long)(short)va_arg(ap,short) -+ : flags & flagshortint ? (long)(short)va_arg(ap,int) - : (long)va_arg(ap,int) ; - - goto number; -@@ -225,7 +225,7 @@ nosign: - case 'd': - case 'i': - ulval = flags & flaglongint ? va_arg(ap, long) -- : flags & flagshortint ? (long)(short)va_arg(ap,short) -+ : flags & flagshortint ? (long)(short)va_arg(ap,int) - : (long)va_arg(ap,int) ; - - if((long)ulval < 0) |