Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 14 Sep 2013 09:59:28 +0000 (UTC)
From:      Olli Hauer <ohauer@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r327257 - head/devel/cvsd
Message-ID:  <201309140959.r8E9xSGm023148@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ohauer
Date: Sat Sep 14 09:59:28 2013
New Revision: 327257
URL: http://svnweb.freebsd.org/changeset/ports/327257

Log:
  - fix r327153, cvs is only required
    .if ${OSVERSION} > 1000000
  
  - since I'm here do some minor cleanup

Modified:
  head/devel/cvsd/Makefile

Modified: head/devel/cvsd/Makefile
==============================================================================
--- head/devel/cvsd/Makefile	Sat Sep 14 09:41:33 2013	(r327256)
+++ head/devel/cvsd/Makefile	Sat Sep 14 09:59:28 2013	(r327257)
@@ -13,8 +13,6 @@ COMMENT=	CVS pserver daemon
 EXTRA_PATCHES=	${FILESDIR}/extra-cvsd-buildroot.in
 
 USES=		perl5
-BUILD_DEPENDS=	cvs:${PORTSDIR}/devel/cvs
-RUN_DEPENDS=	cvs:${PORTSDIR}/devel/cvs
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libwrap
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
@@ -25,9 +23,17 @@ MAN8=		cvsd.8 cvsd-buginfo.8 cvsd-buildr
 PORTDOCS=	FAQ NEWS README
 PLIST_FILES=	etc/cvsd/cvsd.conf.sample sbin/cvsd sbin/cvsd-buginfo \
 		sbin/cvsd-buildroot sbin/cvsd-passwd
-PLIST_DIRS=	etc/cvsd
+PLIST_DIRSTRY=	etc/cvsd
 USE_RC_SUBR=	cvsd
 
+OPTIONS_DEFINE=	DOCS
+.include <bsd.port.options.mk>
+
+.if ${OSVERSION} > 1000000
+BUILD_DEPENDS=	cvs:${PORTSDIR}/devel/cvs
+RUN_DEPENDS=	cvs:${PORTSDIR}/devel/cvs
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cvsd ${PREFIX}/sbin/cvsd
 .for f in cvsd-buginfo cvsd-buildroot cvsd-passwd
@@ -41,11 +47,9 @@ do-install:
 .for FILE in ${MAN8}
 	${INSTALL_MAN} ${WRKSRC}/${FILE} ${MAN8PREFIX}/man/man8
 .endfor
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-.for docs in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}
-.endfor
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309140959.r8E9xSGm023148>