From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Nov 1 14:50:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 A01E435C for ; Fri, 1 Nov 2013 14:50:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 7ECE221C7 for ; Fri, 1 Nov 2013 14:50:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rA1Eo0AW076012 for ; Fri, 1 Nov 2013 14:50:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rA1Eo0PM076011; Fri, 1 Nov 2013 14:50:00 GMT (envelope-from gnats) Resent-Date: Fri, 1 Nov 2013 14:50:00 GMT Resent-Message-Id: <201311011450.rA1Eo0PM076011@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Boris Samorodov 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 ESMTP id 2DADB318 for ; Fri, 1 Nov 2013 14:47:33 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F3F8421B0 for ; Fri, 1 Nov 2013 14:47:32 +0000 (UTC) Received: from oldred.freebsd.org ([127.0.1.6]) by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id rA1ElW9h018699 for ; Fri, 1 Nov 2013 14:47:32 GMT (envelope-from nobody@oldred.freebsd.org) Received: (from nobody@localhost) by oldred.freebsd.org (8.14.5/8.14.5/Submit) id rA1ElWAl018696; Fri, 1 Nov 2013 14:47:32 GMT (envelope-from nobody) Message-Id: <201311011447.rA1ElWAl018696@oldred.freebsd.org> Date: Fri, 1 Nov 2013 14:47:32 GMT From: Boris Samorodov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/183553: [patch] x11/fbpanel: support STAGE and more X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Nov 2013 14:50:00 -0000 >Number: 183553 >Category: ports >Synopsis: [patch] x11/fbpanel: support STAGE and more >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Nov 01 14:50:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Boris Samorodov >Release: FreeBSD 10.0-BETA1 >Organization: BSDprint >Environment: FreeBSD bsam.int.wart.ru 10.0-BETA1 FreeBSD 10.0-BETA1 #55 r256555: Wed Oct 16 04:35:03 SAMT 2013 bsam@bsam.int.wart.ru:/usr/obj/usr/src/sys/BB64X amd64 >Description: >How-To-Repeat: >Fix: . support STAGE; . convert USE_GMAKE to USES; . simplify Makefile and remove bsd.port.options.mk. Patch attached with submission follows: Index: x11/fbpanel/Makefile =================================================================== --- x11/fbpanel/Makefile (revision 332217) +++ x11/fbpanel/Makefile (working copy) @@ -14,14 +14,11 @@ 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 OPTIONS_DEFINE= DOCS @@ -29,21 +26,15 @@ 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 + ${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} -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} -.endif - .include Index: x11/fbpanel/pkg-plist =================================================================== --- x11/fbpanel/pkg-plist (revision 332217) +++ x11/fbpanel/pkg-plist (working copy) @@ -22,6 +22,7 @@ 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 >Release-Note: >Audit-Trail: >Unformatted: