New commits:
commit f7ff09e8dff5a908fabddae52775fff8b543f9d2
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
dillo2: release and cvs versions use different methods
for setting ssl
diff --git a/http/dillo2/CONFIGURE b/http/dillo2/CONFIGURE
index 958f95c..26cdc78 100755
--- a/http/dillo2/CONFIGURE
+++ b/http/dillo2/CONFIGURE
@@ -8,4 +8,8 @@ config_query_option DILLO_OPTS \
"Threaded IPv6 support?" \
y \
"--enable-ipv6" \
- "--disable-ipv6"
+ "--disable-ipv6" &&
+
+if [[ "$DILLO2_CVS" == "n" ]]; then
+ config_query DILLO2_SSL "Build SSL support?" n
+fi
diff --git a/http/dillo2/DEPENDS b/http/dillo2/DEPENDS
index 34481ca..9de44d8 100755
--- a/http/dillo2/DEPENDS
+++ b/http/dillo2/DEPENDS
@@ -7,6 +7,17 @@ fi &&
depends fltk2 &&
depends wget &&
-optional_depends "openssl" \
- "--enable-ssl" \
- "--disable-ssl" \
- "for SSL support"
diff --git a/http/dillo2/HISTORY b/http/dillo2/HISTORY
index 9f9178c..3e89322 100644
--- a/http/dillo2/HISTORY
+++ b/http/dillo2/HISTORY
@@ -1,10 +1,13 @@
2008-11-05 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Added released version
* PREPARE: Added query for released version
- * PRE_BUILD: autogen.sh only for cvs version
+ * CONFIGURE: Added query to use ssl.
+ * PRE_BUILD: autogen.sh only for cvs version.
+ Added sed for ssl.
* DEPENDS: group depends needed for cvs version
added depends fltk2. removed depends ds2
jpeg was listed twice, Removed one. Added optional_depends libpng
+ Added depends openssl if wanted.
* desktop/dillo: Added.
2008-09-26 Arjan Bouter <abouter AT sourcemage.org>
diff --git a/http/dillo2/PRE_BUILD b/http/dillo2/PRE_BUILD
index 8447345..512c7c6 100755
--- a/http/dillo2/PRE_BUILD
+++ b/http/dillo2/PRE_BUILD
@@ -1,5 +1,10 @@
default_pre_build &&
if [[ "$DILLO2_CVS" == "y" ]]; then
-cd $SOURCE_DIRECTORY &&
-./autogen.sh
+ cd $SOURCE_DIRECTORY &&
+ ./autogen.sh
+else
+ if [[ "$DILLO2_SSL" == "y" ]]; then
+ cd $SOURCE_DIRECTORY &&
+ sed -i 72d dpi/https.c
+ fi
fi
[SM-Commit] GIT changes to master grimoire by George Sherwood (f7ff09e8dff5a908fabddae52775fff8b543f9d2),
George Sherwood, 11/05/2008