diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/midori/Makefile | 22 | ||||
| -rw-r--r-- | www/midori/PLIST | 14 | ||||
| -rw-r--r-- | www/midori/distinfo | 10 | ||||
| -rw-r--r-- | www/midori/patches/patch-aa | 21 |
4 files changed, 46 insertions, 21 deletions
diff --git a/www/midori/Makefile b/www/midori/Makefile index 964013e5aa6..9426e36c1de 100644 --- a/www/midori/Makefile +++ b/www/midori/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.18 2010/02/10 19:17:47 joerg Exp $ +# $NetBSD: Makefile,v 1.19 2010/04/10 00:57:06 obache Exp $ -DISTNAME= midori-0.1.9 -PKGREVISION= 5 +DISTNAME= midori-0.2.4 CATEGORIES= www -MASTER_SITES= http://archive.xfce.org/src/apps/midori/0.1/ +MASTER_SITES= http://archive.xfce.org/src/apps/midori/0.2/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.twotoasts.de/index.php?/pages/midori_summary.html @@ -18,7 +17,7 @@ PKG_DESTDIR_SUPPORT= user-destdir CONFIGURE_ARGS+= --prefix=${PREFIX:Q} REPLACE_PYTHON= waf wscript docs/api/wscript_build -REPLACE_PYTHON+= katze/wscript_build extensions/wscript_build +REPLACE_PYTHON+= tests/wscript_build extensions/wscript_build REPLACE_PYTHON+= icons/wscript_build midori/wscript_build BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.4:../../textproc/py-docutils @@ -30,7 +29,15 @@ EGDIR= ${PREFIX}/share/examples/midori OWN_DIRS= ${PKG_SYSCONFDIR}/xdg/midori CONF_FILES= ${EGDIR}/search ${PKG_SYSCONFDIR}/xdg/midori/search -PRIVILEGED_STAGES+= clean +.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 # XXX stupid hack. python has a marshal.h that gets included before # the local marshal.h @@ -44,12 +51,11 @@ SUBST_FILES.marshal+= katze/katze-array.c katze/katze-arrayaction.c SUBST_SED.marshal= -e 's/"marshal/"marshallocal/' SUBST_STAGE.marshal2= pre-configure SUBST_MESSAGE.marshal2= Gross hack (part two) in progress -SUBST_FILES.marshal2= midori/wscript_build katze/wscript_build +SUBST_FILES.marshal2= midori/wscript_build SUBST_SED.marshal2= -e s/\'marshal/\'marshallocal/ pre-configure: ${MV} ${WRKSRC}/midori/marshal.list ${WRKSRC}/midori/marshallocal.list - ${MV} ${WRKSRC}/katze/marshal.list ${WRKSRC}/katze/marshallocal.list .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libidn/buildlink3.mk" diff --git a/www/midori/PLIST b/www/midori/PLIST index dd747c57d15..95fb4d714be 100644 --- a/www/midori/PLIST +++ b/www/midori/PLIST @@ -1,24 +1,27 @@ -@comment $NetBSD: PLIST,v 1.11 2009/08/06 06:48:11 hasso Exp $ +@comment $NetBSD: PLIST,v 1.12 2010/04/10 00:57:06 obache Exp $ bin/midori lib/midori/libadblock.so lib/midori/libcolorful-tabs.so lib/midori/libcookie-manager.so lib/midori/libfeed-panel.so +lib/midori/libformhistory.so lib/midori/libmouse-gestures.so 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/AUTHORS share/doc/midori/COPYING share/doc/midori/ChangeLog share/doc/midori/EXPAT share/doc/midori/README -share/doc/midori/TRANSLATE share/doc/midori/user/midori.html 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 @@ -34,6 +37,8 @@ share/icons/hicolor/32x32/status/news-feed.png share/icons/hicolor/48x48/apps/midori.png share/icons/hicolor/48x48/categories/extension.png share/icons/hicolor/48x48/status/news-feed.png +share/locale/ast/LC_MESSAGES/midori.mo +share/locale/ca/LC_MESSAGES/midori.mo share/locale/cs/LC_MESSAGES/midori.mo share/locale/da/LC_MESSAGES/midori.mo share/locale/de/LC_MESSAGES/midori.mo @@ -49,9 +54,12 @@ share/locale/hu/LC_MESSAGES/midori.mo share/locale/id/LC_MESSAGES/midori.mo 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 share/locale/ro/LC_MESSAGES/midori.mo share/locale/ru/LC_MESSAGES/midori.mo share/locale/sk/LC_MESSAGES/midori.mo @@ -62,6 +70,8 @@ share/locale/tr/LC_MESSAGES/midori.mo 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/res/autosuggestcontrol.css +share/midori/res/autosuggestcontrol.js share/midori/res/error.html share/midori/res/logo-shade.png share/midori/res/mootools.js diff --git a/www/midori/distinfo b/www/midori/distinfo index 2467f452e57..102ba4fa591 100644 --- a/www/midori/distinfo +++ b/www/midori/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.7 2009/08/06 06:48:11 hasso Exp $ +$NetBSD: distinfo,v 1.8 2010/04/10 00:57:06 obache Exp $ -SHA1 (midori-0.1.9.tar.bz2) = d54314f7e0e2714866e0e57dc55f142c2285757c -RMD160 (midori-0.1.9.tar.bz2) = 9e1d6d18cd16f00119adc739551c6ecbb980b166 -Size (midori-0.1.9.tar.bz2) = 516902 bytes -SHA1 (patch-aa) = e8b1576dc4b42756d33eb260eab4d7fa88d4117b +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 diff --git a/www/midori/patches/patch-aa b/www/midori/patches/patch-aa index 3b9465fe661..d8aa85f7694 100644 --- a/www/midori/patches/patch-aa +++ b/www/midori/patches/patch-aa @@ -1,13 +1,22 @@ -$NetBSD: patch-aa,v 1.1 2009/03/18 03:14:11 snj Exp $ +$NetBSD: patch-aa,v 1.2 2010/04/10 00:57:06 obache Exp $ ---- wscript.orig 2009-03-17 18:29:37.000000000 -0700 -+++ wscript 2009-03-17 18:29:33.000000000 -0700 -@@ -311,7 +311,7 @@ def build (bld): - 'AUTHORS ChangeLog COPYING EXPAT README TRANSLATE') +--- wscript.orig 2010-03-07 21:23:04.000000000 +0000 ++++ wscript +@@ -430,7 +430,7 @@ def build (bld): + 'AUTHORS COPYING ChangeLog EXPAT README') # Install default configuration - bld.install_files ('${SYSCONFDIR}/xdg/' + APPNAME + '/', 'data/search') -+ bld.install_files ('${DESTDIR}${PREFIX}/share/examples/midori/', 'data/search') ++ bld.install_files ('${DESTDIR}${PREFIX}/share/examples/' + APPNAME + '/', 'data/search') if bld.env['RST2HTML']: # FIXME: Build only if needed +@@ -515,7 +515,7 @@ def build (bld): + folder = 'lib' + extension + '.so' + source = 'data/extensions/' + extension + '/config' + if os.path.exists (source): +- bld.install_files ('${SYSCONFDIR}/xdg/' + APPNAME + \ ++ bld.install_files ('${DESTDIR}${PREFIX}/share/examples/' + APPNAME + \ + '/extensions/' + folder, source) + + if Options.commands['check']: |