Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 30 Jun 2013 00:21:16 +0200
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        jpaetzel@FreeBSD.org
Subject:   ports/180112: [MAINTAINER] x11/fbpanel: Trim Desktop entry file, docs, pkg-plist
Message-ID:  <20130629222121.5CE84B80@hub.freebsd.org>
Resent-Message-ID: <201306292230.r5TMU1bs052754@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         180112
>Category:       ports
>Synopsis:       [MAINTAINER] x11/fbpanel: Trim Desktop entry file, docs, pkg-plist
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 29 22:30:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.1-RELEASE-p8 amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.1-RELEASE-p8 FreeBSD 9.1-RELEASE-p8 #0: Tue Jun 18 15:25:28 UTC 2013
>Description:

- 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/

>Fix:

--- fbpanel-6.1_2.patch begins here ---
diff -ruN /usr/ports/x11/fbpanel/Makefile ./Makefile
--- /usr/ports/x11/fbpanel/Makefile	2013-06-02 18:57:10.000000000 +0200
+++ ./Makefile	2013-06-29 22:19:08.000000000 +0200
@@ -14,11 +14,11 @@
 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 @@
 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
 
diff -ruN /usr/ports/x11/fbpanel/pkg-plist ./pkg-plist
--- /usr/ports/x11/fbpanel/pkg-plist	2013-06-02 18:57:10.000000000 +0200
+++ ./pkg-plist	2013-03-26 01:55:18.000000000 +0100
@@ -22,10 +22,6 @@
 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 @@
 share/pixmaps/fbpanel.png
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm libexec/fbpanel
 @dirrm lib/fbpanel
--- fbpanel-6.1_2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130629222121.5CE84B80>