want www/dillo i18n patched version

	Dillo aims to be a multiplatform browser alternative that's
	small, stable, developer-friendly, usable, fast, and
	extensible.

	WWW: http://www.dillo.org/

	This package also supports multilingualization.
	http://teki.jpn.ph/pc/software/

PR:		ports/90112
Submitted by:	Hirohisa Yamaguchi <umq@ueo.co.jp>

6 files changed, 86 insertions, 60 deletions

diff --git a/www/Makefile b/www/Makefile
index d931966d6e67..02fca705b6f7 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -95,6 +95,7 @@
     SUBDIR += dfileserver
     SUBDIR += dhttpd
     SUBDIR += dillo
+    SUBDIR += dillo-i18n
     SUBDIR += dokuwiki
     SUBDIR += dotproject
     SUBDIR += dpsearch
diff --git a/www/dillo-i18n/Makefile b/www/dillo-i18n/Makefile
index 03cf2cdaee88..89e9fb1053d8 100644
--- a/www/dillo-i18n/Makefile
+++ b/www/dillo-i18n/Makefile
@@ -1,54 +1,90 @@
-# New ports collection makefile for:   dillo
-# Date created:        23 February 2001
-# Whom:                George Reid <greid@ukug.uk.freebsd.org>
+# New ports collection makefile for:	dillo-i18n
+# Date created:			2005-12-11
+# Whom:               		Thomas-Martin Seck <tmseck@netcologne.de>
 #
 # $FreeBSD$
 #
 # Tunables:
-# WITH_DILLO_SSL: enable experimental SSL support
+# 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
 #
+# Please see www/dillo for any general tunables not listed here.
+#
+# XXX:
+# SSL support is currently broken in this version of the i18n patchset:
+# On FreeBSD 4 with OpenSSL 0.9.7d, the configure script refuses to enable
+# ssl at all and on FreeBSD 5 and up, linking is broken.
+
+PKGNAMESUFFIX=	-i18n
 
-PORTNAME=	dillo
-PORTVERSION=	0.8.5
-CATEGORIES=	www
-MASTER_SITES=	http://www.dillo.org/download/
+PATCH_SITES=	http://teki.jpn.ph/pc/software/
+PATCHFILES=	dillo-0.8.5-i18n-misc-20051207.diff.bz2
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
-COMMENT=	A fast, small graphical Web browser built upon GTK+
+COMMENT=	A fast, small graphical Web browser with support for i18n
+
+MD5_FILE=	${.CURDIR}/distinfo
 
-RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.5:${PORTSDIR}/graphics/png
+MASTERDIR=	${.CURDIR}/../../www/dillo
+PKGDIR=		${.CURDIR}
+PLIST_SUB=	NLS=""
 
-USE_BZIP2=	yes
-USE_GNOME=	gnometarget gtk12
-USE_REINPLACE=	yes
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--enable-ipv6 --libdir=${PREFIX}/libexec
+CONFLICTS=	dillo-[0-9].[0-9].[0-9]*
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+PLIST_SUB=	NLS=""
+.else
+# Unfortunately, this option does not work yet; the dpi plugins do not
+# build without NLS support anymore.
+# I leave this option in in case anyone really wants to fix this in the
+# i18n patch.
+PLIST_SUB=	NLS="@comment "
+CONFIGURE_ARGS+=	--disable-nls
+IGNORE=		does not build without NLS support
+.endif
 
 .if defined(WITH_DILLO_SSL)
-CONFIGURE_ARGS+=	--enable-ssl
-USE_OPENSSL=	yes
+IGNORE=		does not build with SSL support
+.endif
+
+.if defined(WITH_DILLO_META-REFRESH)
+CONFIGURE_ARGS+=	--enable-meta-refresh
 .else
-CONFIGURE_ARGS+=	--disable-ssl
+CONFIGURE_ARGS+=	--disable-meta-refresh
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g ; \
-		 s|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|dillorc|dillorc.sample|g' ${WRKSRC}/Makefile.in
-	@${CP} ${WRKSRC}/dillorc ${WRKSRC}/dillorc.sample
+.if defined(WITHOUT_DILLO_TABS)
+CONFIGURE_ARGS+=	--disable-tabs
+.else
+CONFIGURE_ARGS+=	--enable-tabs
+.endif
+
+.if !defined(WITHOUT_DILLO_ANTIALIAS)
+LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
+CONFIGURE_ARGS+=	--enable-anti-alias
+.else
+CONFIGURE_ARGS+=	--disable-anti-alias
+.endif
 
 pre-configure:
-.if !defined(WITH_DILLO_SSL)
+.if !defined(WITH_DILLO_META-REFRESH)
 	@${ECHO_CMD} ""
