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

Add missing CONFIGURE_ARGS.

Browse Source 
Don't hardcode /usr/local.
Fix mozilla plugins directory.
Regen WANTLIB.
This commit is contained in:
ajacoutot 2010-04-24 09:37:46 +00:00
parent 89f8835d7d
commit c1add17eac
3 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
x11/gnome/deskbar-applet/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.28 2010/04/23 23:45:29 jasper Exp $
# $OpenBSD: Makefile,v 1.29 2010/04/24 09:37:46 ajacoutot Exp $
COMMENT= universal search and navigation for GNOME
GNOME_PROJECT= deskbar-applet
GNOME_VERSION= 2.30.0
PKGNAME= ${DISTNAME}p0
CATEGORIES= sysutils
@ -43,11 +44,14 @@ LIB_DEPENDS= camel-1.2,ebook-1.2,edataserver-1.2::databases/evolution-data-serve
MODGNOME_HELP_FILES= Yes
MODGCONF2_SCHEMAS_DIR= deskbar-applet
CONFIGURE_ARGS= --enable-evolution
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-evolution
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
pre-configure:
${SUBST_CMD} ${WRKSRC}/deskbar/deskbar-applet.py
${SUBST_CMD} ${WRKSRC}/deskbar/deskbar-applet.py \
${WRKSRC}/deskbar/core/Utils.py \
${WRKSRC}/deskbar/handlers/mozilla.py
.include <bsd.port.mk>

12
x11/gnome/deskbar-applet/patches/patch-deskbar_core_Utils_py Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-deskbar_core_Utils_py,v 1.1 2010/04/24 09:37:46 ajacoutot Exp $
--- deskbar/core/Utils.py.orig Sat Apr 24 10:52:20 2010
+++ deskbar/core/Utils.py Sat Apr 24 10:52:39 2010
@@ -71,7 +71,7 @@ def get_xdg_data_dirs():
sysdirs = os.getenv("XDG_DATA_DIRS")
if sysdirs == None:
- sysdirs = "/usr/local/share:/usr/share"
+ sysdirs = "${LOCALBASE}/share:/usr/share"
dirs = "%s:%s" % (dirs, sysdirs)
return [dir for dir in dirs.split(":") if dir.strip() != "" and exists(dir)]

21
x11/gnome/deskbar-applet/patches/patch-deskbar_handlers_mozilla_py Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-deskbar_handlers_mozilla_py,v 1.1 2010/04/24 09:37:46 ajacoutot Exp $
--- deskbar/handlers/mozilla.py.orig Sat Apr 24 10:55:09 2010
+++ deskbar/handlers/mozilla.py Sat Apr 24 11:00:05 2010
@@ -249,6 +249,7 @@ class MozillaSearchHandler(deskbar.interfaces.Module):
get_firefox_home_file("searchplugins"),
get_firefox_home_file("search"),
expanduser("~/.mozilla/searchplugins"),
+ "${LOCALBASE}/lib/mozilla-plugins",
"/usr/local/lib/firefox/searchplugins",
"/usr/lib/mozilla-firefox/searchplugins",
"/usr/local/lib/mozilla-firefox/searchplugins",
@@ -258,6 +259,9 @@ class MozillaSearchHandler(deskbar.interfaces.Module):
smart_dirs = [
get_mozilla_home_file("search"),
expanduser("~/.mozilla/searchplugins"),
+ "${LOCALBASE}/mozilla-firefox/searchplugins",
+ "${LOCALBASE}/firefox35/searchplugins",
+ "${LOCALBASE}/firefox36/searchplugins",
"/usr/lib/mozilla/searchplugins",
"/usr/local/lib/mozilla/searchplugins"]