diff options
-rw-r--r-- | chat/ircII/Makefile | 11 | ||||
-rw-r--r-- | chat/ircII/distinfo | 5 | ||||
-rw-r--r-- | chat/ircII/patches/patch-aa | 25 |
3 files changed, 29 insertions, 12 deletions
diff --git a/chat/ircII/Makefile b/chat/ircII/Makefile index 2c2ac1eecbf..c9bde2e80da 100644 --- a/chat/ircII/Makefile +++ b/chat/ircII/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/07/07 20:54:52 mrg Exp $ +# $NetBSD: Makefile,v 1.9 2001/07/15 12:22:16 jlam Exp $ # FreeBSD Id: Makefile,v 1.14 1997/05/14 10:35:13 torstenb Exp # @@ -16,6 +16,7 @@ CONFLICTS= blackened-* .include "../../mk/bsd.prefs.mk" +USE_BUILDLINK_ONLY= yes GNU_CONFIGURE= yes .if defined(DEFAULT_IRC_SERVER) CONFIGURE_ARGS+= --with-default-server=${DEFAULT_IRC_SERVER} @@ -31,16 +32,16 @@ BUILD_DEFS+= USE_SOCKS # Include SOCKS firewall support .if defined(USE_SOCKS) && (${USE_SOCKS} == 4 || ${USE_SOCKS} == 5) -CONFIGURE_ARGS+= --with-socks${USE_SOCKS}=${PREFIX} +CONFIGURE_ARGS+= --with-socks${USE_SOCKS}=${BUILDLINK_DIR} .if ${USE_SOCKS} == 4 -DEPENDS+= socks4-2.2:../../net/socks4 +.include "../../net/socks4/buildlink.mk" .else -DEPENDS+= socks5-1.0.2:../../net/socks5 +.include "../../net/socks5/buildlink.mk" .endif .endif .if (${OPSYS} == SunOS) -LIBS= -lnsl +LIBS+= -lnsl .endif .if defined(IRCII_CONFIGURE_ARGS) diff --git a/chat/ircII/distinfo b/chat/ircII/distinfo index c1463edf1fa..4af67389698 100644 --- a/chat/ircII/distinfo +++ b/chat/ircII/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.4 2001/07/07 20:54:52 mrg Exp $ +$NetBSD: distinfo,v 1.5 2001/07/15 12:22:16 jlam Exp $ SHA1 (ircii-20010612.tar.bz2) = 04189908de744956a66530d77d97c452927bb876 Size (ircii-20010612.tar.bz2) = 522912 bytes -SHA1 (patch-aa) = 3bd1f330a21fd80d19394c5f2d96bf5ae1aff594 -SHA1 (patch-ab) = 263d34d9f5af092a170a762f5337007d9a2cca37 +SHA1 (patch-aa) = 80aa471bcb6f864bed32117ed437d9d1ca9aa1ee SHA1 (patch-ac) = 0afd36f3ad2247b0d42dfebab210822dd5dfe151 diff --git a/chat/ircII/patches/patch-aa b/chat/ircII/patches/patch-aa index 705b22d5296..d6ba25ee00b 100644 --- a/chat/ircII/patches/patch-aa +++ b/chat/ircII/patches/patch-aa @@ -1,8 +1,25 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/12/15 00:36:32 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2001/07/15 12:22:17 jlam Exp $ ---- configure.orig Sun Apr 9 09:11:08 2000 -+++ configure Thu Aug 3 07:43:46 2000 -@@ -5241,7 +5241,7 @@ +--- configure.orig Mon Feb 12 07:46:44 2001 ++++ configure +@@ -538,16 +538,6 @@ + + + +-# So many systems seem to need this that it is better do it here automatically. +-if test "x$prefix" != xNONE; then +- if test -d "$prefix/lib"; then +- LIBS="-L${prefix}/lib $LIBS" +- fi +-else +- if test -d "$ac_default_prefix/lib"; then +- LIBS="-L${ac_default_prefix}/lib $LIBS" +- fi +-fi + + + VERSION=`sed -n -e 's/"[^"]*$//' -e '/#define[ ]*IRCII_VERSION[ ]*"/s///p' -e '/#define IRCII_VERSION/q' < ${srcdir}/source/irc.c` +@@ -5499,7 +5489,7 @@ fi if test "x$COPY_DIRECTORY" = "xpax"; then |