summaryrefslogtreecommitdiff
path: root/devel/cvs
diff options
context:
space:
mode:
authorAndrey A. Chernov <ache@FreeBSD.org>2014-07-15 08:39:26 +0000
committerAndrey A. Chernov <ache@FreeBSD.org>2014-07-15 08:39:26 +0000
commit0b94597cca10b6122e9a0296c5e13654e24721eb (patch)
tree424305aeaf17d83db0625aea48fb7338aa8c3658 /devel/cvs
parentUpdate to 1.3.2. (diff)
MK_KERBEROS_SUPPORT can't be set by user, so rename it to KERBEROS_SUPPORT
Diffstat (limited to 'devel/cvs')
-rw-r--r--devel/cvs/Makefile2
-rw-r--r--devel/cvs/files/patch-cvs__Makefile11
2 files changed, 12 insertions, 1 deletions
diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index 21f70957754a..03d1e036cf94 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -25,7 +25,7 @@ MAKE_ARGS= DESTDIR=${STAGEDIR}${PREFIX}
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MKERBEROS}
-MAKE_ARGS+= MK_KERBEROS_SUPPORT=yes
+MAKE_ARGS+= KERBEROS_SUPPORT=yes
.endif
.include <bsd.port.pre.mk>
diff --git a/devel/cvs/files/patch-cvs__Makefile b/devel/cvs/files/patch-cvs__Makefile
new file mode 100644
index 000000000000..3f0b82e696dd
--- /dev/null
+++ b/devel/cvs/files/patch-cvs__Makefile
@@ -0,0 +1,11 @@
+--- cvs/Makefile.orig 2012-09-06 06:25:43.000000000 +0400
++++ cvs/Makefile 2014-07-15 12:37:28.000000000 +0400
+@@ -32,7 +32,7 @@
+ DPADD= ${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ}
+ LDADD= ${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
+
+-.if ${MK_KERBEROS_SUPPORT} != "no"
++.if ${KERBEROS_SUPPORT} != "no"
+ CFLAGS+= -DHAVE_GSSAPI -DENCRYPTION
+ LDADD+= -lgssapi -lkrb5 -lhx509 -lasn1 -lcrypto -lroken -lcrypt -lcom_err
+ DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCRYPTO} ${LIBROKEN}