From owner-svn-ports-head@FreeBSD.ORG  Wed Dec  5 02:31:45 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 21CE4AB2;
 Wed,  5 Dec 2012 02:31:45 +0000 (UTC)
 (envelope-from amdmi3@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 E19B38FC12;
 Wed,  5 Dec 2012 02:31:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB52ViOQ038401;
 Wed, 5 Dec 2012 02:31:44 GMT (envelope-from amdmi3@svn.freebsd.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB52VibR038400;
 Wed, 5 Dec 2012 02:31:44 GMT (envelope-from amdmi3@svn.freebsd.org)
Message-Id: <201212050231.qB52VibR038400@svn.freebsd.org>
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Wed, 5 Dec 2012 02:31:44 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r308302 - head/games/apricots
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: Wed, 05 Dec 2012 02:31:45 -0000

Author: amdmi3
Date: Wed Dec  5 02:31:44 2012
New Revision: 308302
URL: http://svnweb.freebsd.org/changeset/ports/308302

Log:
  - OptionsNG
  - Trim header
  
  Feature safe:	yes

Modified:
  head/games/apricots/Makefile

Modified: head/games/apricots/Makefile
==============================================================================
--- head/games/apricots/Makefile	Wed Dec  5 02:31:03 2012	(r308301)
+++ head/games/apricots/Makefile	Wed Dec  5 02:31:44 2012	(r308302)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	apricots
-# Date created:		07 Jan 2008
-# Whom:			Dmitry Marakasov <amdmi3@amdmi3.ru>
-#
+# Created by: Dmitry Marakasov <amdmi3@amdmi3.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	apricots
 PORTVERSION=	0.2.6
@@ -33,24 +29,25 @@ DESKTOP_ENTRIES="Apricots" \
 		"Game;ArcadeGame;" \
 		false
 
-OPTIONS=	OPENAL	"Enable OpenAL audio" on
+OPTIONS_DEFINE=	OPENAL
+OPTIONS_DEFAULT=OPENAL
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_OPENAL)
+.if ${PORT_OPTIONS:MOPENAL}
 USE_OPENAL=	al alut
 .endif
 
 post-patch:
-.if defined(WITHOUT_OPENAL)
-	@${REINPLACE_CMD} -e 's|-DAP_AUDIO_OPENAL||' ${WRKSRC}/configure
-.else
+.if ${PORT_OPTIONS:MOPENAL}
 	@${REINPLACE_CMD} -e '/^LIBS = / s|$$| -lopenal -lalut|' \
 		${WRKSRC}/apricots/Makefile.in
+.else
+	@${REINPLACE_CMD} -e 's|-DAP_AUDIO_OPENAL||' ${WRKSRC}/configure
 .endif
 	@${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/configure
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 post-install:
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
@@ -58,4 +55,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>