From owner-svn-ports-head@FreeBSD.ORG Sun Dec 8 13:21:43 2013 Return-Path: Delivered-To: svn-ports-head@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 D32DF699; Sun, 8 Dec 2013 13:21:43 +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 BEDDC1269; Sun, 8 Dec 2013 13:21:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB8DLh6G078432; Sun, 8 Dec 2013 13:21:43 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB8DLhmG078431; Sun, 8 Dec 2013 13:21:43 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201312081321.rB8DLhmG078431@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Sun, 8 Dec 2013 13:21:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335886 - head/misc/hotkeys 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.17 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: Sun, 08 Dec 2013 13:21:43 -0000 Author: danilo Date: Sun Dec 8 13:21:43 2013 New Revision: 335886 URL: http://svnweb.freebsd.org/changeset/ports/335886 Log: - Convert LIB_DEPENDS to new syntax - Convert USE_GMAKE to USES - Add stage support - Use options helpers Modified: head/misc/hotkeys/Makefile Modified: head/misc/hotkeys/Makefile ============================================================================== --- head/misc/hotkeys/Makefile Sun Dec 8 13:17:41 2013 (r335885) +++ head/misc/hotkeys/Makefile Sun Dec 8 13:21:43 2013 (r335886) @@ -13,7 +13,7 @@ COMMENT= Allows usage of special keys on LICENSE= GPLv2 -LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 +LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} CONFIGURE_ARGS= --with-db3-inc=${BDB_INCLUDE_DIR} \ @@ -23,20 +23,13 @@ CONFIGURE_ARGS= --with-db3-inc=${BDB_INC USE_XORG= x11 xkbfile xmu GNU_CONFIGURE= yes USE_BDB= yes -USE_GMAKE= yes - -MAN1= hotkeys.1 +USES= gmake OPTIONS_DEFINE= OSD OPTIONS_DEFAULT= OSD -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MOSD} -LIB_DEPENDS+= xosd.4:${PORTSDIR}/misc/xosd -CONFIGURE_ARGS+= --with-xosd -.endif +OSD_LIB_DEPENDS= libxosd.so:${PORTSDIR}/misc/xosd +OSD_CONFIGURE_WITH= xosd post-extract: @${CP} ${PATCHDIR}/error.h ${WRKSRC}/src @@ -48,10 +41,6 @@ post-patch: ${WRKSRC}/src/Makefile.in post-install: - @${INSTALL_DATA} ${WRKSRC}/src/hotkeys.conf ${PREFIX}/etc/hotkeys.conf.sample - @if [ ! -f ${PREFIX}/etc/hotkeys.conf ]; then \ - ${CP} -p ${PREFIX}/etc/hotkeys.conf.sample ${PREFIX}/etc/hotkeys.conf ; \ - fi - @${CAT} ${PKGMESSAGE} + @${INSTALL_DATA} ${WRKSRC}/src/hotkeys.conf ${STAGEDIR}${PREFIX}/etc/hotkeys.conf.sample .include