Index: Makefile
===================================================================
--- Makefile	(revision 304447)
+++ Makefile	(working copy)
@@ -1,7 +1,3 @@
-# New ports collection makefile for:	cvs2svn
-# Date created:		1 May 2004
-# Whom:			Hye-Shik Chang
-#
 # $FreeBSD$
 
 PORTNAME=	cvs2svn
@@ -22,25 +18,25 @@
 USE_PYTHON=	2.5+
 USE_PYDISTUTILS=	yes
 
-OPTIONS=	SUBVERSION "Build with subversion support" on \
-		GIT "Build with git support" off \
-		BAZAAR "Build with Bazaar support" off
+OPTIONS_MULTI=		SCM
+OPTIONS_MULTI_SCM=	SUBVERSION GIT BAZAAR
+OPTIONS_DEFAULT=	SUBVERSION
 
-.include <bsd.port.pre.mk>
+SUBVERSION_DESC=	Build with subversion support
+GIT_DESC= 		Build with git support
+BAZAAR_DESC= 		Build with Bazaar support
 
-.if defined(WITHOUT_SUBVERSION) && defined(WITHOUT_GIT) && defined(WITHOUT_BAZAAR)
-IGNORE=	choose at least one or more options from subversion, git or bazaar
-.endif
+.include <bsd.port.options.mk>
 
-.if defined(WITH_SUBVERSION)
+.if ${PORT_OPTIONS:MSUBVERSION}
 RUN_DEPENDS+=	${LOCALBASE}/bin/svn:${PORTSDIR}/devel/py-subversion
 .endif
 
-.if defined(WITH_GIT)
+.if ${PORT_OPTIONS:MGIT}
 RUN_DEPENDS+=	${LOCALBASE}/bin/git:${PORTSDIR}/devel/git
 .endif
 
-.if defined(WITH_BAZAAR)
+.if ${PORT_OPTIONS:MBAZAAR}
 RUN_DEPENDS+=	${LOCALBASE}/bin/bzr:${PORTSDIR}/devel/bzr
 .endif
 
@@ -73,7 +69,7 @@
 	@${INSTALL_MAN} ${WRKSRC}/cvs2svn.1 ${PREFIX}/man/man1/
 	@${INSTALL_MAN} ${WRKSRC}/cvs2git.1 ${PREFIX}/man/man1/
 	@${INSTALL_MAN} ${WRKSRC}/cvs2bzr.1 ${PREFIX}/man/man1/
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/doc/design-notes.txt ${DOCSDIR}/
 	@${INSTALL_DATA} ${WRKSRC}/doc/making-releases.txt ${DOCSDIR}/
@@ -95,4 +91,4 @@
 	@${INSTALL_DATA} ${WRKSRC}/cvs2svn-example.options ${EXAMPLESDIR}/
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>