Index: head/devel/cvs/files/patch-cvs__Makefile =================================================================== --- head/devel/cvs/files/patch-cvs__Makefile (revision 361894) +++ head/devel/cvs/files/patch-cvs__Makefile (nonexistent) @@ -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 Property changes on: head/devel/cvs/files/patch-cvs__Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/cvs/Makefile =================================================================== --- head/devel/cvs/Makefile (revision 361894) +++ head/devel/cvs/Makefile (revision 361895) @@ -1,31 +1,40 @@ # $FreeBSD$ PORTNAME= cvs PORTVERSION= 1.20120905 PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= LOCAL/eadler MAINTAINER= ports@FreeBSD.org 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 # bsd.stage.makes sets the wrong value for DESTDIR DESTDIRNAME= NADA MAKE_ARGS= DESTDIR=${STAGEDIR}${PREFIX} + +.include + +.if ${PORT_OPTIONS:MKERBEROS} +MAKE_ARGS+= MK_KERBEROS_SUPPORT=yes +.endif .include .if ${OPSYS} == FreeBSD && ${OSVERSION} < 900000 BROKEN= does not link .endif pre-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/contrib .include