summaryrefslogtreecommitdiff
path: root/www/dillo
diff options
context:
space:
mode:
authorreed <reed@pkgsrc.org>2006-05-27 03:22:32 +0000
committerreed <reed@pkgsrc.org>2006-05-27 03:22:32 +0000
commit10468e2523fdf278c009cd7758ed22390a2067c9 (patch)
treebab9f820b6a25d969cc53bdc49da9dfd3f5f0909 /www/dillo
parent544a5b9ac01eb19fd87e3f85eec8f071c1631bc3 (diff)
downloadpkgsrc-10468e2523fdf278c009cd7758ed22390a2067c9.tar.gz
Move options to separate options.mk file.
And add new option: dillo-ssl The openssl buildlink3.mk is only used when that is enabled. The package didn't use openssl and the https was disabled in the code. The new option which is off by default can be used to enable ssl. Note that is experimental for dillo and does not appear to work very good. No change to default package except on systems where it had an un-needed dependency on openssl package -- so bump PKGREVISION for that.
Diffstat (limited to 'www/dillo')
-rw-r--r--www/dillo/Makefile13
-rw-r--r--www/dillo/distinfo3
-rw-r--r--www/dillo/options.mk17
-rw-r--r--www/dillo/patches/patch-ac13
4 files changed, 35 insertions, 11 deletions
diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index b1bdeb5b25d..fee3310c06c 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2006/05/10 21:03:41 adam Exp $
+# $NetBSD: Makefile,v 1.40 2006/05/27 03:22:32 reed Exp $
DISTNAME= dillo-0.8.6
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= http://www.dillo.org/download/
EXTRACT_SUFX= .tar.bz2
@@ -18,14 +19,7 @@ EGDIR= ${PREFIX}/share/examples/dillo
CONF_FILES= ${EGDIR}/dillorc.default ${PKG_SYSCONFDIR}/dillorc
CONF_FILES+= ${EGDIR}/dpidrc ${PKG_SYSCONFDIR}/dpidrc
-PKG_OPTIONS_VAR= PKG_OPTIONS.dillo
-PKG_SUPPORTED_OPTIONS= inet6
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+= --enable-ipv6
-.endif
+.include "options.mk"
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dillo
@@ -36,7 +30,6 @@ post-install:
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
.include "../../x11/gtk/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/www/dillo/distinfo b/www/dillo/distinfo
index 42def5a5d3d..41e7dd46382 100644
--- a/www/dillo/distinfo
+++ b/www/dillo/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.26 2006/05/10 21:03:41 adam Exp $
+$NetBSD: distinfo,v 1.27 2006/05/27 03:22:32 reed Exp $
SHA1 (dillo-0.8.6.tar.bz2) = ee03b11ba6b75d3180ca906d8275bd35e8765995
RMD160 (dillo-0.8.6.tar.bz2) = 062cff85b330a5b443ddc81a356e81f930677cbb
Size (dillo-0.8.6.tar.bz2) = 441739 bytes
SHA1 (patch-aa) = 1307be194c84a6baad25b4272844b804114d5c3b
SHA1 (patch-ab) = d057a931cea3d368000ee3d24ff49402ba25edfb
+SHA1 (patch-ac) = 3eacaa1711d1bda01508290c8acf58f035892b78
diff --git a/www/dillo/options.mk b/www/dillo/options.mk
new file mode 100644
index 00000000000..d93feaa2e81
--- /dev/null
+++ b/www/dillo/options.mk
@@ -0,0 +1,17 @@
+# $NetBSD: options.mk,v 1.1 2006/05/27 03:22:32 reed Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.dillo
+PKG_SUPPORTED_OPTIONS= inet6 dillo-ssl
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+= --enable-ipv6
+.endif
+
+.if !empty(PKG_OPTIONS:Mdillo-ssl)
+CONFIGURE_ARGS+= --enable-ssl
+.include "../../security/openssl/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-ssl
+.endif
diff --git a/www/dillo/patches/patch-ac b/www/dillo/patches/patch-ac
new file mode 100644
index 00000000000..531e16f5d4b
--- /dev/null
+++ b/www/dillo/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.10 2006/05/27 03:22:32 reed Exp $
+
+--- dpi/https.c.orig 2006-03-24 07:52:23.000000000 -0800
++++ dpi/https.c 2006-05-26 18:18:34.000000000 -0700
+@@ -61,8 +61,6 @@
+ #include "../dpip/dpip.h"
+ #include "dpiutil.h"
+
+-#define ENABLE_SSL
+-#undef ENABLE_SSL
+ #ifdef ENABLE_SSL
+
+ #include <openssl/ssl.h>