-	@${ECHO_CMD} "   You can enable dillo's experimental SSL support by specifing"
-	@${ECHO_CMD} "   WITH_DILLO_SSL=yes in your make environment or on the"
-	@${ECHO_CMD} "   commandline."
+	@${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."
+.endif
+.if !defined(WITHOUT_DILLO_TABS)
+	@${ECHO_CMD} ""
+	@${ECHO_CMD} "   Set WITHOUT_DILLO_TABS=yes in your make environment or on the"
+	@${ECHO_CMD} "   commandline to disable support for tabbed browsing."
+.endif
+.if !defined(WITHOUT_DILLO_ANTIALIAS)
 	@${ECHO_CMD} ""
+	@${ECHO_CMD} "   Set WITHOUT_DILLO_ANTIALIAS=yes in your make environment or on the"
+	@${ECHO_CMD} "   commandline to disable support for antialiased fonts."
 .endif
+	@${ECHO_CMD} ""
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/www/dillo-i18n/distinfo b/www/dillo-i18n/distinfo
index 2c13a978ce72..7cf9c9c2ab19 100644
--- a/www/dillo-i18n/distinfo
+++ b/www/dillo-i18n/distinfo
@@ -1,2 +1,6 @@
 MD5 (dillo-0.8.5.tar.bz2) = d0ab7fa1d40b310deb891388604188f8
+SHA256 (dillo-0.8.5.tar.bz2) = 980ccd8e0c0a85e37478e33b5f4f59d2cfda5c16d30af3acad259626d387cd1a
 SIZE (dillo-0.8.5.tar.bz2) = 424795
+MD5 (dillo-0.8.5-i18n-misc-20051207.diff.bz2) = df0f2953c4224e2d8ecac815edb468fe
+SHA256 (dillo-0.8.5-i18n-misc-20051207.diff.bz2) = 63573329819898b35a669bbbdf73dd84f8c03c4dd9700e9a2da7f50e9b49bc7e
+SIZE (dillo-0.8.5-i18n-misc-20051207.diff.bz2) = 247216
diff --git a/www/dillo-i18n/files/patch-dpi-https.c b/www/dillo-i18n/files/patch-dpi-https.c
deleted file mode 100644
index b3e4173cd8c2..000000000000
--- a/www/dillo-i18n/files/patch-dpi-https.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- dpi/https.c.orig	Sun Oct  3 17:16:15 2004
-+++ dpi/https.c	Sun Oct  3 17:17:47 2004
-@@ -53,7 +53,6 @@
- #include <glib.h>
- #include "dpiutil.h"
- 
--#undef ENABLE_SSL
- #ifdef ENABLE_SSL
- 
- #include <openssl/ssl.h>
-@@ -605,13 +616,8 @@ static void no_ssl_support(void)
-       "<b>}</b>\n\n"
-       "  <b>*** Dillo's prototype plugin for https support"
-       " is disabled now ***</b>\n\n"
--      "  If you want to test this <b>alpha</b> support code, just remove\n"
--      "  line 56 from https.c, recompile and reinstall.\n\n"
--      "  (beware that this https support is very limited now)\n\n"
--      "  To use https and SSL, you must have \n"
--      "  the OpenSSL development libraries installed.  Check your\n"
--      "  O/S distribution provider, or check out\n"
--      "  <a href=\"http://www.openssl.org\">www.openssl.org</a>\n\n"
-+      "  If you want to test this <b>alpha</b> support code, define\n"
-+      "  WITH_DILLO_SSL in your make environment and rebuild the port.\n\n"
-       "  --\n"
-       "</pre></body></html>\n",
-       http_query
diff --git a/www/dillo-i18n/pkg-descr b/www/dillo-i18n/pkg-descr
index d915e3ead2ef..4443f8ce9ccb 100644
--- a/www/dillo-i18n/pkg-descr
+++ b/www/dillo-i18n/pkg-descr
@@ -1,4 +1,11 @@
 Dillo aims to be a multiplatform browser alternative that's small,
 stable, developer-friendly, usable, fast, and extensible.
 
-WWW: http://www.dillo.org/
+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
+for further information.
+
+NOTE:
+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 36cd84b7d98d..e44c54d34d09 100644
--- a/www/dillo-i18n/pkg-plist
+++ b/www/dillo-i18n/pkg-plist
@@ -1,5 +1,6 @@
 @comment $FreeBSD$
 bin/dillo
+bin/dillocfg
 bin/dpid
 bin/dpidc
 etc/dillorc.sample
@@ -10,6 +11,9 @@ libexec/dillo/dpi/file/file.dpi
 libexec/dillo/dpi/ftp/ftp.filter.dpi
 libexec/dillo/dpi/hello/hello.filter.dpi
 libexec/dillo/dpi/https/https.filter.dpi
+%%NLS%%share/locale/ja/LC_MESSAGES/dillo.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/dillo.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/dillo.mo
 @dirrm libexec/dillo/dpi/https
 @dirrm libexec/dillo/dpi/hello
 @dirrm libexec/dillo/dpi/ftp