summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/midori/Makefile14
-rw-r--r--www/midori/PLIST8
-rw-r--r--www/midori/distinfo10
-rw-r--r--www/midori/patches/patch-aa17
4 files changed, 28 insertions, 21 deletions
diff --git a/www/midori/Makefile b/www/midori/Makefile
index 9426e36c1de..89ca25de2e9 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2010/04/10 00:57:06 obache Exp $
+# $NetBSD: Makefile,v 1.20 2010/05/19 18:01:29 drochner Exp $
-DISTNAME= midori-0.2.4
+DISTNAME= midori-0.2.5
CATEGORIES= www
MASTER_SITES= http://archive.xfce.org/src/apps/midori/0.2/
@@ -31,13 +31,9 @@ CONF_FILES= ${EGDIR}/search ${PKG_SYSCONFDIR}/xdg/midori/search
.include "../../mk/bsd.prefs.mk"
-# XXX arould hunk#2 of patch-aa
-PLIST_VARS+= linux
-.if ${OPSYS} == "Linux"
-PLIST.linux= yes
-OWN_DIRS+= ${PKG_SYSCONFDIR}/xdg/midori/extensions/libadblock.so
-CONF_FILES+= ${EGDIR}/extensions/libadblock.so/config ${PKG_SYSCONFDIR}/xdg/midori/extensions/libadblock.so/config
-.endif
+OWN_DIRS+= ${PKG_SYSCONFDIR}/xdg/midori/extensions/libadblock.so
+CONF_FILES+= ${EGDIR}/extensions/libadblock.so/config \
+ ${PKG_SYSCONFDIR}/xdg/midori/extensions/libadblock.so/config
# XXX stupid hack. python has a marshal.h that gets included before
# the local marshal.h
diff --git a/www/midori/PLIST b/www/midori/PLIST
index 95fb4d714be..73669226992 100644
--- a/www/midori/PLIST
+++ b/www/midori/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.12 2010/04/10 00:57:06 obache Exp $
+@comment $NetBSD: PLIST,v 1.13 2010/05/19 18:01:29 drochner Exp $
bin/midori
lib/midori/libadblock.so
+lib/midori/libaddons.so
lib/midori/libcolorful-tabs.so
lib/midori/libcookie-manager.so
lib/midori/libfeed-panel.so
@@ -8,6 +9,7 @@ lib/midori/libformhistory.so
lib/midori/libmouse-gestures.so
lib/midori/libpage-holder.so
lib/midori/libshortcuts.so
+lib/midori/libstatus-clock.so
lib/midori/libstatusbar-features.so
lib/midori/libtab-panel.so
lib/midori/libtab-switcher.so
@@ -20,8 +22,8 @@ share/doc/midori/ChangeLog
share/doc/midori/EXPAT
share/doc/midori/README
share/doc/midori/user/midori.html
+share/examples/midori/extensions/libadblock.so/config
share/examples/midori/search
-${PLIST.linux}share/examples/midori/extensions/libadblock.so/config
share/icons/hicolor/16x16/apps/midori.png
share/icons/hicolor/16x16/categories/extension.png
share/icons/hicolor/16x16/status/news-feed.png
@@ -50,6 +52,7 @@ share/locale/fi/LC_MESSAGES/midori.mo
share/locale/fr/LC_MESSAGES/midori.mo
share/locale/gl/LC_MESSAGES/midori.mo
share/locale/he/LC_MESSAGES/midori.mo
+share/locale/hr/LC_MESSAGES/midori.mo
share/locale/hu/LC_MESSAGES/midori.mo
share/locale/id/LC_MESSAGES/midori.mo
share/locale/it/LC_MESSAGES/midori.mo
@@ -57,6 +60,7 @@ share/locale/ja/LC_MESSAGES/midori.mo
share/locale/ko/LC_MESSAGES/midori.mo
share/locale/nl/LC_MESSAGES/midori.mo
share/locale/no/LC_MESSAGES/midori.mo
+share/locale/pa/LC_MESSAGES/midori.mo
share/locale/pl/LC_MESSAGES/midori.mo
share/locale/pt/LC_MESSAGES/midori.mo
share/locale/pt_BR/LC_MESSAGES/midori.mo
diff --git a/www/midori/distinfo b/www/midori/distinfo
index 102ba4fa591..16c8abcf99c 100644
--- a/www/midori/distinfo
+++ b/www/midori/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2010/04/10 00:57:06 obache Exp $
+$NetBSD: distinfo,v 1.9 2010/05/19 18:01:29 drochner Exp $
-SHA1 (midori-0.2.4.tar.bz2) = 41b11ff4a65256fc3fdcafb8151f60195d7f8845
-RMD160 (midori-0.2.4.tar.bz2) = 8291b66b23c80b1881c06a1f001789155a5fbf76
-Size (midori-0.2.4.tar.bz2) = 645554 bytes
-SHA1 (patch-aa) = 9d78b4fc1f2a1c881d07283d261e5f1ac3765f47
+SHA1 (midori-0.2.5.tar.bz2) = ee7cfe6b960029becb4b4c37efc8ec8008e3be5d
+RMD160 (midori-0.2.5.tar.bz2) = 1b70959b867a401f80da5223b6851e81f9b1f89d
+Size (midori-0.2.5.tar.bz2) = 705277 bytes
+SHA1 (patch-aa) = 80f3ef1e174bc19f2bc0b8215ad546cf82fcd89d
diff --git a/www/midori/patches/patch-aa b/www/midori/patches/patch-aa
index d8aa85f7694..2427d68b135 100644
--- a/www/midori/patches/patch-aa
+++ b/www/midori/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2010/04/10 00:57:06 obache Exp $
+$NetBSD: patch-aa,v 1.3 2010/05/19 18:01:29 drochner Exp $
---- wscript.orig 2010-03-07 21:23:04.000000000 +0000
+--- wscript.orig 2010-05-16 18:32:33.000000000 +0000
+++ wscript
-@@ -430,7 +430,7 @@ def build (bld):
+@@ -454,7 +454,7 @@ def build (bld):
'AUTHORS COPYING ChangeLog EXPAT README')
# Install default configuration
@@ -11,7 +11,14 @@ $NetBSD: patch-aa,v 1.2 2010/04/10 00:57:06 obache Exp $
if bld.env['RST2HTML']:
# FIXME: Build only if needed
-@@ -515,7 +515,7 @@ def build (bld):
+@@ -533,13 +533,13 @@ def build (bld):
+ bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/autosuggestcontrol.css')
+
+ # FIXME: Determine the library naming for other platforms
+- if Options.platform == 'linux':
++ if 1:
+ extensions = os.listdir ('data/extensions')
+ for extension in extensions:
folder = 'lib' + extension + '.so'
source = 'data/extensions/' + extension + '/config'
if os.path.exists (source):
@@ -19,4 +26,4 @@ $NetBSD: patch-aa,v 1.2 2010/04/10 00:57:06 obache Exp $
+ bld.install_files ('${DESTDIR}${PREFIX}/share/examples/' + APPNAME + \
'/extensions/' + folder, source)
- if Options.commands['check']:
+ if Options.commands['check'] or bld.env['tests']: