diff options
| author | jlam <jlam@pkgsrc.org> | 2002-08-25 21:48:57 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-08-25 21:48:57 +0000 |
| commit | 1c57323789a922a7182ba378831f2c0a336a6959 (patch) | |
| tree | c8d09a03adeac7a950080d8040f6c9ceb10ef9d2 /chat/ircII | |
| parent | ee84541509a09b09b26167f474c4b53185c17b5f (diff) | |
| download | pkgsrc-1c57323789a922a7182ba378831f2c0a336a6959.tar.gz | |
Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
Diffstat (limited to 'chat/ircII')
| -rw-r--r-- | chat/ircII/Makefile | 22 | ||||
| -rw-r--r-- | chat/ircII/distinfo | 4 | ||||
| -rw-r--r-- | chat/ircII/patches/patch-aa | 25 |
3 files changed, 16 insertions, 35 deletions
diff --git a/chat/ircII/Makefile b/chat/ircII/Makefile index 0d0a4a10a55..563c5715588 100644 --- a/chat/ircII/Makefile +++ b/chat/ircII/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2002/04/03 14:00:49 mrg Exp $ +# $NetBSD: Makefile,v 1.18 2002/08/25 21:49:34 jlam Exp $ DISTNAME= ircii-${VERS} PKGNAME= ircII-${VERS} @@ -17,7 +17,7 @@ PLIST_SUBST+= VERS=${VERS} .include "../../mk/bsd.prefs.mk" -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= yes GNU_CONFIGURE= yes .if defined(DEFAULT_IRC_SERVER) CONFIGURE_ARGS+= --with-default-server=${DEFAULT_IRC_SERVER} @@ -34,20 +34,18 @@ BUILD_DEFS+= USE_SOCKS # Include SOCKS firewall support .if defined(USE_SOCKS) && (${USE_SOCKS} == 4 || ${USE_SOCKS} == 5) -CONFIGURE_ARGS+= --with-socks${USE_SOCKS}=${BUILDLINK_DIR} -.if ${USE_SOCKS} == 4 -.include "../../net/socks4/buildlink.mk" -.else -.include "../../net/socks5/buildlink.mk" -.endif +. if ${USE_SOCKS} == 4 +. include "../../net/socks4/buildlink2.mk" +CONFIGURE_ARGS+= --with-socks4=${BUILDLINK_PREFIX.socks4} +. elif ${USE_SOCKS} == 5 +. include "../../net/socks5/buildlink2.mk" +CONFIGURE_ARGS+= --with-socks5=${BUILDLINK_PREFIX.socks5} +. endif .endif -.if defined(IRCII_CONFIGURE_ARGS) +# Allow customizations from /etc/mk.conf. CONFIGURE_ARGS+= ${IRCII_CONFIGURE_ARGS} -.endif -.if defined(IRCII_CONFIGURE_ENV) CONFIGURE_ENV+= ${IRCII_CONFIGURE_ENV} -.endif pre-install: @(if [ "X${MANZ}" != X"" ]; then \ diff --git a/chat/ircII/distinfo b/chat/ircII/distinfo index 7a56eee0047..56365df494f 100644 --- a/chat/ircII/distinfo +++ b/chat/ircII/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.12 2002/04/03 13:42:01 mrg Exp $ +$NetBSD: distinfo,v 1.13 2002/08/25 21:49:34 jlam Exp $ SHA1 (ircii-20020403.tar.bz2) = e6492a796dc068eafe34c60b4ad503b36c4dc198 Size (ircii-20020403.tar.bz2) = 537289 bytes -SHA1 (patch-aa) = 80aa471bcb6f864bed32117ed437d9d1ca9aa1ee +SHA1 (patch-aa) = aff3a8c5ff05797b8617be2b4b57920913ae9ca2 SHA1 (patch-ac) = 0afd36f3ad2247b0d42dfebab210822dd5dfe151 diff --git a/chat/ircII/patches/patch-aa b/chat/ircII/patches/patch-aa index d6ba25ee00b..48978813371 100644 --- a/chat/ircII/patches/patch-aa +++ b/chat/ircII/patches/patch-aa @@ -1,25 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2001/07/15 12:22:17 jlam Exp $ +$NetBSD: patch-aa,v 1.3 2002/08/25 21:49:35 jlam Exp $ ---- 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 @@ +--- configure.orig Wed Mar 27 09:20:46 2002 ++++ configure Wed May 8 05:34:40 2002 +@@ -5578,7 +5578,7 @@ fi if test "x$COPY_DIRECTORY" = "xpax"; then |