cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- add a patch from Debian to automatically copy the default openbox menu

Browse Source 
if none exist in the user's homedir
- remove trailing space from shebang that would prevent obm-nav from
working

requested by and ok sthen@
This commit is contained in:
ajacoutot 2007-12-20 11:53:24 +00:00
parent 0404428ef9
commit 92be3d4db4
3 changed files with 61 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
x11/obmenu/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.1.1.1 2007/12/19 16:09:34 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.2 2007/12/20 11:53:24 ajacoutot Exp $
COMMENT= Openbox menu editor
DISTNAME= obmenu-1.0
PKGNAME= ${DISTNAME}p0
CATEGORIES= x11
HOMEPAGE= http://obmenu.sourceforge.net/
@ -18,10 +19,17 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=obmenu/}
MODULES= lang/python
RUN_DEPENDS= ::x11/py-gtk2
RUN_DEPENDS= ::x11/py-gtk2 \
::x11/openbox
pre-configure:
@find ${WRKSRC} -name \*.py | \
xargs perl -pi -e 's,/usr/bin/python,${MODPY_BIN},g'
@perl -pi -e 's,!!SYSCONFDIR!!,${SYSCONFDIR},g' \
${WRKSRC}/obmenu
.for i in pipes/obm-moz pipes/obm-nav pipes/obm-dir
@perl -pi -e 's,/usr/bin/env python,${MODPY_BIN},g' ${WRKSRC}/${i}
.endfor
.for i in pipes/obm-xdg obxml.py obmenu
@perl -pi -e 's,/usr/bin/python,${MODPY_BIN},g' ${WRKSRC}/${i}
.endfor
.include <bsd.port.mk>

43
x11/obmenu/patches/patch-obmenu
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-obmenu,v 1.1.1.1 2007/12/19 16:09:34 ajacoutot Exp $
$OpenBSD: patch-obmenu,v 1.2 2007/12/20 11:53:24 ajacoutot Exp $
--- obmenu.orig Thu Feb 2 13:03:38 2006
+++ obmenu Wed Dec 19 15:10:23 2007
+++ obmenu Thu Dec 20 09:49:59 2007
@@ -462,9 +462,12 @@ class App:
self.remove(None)
@ -17,7 +17,44 @@ $OpenBSD: patch-obmenu,v 1.1.1.1 2007/12/19 16:09:34 ajacoutot Exp $
# application init
def init(self):
if len(sys.argv) == 2:
@@ -503,6 +506,10 @@ class App:
@@ -472,6 +475,36 @@ class App:
self.menu_path = sys.argv[1]
elif len(sys.argv) == 1:
self.menu_path = os.getenv("HOME") + "/.config/openbox/menu.xml"
+ if not os.path.isfile("%s/.config/openbox/menu.xml" % (os.getenv("HOME"))):
+ if not os.path.isdir("%s/.config/" % (os.getenv("HOME"))):
+ try:
+ os.mkdir("%s/.config/" % (os.getenv("HOME")))
+ except:
+ print "Error: Can't create ~/.config directory!"
+ return
+
+ if not os.path.isdir("%s/.config/openbox" % (os.getenv("HOME"))):
+ try:
+ os.mkdir("%s/.config/openbox" % (os.getenv("HOME")))
+ except:
+ print "Error: Can't create ~/.config/openbox directory!"
+ return
+
+ if not os.path.isfile("!!SYSCONFDIR!!/xdg/openbox/menu.xml"):
+ print "Error: Couldn't find default menu file!"
+ return
+
+ try:
+ orig = open("!!SYSCONFDIR!!/xdg/openbox/menu.xml", "r")
+ dest = open("%s/.config/openbox/menu.xml" % (os.getenv("HOME")), "w")
+ dest.write(orig.read())
+ orig.close()
+ dest.close()
+ except:
+ print "Error: Couldn't create default menu file!"
+ return
+ elif len(sys.argv) == 1:
+ self.menu_path = os.getenv("HOME") + "/.config/openbox/menu.xml"
else:
print "Error: Wrong number of arguments"
print "Usage: obmenu /path/to/menu.xml"
@@ -503,6 +536,10 @@ class App:
# Set the basics for GTK
self.arbol = gtk.glade.XML(self.gladefile, "window1")

9
x11/obmenu/patches/patch-pipes_obm-nav Normal file
View File

@ -0,0 +1,9 @@
$OpenBSD: patch-pipes_obm-nav,v 1.1 2007/12/20 11:53:24 ajacoutot Exp $
--- pipes/obm-nav.orig Thu Dec 20 11:16:01 2007
+++ pipes/obm-nav Thu Dec 20 11:16:07 2007
@@ -1,4 +1,4 @@
-#!/usr/bin/env python -O
+#!/usr/bin/env python -O
#########################################################################
# Copyright 2005 Manuel Colmenero
#