Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 08 Feb 2013 01:06:03 +0100
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/175944: [PATCH] x11-wm/obmenu: OptionsNG, changed Makefile, Desktop entries, take maintainership
Message-ID:  <20130208000605.C5F9499D@hub.freebsd.org>
Resent-Message-ID: <201302080010.r180A0sp031648@freefall.freebsd.org>

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

>Number:         175944
>Category:       ports
>Synopsis:       [PATCH] x11-wm/obmenu: OptionsNG, changed Makefile, Desktop entries, 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:   Fri Feb 08 00:10: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:
+LICENSE=	GPLv2
+SUB_FILES=
+DESKTOP_ENTRIES=
+.include <bsd.port.options.mk>

Changed and refined:
 post-install:
 pkg-plist

- Take maintainership

Added file(s):
- files/pkg-install.in
- files/pkg-message.in

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
WARN: Makefile: [26]: possible direct use of command "false" found. use ${FALSE} instead.
WARN: Makefile: for new port, make $FreeBSD$ tag in comment section empty, to make SVN happy.
WARN: Makefile: new ports should not set PORTREVISION.
0 fatal errors and 3 warnings found.

WARN: Makefile: [26]: because is used
+		"${PORTNAME}" "Settings;" false

port test: clean

>Fix:

--- obmenu-1.0_6.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/x11-wm/obmenu/Makefile ./Makefile
--- /usr/ports/x11-wm/obmenu/Makefile	2013-01-14 17:55:01.000000000 +0100
+++ ./Makefile	2013-02-08 00:56:00.000000000 +0100
@@ -2,13 +2,15 @@
 
 PORTNAME=	obmenu
 PORTVERSION=	1.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nemysis@gmx.ch
 COMMENT=	Menu manager for Openbox supporting both static and pipe menus
 
+LICENSE=	GPLv2
+
 USE_GNOME=		pygtk2
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
@@ -16,12 +18,25 @@
 
 PORTDOCS=	README
 
+SUB_FILES=	pkg-install \
+		pkg-message
+
+DESKTOP_ENTRIES="Obmenu" "Menu manager for Openbox" \
+		"${PREFIX}/share/pixmaps/${PORTNAME}.png" \
+		"${PORTNAME}" "Settings;" false
+
+.include <bsd.port.options.mk>
+
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
+	${LN} -sf ${DATADIR}/mnu48.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
+
+	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${ECHO_CMD}
+	@${CAT} ${PKGMESSAGE}
+	@${ECHO_CMD}
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/x11-wm/obmenu/files/pkg-install.in ./files/pkg-install.in
--- /usr/ports/x11-wm/obmenu/files/pkg-install.in	1970-01-01 01:00:00.000000000 +0100
+++ ./files/pkg-install.in	2013-02-08 00:55:05.000000000 +0100
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+echo ""
+echo "Have your user menu.xml for Openbox?"
+echo ""
+
+ls -lh /home/*/.config/openbox | grep menu.xml
+echo ""
diff -ruN --exclude=CVS /usr/ports/x11-wm/obmenu/files/pkg-message.in ./files/pkg-message.in
--- /usr/ports/x11-wm/obmenu/files/pkg-message.in	1970-01-01 01:00:00.000000000 +0100
+++ ./files/pkg-message.in	2013-02-08 00:53:40.000000000 +0100
@@ -0,0 +1,13 @@
+===============================================================================
+
+Obmenu has been installed.
+
+If yours users don't have  ~/.config/openbox/menu.xml
+
+To can use Obmenu, please type as user:
+
+    cp -a %%LOCALBASE%%/etc/xdg/openbox/menu.xml ~/.config/openbox/menu.xml
+
+Have fun!
+
+===============================================================================
diff -ruN --exclude=CVS /usr/ports/x11-wm/obmenu/pkg-plist ./pkg-plist
--- /usr/ports/x11-wm/obmenu/pkg-plist	2013-01-14 17:55:01.000000000 +0100
+++ ./pkg-plist	2013-02-08 00:17:26.000000000 +0100
@@ -9,6 +9,7 @@
 %%DATADIR%%/mnu16.png
 %%DATADIR%%/mnu48.png
 %%DATADIR%%/obmenu.glade
+share/pixmaps/obmenu.png
 @dirrm %%DATADIR%%
 @dirrmtry %%PYTHON_SITELIBDIR%%
 @dirrmtry %%PYTHON_LIBDIR%%
--- obmenu-1.0_6.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?20130208000605.C5F9499D>