From owner-svn-ports-head@FreeBSD.ORG  Sun Jan  6 13:01:46 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 95A79DC6;
 Sun,  6 Jan 2013 13:01:46 +0000 (UTC)
 (envelope-from mandree@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6FC93F2E;
 Sun,  6 Jan 2013 13:01:46 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r06D1kbh047758;
 Sun, 6 Jan 2013 13:01:46 GMT (envelope-from mandree@svn.freebsd.org)
Received: (from mandree@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r06D1kP6047757;
 Sun, 6 Jan 2013 13:01:46 GMT (envelope-from mandree@svn.freebsd.org)
Message-Id: <201301061301.r06D1kP6047757@svn.freebsd.org>
From: Matthias Andree <mandree@FreeBSD.org>
Date: Sun, 6 Jan 2013 13:01:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r309980 - head/textproc/xmlto
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Jan 2013 13:01:46 -0000

Author: mandree
Date: Sun Jan  6 13:01:45 2013
New Revision: 309980
URL: http://svnweb.freebsd.org/changeset/ports/309980

Log:
  Convert to Options NG

Modified:
  head/textproc/xmlto/Makefile

Modified: head/textproc/xmlto/Makefile
==============================================================================
--- head/textproc/xmlto/Makefile	Sun Jan  6 12:52:30 2013	(r309979)
+++ head/textproc/xmlto/Makefile	Sun Jan  6 13:01:45 2013	(r309980)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xmlto
-# Date created:		2003-06-05
-# Whom:			Sergei Kolobov <sergei@kolobov.com>
-#
+# Created by: Sergei Kolobov <sergei@kolobov.com>
 # $FreeBSD$
-#
 
 PORTNAME=	xmlto
 PORTVERSION=	0.0.25
@@ -25,9 +21,10 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS=	DBLATEX "Add dependency on Dblatex" OFF \
-		FOP "Add dependency on FOP (needs Java)" OFF \
-		PASSIVETEX "Add dependency on PassiveTeX" OFF
+OPTIONS_DEFINE=		DBLATEX FOP PASSIVETEX
+DBLATEX_DESCR=		Add dependency on Dblatex
+FOP_DESCR=		Add dependency on FOP (needs Java)
+PASSIVETEX_DESCR=	Add dependency on PassiveTeX
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
@@ -46,29 +43,29 @@ PORTDOCS=	AUTHORS COPYING ChangeLog NEWS
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_PASSIVETEX)
+.if ${PORT_OPTIONS:MPASSIVETEX}
 BUILD_DEPENDS+=	${LOCALBASE}/share/texmf-local/tex/passivetex/fotex.sty:${PORTSDIR}/print/passivetex
 .endif
 
-.if defined(WITH_FOP)
+.if ${PORT_OPTIONS:MFOP}
 RUN_DEPENDS+=	fop>=0.90:${PORTSDIR}/textproc/fop
 CONFIGURE_ARGS+=	--with-backend=fop
 .endif
 
-.if defined(WITH_DBLATEX)
+.if ${PORT_OPTIONS:MDBLATEX}
 RUN_DEPENDS+=	${LOCALBASE}/bin/dblatex:${PORTSDIR}/textproc/dblatex
-.if !defined(WITH_FOP)
+.if ! ${PORT_OPTIONS:MFOP}
 CONFIGURE_ARGS+=	--with-backend=dblatex
 .endif
 .endif
 
 post-patch:
-	# get rid of nonstandard "type" option -t:
+	@# get rid of nonstandard "type" option -t:
 	cd ${WRKSRC} && ${FIND} . -type f -exec ${REINPLACE_CMD} -i '' -e 's/type -t/which/;' '{}' '+'
-	# get rid of GNU-make-ism (BSD make defines $< only in suffix rules)
+	@# get rid of GNU-make-ism (BSD make defines $< only in suffix rules)
 	${REINPLACE_CMD} -e '/^GEN_MANPAGE/{s/\$$</$$>/;}' ${WRKSRC}/Makefile.in
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}