From owner-svn-ports-all@FreeBSD.ORG Mon Jan 6 21:24:42 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2F799360; Mon, 6 Jan 2014 21:24:42 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 016681AEC; Mon, 6 Jan 2014 21:24:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s06LOfxn050204; Mon, 6 Jan 2014 21:24:41 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s06LOfhw050203; Mon, 6 Jan 2014 21:24:41 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401062124.s06LOfhw050203@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 6 Jan 2014 21:24:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338939 - head/x11/idesk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Jan 2014 21:24:42 -0000 Author: bapt Date: Mon Jan 6 21:24:41 2014 New Revision: 338939 URL: http://svnweb.freebsd.org/changeset/ports/338939 Log: Support stage Use options helpers Modified: head/x11/idesk/Makefile Modified: head/x11/idesk/Makefile ============================================================================== --- head/x11/idesk/Makefile Mon Jan 6 21:23:31 2014 (r338938) +++ head/x11/idesk/Makefile Mon Jan 6 21:24:41 2014 (r338939) @@ -10,48 +10,32 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME} MAINTAINER= acm@FreeBSD.org COMMENT= Place launch icons and background directly on your desktop -LIB_DEPENDS= Xft:${PORTSDIR}/x11-fonts/libXft +LIB_DEPENDS= libXft.so:${PORTSDIR}/x11-fonts/libXft USE_BZIP2= yes -USE_GMAKE= yes USE_EFL= imlib2 GNU_CONFIGURE= yes USE_AUTOTOOLS= autoconf -USES= pkgconfig +USES= gmake pkgconfig -OPTIONS_DEFINE= SHAPE SN +OPTIONS_DEFINE= SHAPE SN DOCS SHAPE_DESC= Support of XShape extension SN_DESC= Startup notification support OPTIONS_DEFAULT= SHAPE -NO_STAGE= yes -.include - CXXFLAGS+= `imlib2-config --cflags` `freetype-config --cflags` MAKE_ARGS= cc="${CXX}" cflags="${CXXFLAGS}" SUB_FILES= pkg-message PLIST_FILES= bin/${PORTNAME} PORTDOCS= README -.include - -.if ${PORT_OPTIONS:MSHAPE} -CONFIGURE_ARGS+= --enable-shape -.else -CONFIGURE_ARGS+= --disable-shape -.endif - -.if ${PORT_OPTIONS:MSN} -LIB_DEPENDS+= startup-notification:${PORTSDIR}/x11/startup-notification -CONFIGURE_ARGS+= --enable-libsn -.endif +SHAPE_CONFIGURE_ENABLE= shape +SN_LIB_DEPENDS= libstartup-notification.so:${PORTSDIR}/x11/startup-notification +SN_CONFIGURE_ENABLE= libsn do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/idesk ${PREFIX}/bin -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} -.endif - @${CAT} ${PKGMESSAGE} + ${INSTALL_PROGRAM} ${WRKSRC}/src/idesk ${STAGEDIR}${PREFIX}/bin + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} -.include +.include