- Update to 0.8.6.20060709

- Spell "dillo" as "Dillo" when refering to the Dillo project/software

PR:		ports/100743
Submitted by:	Thomas-Martin Seck <tmseck at netcologne.de> (maintainer)

5 files changed, 33 insertions, 9 deletions

diff --git a/www/dillo-i18n/Makefile b/www/dillo-i18n/Makefile
index 0305ba2574cf..e667325feafe 100644
--- a/www/dillo-i18n/Makefile
+++ b/www/dillo-i18n/Makefile
@@ -6,14 +6,14 @@
 #
 # Tunables:
 # WITH_DILLO_SSL:		enable experimental SSL support
-# WITH_DILLO_META-REFRESH:	make dillo accept the meta-refresh tag
+# WITH_DILLO_META-REFRESH:	make Dillo accept the meta-refresh tag
 # WITHOUT_DILLO_TABS:		disable support for tabbed browsing
 # WITHOUT_DILLO_ANTIALIAS:	disable support for antialiased display
 # WITH_DILLO_DLGUI:		enable experimental FLTK2 based gui for file
 # 				downloads
 #
 # TODO:
-# SSL support is currently partly broken in this version of the i18n dillo:
+# SSL support is currently partly broken in this version of the i18n Dillo:
 # On FreeBSD 4 with OpenSSL 0.9.7d, the configure script uses checks that are
 # too strict. On FreeBSD 5 and 6 it seems to work OK.
 
@@ -32,11 +32,12 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
 
 DILLOVERSION=	0.8.6
-I18NVERSION=	20060625
+I18NVERSION=	20060709
 
 USE_BZIP2=	yes
 USE_GNOME=	gnometarget gtk12
 USE_GMAKE=	yes
+USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -108,7 +109,7 @@ pre-configure:
 .if !defined(WITH_DILLO_META-REFRESH)
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "   Set WITH_DILLO_META-REFRESH=yes in your make environment or on the"
-	@${ECHO_CMD} "   commandline to make dillo respect the meta-refresh tag."
+	@${ECHO_CMD} "   commandline to make Dillo respect the meta-refresh tag."
 .endif
 .if !defined(WITHOUT_DILLO_TABS)
 	@${ECHO_CMD} ""
diff --git a/www/dillo-i18n/distinfo b/www/dillo-i18n/distinfo
index 53fd48d94923..a96145a1a540 100644
--- a/www/dillo-i18n/distinfo
+++ b/www/dillo-i18n/distinfo
@@ -1,3 +1,3 @@
-MD5 (dillo-0.8.6-i18n-misc-20060625.tar.bz2) = ddf03ab6786c096620f30cdf0cdaa0d0
-SHA256 (dillo-0.8.6-i18n-misc-20060625.tar.bz2) = f4dadeca74728ba7880ac8b9ca41a6096980522f6883a78ed101855f0f4fab9d
-SIZE (dillo-0.8.6-i18n-misc-20060625.tar.bz2) = 605107
+MD5 (dillo-0.8.6-i18n-misc-20060709.tar.bz2) = 5e632d551065abadac320edaa9ead76a
+SHA256 (dillo-0.8.6-i18n-misc-20060709.tar.bz2) = 60e4695fda9b16adece42eb6a05018f761acaea18e5ff8a8d98d4ccdb0aa876e
+SIZE (dillo-0.8.6-i18n-misc-20060709.tar.bz2) = 606147
diff --git a/www/dillo-i18n/files/patch-bm-update b/www/dillo-i18n/files/patch-bm-update
new file mode 100644
index 000000000000..d95cd3c77e14
--- /dev/null
+++ b/www/dillo-i18n/files/patch-bm-update
@@ -0,0 +1,22 @@
+--- bm-update.orig	Sat Jul  8 17:32:51 2006
++++ bm-update	Sun Jul 23 11:39:38 2006
+@@ -10,9 +10,8 @@
+     exit
+ fi
+ 
+-CONVTEST=`LANG=C iconv -f UTF-8 -t UTF-8 ~/.dillo/bm.txt -o ~/.dillo/bm.txt.update 2>&1| sed -e "s/.*illegal.*/illegal/g"`
++CONVTEST=`LANG=C iconv -f UTF-8 -t UTF-8 ~/.dillo/bm.txt 2>&1| sed -e "s/.*illegal.*/illegal/g"`
+ 
+-rm -f ~/.dillo/bm.txt.update
+ if test "x$CONVTEST" = "xillegal"; then
+     echo "bookmark needs update."
+ else
+@@ -22,7 +21,7 @@
+ 
+ CHARSET=`locale | grep "LC_CTYPE.*\." | sed -e "s/^.*\.//g" -e "s/\"//g"`
+ if test "x$CHARSET" = "x"; then
+-    CHARSET="iso88591"
++    CHARSET="iso-8859-1"
+ fi
+ 
+ case $CHARSET in
diff --git a/www/dillo-i18n/pkg-descr b/www/dillo-i18n/pkg-descr
index 4443f8ce9ccb..26f0d54cbcc7 100644
--- a/www/dillo-i18n/pkg-descr
+++ b/www/dillo-i18n/pkg-descr
@@ -2,10 +2,10 @@ Dillo aims to be a multiplatform browser alternative that's small,
 stable, developer-friendly, usable, fast, and extensible.
 
 This package adds multilingualization and a lot of other features missing
-from plain dillo.  Please see http://teki.jpn.ph/pc/software/index-e.shtml
+from plain Dillo.  Please see http://teki.jpn.ph/pc/software/index-e.shtml
 for further information.
 
 NOTE:
-This patched version of dillo is not supported by the dillo developers.
+This patched version of Dillo is not supported by the Dillo developers.
 
 WWW: http://teki.jpn.ph/pc/software/index-e.shtml
diff --git a/www/dillo-i18n/pkg-plist b/www/dillo-i18n/pkg-plist
index 6120821b8e4d..948ab972419c 100644
--- a/www/dillo-i18n/pkg-plist
+++ b/www/dillo-i18n/pkg-plist
@@ -1,4 +1,5 @@
 @comment $FreeBSD$
+bin/bm-update
 bin/dillo
 bin/dillocfg
 bin/dpid