diff --git a/devel/cvsps/Makefile b/devel/cvsps/Makefile
index 74bb84f52d41..72b904665452 100644
--- a/devel/cvsps/Makefile
+++ b/devel/cvsps/Makefile
@@ -1,36 +1,33 @@
-# ex:ts=8
-# Ports collection makefile for:	cvsps
-# Date Created:			Feb 9, 2002
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	cvsps
 PORTVERSION=	2.1
 PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cobite.com/cvsps/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Create patchset information from CVS
 
-CONFLICTS=	cvsps-devel-*
+CONFLICTS=	cvsps-devel-[0-9]*
 
 MAN1=		cvsps.1
 PLIST_FILES=	bin/cvsps
 
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	README
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cvsps ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/cvsps.1 ${MANPREFIX}/man/man1
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>