Attached are two diffs that bring fltk2 to the latest snapshot and dillo
to version 2.1. I think I heard ports were locked so I figure people can
atleast get some testing in. dillo 2.1 has some basic css support now
and ssl seems to work better, though it doesn't actually check the
certificates it would seem. Probably should patch with -E since I have
removed the ipv6/ipv4 full back patch that is now upstream. Thanks.
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/fltk2/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile 3 Nov 2008 11:02:25 -0000 1.2
+++ Makefile 25 Jun 2009 23:53:07 -0000
@@ -2,7 +2,7 @@
COMMENT = fast light toolkit
-V= 6483
+V= 6786
DISTNAME = fltk-2.0.x-r${V}
PKGNAME = fltk2-2.0r${V}
CATEGORIES = x11
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/fltk2/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo 3 Nov 2008 11:02:25 -0000 1.2
+++ distinfo 25 Jun 2009 23:53:07 -0000
@@ -1,5 +1,5 @@
-MD5 (fltk-2.0.x-r6483.tar.gz) = mQiUXDj4vCzYSBTKcIgWlA==
-RMD160 (fltk-2.0.x-r6483.tar.gz) = /heotLVkSyTqSLYHzZME5bOS2IQ=
-SHA1 (fltk-2.0.x-r6483.tar.gz) = /3Ol5BIP4Vk/wYziOypuClr7EF4=
-SHA256 (fltk-2.0.x-r6483.tar.gz) = JG5acq+OrxBfRSYFVI9JdNfEovxB6kiZcDK98fvnY5o=
-SIZE (fltk-2.0.x-r6483.tar.gz) = 3033495
+MD5 (fltk-2.0.x-r6786.tar.gz) = fYT5gIg31toLZtkpVs524w==
+RMD160 (fltk-2.0.x-r6786.tar.gz) = aFcGeQTZbiOSYHfm8ZACZynHZHE=
+SHA1 (fltk-2.0.x-r6786.tar.gz) = csJvBq+1fqipiyM/okujFRMy+kg=
+SHA256 (fltk-2.0.x-r6786.tar.gz) = BV4U7Z0seW2vd0cqchcJ3IvbvI+vBPCRZl8TsjjONU4=
+SIZE (fltk-2.0.x-r6786.tar.gz) = 3031770
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/dillo/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- Makefile 3 Nov 2008 11:05:25 -0000 1.29
+++ Makefile 26 Jun 2009 00:18:07 -0000
@@ -2,8 +2,7 @@
COMMENT= fast and light graphical web browser
-DISTNAME= dillo-2.0
-PKGNAME= ${DISTNAME}p1
+DISTNAME= dillo-2.1
CATEGORIES= www
HOMEPAGE= http://www.dillo.org/
@@ -28,13 +27,13 @@
BUILD_DEPENDS= ::x11/fltk2
LIB_DEPENDS= jpeg.>=62::graphics/jpeg \
png.>=2::graphics/png
-# XXX dillo should be patched to use ftp(1)
RUN_DEPENDS= ::net/wget
USE_X11= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --enable-ipv6 \
+ --enable-ssl \
--disable-threaded-dns
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include
-I${LOCALBASE}/include/libpng" \
LDFLAGS="-L${LOCALBASE}/lib"
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/dillo/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- distinfo 19 Oct 2008 08:42:55 -0000 1.13
+++ distinfo 26 Jun 2009 00:18:07 -0000
@@ -1,5 +1,5 @@
-MD5 (dillo-2.0.tar.bz2) = u5mZyr602z2RVofeRl2+sA==
-RMD160 (dillo-2.0.tar.bz2) = 9FfloDHYoOaCvlDuFsv7o/6jTqo=
-SHA1 (dillo-2.0.tar.bz2) = m95+q1yDXhNQjWOhkKi87E6UVTo=
-SHA256 (dillo-2.0.tar.bz2) = hH0dsxvWirmrlLZCsM1ArI08+BaQD11WUhJJhmAd8ek=
-SIZE (dillo-2.0.tar.bz2) = 551569
+MD5 (dillo-2.1.tar.bz2) = xwOFGlxE9zkZX+vQkmjtwQ==
+RMD160 (dillo-2.1.tar.bz2) = F9eqjHy/zALcHqbHgR2I3y4/rP0=
+SHA1 (dillo-2.1.tar.bz2) = qq40HnHASMYLSLwFWnFV2eXoVmg=
+SHA256 (dillo-2.1.tar.bz2) = 6aNqGaDii5biAtraxOwlVIm8z9ZzQXCjJjHhsiQGkJ4=
+SIZE (dillo-2.1.tar.bz2) = 625886
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/www/dillo/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 19 Oct 2008 08:42:55 -0000 1.4
+++ patches/patch-Makefile_in 26 Jun 2009 00:18:07 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.4 2008/10/19 08:42:55 ajacoutot Exp $
---- Makefile.in.orig Fri Oct 17 07:13:44 2008
-+++ Makefile.in Fri Oct 17 07:14:31 2008
-@@ -254,12 +254,12 @@ distclean-hdr:
+--- Makefile.in.orig Wed Jun 17 14:19:04 2009
++++ Makefile.in Thu Jun 25 19:04:53 2009
+@@ -255,12 +255,12 @@ distclean-hdr:
-rm -f config.h stamp-h1
install-sysconfDATA: $(sysconf_DATA)
@$(NORMAL_INSTALL)
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/www/dillo/patches/patch-configure,v
retrieving revision 1.4
diff -u -r1.4 patch-configure
--- patches/patch-configure 19 Oct 2008 08:42:55 -0000 1.4
+++ patches/patch-configure 26 Jun 2009 00:18:07 -0000
@@ -1,12 +1,14 @@
$OpenBSD: patch-configure,v 1.4 2008/10/19 08:42:55 ajacoutot Exp $
---- configure.orig Fri Oct 17 06:47:30 2008
-+++ configure Fri Oct 17 06:47:46 2008
-@@ -7604,14 +7604,6 @@ cat >d_size.h <<_______EOF
+--- configure.orig Wed Jun 17 14:19:02 2009
++++ configure Thu Jun 25 19:06:50 2009
+@@ -7502,16 +7502,6 @@ cat >d_size.h <<_______EOF
#include "config.h"
-#if HAVE_STDINT_H == 0
-#include <stdint.h>
+-#elif defined(HAVE_INTTYPES_H)
+-#include <inttypes.h>
-#else
-typedef signed $gint16 int16_t;
-typedef unsigned $gint16 uint16_t;
Index: patches/patch-dillorc
===================================================================
RCS file: /cvs/ports/www/dillo/patches/patch-dillorc,v
retrieving revision 1.1
diff -u -r1.1 patch-dillorc
--- patches/patch-dillorc 3 Nov 2008 11:05:25 -0000 1.1
+++ patches/patch-dillorc 26 Jun 2009 00:18:07 -0000
@@ -1,19 +1,20 @@
$OpenBSD: patch-dillorc,v 1.1 2008/11/03 11:05:25 ajacoutot Exp $
---- dillorc.orig Mon Nov 3 11:45:40 2008
-+++ dillorc Mon Nov 3 11:46:03 2008
-@@ -39,13 +39,13 @@
- # vw_fontname="new century schoolbook"
- # vw_fontname="helvetica"
- # vw_fontname="times"
--# vw_fontname="Bitstream vera Serif"
-+vw_fontname="Bitstream vera Serif"
- # vw_fontname="arial"
- #vw_fontname="DejaVu Sans"
-
- # Fontname for fixed width rendering (mainly text quoted with <pre>)
- # fw_fontname=courier
--# fw_fontname="Bitstream Vera Sans Mono"
-+fw_fontname="Bitstream Vera Sans Mono"
- # fw_fontname="Andale Mono"
- #fw_fontname="DejaVu Sans Mono"
+--- dillorc.orig Wed Jun 17 13:58:19 2009
++++ dillorc Thu Jun 25 19:09:05 2009
+@@ -45,11 +45,11 @@
+ # Ex. {helvetica, lucida, times, "new century schoolbook", utopia, ...}
+ # The values below represent the defaults.
+ #
+-#font_serif="DejaVu Serif"
+-#font_sans_serif="DejaVu Sans"
+-#font_cursive="DejaVu Sans"
+-#font_fantasy="DejaVu Sans"
+-#font_monospace="DejaVu Sans Mono"
++font_serif="Bitstream vera Serif"
++font_sans_serif="Bitstream vera Sans"
++font_cursive="Bitstream vera Sans"
++font_fantasy="Bitstream vera Sans"
++font_monospace="Bitstream vera Sans Mono"
+ # All font sizes are scaled by this value
+ # font_factor=1.5
Index: patches/patch-dpi_datauri_c
===================================================================
RCS file: /cvs/ports/www/dillo/patches/patch-dpi_datauri_c,v
retrieving revision 1.2
diff -u -r1.2 patch-dpi_datauri_c
--- patches/patch-dpi_datauri_c 19 Oct 2008 08:42:55 -0000 1.2
+++ patches/patch-dpi_datauri_c 26 Jun 2009 00:18:07 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-dpi_datauri_c,v 1.2 2008/10/19 08:42:55 ajacoutot Exp $
---- dpi/datauri.c.orig Sat Oct 18 10:57:54 2008
-+++ dpi/datauri.c Sat Oct 18 10:59:16 2008
-@@ -296,7 +296,7 @@ int main(void)
+--- dpi/datauri.c.orig Wed Jun 17 13:58:19 2009
++++ dpi/datauri.c Thu Jun 25 19:04:53 2009
+@@ -298,7 +298,7 @@ int main(void)
data = datauri_get_data(url, &data_size);
MSG("mime_type: %s\n", mime_type);
Index: patches/patch-dpi_https_c
===================================================================
RCS file: /cvs/ports/www/dillo/patches/patch-dpi_https_c,v
retrieving revision 1.2
diff -u -r1.2 patch-dpi_https_c
--- patches/patch-dpi_https_c 21 Oct 2008 07:14:20 -0000 1.2
+++ patches/patch-dpi_https_c 26 Jun 2009 00:18:07 -0000
@@ -1,15 +1,7 @@
-$OpenBSD: patch-dpi_https_c,v 1.2 2008/10/21 07:14:20 ajacoutot Exp $
---- dpi/https.c.orig Mon Oct 13 16:49:46 2008
-+++ dpi/https.c Tue Oct 21 09:12:22 2008
-@@ -69,7 +69,6 @@
-
-
- #define ENABLE_SSL
--#undef ENABLE_SSL
- #ifdef ENABLE_SSL
-
- #include <openssl/ssl.h>
-@@ -155,7 +154,7 @@ static void yes_ssl_support(void)
+$OpenBSD$
+--- dpi/https.c.orig Thu Jun 25 19:18:08 2009
++++ dpi/https.c Thu Jun 25 19:18:21 2009
+@@ -159,7 +159,7 @@ static void yes_ssl_support(void)
/*FIXME - provide for sysconfdir variables and such*/
if (exit_error == 0){
if (SSL_CTX_load_verify_locations(
Index: patches/patch-dpid_Makefile_in
===================================================================
RCS file: /cvs/ports/www/dillo/patches/patch-dpid_Makefile_in,v
retrieving revision 1.3
diff -u -r1.3 patch-dpid_Makefile_in
--- patches/patch-dpid_Makefile_in 19 Oct 2008 08:42:55 -0000 1.3
+++ patches/patch-dpid_Makefile_in 26 Jun 2009 00:18:07 -0000
@@ -1,24 +1,28 @@
$OpenBSD: patch-dpid_Makefile_in,v 1.3 2008/10/19 08:42:55 ajacoutot Exp $
---- dpid/Makefile.in.orig Fri Oct 10 16:48:19 2008
-+++ dpid/Makefile.in Fri Oct 17 07:25:33 2008
-@@ -485,13 +485,13 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIP
+--- dpid/Makefile.in.orig Wed Jun 17 14:19:03 2009
++++ dpid/Makefile.in Thu Jun 25 19:16:55 2009
+@@ -320,12 +320,12 @@ distclean-compile:
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+ install-sysconfDATA: $(sysconf_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
++ test -z "$(PREFIX)/share/examples/dillo" || $(MKDIR_P)
"$(PREFIX)/share/examples/dillo"
+ @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'
'$(PREFIX)/share/examples/dillo/$$f'"; \
++ $(sysconfDATA_INSTALL) "$$d$$p" "$(PREFIX)/share/examples/dillo/$$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) $(PREFIX)/share/examples/dillo/
-+ echo dpi_dir=$(libdir)/dillo/dpi > $(PREFIX)/share/examples/dillo/dpidrc
-+ echo >> $(PREFIX)/share/examples/dillo/dpidrc
-+ echo "proto.file=file/file.dpi" >> $(PREFIX)/share/examples/dillo/dpidrc
-+ echo "proto.ftp=ftp/ftp.filter.dpi" >>
$(PREFIX)/share/examples/dillo/dpidrc
-+ echo "proto.https=https/https.filter.dpi" >>
$(PREFIX)/share/examples/dillo/dpidrc
-+ echo "proto.data=datauri/datauri.filter.dpi" >>
$(PREFIX)/share/examples/dillo/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:
+@@ -413,7 +413,7 @@ check-am: all-am
+ check: check-am
+ all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA)
+ installdirs:
+- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
"$(DESTDIR)$(sysconfdir)"; do \
++ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
"$(PREFIX)/share/examples/dillo"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: install-am
Index: patches/patch-dpid_main_c
===================================================================
RCS file: /cvs/ports/www/dillo/patches/patch-dpid_main_c,v
retrieving revision 1.3
diff -u -r1.3 patch-dpid_main_c
--- patches/patch-dpid_main_c 19 Oct 2008 08:42:55 -0000 1.3
+++ patches/patch-dpid_main_c 26 Jun 2009 00:18:07 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-dpid_main_c,v 1.3 2008/10/19 08:42:55 ajacoutot Exp $
---- dpid/main.c.orig Tue Sep 30 16:27:32 2008
-+++ dpid/main.c Sat Oct 18 11:14:19 2008
-@@ -69,7 +69,7 @@ static int start_filter_plugin(struct dp dpi_attr)
+--- dpid/main.c.orig Wed Jun 17 13:58:19 2009
++++ dpid/main.c Thu Jun 25 19:04:53 2009
+@@ -68,7 +68,7 @@ static int start_filter_plugin(struct dp dpi_attr)
}
if (pid == 0) {
/* Child, start plugin */
@@ -10,7 +10,7 @@
ERRMSG("start_plugin", "execl", errno);
MSG_ERR("ERROR in child proc for %s\n", dpi_attr.path);
exit(1);
-@@ -101,7 +101,7 @@ static void start_server_plugin(struct dp dpi_attr)
+@@ -100,7 +100,7 @@ static void start_server_plugin(struct dp dpi_attr)
MSG_ERR("ERROR in child proc for %s\n", dpi_attr.path);
exit(1);
}
Index: patches/patch-src_IO_http_c
===================================================================
RCS file: patches/patch-src_IO_http_c
diff -N patches/patch-src_IO_http_c
--- patches/patch-src_IO_http_c 19 Oct 2008 08:42:55 -0000 1.10
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,125 +0,0 @@
-$OpenBSD: patch-src_IO_http_c,v 1.10 2008/10/19 08:42:55 ajacoutot Exp $
---- src/IO/http.c.orig Sun Sep 28 14:57:42 2008
-+++ src/IO/http.c Sat Oct 18 22:26:06 2008
-@@ -311,7 +311,7 @@ static void Http_send_query(ChainLink *Info, SocketDat
- */
- static int Http_connect_socket(ChainLink *Info)
- {
-- int status;
-+ int i, status;
- #ifdef ENABLE_IPV6
- struct sockaddr_in6 name;
- #else
-@@ -324,61 +324,63 @@ static int Http_connect_socket(ChainLink *Info)
- S = a_Klist_get_data(ValidSocks, VOIDP2INT(Info->LocalKey));
-
- /* TODO: iterate this address list until success, or end-of-list */
-- dh = dList_nth_data(S->addr_list, 0);
-+ for (i = 0; (dh = dList_nth_data(S->addr_list, i)); ++i) {
-+ if ((S->SockFD = socket(dh->af, SOCK_STREAM, IPPROTO_TCP)) < 0) {
-+ S->Err = errno;
-+ MSG("Http_connect_socket ERROR: %s\n", dStrerror(errno));
-+ continue;
-+ }
-+ /* set NONBLOCKING and close on exec. */
-+ fcntl(S->SockFD, F_SETFL, O_NONBLOCK | fcntl(S->SockFD, F_GETFL));
-+ fcntl(S->SockFD, F_SETFD, FD_CLOEXEC | fcntl(S->SockFD, F_GETFD));
-
-- if ((S->SockFD = socket(dh->af, SOCK_STREAM, IPPROTO_TCP)) < 0) {
-- S->Err = errno;
-- MSG("Http_connect_socket ERROR: %s\n", dStrerror(errno));
-- return -1;
-- }
-- /* set NONBLOCKING and close on exec. */
-- fcntl(S->SockFD, F_SETFL, O_NONBLOCK | fcntl(S->SockFD, F_GETFL));
-- fcntl(S->SockFD, F_SETFD, FD_CLOEXEC | fcntl(S->SockFD, F_GETFD));
--
-- /* Some OSes require this... */
-- memset(&name, 0, sizeof(name));
-- /* Set remaining parms. */
-- switch (dh->af) {
-- case AF_INET:
-- {
-- struct sockaddr_in *sin = (struct sockaddr_in *)&name;
-- socket_len = sizeof(struct sockaddr_in);
-- sin->sin_family = dh->af;
-- sin->sin_port = S->port ? htons(S->port) : htons(DILLO_URL_HTTP_PORT);
-- memcpy(&sin->sin_addr, dh->data, (size_t)dh->alen);
-- if (a_Web_valid(S->web) && (S->web->flags & WEB_RootUrl))
-- MSG("Connecting to %s\n", inet_ntoa(sin->sin_addr));
-- break;
-- }
-+ /* Some OSes require this... */
-+ memset(&name, 0, sizeof(name));
-+ /* Set remaining parms. */
-+ switch (dh->af) {
-+ case AF_INET:
-+ {
-+ struct sockaddr_in *sin = (struct sockaddr_in *)&name;
-+ socket_len = sizeof(struct sockaddr_in);
-+ sin->sin_family = dh->af;
-+ sin->sin_len = socket_len;
-+ sin->sin_port = S->port ? htons(S->port) :
htons(DILLO_URL_HTTP_PORT);
-+ memcpy(&sin->sin_addr, dh->data, (size_t)dh->alen);
-+ if (a_Web_valid(S->web) && (S->web->flags & WEB_RootUrl))
-+ MSG("Connecting to %s\n", inet_ntoa(sin->sin_addr));
-+ break;
-+ }
- #ifdef ENABLE_IPV6
-- case AF_INET6:
-- {
-- char buf[128];
-- struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&name;
-- socket_len = sizeof(struct sockaddr_in6);
-- sin6->sin6_family = dh->af;
-- sin6->sin6_port = S->port ? htons(S->port) : htons(DILLO_URL_HTTP_PORT);
-- memcpy(&sin6->sin6_addr, dh->data, dh->alen);
-- inet_ntop(dh->af, dh->data, buf, sizeof(buf));
-- if (a_Web_valid(S->web) && (S->web->flags & WEB_RootUrl))
-- MSG("Connecting to %s\n", buf);
-- break;
-- }
-+ case AF_INET6:
-+ {
-+ char buf[128];
-+ struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&name;
-+ socket_len = sizeof(struct sockaddr_in6);
-+ sin6->sin6_family = dh->af;
-+ sin6->sin6_port = S->port ? htons(S->port) :
htons(DILLO_URL_HTTP_PORT);
-+ sin6->sin6_len = socket_len;
-+ memcpy(&sin6->sin6_addr, dh->data, dh->alen);
-+ inet_ntop(dh->af, dh->data, buf, sizeof(buf));
-+ if (a_Web_valid(S->web) && (S->web->flags & WEB_RootUrl))
-+ MSG("Connecting to %s\n", buf);
-+ break;
-+ }
- #endif
-- }/*switch*/
-+ }/*switch*/
-
-- MSG_BW(S->web, 1, "Contacting host...");
-- status = connect(S->SockFD, (struct sockaddr *)&name, socket_len);
-- if (status == -1 && errno != EINPROGRESS) {
-- S->Err = errno;
-- Http_socket_close(S);
-- MSG("Http_connect_socket ERROR: %s\n", dStrerror(S->Err));
-- return -1;
-- } else {
-- Http_send_query(S->Info, S);
-+ MSG_BW(S->web, 1, "Contacting host...");
-+ status = connect(S->SockFD, (struct sockaddr *)&name, socket_len);
-+ if (status == -1 && errno != EINPROGRESS) {
-+ S->Err = errno;
-+ Http_socket_close(S);
-+ MSG("Http_connect_socket ERROR: %s\n", dStrerror(S->Err));
-+ } else {
-+ Http_send_query(S->Info, S);
-+ return 0; /* Success */
-+ }
- }
-
-- return 0; /* Success */
-+ return -1;
- }
-
- /*
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: patches/patch-src_Makefile_in
diff -N patches/patch-src_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_Makefile_in 26 Jun 2009 00:18:07 -0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+--- src/Makefile.in.orig Thu Jun 25 19:23:22 2009
++++ src/Makefile.in Thu Jun 25 19:24:16 2009
+@@ -466,12 +466,12 @@ distclean-compile:
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+ install-sysconfDATA: $(sysconf_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
++ test -z "$(PREFIX)/share/examples/dillo" || $(MKDIR_P)
"$(PREFIX)/share/examples/dillo"
+ @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'
'$(PREFIX)/share/examples/dillo/$$f'"; \
++ $(sysconfDATA_INSTALL) "$$d$$p" "$(PREFIX)/share/examples/dillo/$$f";
\
+ done
+
+ uninstall-sysconfDATA:
Index: patches/patch-src_dns_c
===================================================================
RCS file: /cvs/ports/www/dillo/patches/patch-src_dns_c,v
retrieving revision 1.10
diff -u -r1.10 patch-src_dns_c
--- patches/patch-src_dns_c 19 Oct 2008 08:42:55 -0000 1.10
+++ patches/patch-src_dns_c 26 Jun 2009 00:18:07 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dns_c,v 1.10 2008/10/19 08:42:55 ajacoutot Exp $
---- src/dns.c.orig Sat Oct 4 20:52:30 2008
-+++ src/dns.c Sat Oct 18 11:14:19 2008
-@@ -34,7 +34,7 @@
+--- src/dns.c.orig Wed Jun 17 13:58:20 2009
++++ src/dns.c Thu Jun 25 19:04:53 2009
+@@ -35,7 +35,7 @@
/*
* Uncomment the following line for debugging or gprof profiling.
*/
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/dillo/pkg/PLIST,v
retrieving revision 1.9
diff -u -r1.9 PLIST
--- pkg/PLIST 19 Oct 2008 08:42:55 -0000 1.9
+++ pkg/PLIST 26 Jun 2009 00:18:07 -0000
@@ -20,6 +20,7 @@
@bin lib/dillo/dpi/hello/hello.filter.dpi
lib/dillo/dpi/https/
@bin lib/dillo/dpi/https/https.filter.dpi
+...@man man/man1/dillo.1
share/doc/dillo/
share/doc/dillo/Cache.txt
share/doc/dillo/Cookies.txt
@@ -33,7 +34,10 @@
share/doc/dillo/NC_design.txt
share/doc/dillo/Selection.txt
share/examples/dillo/
+...@sample ${SYSCONFDIR}/dillo/
share/examples/dillo/dillorc
-...@sample ${SYSCONFDIR}/dillorc
+...@sample ${SYSCONFDIR}/dillo/dillorc
share/examples/dillo/dpidrc
-...@sample ${SYSCONFDIR}/dpidrc
+...@sample ${SYSCONFDIR}/dillo/dpidrc
+share/examples/dillo/keysrc
+...@sample ${SYSCONFDIR}/dillo/keysrc
