svn commit: r317403 - in head/sysutils: cdrtools cdrtools-devel

[Baptiste Daroussin]

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 at FreeBSD.org>
-#
+# Created by: Dirk Froemberg <dirk at 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>