From owner-svn-ports-head@FreeBSD.ORG  Tue Jul 29 16:17:48 2014
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])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 58231160;
 Tue, 29 Jul 2014 16:17:48 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 455AA23F5;
 Tue, 29 Jul 2014 16:17:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6TGHmcW073875;
 Tue, 29 Jul 2014 16:17:48 GMT (envelope-from adamw@svn.freebsd.org)
Received: (from adamw@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6TGHmWD073874;
 Tue, 29 Jul 2014 16:17:48 GMT (envelope-from adamw@svn.freebsd.org)
Message-Id: <201407291617.s6TGHmWD073874@svn.freebsd.org>
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Tue, 29 Jul 2014 16:17:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r363353 - head/x11-wm/afterstep
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.18
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: Tue, 29 Jul 2014 16:17:48 -0000

Author: adamw
Date: Tue Jul 29 16:17:47 2014
New Revision: 363353
URL: http://svnweb.freebsd.org/changeset/ports/363353
QAT: https://qat.redports.org/buildarchive/r363353/

Log:
  Use OPTIONS instead of WITH_*

Modified:
  head/x11-wm/afterstep/Makefile

Modified: head/x11-wm/afterstep/Makefile
==============================================================================
--- head/x11-wm/afterstep/Makefile	Tue Jul 29 16:09:41 2014	(r363352)
+++ head/x11-wm/afterstep/Makefile	Tue Jul 29 16:17:47 2014	(r363353)
@@ -31,6 +31,11 @@ SRCDIRS=	afterstep \
 		modules/Banner modules/Pager modules/Wharf \
 		modules/Wharf/ASSound
 
+OPTIONS_DEFINE=	HICOLOR_ICONS
+HICOLOR_ICONS_DESC=	Use hi-color icons
+
+.include <bsd.port.options.mk>
+
 post-patch:
 		${REINPLACE_CMD} \
 			-e 's|%%PREFIX%%|${PREFIX}|g' \
@@ -43,7 +48,7 @@ post-patch:
 		done
 
 pre-build:
-		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${SH} MakeMakefiles
+		@ (cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${SH} MakeMakefiles)
 
 post-install:
 		@ ${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/afterstep/backgrounds/
@@ -51,15 +56,10 @@ post-install:
 		@ ${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/afterstep/sounds/
 		${INSTALL_DATA} ${WRKSRC}/sounds/* ${STAGEDIR}${PREFIX}/lib/X11/afterstep/sounds/
 		@ ${MKDIR} ${STAGEDIR}${PREFIX}/include/X11/pixmaps/
-.if defined(WITH_HICOLOR_ICONS)
+.if ${PORT_OPTIONS:MHICOLOR_ICONS}
 		${INSTALL_DATA} ${WRKSRC}/icons/*.xpm ${STAGEDIR}${PREFIX}/include/X11/pixmaps/
 		${INSTALL_DATA} ${FILESDIR}/monitor_bsd.xpm ${STAGEDIR}${PREFIX}/include/X11/pixmaps/
 .else
-.if !defined(BATCH)
-		@${ECHO_MSG} "===>  Note: to use the hi-color icons,"
-		@${ECHO_MSG} "      reinstall this port with -DWITH_HICOLOR_ICONS"
-		@${ECHO_MSG} "      defined"
-.endif
 		@for i in AFstep.xpm penguin.xpm monitor_bsd.xpm; do \
 			${CP} ${FILESDIR}/$$i ${WRKSRC}/icons/8bit/; \
 		done