summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2001-04-17 07:44:03 +0000
committertron <tron@pkgsrc.org>2001-04-17 07:44:03 +0000
commite1974d465f88c8d7e515007ce054bf0c0ce9e37b (patch)
tree990472c3462e705ce3fa3be6bcb8e4d31dce6484
parentc215ff9f5e7599a4c9a8780bc984f83aab9cb65a (diff)
downloadpkgsrc-e1974d465f88c8d7e515007ce054bf0c0ce9e37b.tar.gz
Disable the IPv6 patch under Solaris because it is not backward compatible
and causes build failures on systems with IPv6 but without KAME API.
-rw-r--r--devel/cvs/Makefile28
1 files changed, 14 insertions, 14 deletions
diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index aba6fde274e..bbcf828b130 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2001/04/16 02:49:43 itojun Exp $
+# $NetBSD: Makefile,v 1.41 2001/04/17 07:44:03 tron Exp $
#
DISTNAME= cvs-1.11
@@ -7,10 +7,6 @@ CATEGORIES= devel
MASTER_SITES= ftp://ftp.cvshome.org/pub/${DISTNAME}/ \
${MASTER_SITE_GNU:=cvs/}
-PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/
-PATCHFILES= cvs-1.11-v6-20010413.diff.gz
-PATCH_DIST_STRIP= -p1
-
MAINTAINER= tv@netbsd.org
HOMEPAGE= http://www.cvshome.org/
COMMENT= Concurrent Versions System
@@ -27,6 +23,19 @@ BUILD_DEFS+= USE_INET6
.if (${OPSYS} == "SunOS")
DEPENDS+= zlib-*:../../devel/zlib
CFLAGS+= -I${PREFIX}/include # zlib.h
+.else
+PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/
+PATCHFILES= cvs-1.11-v6-20010413.diff.gz
+PATCH_DIST_STRIP= -p1
+
+.if ${USE_INET6} == "YES"
+CONFIGURE_ARGS+= --enable-ipv6
+.else
+CONFIGURE_ARGS+= --disable-ipv6
+.endif
+
+post-patch:
+ (cd ${WRKSRC}; autoreconf)
.endif
.if defined(KERBEROS)
@@ -39,17 +48,8 @@ pre-fetch:
@${ECHO} RCS_LOCALID is now replaced by the tag variable in CVSROOT/config.
.endif
-.if ${USE_INET6} == "YES"
-CONFIGURE_ARGS+= --enable-ipv6
-.else
-CONFIGURE_ARGS+= --disable-ipv6
-.endif
-
CONFIGURE_ENV+= perl_path=${PERL5}
INFO_FILES= cvs.info cvsclient.info
-post-patch:
- (cd ${WRKSRC}; autoreconf)
-
.include "../../mk/bsd.pkg.mk"