Bug 180112 - [MAINTAINER] x11/fbpanel: Trim Desktop entry file, docs, pkg-plist
Summary: [MAINTAINER] x11/fbpanel: Trim Desktop entry file, docs, pkg-plist
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: William Grzybowski
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-06-29 23:30 UTC by nemysis
Modified: 2013-07-04 15:30 UTC (History)
1 user (show)

See Also:


Attachments
fbpanel-6.1_2.patch (2.01 KB, patch)
2013-06-29 23:30 UTC, nemysis
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description nemysis 2013-06-29 23:30:01 UTC
- Trim Desktop entry file
- Trim REINPLACE_CMD
- Trim docs
- Trim pkg-plist, remove docs

Generated and tested manually, tested with port test and with RedPorts, sent with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports)

How-To-Repeat: 
Build log

https://redports.org/buildarchive/20130629203101-40812/
Comment 1 William Grzybowski freebsd_committer 2013-07-04 02:55:55 UTC
Responsible Changed
From-To: freebsd-ports-bugs->wg

I'll take it.
Comment 2 dfilter service freebsd_committer 2013-07-04 15:22:49 UTC
Author: wg
Date: Thu Jul  4 14:22:41 2013
New Revision: 322276
URL: http://svnweb.freebsd.org/changeset/ports/322276

Log:
  x11/fbpanel: minor fixes
  
  - Remove unnecessary PORTDCOS from pkg-plist
  - Mute mkdir
  - Trim desktop entry and replace command
  
  PR:		ports/180112
  Submitted by:	nemysis <nemysis@gmx.ch> (maintainer)

Modified:
  head/x11/fbpanel/Makefile
  head/x11/fbpanel/pkg-plist

Modified: head/x11/fbpanel/Makefile
==============================================================================
--- head/x11/fbpanel/Makefile	Thu Jul  4 14:20:37 2013	(r322275)
+++ head/x11/fbpanel/Makefile	Thu Jul  4 14:22:41 2013	(r322276)
@@ -14,11 +14,11 @@ COMMENT=	Lightweight, NETWM compliant X1
 LICENSE=	MIT
 
 USE_BZIP2=	yes
+USES=		pkgconfig
+USE_GNOME=	gtk20
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 USE_GMAKE=	yes
-USE_GNOME=	gtk20
-USES=		pkgconfig
 
 MAN1=		${PORTNAME}.1
 
@@ -27,28 +27,21 @@ PORTDOCS=	CHANGELOG CREDITS NOTES README
 OPTIONS_DEFINE=	DOCS
 
 DESKTOP_ENTRIES="${PORTNAME}" "${PORTNAME} NETWM compliant X11 desktop panel" \
-		"${PREFIX}/share/pixmaps/${PORTNAME}.png" \
-		"${PORTNAME}" "System;" false
+		"${PORTNAME}" "${PORTNAME}" "System;" false
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MDOCS}
-PLIST_SUB+=	PORTDOCS=""
-.else
-PLIST_SUB+=	PORTDOCS="@comment "
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|bash|sh|' ${WRKSRC}/scripts/install.sh
+	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' ${WRKSRC}/scripts/install.sh
 	@${REINPLACE_CMD} -e 's|@DATADIR@|${DATADIR}|' \
 		${WRKSRC}/data/man/${MAN1}.in
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/data/man/${MAN1} ${MAN1PREFIX}/man/man1/
+	${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}
+	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 

Modified: head/x11/fbpanel/pkg-plist
==============================================================================
--- head/x11/fbpanel/pkg-plist	Thu Jul  4 14:20:37 2013	(r322275)
+++ head/x11/fbpanel/pkg-plist	Thu Jul  4 14:22:41 2013	(r322276)
@@ -22,10 +22,6 @@ lib/fbpanel/tray.so
 lib/fbpanel/volume.so
 lib/fbpanel/wincmd.so
 libexec/fbpanel/make_profile
-%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/NOTES
-%%PORTDOCS%%%%DOCSDIR%%/README
 %%DATADIR%%/default
 %%DATADIR%%/images/battery_0.png
 %%DATADIR%%/images/battery_1.png
@@ -55,6 +51,5 @@ libexec/fbpanel/make_profile
 share/pixmaps/fbpanel.png
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm libexec/fbpanel
 @dirrm lib/fbpanel
_______________________________________________
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 3 William Grzybowski freebsd_committer 2013-07-04 15:23:16 UTC
State Changed
From-To: open->closed

Committed. Thanks!