svn commit: r384063 - in head/devel/cvs: . files

[Jan Beich]

Author: jbeich
Date: Wed Apr 15 17:08:01 2015
New Revision: 384063
URL: https://svnweb.freebsd.org/changeset/ports/384063

Log:
  - Install INFO docs again as they're more complete [1]
  - Drop BROKEN: builds fine on 8.4R i386/amd64
  - Checking "no" value is only required for MK_ variables
  - Convert to option helpers
  - Clarify LICENSE allows any later version
  
  PR:		191548 [1]

Added:
  head/devel/cvs/files/patch-cvs.info.texinfo-5.x
     - copied, changed from r384057, head/devel/cvs-devel/files/patch-cvs.info.texinfo-5.x
Deleted:
  head/devel/cvs/files/patch-Makefile
Modified:
  head/devel/cvs/Makefile
  head/devel/cvs/files/patch-cvs__Makefile

Modified: head/devel/cvs/Makefile
==============================================================================
--- head/devel/cvs/Makefile	Wed Apr 15 16:42:19 2015	(r384062)
+++ head/devel/cvs/Makefile	Wed Apr 15 17:08:01 2015	(r384063)
@@ -2,40 +2,29 @@
 
 PORTNAME=	cvs
 PORTVERSION=	1.20120905
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	LOCAL/eadler
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Version control system
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2 # or any later version
 
 OPTIONS_DEFINE=	KERBEROS EXAMPLES
 OPTIONS_DEFAULT=KERBEROS
 
-USES=		tar:xz uidfix
+KERBEROS_MAKE_ARGS=	KERBEROS_SUPPORT=yes
+
+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 <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MKERBEROS}
-MAKE_ARGS+=	KERBEROS_SUPPORT=yes
-.else
-MAKE_ARGS+=	KERBEROS_SUPPORT=no
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 900000
-BROKEN=	does not link
-.endif
-
 pre-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/contrib
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Copied and modified: head/devel/cvs/files/patch-cvs.info.texinfo-5.x (from r384057, head/devel/cvs-devel/files/patch-cvs.info.texinfo-5.x)
==============================================================================
--- head/devel/cvs-devel/files/patch-cvs.info.texinfo-5.x	Wed Apr 15 15:35:05 2015	(r384057, copy source)
+++ head/devel/cvs/files/patch-cvs.info.texinfo-5.x	Wed Apr 15 17:08:01 2015	(r384063)
@@ -6,8 +6,8 @@ Subject: Make cvs.texinfo compatible wit
 
 diff --git a/doc/cvs.texinfo b/doc/cvs.texinfo
 index a0136a5..d11a5e1 100644
---- doc/cvs.texinfo
-+++ doc/cvs.texinfo
+--- ../cvs/doc/cvs.texinfo
++++ ../cvs/doc/cvs.texinfo
 @@ -113,9 +113,9 @@ approved by the Free Software Foundation.
  @sp 4
  @comment The title is printed in a large font.

Modified: head/devel/cvs/files/patch-cvs__Makefile
==============================================================================
--- head/devel/cvs/files/patch-cvs__Makefile	Wed Apr 15 16:42:19 2015	(r384062)
+++ head/devel/cvs/files/patch-cvs__Makefile	Wed Apr 15 17:08:01 2015	(r384063)
@@ -5,7 +5,7 @@
  LDADD=	${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz
  
 -.if ${MK_KERBEROS_SUPPORT} != "no"
-+.if ${KERBEROS_SUPPORT} != "no"
++.if defined(KERBEROS_SUPPORT)
  CFLAGS+= -DHAVE_GSSAPI -DENCRYPTION
  LDADD+= -lgssapi -lkrb5 -lhx509 -lasn1 -lcrypto -lroken -lcrypt -lcom_err
  DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCRYPTO} ${LIBROKEN}