ports/100743: [Maintainer] www/dillo-i18n

[Thomas-Martin Seck]

>Number:         100743
>Category:       ports
>Synopsis:       [Maintainer] www/dillo-i18n
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 23 10:00:32 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Thomas-Martin Seck
>Release:        FreeBSD 6.1-STABLE i386
>Organization:
a private site in Germany
>Environment:
FreeBSD ports collection as of July 23, 2006.

	
>Description:
- Update www/dillo-i18n to version 20060709.
- Spell "dillo" as "Dillo" when refering to the Dillo project/software.

Added file:

  files/patch-bm-update

The following entry should be added to UPDATING:

20060723:
  AFFECTS: users of www/dillo-i18n
  AUTHOR: tmseck at netcologne.de

  Starting with version 20060709 the i18n version of Dillo encodes
  the bookmark file using UTF-8 encoding. You can try to convert
  your existing bookmark file with the bm-update script or you could
  try to convert it by hand using iconv(1) from you current locale
  to UTF-8, e.g.  by calling 'iconv -f ISO-8859-1 -t UTF-8 ~/.dillo/bm.txt'.

  Please see the iconv documentation for further details.
	
>How-To-Repeat:
	
>Fix:
Apply this patch:

Index: distinfo
===================================================================
--- distinfo	(.../www/dillo-i18n)	(revision 967)
+++ distinfo	(.../local/dillo-i18n)	(revision 967)
@@ -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
Index: pkg-descr
===================================================================
--- pkg-descr	(.../www/dillo-i18n)	(revision 967)
+++ pkg-descr	(.../local/dillo-i18n)	(revision 967)
@@ -2,10 +2,10 @@
 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
Index: files/patch-bm-update
===================================================================
--- files/patch-bm-update	(.../www/dillo-i18n)	(revision 0)
+++ files/patch-bm-update	(.../local/dillo-i18n)	(revision 967)
@@ -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
Index: pkg-plist
===================================================================
--- pkg-plist	(.../www/dillo-i18n)	(revision 967)
+++ pkg-plist	(.../local/dillo-i18n)	(revision 967)
@@ -1,4 +1,5 @@
 @comment $FreeBSD: ports/www/dillo-i18n/pkg-plist,v 1.7 2006/05/20 20:36:53 mnag Exp $
+bin/bm-update
 bin/dillo
 bin/dillocfg
 bin/dpid
Index: Makefile
===================================================================
--- Makefile	(.../www/dillo-i18n)	(revision 967)
+++ Makefile	(.../local/dillo-i18n)	(revision 967)
@@ -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 @@
 		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 @@
 .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} ""
	


>Release-Note:
>Audit-Trail:
>Unformatted: