All updated. Also, PLIST was wrong. Default path is /etc/dillo, not
/etc, so this fixes that as well.
Still good on amd64 and loongson.
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/dillo/Makefile,v
retrieving revision 1.42
diff -u -p -r1.42 Makefile
--- Makefile 11 Mar 2013 11:44:41 -0000 1.42
+++ Makefile 19 Apr 2013 02:48:32 -0000
@@ -2,12 +2,11 @@
COMMENT = fast and light graphical web browser
-DISTNAME = dillo-3.0.2
+DISTNAME = dillo-3.0.3
CATEGORIES = www
MAINTAINER = Brian Callahan <[email protected]>
HOMEPAGE = http://www.dillo.org/
-REVISION = 1
# GPLv3
PERMIT_PACKAGE_CDROM = Yes
@@ -18,7 +17,7 @@ WANTLIB += stdc++ z jpeg>=62 png>=2
MODULES = converters/libiconv
-MASTER_SITES = ${HOMEPAGE}download/
+MASTER_SITES = http://www.dillo.org/download/
EXTRACT_SUFX = .tar.bz2
@@ -37,6 +36,8 @@ CONFIGURE_ARGS = --enable-ipv6 \
--enable-ssl
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
LDFLAGS="-L${LOCALBASE}/lib"
+
+FAKE_FLAGS = sysconfdir=${PREFIX}/share/examples/dillo/
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dillo
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/dillo/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo 5 Jan 2013 22:42:58 -0000 1.16
+++ distinfo 19 Apr 2013 02:48:32 -0000
@@ -1,2 +1,2 @@
-SHA256 (dillo-3.0.2.tar.bz2) = tPLNfBvp8J5wX2jAlYE+pbudcocDOPw2xh1ofgQpUNY=
-SIZE (dillo-3.0.2.tar.bz2) = 640894
+SHA256 (dillo-3.0.3.tar.bz2) = SCQcqW1ML0v4Pr60DHQcmQ+rDWsPe5dmpkI05IEAjdI=
+SIZE (dillo-3.0.3.tar.bz2) = 685824
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 1 Mar 2010 14:53:34 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.6 2010/03/01 14:53:34 benoit Exp $
---- Makefile.in.orig Thu Feb 11 11:20:01 2010
-+++ Makefile.in Tue Feb 23 10:28:08 2010
-@@ -302,7 +302,7 @@
- -rm -f config.h stamp-h1
- install-sysconfDATA: $(sysconf_DATA)
- @$(NORMAL_INSTALL)
-- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
-+ $(mkdir_p) $(PREFIX)/share/examples/dillo/
- @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-@@ -310,7 +310,7 @@
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
-- $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
-+ $(INSTALL_DATA) $$files "$(PREFIX)/share/examples/dillo/"; \
- done
-
- uninstall-sysconfDATA:
Index: patches/patch-dillorc
===================================================================
RCS file: /cvs/ports/www/dillo/patches/patch-dillorc,v
retrieving revision 1.3
diff -u -p -r1.3 patch-dillorc
--- patches/patch-dillorc 5 Jan 2013 22:42:58 -0000 1.3
+++ patches/patch-dillorc 19 Apr 2013 02:48:32 -0000
@@ -1,6 +1,6 @@
---- dillorc.orig Fri Jan 4 19:53:22 2013
-+++ dillorc Fri Jan 4 19:53:37 2013
-@@ -53,7 +53,7 @@
+--- dillorc.orig Thu Apr 4 13:20:10 2013
++++ dillorc Thu Apr 18 12:25:04 2013
+@@ -46,7 +46,7 @@
# "fc-list : family | cut -d ',' -f 2 | sort").
#font_serif="DejaVu Serif"
#font_sans_serif="DejaVu Sans"
Index: patches/patch-dpi_datauri_c
===================================================================
RCS file: /cvs/ports/www/dillo/patches/patch-dpi_datauri_c,v
retrieving revision 1.2
diff -u -p -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 19 Apr 2013 02:48:32 -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 Sun Jan 27 12:26:38 2013
++++ dpi/datauri.c Thu Apr 18 12:25:04 2013
+@@ -324,7 +324,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.3
diff -u -p -r1.3 patch-dpi_https_c
--- patches/patch-dpi_https_c 29 Sep 2009 07:38:36 -0000 1.3
+++ patches/patch-dpi_https_c 19 Apr 2013 02:48:32 -0000
@@ -1,6 +1,6 @@
---- dpi/https.c.orig Sun Jun 7 05:40:49 2009
-+++ dpi/https.c Tue Sep 22 16:03:34 2009
-@@ -159,7 +159,7 @@
+--- dpi/https.c.orig Sun Jan 27 12:26:38 2013
++++ dpi/https.c Thu Apr 18 12:25:04 2013
+@@ -165,7 +165,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: patches/patch-dpid_Makefile_in
diff -N patches/patch-dpid_Makefile_in
--- patches/patch-dpid_Makefile_in 1 Mar 2010 14:53:34 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-dpid_Makefile_in,v 1.5 2010/03/01 14:53:34 benoit Exp $
---- dpid/Makefile.in.orig Thu Feb 11 11:20:00 2010
-+++ dpid/Makefile.in Tue Feb 23 10:30:20 2010
-@@ -440,7 +440,7 @@
- check: check-am
- all-am: Makefile $(PROGRAMS) $(DATA)
- installdirs:
-- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sysconfdir)"; do \
-+ for dir in "$(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.4
diff -u -p -r1.4 patch-dpid_main_c
--- patches/patch-dpid_main_c 1 Mar 2010 14:53:34 -0000 1.4
+++ patches/patch-dpid_main_c 19 Apr 2013 02:48:32 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-dpid_main_c,v 1.4 2010/03/01 14:53:34 benoit Exp $
---- dpid/main.c.orig Mon Feb 8 11:59:31 2010
-+++ dpid/main.c Tue Feb 23 10:32:46 2010
-@@ -68,7 +68,7 @@
+--- dpid/main.c.orig Sun Jan 27 12:26:38 2013
++++ dpid/main.c Thu Apr 18 12:25:04 2013
+@@ -70,7 +70,7 @@ static int start_filter_plugin(struct dp dpi_attr)
}
if (pid == 0) {
/* Child, start plugin */
@@ -10,7 +10,7 @@ $OpenBSD: patch-dpid_main_c,v 1.4 2010/0
ERRMSG("start_plugin", "execl", errno);
MSG_ERR("ERROR in child proc for %s\n", dpi_attr.path);
exit(1);
-@@ -100,7 +100,7 @@
+@@ -102,7 +102,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_dpi_c
===================================================================
RCS file: patches/patch-src_IO_dpi_c
diff -N patches/patch-src_IO_dpi_c
--- patches/patch-src_IO_dpi_c 1 Mar 2010 14:53:34 -0000 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-src_IO_dpi_c,v 1.9 2010/03/01 14:53:34 benoit Exp $
---- src/IO/dpi.c.orig Thu Feb 4 23:09:33 2010
-+++ src/IO/dpi.c Tue Feb 23 10:41:48 2010
-@@ -363,12 +363,12 @@
- /* This is the child process. Execute the command. */
- char *path1 = dStrconcat(dGethomedir(), "/.dillo/dpid", NULL);
- Dpi_close_fd(st_pipe[0]);
-- if (execl(path1, "dpid", (char*)NULL) == -1) {
-+ if (execl(path1, "dpid", (void *)NULL) == -1) {
- dFree(path1);
- path1 = dStrconcat(DILLO_BINDIR, "dpid", NULL);
-- if (execl(path1, "dpid", (char*)NULL) == -1) {
-+ if (execl(path1, "dpid", (void *)NULL) == -1) {
- dFree(path1);
-- if (execlp("dpid", "dpid", (char*)NULL) == -1) {
-+ if (execlp("dpid", "dpid", (void *)NULL) == -1) {
- MSG("Dpi_start_dpid (child): %s\n", dStrerror(errno));
- if (Dpi_blocking_write(st_pipe[1], "ERROR", 5) == -1) {
- MSG("Dpi_start_dpid (child): can't write to pipe.\n");
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: patches/patch-src_Makefile_in
diff -N patches/patch-src_Makefile_in
--- patches/patch-src_Makefile_in 1 Mar 2010 14:53:34 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-src_Makefile_in,v 1.2 2010/03/01 14:53:34 benoit Exp $
---- src/Makefile.in.orig Thu Feb 11 11:20:01 2010
-+++ src/Makefile.in Tue Feb 23 10:39:12 2010
-@@ -527,15 +527,15 @@
- @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)'; test -n "$(sysconfdir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
-- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
-- $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
-+ echo " $(INSTALL_DATA) $$files '$(PREFIX)/share/examples/dillo/'"; \
-+ $(INSTALL_DATA) $$files "$(PREFIX)/share/examples/dillo/" || exit $$?; \
- done
-
- uninstall-sysconfDATA:
Index: patches/patch-src_cookies_c
===================================================================
RCS file: /cvs/ports/www/dillo/patches/patch-src_cookies_c,v
retrieving revision 1.6
diff -u -p -r1.6 patch-src_cookies_c
--- patches/patch-src_cookies_c 19 Oct 2008 08:42:55 -0000 1.6
+++ patches/patch-src_cookies_c 19 Apr 2013 02:48:32 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_cookies_c,v 1.6 2008/10/19 08:42:55 ajacoutot Exp $
---- src/cookies.c.orig Sat Oct 18 11:12:23 2008
-+++ src/cookies.c Sat Oct 18 11:12:44 2008
-@@ -92,6 +92,9 @@ static FILE *Cookies_fopen(const char *filename, char
+--- src/cookies.c.orig Sun Jan 27 12:26:38 2013
++++ src/cookies.c Thu Apr 18 12:25:04 2013
+@@ -94,6 +94,9 @@ static FILE *Cookies_fopen(const char *filename, char
MSG("Cookies: Created file: %s\n", filename);
F_in = fopen(filename, "r");
Index: patches/patch-src_dns_c
===================================================================
RCS file: patches/patch-src_dns_c
diff -N patches/patch-src_dns_c
--- patches/patch-src_dns_c 19 Oct 2008 08:42:55 -0000 1.10
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$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 @@
- /*
- * Uncomment the following line for debugging or gprof profiling.
- */
--/* #undef D_DNS_THREADED */
-+#undef D_DNS_THREADED
-
-
- /* Maximum dns resolving threads */
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/dillo/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- pkg/PLIST 5 Jan 2013 22:42:58 -0000 1.12
+++ pkg/PLIST 19 Apr 2013 02:48:32 -0000
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.12 2013/01/05 22:42:58 sthen Exp $
@bin bin/dillo
+bin/dillo-install-hyphenation
@bin bin/dpid
@bin bin/dpidc
lib/dillo/
@@ -37,8 +38,12 @@ share/doc/dillo/NC_design.txt
share/doc/dillo/Selection.txt
share/doc/dillo/user_help.html
share/examples/dillo/
+@sample ${SYSCONFDIR}/dillo/
share/examples/dillo/dillorc
-@sample ${SYSCONFDIR}/dillorc
+@sample ${SYSCONFDIR}/dillo/dillorc
+share/examples/dillo/domainrc
+@sample ${SYSCONFDIR}/dillo/domainrc
share/examples/dillo/dpidrc
-@sample ${SYSCONFDIR}/dpidrc
+@sample ${SYSCONFDIR}/dillo/dpidrc
share/examples/dillo/keysrc
+@sample ${SYSCONFDIR}/dillo/keysrc
