Bug 175944 - [PATCH] x11-wm/obmenu: OptionsNG, changed Makefile, Desktop entries, take maintainership
Summary: [PATCH] x11-wm/obmenu: OptionsNG, changed Makefile, Desktop entries, take mai...
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-02-08 00:10 UTC by nemysis
Modified: 2013-10-19 18:10 UTC (History)
0 users

See Also:


Attachments
obmenu-1.0_6.patch (2.62 KB, patch)
2013-02-08 00:10 UTC, nemysis
no flags Details | Diff
obmenu.diff (2.73 KB, patch)
2013-02-08 00:37 UTC, nemysis
no flags Details | Diff
obmenu.diff (2.69 KB, patch)
2013-04-16 12:56 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-02-08 00:10:00 UTC
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
Comment 1 nemysis 2013-02-08 00:37:30 UTC
Added that user can store menu.xml

chmod chmod 644 ~/.config/openbox/menu.xml
Comment 2 Martin Wilke freebsd_committer freebsd_triage 2013-02-10 05:07:35 UTC
State Changed
From-To: open->feedback

your pkg-install script is wrong. you cant just simply symlink in a home 
dir. You need to respect existing configs. please review the handbook 
for that.
Comment 3 nemysis 2013-02-10 12:50:20 UTC
> your pkg-install script is wrong. you cant just simply symlink in a home
> dir. You need to respect existing configs. please review the handbook
> for that.

Thanks i have reread

http://www.freebsd.org/doc/en/books/porters-handbook/pkg-files.html

But i don't symlink in pkg-install

files/pkg-install.in

ls -lh /home/*/.config/openbox | grep menu.xml


this is only a Proposal from

files/pkg-message.in

cp -a %%LOCALBASE%%/etc/xdg/openbox/menu.xml ~/.config/openbox/menu.xml
chmod chmod 644 ~/.config/openbox/menu.xml
Comment 4 Baptiste Daroussin freebsd_committer freebsd_triage 2013-02-11 08:13:47 UTC
I do not understand the purpose of the pkg-install, it seems useless,
it is checking things that might has a very high chance to fail. I can
have my home directories anywhere in the filesystem or even outside if
I use to automount things.

The pkg-message.in is wrong "chmod chmod..."

Why a buggy -a on the cp line simply copy a file?

Please review the wording of you pkg-message, the sentence are in very
badly understandable english, ask some native to review it for example
(that is usually what I do)

regards,
Bapt
Comment 5 nemysis 2013-04-16 12:56:42 UTC
- Bump portrevision
- Add license
- Add Desktop entry file
- Convert to OptionsNG
- Trim pkg-plist

Added file(s):
- files/pkg-install.in
- files/pkg-message.in
Comment 6 Martin Wilke freebsd_committer freebsd_triage 2013-08-14 10:30:05 UTC
Responsible Changed
From-To: freebsd-ports-bugs->nemysis

submitter is now committer.
Comment 7 Rusmir Dusko freebsd_committer freebsd_triage 2013-10-18 01:02:24 UTC
State Changed
From-To: feedback->open

Submitter has fixed.
Comment 8 Rusmir Dusko freebsd_committer freebsd_triage 2013-10-19 17:59:13 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 9 dfilter service freebsd_committer freebsd_triage 2013-10-19 18:00:13 UTC
Author: nemysis
Date: Sat Oct 19 17:00:05 2013
New Revision: 330913
URL: http://svnweb.freebsd.org/changeset/ports/330913

Log:
  - Change Makefile header
  - Bump PORTREVISION
  - Pass maintainership to submitter
  - Add license (GPLv2)
  - Support STAGEDIR
  - Add Desktop entry file and pkg-message
  
  PR:		ports/175944
  Submitted by:	nemysis (self)
  Approved by:	pawel (mentor)

Added:
  head/x11-wm/obmenu/files/
  head/x11-wm/obmenu/files/pkg-message.in   (contents, props changed)
Modified:
  head/x11-wm/obmenu/Makefile   (contents, props changed)
  head/x11-wm/obmenu/pkg-plist   (contents, props changed)

Modified: head/x11-wm/obmenu/Makefile
==============================================================================
--- head/x11-wm/obmenu/Makefile	Sat Oct 19 16:58:27 2013	(r330912)
+++ head/x11-wm/obmenu/Makefile	Sat Oct 19 17:00:05 2013	(r330913)
@@ -1,14 +1,17 @@
+# Created by: Doug Barton <dougb@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	obmenu
 PORTVERSION=	1.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Menu manager for Openbox supporting both static and pipe menus
 
+LICENSE=	GPLv2
+
 USE_GNOME=		pygtk2
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
@@ -16,13 +19,18 @@ PYDISTUTILS_PKGNAME=	obMenu
 
 PORTDOCS=	README
 
-NO_STAGE=	yes
+SUB_FILES=	pkg-message
+
+DESKTOP_ENTRIES="Obmenu" "Menu manager for Openbox" ${PORTNAME} \
+		"${PORTNAME}" "Settings;" false
+
+.include <bsd.port.options.mk>
+
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 .endif
+	${LN} -sf ${DATADIR}/mnu48.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 
 .include <bsd.port.mk>

Added: head/x11-wm/obmenu/files/pkg-message.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-wm/obmenu/files/pkg-message.in	Sat Oct 19 17:00:05 2013	(r330913)
@@ -0,0 +1,19 @@
+===============================================================================
+
+Obmenu has been installed.
+
+If you don't have ~/.config/openbox/menu.xml
+
+the Obmenu config can be copied, please type as user:
+
+    su user
+
+    cp %%LOCALBASE%%/etc/xdg/openbox/menu.xml ~/.config/openbox/menu.xml
+
+    chmod 644 ~/.config/openbox/menu.xml
+
+    exit
+
+Have fun!
+
+===============================================================================

Modified: head/x11-wm/obmenu/pkg-plist
==============================================================================
--- head/x11-wm/obmenu/pkg-plist	Sat Oct 19 16:58:27 2013	(r330912)
+++ head/x11-wm/obmenu/pkg-plist	Sat Oct 19 17:00:05 2013	(r330913)
@@ -9,6 +9,5 @@ bin/obmenu
 %%DATADIR%%/mnu16.png
 %%DATADIR%%/mnu48.png
 %%DATADIR%%/obmenu.glade
+share/pixmaps/obmenu.png
 @dirrm %%DATADIR%%
-@dirrmtry %%PYTHON_SITELIBDIR%%
-@dirrmtry %%PYTHON_LIBDIR%%
_______________________________________________
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"