diff options
| author | jlam <jlam> | 2002-08-25 21:48:57 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-08-25 21:48:57 +0000 |
| commit | 02526271b78c18a0c07b3ea8be04d2a61b0bf8e7 (patch) | |
| tree | c8d09a03adeac7a950080d8040f6c9ceb10ef9d2 /chat/ircII/Makefile | |
| parent | 521a29ec203c35a133d1b565a410d027176ebfc9 (diff) | |
| download | pkgsrc-02526271b78c18a0c07b3ea8be04d2a61b0bf8e7.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/Makefile')
| -rw-r--r-- | chat/ircII/Makefile | 22 |
1 files changed, 10 insertions, 12 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 \ |