diff options
| author | ache <ache@FreeBSD.org> | 2014-07-15 16:25:44 +0800 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 2014-07-15 16:25:44 +0800 |
| commit | 4857828b0afd69be9832a3a276c74c6aa268ce0f (patch) | |
| tree | cba7340720659f45938484e44689496165041920 /devel/cvs | |
| parent | 3d2b853d044e1a1d2a84a1958413dfd23b341087 (diff) | |
| download | freebsd-ports-gnome-4857828b0afd69be9832a3a276c74c6aa268ce0f.tar.gz freebsd-ports-gnome-4857828b0afd69be9832a3a276c74c6aa268ce0f.tar.zst freebsd-ports-gnome-4857828b0afd69be9832a3a276c74c6aa268ce0f.zip | |
Fix build on systems without kerberos installed by adding
KERBEROS option (default on, so unchanged from previous state)
Diffstat (limited to 'devel/cvs')
| -rw-r--r-- | devel/cvs/Makefile | 9 | ||||
| -rw-r--r-- | devel/cvs/files/patch-cvs__Makefile | 15 |
2 files changed, 9 insertions, 15 deletions
diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile index a89083e85e04..21f70957754a 100644 --- a/devel/cvs/Makefile +++ b/devel/cvs/Makefile @@ -11,6 +11,9 @@ COMMENT= Version control system LICENSE= GPLv2 +OPTIONS_DEFINE= KERBEROS +OPTIONS_DEFAULT= KERBEROS + USES= makeinfo tar:xz uidfix WRKSRC= ${WRKDIR}/call/cvs-build INFO= cvs cvsclient @@ -19,6 +22,12 @@ INFO= cvs cvsclient DESTDIRNAME= NADA MAKE_ARGS= DESTDIR=${STAGEDIR}${PREFIX} +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MKERBEROS} +MAKE_ARGS+= MK_KERBEROS_SUPPORT=yes +.endif + .include <bsd.port.pre.mk> .if ${OPSYS} == FreeBSD && ${OSVERSION} < 900000 diff --git a/devel/cvs/files/patch-cvs__Makefile b/devel/cvs/files/patch-cvs__Makefile deleted file mode 100644 index 4962caff99ba..000000000000 --- a/devel/cvs/files/patch-cvs__Makefile +++ /dev/null @@ -1,15 +0,0 @@ ---- ./cvs/Makefile.orig 2012-09-06 04:25:43.000000000 +0200 -+++ ./cvs/Makefile 2014-06-19 12:37:27.000000000 +0200 -@@ -32,12 +32,10 @@ - DPADD= ${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ} - LDADD= ${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz - --.if ${MK_KERBEROS_SUPPORT} != "no" - CFLAGS+= -DHAVE_GSSAPI -DENCRYPTION - LDADD+= -lgssapi -lkrb5 -lhx509 -lasn1 -lcrypto -lroken -lcrypt -lcom_err - DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCRYPTO} ${LIBROKEN} - DPADD+= ${LIBCRYPT} ${LIBCOM_ERR} --.endif - - # - # Regression test support |