ports/176797: [PATCH] x11/fbpanel: Changed license, added OptionsNG, desktop entry, documentation, take maintainership

nemysis nemysis at gmx.ch
Sat Mar 9 23:30:00 UTC 2013


>Number:         176797
>Category:       ports
>Synopsis:       [PATCH] x11/fbpanel: Changed license, added OptionsNG, desktop entry, documentation, take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 09 23:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec  4 09:23:10
>Description:

Makefile changed:

Port is now safe with NOPORTDOCS=yes in /etc/make.conf
+LICENSE=	MIT
+PORTDOCS=	CHANGELOG CREDITS NOTES README
+OPTIONS_DEFINE=	DOCS
+DESKTOP_ENTRIES=
+.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MDOCS}

Changed and refined:
 post-install:
 pkg-plist

- Take maintainership

Generated and tested manually, tested with port test, sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:

portlint -A
looks fine.

port test: clean

>Fix:

--- fbpanel-6.1_2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/x11/fbpanel/Makefile ./Makefile
--- /usr/ports/x11/fbpanel/Makefile	2013-01-14 17:57:25.000000000 +0100
+++ ./Makefile	2013-03-10 00:15:20.000000000 +0100
@@ -3,15 +3,15 @@
 
 PORTNAME=	fbpanel
 PORTVERSION=	6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	SF
 EXTRACT_SUFX=	.tbz2
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	nemysis at gmx.ch
 COMMENT=	Lightweight, NETWM compliant X11 desktop panel
 
-LICENSE=	GPLv2
+LICENSE=	MIT
 
 USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
@@ -22,12 +22,34 @@
 
 MAN1=		${PORTNAME}.1
 
+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
+
+.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|@DATADIR@|${DATADIR}|' \
 		${WRKSRC}/data/man/${MAN1}.in
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/data/man/${MAN1} ${MANPREFIX}/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}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/x11/fbpanel/pkg-plist ./pkg-plist
--- /usr/ports/x11/fbpanel/pkg-plist	2013-01-14 17:57:25.000000000 +0100
+++ ./pkg-plist	2013-03-10 00:03:14.000000000 +0100
@@ -22,6 +22,10 @@
 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
@@ -48,7 +52,9 @@
 %%DATADIR%%/images/gnome-session-reboot.png
 %%DATADIR%%/images/logo.png
 %%DATADIR%%/pager
+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:


More information about the freebsd-ports-bugs mailing list