diff --git a/www/htmldoc-x11/Makefile b/www/htmldoc-x11/Makefile
index 496766837a27..ff7085b3bd51 100644
--- a/www/htmldoc-x11/Makefile
+++ b/www/htmldoc-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2008/04/24 15:20:06 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2009/01/08 11:57:24 obache Exp $
PKGNAME= ${PKGNAME_BASE:S/-/-x11-/}
@@ -13,6 +13,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
.include "../../mk/bsd.prefs.mk"
-PKG_OPTIONS.htmldoc+= htmldoc-gui
+PKG_OPTIONS.htmldoc+= x11
.include "../../www/htmldoc/Makefile"
diff --git a/www/htmldoc/Makefile b/www/htmldoc/Makefile
index 5cabb93c2112..a8f16237ca65 100644
--- a/www/htmldoc/Makefile
+++ b/www/htmldoc/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.24 2008/04/22 16:24:31 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2009/01/08 11:57:24 obache Exp $
# This section contains variables that might be overridden.
PKGNAME?= ${PKGNAME_BASE}
COMMENT?= Converts HTML to indexed HTML, PDF and/or PostScript
# Normal package Makefile contents follow.
-DISTNAME= htmldoc-1.8.23-source
+DISTNAME= htmldoc-1.8.27-source
PKGNAME_BASE= ${DISTNAME:S/-source//}
-PKGREVISION= 7
CATEGORIES= www
MASTER_SITES= ftp://ftp.easysw.com/pub/htmldoc/${PKGVERSION_NOREV}/
EXTRACT_SUFX= .tar.bz2
@@ -16,7 +15,7 @@ CONFLICTS+= htmldoc-[0-9]*
CONFLICTS+= htmldoc-x11-[0-9]*
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.easysw.com/htmldoc/
+HOMEPAGE= http://www.htmldoc.org/
# ps-pdf.cpp:3229: Internal compiler error. on 1.4 - 1.7 unknown
NOT_FOR_PLATFORM= NetBSD-1.[3-4]*-alpha
@@ -33,7 +32,7 @@ INSTALL_MAKE_FLAGS+= bindir=${DESTDIR}${PREFIX}/bin
INSTALL_MAKE_FLAGS+= datadir=${DESTDIR}${PREFIX}/share
INSTALL_MAKE_FLAGS+= mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
+.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/htmldoc/PLIST b/www/htmldoc/PLIST
index 0c3f2e19024b..bc69fb122e39 100644
--- a/www/htmldoc/PLIST
+++ b/www/htmldoc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/09/29 14:20:04 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/01/08 11:57:24 obache Exp $
bin/htmldoc
man/man1/htmldoc.1
share/doc/htmldoc/help.html
@@ -35,6 +35,8 @@ share/htmldoc/fonts/Courier-Oblique.afm
share/htmldoc/fonts/Courier-Oblique.pfa
share/htmldoc/fonts/Courier.afm
share/htmldoc/fonts/Courier.pfa
+share/htmldoc/fonts/Dingbats.afm
+share/htmldoc/fonts/Dingbats.pfa
share/htmldoc/fonts/Helvetica-Bold.afm
share/htmldoc/fonts/Helvetica-Bold.pfa
share/htmldoc/fonts/Helvetica-BoldOblique.afm
@@ -43,6 +45,30 @@ share/htmldoc/fonts/Helvetica-Oblique.afm
share/htmldoc/fonts/Helvetica-Oblique.pfa
share/htmldoc/fonts/Helvetica.afm
share/htmldoc/fonts/Helvetica.pfa
+share/htmldoc/fonts/Monospace-Bold.afm
+share/htmldoc/fonts/Monospace-Bold.pfa
+share/htmldoc/fonts/Monospace-BoldOblique.afm
+share/htmldoc/fonts/Monospace-BoldOblique.pfa
+share/htmldoc/fonts/Monospace-Oblique.afm
+share/htmldoc/fonts/Monospace-Oblique.pfa
+share/htmldoc/fonts/Monospace.afm
+share/htmldoc/fonts/Monospace.pfa
+share/htmldoc/fonts/Sans-Bold.afm
+share/htmldoc/fonts/Sans-Bold.pfa
+share/htmldoc/fonts/Sans-BoldOblique.afm
+share/htmldoc/fonts/Sans-BoldOblique.pfa
+share/htmldoc/fonts/Sans-Oblique.afm
+share/htmldoc/fonts/Sans-Oblique.pfa
+share/htmldoc/fonts/Sans.afm
+share/htmldoc/fonts/Sans.pfa
+share/htmldoc/fonts/Serif-Bold.afm
+share/htmldoc/fonts/Serif-Bold.pfa
+share/htmldoc/fonts/Serif-BoldOblique.afm
+share/htmldoc/fonts/Serif-BoldOblique.pfa
+share/htmldoc/fonts/Serif-Oblique.afm
+share/htmldoc/fonts/Serif-Oblique.pfa
+share/htmldoc/fonts/Serif-Roman.afm
+share/htmldoc/fonts/Serif-Roman.pfa
share/htmldoc/fonts/Symbol.afm
share/htmldoc/fonts/Symbol.pfa
share/htmldoc/fonts/Times-Bold.afm
diff --git a/www/htmldoc/distinfo b/www/htmldoc/distinfo
index dd54db9057aa..d4a8d42e8f7d 100644
--- a/www/htmldoc/distinfo
+++ b/www/htmldoc/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 14:08:32 wiz Exp $
+$NetBSD: distinfo,v 1.8 2009/01/08 11:57:24 obache Exp $
-SHA1 (htmldoc-1.8.23-source.tar.bz2) = 4bcb4d472862197a35da9f25cc1e6634a9dcac9f
-RMD160 (htmldoc-1.8.23-source.tar.bz2) = 64a52393d35de86ed21616c5c7b08e68cc340f69
-Size (htmldoc-1.8.23-source.tar.bz2) = 2329977 bytes
+SHA1 (htmldoc-1.8.27-source.tar.bz2) = 472908e0aafed1cedfbacd8ed3168734aebdec4b
+RMD160 (htmldoc-1.8.27-source.tar.bz2) = 9605a5894675439f5fae405fb060972e19f33c7e
+Size (htmldoc-1.8.27-source.tar.bz2) = 3960271 bytes
+SHA1 (patch-aa) = 92de5e1e4761ffe2d117004b2a38ec52edb33d7c
diff --git a/www/htmldoc/options.mk b/www/htmldoc/options.mk
index 136803615945..1013747649c0 100644
--- a/www/htmldoc/options.mk
+++ b/www/htmldoc/options.mk
@@ -1,14 +1,41 @@
-# $NetBSD: options.mk,v 1.1 2008/04/22 16:24:31 jlam Exp $
+# $NetBSD: options.mk,v 1.2 2009/01/08 11:57:24 obache Exp $
-PKG_OPTIONS_VAR= PKG_OPTIONS.htmldoc
-PKG_SUPPORTED_OPTIONS= htmldoc-gui
+PKG_OPTIONS_VAR= PKG_OPTIONS.htmldoc
+PKG_SUPPORTED_OPTIONS= x11
+PKG_OPTIONS_OPTIONAL_GROUPS= ssl
+PKG_OPTIONS_GROUP.ssl= gnutls ssl
+PKG_SUGGESTED_OPTIONS= ssl
+PKG_OPTIONS_LEGACY_OPTS+= htmldoc-gui:x11
.include "../../mk/bsd.options.mk"
+###
+### SSL support
+###
+.if !empty(PKG_OPTIONS:Mssl) || !empty(PKG_OPTIONS:Mgnutls)
+CONFIGURE_ARGS+= --enable-ssl
+. if !empty(PKG_OPTIONS:Mssl)
+.include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-openssl
+CONFIGURE_ARGS+= --with-openssl-libs=${SSLBASE:Q}/lib
+CONFIGURE_ARGS+= --with-openssl-includes=${SSLBASE:Q}/include
+. else
+CONFIGURE_ARGS+= --disable-openssl
+. endif
+. if !empty(PKG_OPTIONS:Mgnutls)
+.include "../../security/gnutls/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-gnutls
+. else
+CONFIGURE_ARGS+= --disable-gnutls
+. endif
+.else
+CONFIGURE_ARGS+= --disable-ssl
+.endif
+
###
### X11 GUI support
###
-.if !empty(PKG_OPTIONS:Mhtmldoc-gui)
+.if !empty(PKG_OPTIONS:Mx11)
. include "../../x11/fltk/buildlink3.mk"
. include "../../x11/libXpm/buildlink3.mk"
CONFIGURE_ARGS+= --with-gui --with-x