New commits:
commit a3a8b54631d3fbf3022bdd19e0930c18b15a5247
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
dillo: Updated to version 3.0.1. Trying to get away from creating a
dillo3.
-if [[ $I18NPATCH = y ]]; then
- optional_depends "libxft" \
- "--enable-anti-alias" \
- "--disable-anti-alias" \
- "for font anti-aliasing"
-fi
diff --git a/http/dillo/DETAILS b/http/dillo/DETAILS
index 92ae3ab..b627cbc 100755
--- a/http/dillo/DETAILS
+++ b/http/dillo/DETAILS
@@ -1,24 +1,30 @@
SPELL=dillo
- PATCHLEVEL=3
- VERSION=0.8.6
- PATCH_VERSION=20060516
- SOURCE=${SPELL}-${VERSION}.tar.bz2
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
- SOURCE_URL[0]=http://www.dillo.org/download/${SOURCE}
-
SOURCE_HASH=sha512:63c1306dc7d38716b4ee2459363bdda436f56edf1581271b3c17da189b8a96dc9f013b96d8b50126a5238d7333b0a82d48627eba5f72010ea5c660ab0c3b3995
-if [[ "$I18NPATCH" == "y" ]]
-then
- SOURCE2=${SPELL}-${VERSION}-i18n-misc-${PATCH_VERSION}.diff.bz2
- SOURCE2_URL[0]=http://teki.jpn.ph/pc/software/${SOURCE2}
-
SOURCE2_HASH=sha512:34775d70d49d7c87f1f2da19d264843c0b8c9bc5a714add2151ea586ed454816e1480fe0a93bfb4773280545941273946ad2bb2fbe9b93129cef53956833872a
+if [[ "$DILLO_CVS" == "y" ]]; then
+ if [ "$DILLO_AUTOUPDATE" == "y" ]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=cvs
+ fi
+ SOURCE=$SPELL-cvs.tar.bz2
+ FORCE_DOWNLOAD=on
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
+
SOURCE_URL[0]=cvs://:pserver:anonymous AT auriga.wearlab.de:/sfhome/cvs/dillo:$SPELL
+ SOURCE_IGNORE=volatile
+else
+ VERSION=3.0.1
+ SOURCE=dillo-$VERSION.tar.bz2
+ SOURCE_URL[0]=http://www.dillo.org/download/$SOURCE
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/dillo-$VERSION
+
SOURCE_HASH=sha512:5342193ead9bfc807b900431131a82383298461568e87cc806781162844e52cb71562de31000d98af67174151eb4169284aba8bba562a2b5c44fba40c12fbf3e
fi
- WEB_SITE=http://www.dillo.org
- ENTERED=20010922
- KEYWORDS="web http"
- SHORT='Dillo is a very fast, extremely small web browser'
+ LICENSE[0]=GPL
+ WEB_SITE=http://dillo.org
+ ENTERED=20080826
+ KEYWORDS="http"
+ SHORT="dillo2 is the experimental fltk2 port of dillo"
cat << EOF
Dillo is a very fast, extremely small Web browser that's completely
written in C. The source and binary are less than 300 kilobytes each. It
-is a graphical browser built upon GTK+, and it renders a good subset of
+is a graphical browser built upon FLTK, and it renders a good subset of
HTML, excluding frames, JavaScript, and JVM support.
EOF
diff --git a/http/dillo/HISTORY b/http/dillo/HISTORY
index bdef95b..d6391df 100644
--- a/http/dillo/HISTORY
+++ b/http/dillo/HISTORY
@@ -1,3 +1,6 @@
+2011-09-29 George Sherwood <gsherwood AT sourcemage.org>
+ * ALL: Updated to latest current. Verison 3.0.1
+
2011-01-02 Ismael Luceno <ismael AT sourcemage.org>
* dillo.desktop: added generic name
diff --git a/http/dillo/PREPARE b/http/dillo/PREPARE
index 054b47f..cbdecf2 100755
--- a/http/dillo/PREPARE
+++ b/http/dillo/PREPARE
@@ -1,5 +1,4 @@
-config_query I18NPATCH \
- "Apply i18n patch, contains many other things \
-(see http://teki.jpn.ph/pc/software/index-e.shtml)" \
- n
-
+config_query DILLO_CVS "Build CVS version?" n &&
+if [[ "$DILLO_CVS" == "y" ]]; then
+config_query DILLO_AUTOUPDATE "Automatically update on every system update?"
n
+fi
diff --git a/http/dillo/PRE_BUILD b/http/dillo/PRE_BUILD
index b849094..273f2ff 100755
--- a/http/dillo/PRE_BUILD
+++ b/http/dillo/PRE_BUILD
@@ -1,12 +1,5 @@
-default_pre_build &&
-
-if [ "$I18NPATCH" = "y" ] ; then
- cd $SOURCE_DIRECTORY &&
- unpack_file "2" &&
- bzcat $SOURCE_CACHE/$SOURCE2 | patch -p1
-fi &&
-
-if [ "$DILLO_HTTPS" = "y" ] ; then
- cd $SOURCE_DIRECTORY &&
- sedit '/#undef ENABLE_SSL/d' dpi/https.c
+default_pre_build &&
+if [[ "$DILLO_CVS" == "y" ]]; then
+ cd $SOURCE_DIRECTORY &&
+ ./autogen.sh
fi
[SM-Commit] GIT changes to master grimoire by George Sherwood (a3a8b54631d3fbf3022bdd19e0930c18b15a5247),
George Sherwood, 09/29/2011