summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorsnj <snj@pkgsrc.org>2009-07-09 05:04:02 +0000
committersnj <snj@pkgsrc.org>2009-07-09 05:04:02 +0000
commit4c3816600027b8650e5751476c05ed10c0ae1bd1 (patch)
tree40690ef4b12586732e009c0186a439718383439d /www
parent0db1e8068bb68888485c40b46e01e6fcecf7e247 (diff)
downloadpkgsrc-4c3816600027b8650e5751476c05ed10c0ae1bd1.tar.gz
Update dillo to 2.1.1, partially from Matthew Mondor in PR pkg/41670.
Changes: 2.1.1: Add additional size checks for images. Added support for css colors of the form rgb(255, 255, 255). Added the 'nop' keybinding (nop = NO_OPERATION; cancels a default hook). Added 'stop' key action (not bound by default). Reduced 'warning: ignoring return value of ...' 2.1: Implemented basic CSS infrastructure! Read user style from ~/.dillo/style.css. Added configurable keybindings! (in ~/.dillo/keysrc) Implemented "search previous" in string searches. Ported the command line interface from dillo1 Set middle click to submit in a new TAB. (Helps to keep form data!) Implemented Basic authentication! Implemented a close-tab button for the GUI. Implemented a tools menu. Added dillo(1) man page. Added "font_max_size", "font_min_size" dillorc options. Added instant client-side redirects (aka. zero-delay META refresh). Proxy support for HTTPS. Updated the URL resolver to comply with RFC-3986. Fixed Bookmarks modify's HTML so it wraps nicely on handhelds. Made cookierc parsing more robust. Fix: recover page focus when clicking outside of a widget. Added support for the Q element. BUG#343 Added a right-click menu to form controls (show hiddens, submit, reset) Added the "http_language" dillorc option for setting HTTP's Accept-Language. Replace image loading button and page menu option with a tools menu option. Implemented the "overline" text-decoration. Enhanced and cleaned up text decorations for SUB and SUP. Added "View Stylesheets" to the page menu. System config files have moved to sysconfdir/dillo/ Allowed compilation with older machines by removing a few C99isms. Switched SSL-enabled to configure.in (./configure --enable-ssl). Removed redundant caller NULL checks already in the API. Added use of inttypes.h when stdint.h isn't found. Made the parser recognize "[^ ]/>"-terminated XML elements. Brought in Sebastian's CSS parser from dillo-0.8.0-css-3. Support CSS @import directive. Improved CSS selector matching performance using hash tables. Added support for descendant and child selectors. Support selector specificity. Replace bg_color dillorc option. Remove text_color, link_color, and force_my_colors dillorc options. Replace visited_color dillorc option. Allow negative values for specific CSS properties only. Disable negative margins for now as dw/* does not support them yet. Disable form widgets while stylesheets are loading. Implement --xid command line option (used by claws mail client). Added the "middle_click_drags_page" dillorc option. Set the File menu label to hide when the File menu-button is shown. Made a big cleanup of cache.c WRT charset decoding (fixes bugs). Made an extensive cleanup/fixup of the whole image handling process. Fixed handling of META's content-type with no MIME type (e.g. only charset). Added support for a quoted URL in META refresh. Updated the GPL copyright note in the source files.
Diffstat (limited to 'www')
-rw-r--r--www/dillo/Makefile7
-rw-r--r--www/dillo/PLIST4
-rw-r--r--www/dillo/distinfo15
-rw-r--r--www/dillo/patches/patch-aa41
-rw-r--r--www/dillo/patches/patch-ab10
-rw-r--r--www/dillo/patches/patch-ac20
-rw-r--r--www/dillo/patches/patch-ad13
7 files changed, 62 insertions, 48 deletions
diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index 5c9e57c908c..5c0696a029c 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2009/07/07 14:24:05 joerg Exp $
+# $NetBSD: Makefile,v 1.44 2009/07/09 05:04:02 snj Exp $
-DISTNAME= dillo-2.0
+DISTNAME= dillo-2.1.1
CATEGORIES= www
MASTER_SITES= http://www.dillo.org/download/
EXTRACT_SUFX= .tar.bz2
@@ -20,9 +20,11 @@ USE_TOOLS+= perl:run
DEPENDS+= wget-[0-9]*:../../net/wget
+PKG_SYSCONFSUBDIR= dillo
EGDIR= ${PREFIX}/share/examples/dillo
CONF_FILES= ${EGDIR}/dillorc ${PKG_SYSCONFDIR}/dillorc
CONF_FILES+= ${EGDIR}/dpidrc ${PKG_SYSCONFDIR}/dpidrc
+CONF_FILES+= ${EGDIR}/keysrc ${PKG_SYSCONFDIR}/keysrc
INSTALLATION_DIRS= share/doc/dillo ${EGDIR}
@@ -32,6 +34,7 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DESTDIR}${PREFIX}/share/doc/dillo
${INSTALL_DATA} ${WRKSRC}/doc/README ${DESTDIR}${PREFIX}/share/doc/dillo
${INSTALL_DATA} ${WRKSRC}/dillorc ${DESTDIR}${EGDIR}
+ ${INSTALL_DATA} ${WRKSRC}/src/keysrc ${DESTDIR}${EGDIR}
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
diff --git a/www/dillo/PLIST b/www/dillo/PLIST
index 3d502ba32fe..efbcc9d3a45 100644
--- a/www/dillo/PLIST
+++ b/www/dillo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2009/06/14 22:00:20 joerg Exp $
+@comment $NetBSD: PLIST,v 1.15 2009/07/09 05:04:02 snj Exp $
bin/dillo
bin/dpid
bin/dpidc
@@ -10,6 +10,7 @@ lib/dillo/dpi/file/file.dpi
lib/dillo/dpi/ftp/ftp.filter.dpi
lib/dillo/dpi/hello/hello.filter.dpi
lib/dillo/dpi/https/https.filter.dpi
+man/man1/dillo.1
share/doc/dillo/Cache.txt
share/doc/dillo/Cookies.txt
share/doc/dillo/Dillo.txt
@@ -24,3 +25,4 @@ share/doc/dillo/README
share/doc/dillo/Selection.txt
share/examples/dillo/dillorc
share/examples/dillo/dpidrc
+share/examples/dillo/keysrc
diff --git a/www/dillo/distinfo b/www/dillo/distinfo
index fc9246359e4..fbc5a75a351 100644
--- a/www/dillo/distinfo
+++ b/www/dillo/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.28 2008/10/31 02:02:44 snj Exp $
+$NetBSD: distinfo,v 1.29 2009/07/09 05:04:02 snj Exp $
-SHA1 (dillo-2.0.tar.bz2) = 9bde7eab5c835e13508d63a190a8bcec4e94553a
-RMD160 (dillo-2.0.tar.bz2) = f457e5a031d8a0e682be50ee16cbfba3fea34eaa
-Size (dillo-2.0.tar.bz2) = 551569 bytes
-SHA1 (patch-aa) = ea8a2b930eefed4f6384dc57623d1993d4cd7247
-SHA1 (patch-ab) = 8090c554c52dc0133bf725bacc172f7d08071929
-SHA1 (patch-ac) = ede656975ae077568a432245a9705c70e40a74fc
+SHA1 (dillo-2.1.1.tar.bz2) = eb252663b9480e53e0376d75b81130404ccf40ce
+RMD160 (dillo-2.1.1.tar.bz2) = 4b8fe423e3a0fd0e461cc8e1795bac39ad47d3b6
+Size (dillo-2.1.1.tar.bz2) = 612711 bytes
+SHA1 (patch-aa) = 3a7b8d9e70d82edebf63cd5a715754dfad935832
+SHA1 (patch-ab) = 37bbf07cb5120cbc677ad12d4d9f3ab07a02722e
+SHA1 (patch-ac) = f129ed7bb341211895fc51a7b70a81c94e70b158
+SHA1 (patch-ad) = 005df4881ecea7b1a7aff51ea06697e9949547dd
diff --git a/www/dillo/patches/patch-aa b/www/dillo/patches/patch-aa
index c1308620059..5b7c8289a00 100644
--- a/www/dillo/patches/patch-aa
+++ b/www/dillo/patches/patch-aa
@@ -1,25 +1,20 @@
-$NetBSD: patch-aa,v 1.7 2008/10/31 02:02:44 snj Exp $
+$NetBSD: patch-aa,v 1.8 2009/07/09 05:04:02 snj Exp $
---- ./dpid/Makefile.in.orig 2008-10-30 07:40:38.000000000 -0700
-+++ dpid/Makefile.in 2008-10-30 07:46:09.000000000 -0700
-@@ -485,13 +485,13 @@
+--- dpid/Makefile.in.orig 2009-07-01 10:56:37.000000000 -0700
++++ dpid/Makefile.in 2009-07-08 20:42:08.000000000 -0700
+@@ -320,12 +320,12 @@ distclean-compile:
+ uninstall-info-am:
+ install-sysconfDATA: $(sysconf_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
++ test -z "$(datadir)/examples/$(PACKAGE)" || $(mkdir_p) "$(DESTDIR)$(datadir)/examples/$(PACKAGE)"
+ @list='$(sysconf_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+- echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
+- $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
++ echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/examples/$(PACKAGE)/$$f'"; \
++ $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/examples/$(PACKAGE)/$$f"; \
+ done
-
- install-data-local :
-- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-- echo dpi_dir=$(libdir)/dillo/dpi > $(DESTDIR)$(sysconfdir)/dpidrc
-- echo >> $(DESTDIR)$(sysconfdir)/dpidrc
-- echo "proto.file=file/file.dpi" >> $(DESTDIR)$(sysconfdir)/dpidrc
-- echo "proto.ftp=ftp/ftp.filter.dpi" >> $(DESTDIR)$(sysconfdir)/dpidrc
-- echo "proto.https=https/https.filter.dpi" >> $(DESTDIR)$(sysconfdir)/dpidrc
-- echo "proto.data=datauri/datauri.filter.dpi" >> $(DESTDIR)$(sysconfdir)/dpidrc
-+ $(mkinstalldirs) $(DESTDIR)$(datadir)/examples/$(PACKAGE)
-+ echo dpi_dir=$(libdir)/dillo/dpi > $(DESTDIR)$(datadir)/examples/$(PACKAGE)/dpidrc
-+ echo >> $(DESTDIR)$(datadir)/examples/$(PACKAGE)/dpidrc
-+ echo "proto.file=file/file.dpi" >> $(DESTDIR)$(datadir)/examples/$(PACKAGE)/dpidrc
-+ echo "proto.ftp=ftp/ftp.filter.dpi" >> $(DESTDIR)$(datadir)/examples/$(PACKAGE)/dpidrc
-+ echo "proto.https=https/https.filter.dpi" >> $(DESTDIR)$(datadir)/examples/$(PACKAGE)/dpidrc
-+ echo "proto.data=datauri/datauri.filter.dpi" >> $(DESTDIR)$(datadir)/examples/$(PACKAGE)/dpidrc
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
+ uninstall-sysconfDATA:
diff --git a/www/dillo/patches/patch-ab b/www/dillo/patches/patch-ab
index 8d0ed022f2f..4601f37df92 100644
--- a/www/dillo/patches/patch-ab
+++ b/www/dillo/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.14 2008/10/31 02:02:44 snj Exp $
+$NetBSD: patch-ab,v 1.15 2009/07/09 05:04:03 snj Exp $
---- ./Makefile.in.orig 2008-10-30 07:47:58.000000000 -0700
-+++ ./Makefile.in 2008-10-30 07:48:05.000000000 -0700
-@@ -197,7 +197,7 @@
- top_srcdir = @top_srcdir@
+--- Makefile.in.orig 2009-07-01 10:56:55.000000000 -0700
++++ Makefile.in 2009-07-08 15:30:55.000000000 -0700
+@@ -194,7 +194,7 @@ target_os = @target_os@
+ target_vendor = @target_vendor@
SUBDIRS = lout dw dlib dpip src doc dpid dpi test
EXTRA_DIST = Doxyfile dillorc install-dpi-local
-sysconf_DATA = dillorc
diff --git a/www/dillo/patches/patch-ac b/www/dillo/patches/patch-ac
index 6aefb87fa59..61568087695 100644
--- a/www/dillo/patches/patch-ac
+++ b/www/dillo/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.11 2008/10/31 02:02:44 snj Exp $
+$NetBSD: patch-ac,v 1.12 2009/07/09 05:04:03 snj Exp $
---- dpi/https.c.orig 2008-10-13 07:49:46.000000000 -0700
-+++ dpi/https.c 2008-10-30 07:52:45.000000000 -0700
-@@ -68,8 +68,6 @@
- #define MSG(...) printf("[https dpi]: " __VA_ARGS__)
+--- src/Makefile.in.orig 2009-07-08 20:27:51.000000000 -0700
++++ src/Makefile.in 2009-07-08 20:28:37.000000000 -0700
+@@ -321,7 +321,7 @@ dillo_SOURCES = \
+ xembed.hh
+ EXTRA_DIST = chg srch keysrc
+-sysconf_DATA = keysrc
++sysconf_DATA =
+ all: all-recursive
--#define ENABLE_SSL
--#undef ENABLE_SSL
- #ifdef ENABLE_SSL
-
- #include <openssl/ssl.h>
+ .SUFFIXES:
diff --git a/www/dillo/patches/patch-ad b/www/dillo/patches/patch-ad
new file mode 100644
index 00000000000..ef8bcb173f0
--- /dev/null
+++ b/www/dillo/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2009/07/09 05:04:03 snj Exp $
+
+--- configure.orig 2009-07-08 21:32:56.000000000 -0700
++++ configure 2009-07-08 21:33:06.000000000 -0700
+@@ -2346,7 +2346,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
+
+ ac_config_headers="$ac_config_headers config.h"
+
+-sysconfdir=${sysconfdir}/${PACKAGE}
++sysconfdir=${sysconfdir}
+
+
+