Date: Fri, 1 Nov 2013 14:47:32 GMT From: Boris Samorodov <bsam@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/183553: [patch] x11/fbpanel: support STAGE and more Message-ID: <201311011447.rA1ElWAl018696@oldred.freebsd.org> Resent-Message-ID: <201311011450.rA1Eo0PM076011@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.options.mk>
-
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 <bsd.port.mk>
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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311011447.rA1ElWAl018696>