Update to midori 0.2.1, which i somehow forgot in my tree..

Update deps on newer webkit/libsoup, and drop libidn dep which is now
provided by libsoup.
This commit is contained in:
landry 2009-11-23 21:27:44 +00:00
parent 42e61718d2
commit 61a7d5e182
4 changed files with 21 additions and 19 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.14 2009/10/19 19:54:15 landry Exp $
# $OpenBSD: Makefile,v 1.15 2009/11/23 21:27:44 landry Exp $
COMMENT = lightweight web browser
XFCE_VERSION = 0.2.0
XFCE_VERSION = 0.2.1
XFCE_GOODIE = midori
MAINTAINER = Landry Breuil <gaston@gcu.info>
@ -20,11 +20,10 @@ USE_X11 = Yes
DESKTOP_FILES = Yes
NO_REGRESS = Yes
LIB_DEPENDS = webkit-1.0:webkit->=1.1.5v0:www/webkit \
idn::devel/libidn \
LIB_DEPENDS = webkit-1.0:webkit->=1.1.15v0:www/webkit \
sqlite3::databases/sqlite3 \
unique-1.0::devel/libunique \
soup-2.4:libsoup->=2.24.3p0:devel/libsoup
soup-2.4:libsoup->=2.28.0:devel/libsoup
# pick sqlite
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include"

View File

@ -1,5 +1,5 @@
MD5 (midori-0.2.0.tar.bz2) = gF4uWak6Ckt2UtZUeyvZIw==
RMD160 (midori-0.2.0.tar.bz2) = 5UHFMu4whxsjWy3fw1UTGdtjWz8=
SHA1 (midori-0.2.0.tar.bz2) = 3d8RHY0e7g5gKBg8zas5zZa0PBM=
SHA256 (midori-0.2.0.tar.bz2) = l8edIIB4mbrUskE4XHy/Ok+F0mc7G2wSBZh4RQ4+lxo=
SIZE (midori-0.2.0.tar.bz2) = 570091
MD5 (midori-0.2.1.tar.bz2) = PO6UyaIjFlBKO6mbyS4CRQ==
RMD160 (midori-0.2.1.tar.bz2) = jetfWl1LOe4Mg5gqb9hIwAQ4GYA=
SHA1 (midori-0.2.1.tar.bz2) = Xm6bBVzxMPMKKHiG2Qj4pnLmbgo=
SHA256 (midori-0.2.1.tar.bz2) = fXmkUzHPzwAszVo4a1WX+R4O4EiysEClfG+uvAK7p5w=
SIZE (midori-0.2.1.tar.bz2) = 594189

View File

@ -1,23 +1,23 @@
$OpenBSD: patch-wscript,v 1.7 2009/09/21 08:01:25 landry Exp $
$OpenBSD: patch-wscript,v 1.8 2009/11/23 21:27:44 landry Exp $
We don't need those files installed..
--- wscript.orig Sat Sep 12 00:09:38 2009
+++ wscript Sun Sep 13 13:55:02 2009
--- wscript.orig Fri Nov 13 23:31:25 2009
+++ wscript Mon Nov 23 22:07:02 2009
@@ -63,7 +63,7 @@ def rc_file(self, node):
rctask.set_outputs (node.change_ext ('.rc.o'))
self.compiled_tasks.append (rctask)
rc_file = extension ('.rc')(rc_file)
Task.simple_task_type ('winrc', '${WINRC} -o${TGT} ${SRC}', color='BLUE',
- before='cc cxx', shell=False)
+ before='cc cxx')
def configure (conf):
def option_checkfatal (option, desc):
@@ -373,12 +373,8 @@ def build (bld):
@@ -384,12 +384,8 @@ def build (bld):
bld.add_group ()
- if bld.env['docs']:
- bld.install_files ('${DOCDIR}/' + APPNAME + '/', \
- 'AUTHORS ChangeLog COPYING EXPAT README TRANSLATE')
- 'AUTHORS COPYING ChangeLog EXPAT README')
-
# Install default configuration
- bld.install_files ('${SYSCONFDIR}/xdg/' + APPNAME + '/', 'data/search')

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.11 2009/10/19 19:54:15 landry Exp $
@comment $OpenBSD: PLIST,v 1.12 2009/11/23 21:27:44 landry Exp $
@bin bin/midori
lib/midori/
lib/midori/libadblock.so
@ -12,7 +12,9 @@ lib/midori/libpage-holder.so
lib/midori/libshortcuts.so
lib/midori/libstatusbar-features.so
lib/midori/libtab-panel.so
lib/midori/libtab-switcher.so
lib/midori/libtoolbar-editor.so
lib/midori/libweb-cache.so
share/applications/midori.desktop
share/doc/midori/
share/doc/midori/user/
@ -56,6 +58,7 @@ share/locale/it/LC_MESSAGES/midori.mo
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/pl/LC_MESSAGES/midori.mo
share/locale/pt/LC_MESSAGES/midori.mo
share/locale/pt_BR/LC_MESSAGES/midori.mo
@ -70,9 +73,9 @@ share/locale/uk/LC_MESSAGES/midori.mo
share/locale/zh_CN/LC_MESSAGES/midori.mo
share/locale/zh_TW/LC_MESSAGES/midori.mo
share/midori/
share/midori/autosuggestcontrol.css
share/midori/autosuggestcontrol.js
share/midori/res/
share/midori/res/autosuggestcontrol.css
share/midori/res/autosuggestcontrol.js
share/midori/res/error.html
share/midori/res/logo-shade.png
share/midori/res/mootools.js