From owner-svn-ports-head@FreeBSD.ORG  Sun May  5 08:15:24 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id EC9154BA;
 Sun,  5 May 2013 08:15:24 +0000 (UTC)
 (envelope-from bapt@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 CF0103CC;
 Sun,  5 May 2013 08:15:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r458FOdw082804;
 Sun, 5 May 2013 08:15:24 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r458FOJS082799;
 Sun, 5 May 2013 08:15:24 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201305050815.r458FOJS082799@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 5 May 2013 08:15:24 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r317403 - in head/sysutils: cdrtools cdrtools-devel
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, 05 May 2013 08:15:25 -0000

Author: bapt
Date: Sun May  5 08:15:24 2013
New Revision: 317403
URL: http://svnweb.freebsd.org/changeset/ports/317403

Log:
  Partial convert to new options framework
  Fix USES+= set after .pre.mk

Modified:
  head/sysutils/cdrtools-devel/Makefile
  head/sysutils/cdrtools/Makefile

Modified: head/sysutils/cdrtools-devel/Makefile
==============================================================================
--- head/sysutils/cdrtools-devel/Makefile	Sun May  5 08:10:29 2013	(r317402)
+++ head/sysutils/cdrtools-devel/Makefile	Sun May  5 08:15:24 2013	(r317403)
@@ -1,5 +1,5 @@
 # $FreeBSD$
-#
+
 ###########################################################################
 # This makefile was contributed by Marius Strobl.
 ###########################################################################
@@ -88,10 +88,10 @@ MAKE_ENV=	CCOM=cc GMAKE_NOWARN=true INS_
 		INS_RBASE=${LOCALBASE}
 CDRTLSTARGET=	${ARCH:S/powerpc64/powerpc/}-freebsd-cc
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if exists(${LOCALBASE}/lib/libiconv.a) || \
-	exists(${LOCALBASE}/lib/libintl.a) || !defined(WITHOUT_NLS)
+	exists(${LOCALBASE}/lib/libintl.a) || ${PORT_OPTIONS:MNLS}
 MAKE_ENV+=	OSDEFS=-I${LOCALBASE}/include
 USES+=		gettext iconv
 .endif
@@ -214,7 +214,7 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/rscsi/rscsi.dfl ${PREFIX}/etc/rscsi
 .endif
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for i in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
@@ -238,4 +238,4 @@ post-install:
 		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL; fi
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/sysutils/cdrtools/Makefile
==============================================================================
--- head/sysutils/cdrtools/Makefile	Sun May  5 08:10:29 2013	(r317402)
+++ head/sysutils/cdrtools/Makefile	Sun May  5 08:15:24 2013	(r317403)
@@ -1,9 +1,6 @@
-# New ports collection makefile for:	cdrtools
-# Date created:		Wed Jul 25 23:30:19 CEST 2001
-# Whom:			Dirk Froemberg <dirk@FreeBSD.org>
-#
+# Created by: Dirk Froemberg <dirk@FreeBSD.org>
 # $FreeBSD$
-#
+
 ###########################################################################
 # This makefile was contributed by Marius Strobl.
 ###########################################################################
@@ -94,10 +91,10 @@ MAKE_ENV+=	CCOM=cc GMAKE_NOWARN=true INS
 		INS_RBASE=${LOCALBASE}
 CDRTLSTARGET=	${ARCH:S/powerpc64/powerpc/}-freebsd-cc
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if exists(${LOCALBASE}/lib/libiconv.a) || \
-	exists(${LOCALBASE}/lib/libintl.a) || !defined(WITHOUT_NLS)
+	exists(${LOCALBASE}/lib/libintl.a) || ${PORT_OPTIONS:MNLS}
 MAKE_ENV+=	OSDEFS=-I${LOCALBASE}/include
 USES+=		gettext iconv
 .endif
@@ -222,7 +219,7 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/rscsi/rscsi.dfl ${PREFIX}/etc/rscsi
 .endif
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for i in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
@@ -246,4 +243,4 @@ post-install:
 		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL; fi
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>