From owner-svn-ports-head@freebsd.org Thu Sep 17 11:03:31 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 206F99CE3F0; Thu, 17 Sep 2015 11:03:31 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.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 EB8FD131C; Thu, 17 Sep 2015 11:03:30 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8HB3UlS042849; Thu, 17 Sep 2015 11:03:30 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8HB3UmT042848; Thu, 17 Sep 2015 11:03:30 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201509171103.t8HB3UmT042848@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 17 Sep 2015 11:03:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397104 - head/x11-clocks/dclock 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.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Sep 2015 11:03:31 -0000 Author: amdmi3 Date: Thu Sep 17 11:03:30 2015 New Revision: 397104 URL: https://svnweb.freebsd.org/changeset/ports/397104 Log: - Switch to options helpers Modified: head/x11-clocks/dclock/Makefile Modified: head/x11-clocks/dclock/Makefile ============================================================================== --- head/x11-clocks/dclock/Makefile Thu Sep 17 11:03:26 2015 (r397103) +++ head/x11-clocks/dclock/Makefile Thu Sep 17 11:03:30 2015 (r397104) @@ -9,18 +9,14 @@ MASTER_SITES= http://opencircuitdesign.c MAINTAINER= ports@FreeBSD.org COMMENT= 7-segment digital clock with some optional features -OPTIONS_DEFINE= SOX XFT DOCS -OPTIONS_DEFAULT=SOX XFT -SOX_DESC= Install SOX to play audio - -WRKSRC= ${WRKDIR}/${PORTNAME} - USE_XORG= x11 xt USES= pkgconfig tar:tgz CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lX11 -lXt -lm +WRKSRC= ${WRKDIR}/${PORTNAME} + PORTDOCS= README TODO PLIST_FILES= bin/dclock \ lib/X11/app-defaults/DClock \ @@ -28,17 +24,14 @@ PLIST_FILES= bin/dclock \ %%DATADIR%%/sounds/bell.wav \ %%DATADIR%%/sounds/digital.wav -.include +OPTIONS_DEFINE= SOX XFT DOCS +OPTIONS_DEFAULT=SOX XFT +SOX_DESC= Install SOX to play audio +SOX_RUN_DEPENDS= play:${PORTSDIR}/audio/sox -.if ${PORT_OPTIONS:MSOX} -RUN_DEPENDS+= play:${PORTSDIR}/audio/sox -.endif - -.if ${PORT_OPTIONS:MXFT} -USE_XORG+= xft -CPPFLAGS+= $$(freetype-config --cflags) -DXFT_SUPPORT -LDFLAGS+= $$(freetype-config --libs) -lXft -.endif +XFT_USE= XORG=xft +XFT_CPPFLAGS= $$(freetype-config --cflags) -DXFT_SUPPORT +XFT_LDFLAGS= $$(freetype-config --libs) -lXft post-patch: .for i in Dclock.c Dclock.ad dclock.1 @@ -59,11 +52,11 @@ do-install: ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/DClock) @${MKDIR} ${STAGEDIR}${DATADIR}/sounds (cd ${WRKSRC}/sounds && ${INSTALL_DATA} *.wav ${STAGEDIR}${DATADIR}/sounds) -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} (cd ${WRKSRC} && ${INSTALL_DATA} ${f} ${STAGEDIR}${DOCSDIR}) .endfor -.endif .include