From owner-svn-ports-head@FreeBSD.ORG Fri Nov 1 15:08:10 2013 Return-Path: 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 ESMTP id 724E7B6E; Fri, 1 Nov 2013 15:08:10 +0000 (UTC) (envelope-from bsam@FreeBSD.org) 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 46932231A; Fri, 1 Nov 2013 15:08:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA1F8Axc030556; Fri, 1 Nov 2013 15:08:10 GMT (envelope-from bsam@svn.freebsd.org) Received: (from bsam@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA1F89ZI030554; Fri, 1 Nov 2013 15:08:09 GMT (envelope-from bsam@svn.freebsd.org) Message-Id: <201311011508.rA1F89ZI030554@svn.freebsd.org> From: Boris Samorodov Date: Fri, 1 Nov 2013 15:08:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332390 - head/x11/fbpanel 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Nov 2013 15:08:10 -0000 Author: bsam Date: Fri Nov 1 15:08:09 2013 New Revision: 332390 URL: http://svnweb.freebsd.org/changeset/ports/332390 Log: . support STAGE; . convert USE_GMAKE to USES; . simplify Makefile and remove bsd.port.options.mk. PR: ports/183553 Submitted by: bsam (me) Approved by: nemysis (maintainer) Modified: head/x11/fbpanel/Makefile head/x11/fbpanel/pkg-plist Modified: head/x11/fbpanel/Makefile ============================================================================== --- head/x11/fbpanel/Makefile Fri Nov 1 14:58:06 2013 (r332389) +++ head/x11/fbpanel/Makefile Fri Nov 1 15:08:09 2013 (r332390) @@ -14,13 +14,10 @@ COMMENT= Lightweight, NETWM compliant X1 LICENSE= MIT USE_BZIP2= yes -USES= pkgconfig +USES= gmake pkgconfig USE_GNOME= gtk20 HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} -USE_GMAKE= yes - -MAN1= ${PORTNAME}.1 PORTDOCS= CHANGELOG CREDITS NOTES README @@ -29,21 +26,15 @@ OPTIONS_DEFINE= DOCS DESKTOP_ENTRIES="${PORTNAME}" "${PORTNAME} NETWM compliant X11 desktop panel" \ "${PORTNAME}" "${PORTNAME}" "System;" false -NO_STAGE= yes -.include - post-patch: @${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' ${WRKSRC}/scripts/install.sh @${REINPLACE_CMD} -e 's|@DATADIR@|${DATADIR}|' \ - ${WRKSRC}/data/man/${MAN1}.in + ${WRKSRC}/data/man/${PORTNAME}.1.in post-install: - ${INSTALL_MAN} ${WRKSRC}/data/man/${MAN1} ${MAN1PREFIX}/man/man1 - ${LN} -sf ${DATADIR}/images/logo.png ${PREFIX}/share/pixmaps/${PORTNAME}.png - -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} -.endif + ${INSTALL_MAN} ${WRKSRC}/data/man/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${LN} -sf ${DATADIR}/images/logo.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Modified: head/x11/fbpanel/pkg-plist ============================================================================== --- head/x11/fbpanel/pkg-plist Fri Nov 1 14:58:06 2013 (r332389) +++ head/x11/fbpanel/pkg-plist Fri Nov 1 15:08:09 2013 (r332390) @@ -22,6 +22,7 @@ lib/fbpanel/tray.so lib/fbpanel/volume.so lib/fbpanel/wincmd.so libexec/fbpanel/make_profile +man/man1/fbpanel.1.gz %%DATADIR%%/default %%DATADIR%%/images/battery_0.png %%DATADIR%%/images/battery_1.png