Bug 183553 - [patch] x11/fbpanel: support STAGE and more
Summary: [patch] x11/fbpanel: support STAGE and more
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Rusmir Dusko
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-11-01 14:50 UTC by Boris Samorodov
Modified: 2013-11-01 15:10 UTC (History)
0 users

See Also:


Attachments
file.diff (1.79 KB, patch)
2013-11-01 14:50 UTC, Boris Samorodov
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Boris Samorodov freebsd_committer 2013-11-01 14:50:00 UTC

Fix: . support STAGE;
. convert USE_GMAKE to USES;
. simplify Makefile and remove bsd.port.options.mk.

Patch attached with submission follows:
Comment 1 Edwin Groothuis freebsd_committer 2013-11-01 14:50:06 UTC
Maintainer of x11/fbpanel,

Please note that PR ports/183553 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/183553

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer 2013-11-01 14:50:07 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Rusmir Dusko freebsd_committer 2013-11-01 14:56:42 UTC
I approve the patch.
Comment 4 Rusmir Dusko freebsd_committer 2013-11-01 14:57:21 UTC
Responsible Changed
From-To: freebsd-ports-bugs->nemysis

I'll take it.
Comment 5 dfilter service freebsd_committer 2013-11-01 15:08:23 UTC
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 <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
-
-.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 <bsd.port.mk>

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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 6 Boris Samorodov freebsd_committer 2013-11-01 15:09:41 UTC
State Changed
From-To: feedback->closed

Committed, thanks! ;-)