summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorgrant <grant@pkgsrc.org>2003-03-18 15:29:48 +0000
committergrant <grant@pkgsrc.org>2003-03-18 15:29:48 +0000
commitbd9fb58bec0f1f414cec2859c660705c1aa311ec (patch)
tree74333bcfc2719d790f28515d9f73b85e8c13009d /devel
parent90e0a1604bf261ce067bb13dab2954dd148f04ae (diff)
downloadpkgsrc-bd9fb58bec0f1f414cec2859c660705c1aa311ec.tar.gz
fix USE_INET6 and KERBEROS conditionals, allowing this to build with
IPv6 support on FreeBSD and probably others. bump PKGREVISION for user-visible changes.
Diffstat (limited to 'devel')
-rw-r--r--devel/cvs/Makefile20
1 files changed, 9 insertions, 11 deletions
diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index 973b7ec77fe..9e9d40998ef 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2003/03/07 05:34:30 grant Exp $
+# $NetBSD: Makefile,v 1.60 2003/03/18 15:29:48 grant Exp $
#
DISTNAME= cvs-1.11.5
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://ftp.cvshome.org/${DISTNAME}/ \
${MASTER_SITE_GNU:=non-gnu/cvs/}
@@ -17,27 +18,24 @@ GNU_CONFIGURE= yes
BUILD_DEFS+= USE_INET6
USE_BUILDLINK2= yes
-.if ${OPSYS} == "NetBSD"
+.if defined(USE_INET6) && ${USE_INET6} == "YES"
+CONFIGURE_ARGS+= --enable-ipv6
PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/
PATCHFILES= cvs-1.11.4-v6-20030102.diff.gz
PATCH_DIST_STRIP= -p1
-
-.if defined(USE_INET6) && ${USE_INET6} == "YES"
-CONFIGURE_ARGS+= --enable-ipv6
.else
CONFIGURE_ARGS+= --disable-ipv6
.endif
-.endif
-
-.if ${OPSYS} == "Darwin"
-LDFLAGS+= -framework Kerberos
-.endif
-
.if defined(KERBEROS)
CONFIGURE_ARGS+= --with-krb4=/usr --enable-encryption
CONFIGURE_ARGS+= --with-gssapi=/usr
CPPFLAGS+= -I/usr/include/krb5
+. if ${OPSYS} == "Darwin"
+LDFLAGS+= -framework Kerberos
+. endif
+.else
+CONFIGURE_ARGS+= --without-gssapi
.endif
.if defined(RCS_LOCALID)