>Number:         14557
>Category:       pkg
>Synopsis:       pkgsrc/www/htmldoc, upgrade to 1.8.16, buildlinkify
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Nov 12 05:16:00 PST 2001
>Closed-Date:
>Last-Modified:
>Originator:     
>Release:        NetBSD 1.5.2
>Organization:
>Environment:
System: NetBSD glen 1.5.2 NetBSD 1.5.2 (GLEN) #0: Tue Sep 25 06:41:40 PDT 2001 root@glen:/usr/src/sys/arch/i386/compile/GLEN i386


>Description:
	pkgsrc/www/htmldoc/Makefile does not use buildlink
>How-To-Repeat:
>Fix:
	Upgrade to htmldoc 1.8.16.
	The patches become no longer necessary, remove patches/
	The following patches modify Makefile and PLIST.
	They add a dependency to fltk, to include htmldoc's GUI

--- Makefile.orig	Sun Jun 10 23:34:55 2001
+++ Makefile	Mon Nov 12 04:50:26 2001
@@ -2,28 +2,22 @@
 #
 
 DISTNAME=		${PKGNAME}-source
-PKGNAME=		htmldoc-1.7
+PKGNAME=		htmldoc-1.8.16
 WRKSRC=			${WRKDIR}/${PKGNAME}
 CATEGORIES=		www
-MASTER_SITES=		ftp://ftp.easysw.com/pub/htmldoc/1.7/
+MASTER_SITES=		ftp://ftp.easysw.com/pub/htmldoc/1.8.16/
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.easysw.com/~mike/htmldoc/
 COMMENT=		Converts HTML to indexed HTML, PDF and/or PostScript
 
-DEPENDS+=		jpeg-6b:../../graphics/jpeg
-DEPENDS+=		png>=1.0.11:../../graphics/png
-
 NOT_FOR_PLATFORM=	NetBSD-1.[3-4]*-alpha	#ps-pdf.cpp:3229: Internal compiler error. on 1.4 - 1.7 unknown
 
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--with-x
-CPPFLAGS+=		-L${LOCALBASE}/lib
-MAKE_ENV+=		BINDIR=${PREFIX}/bin \
-			MANDIR=${PREFIX}/man
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/htmldoc ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/htmldoc.1 ${PREFIX}/man/man1
+BUILDLINK_ONLY=		YES
 
+.include "../../graphics/jpeg/buildlink.mk"
+.include "../../graphics/png/buildlink.mk"
+.include "../../x11/fltk/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
--- PLIST.orig	Wed Oct 31 18:16:57 2001
+++ PLIST	Mon Nov 12 04:48:51 2001
@@ -1,3 +1,35 @@
 @comment $NetBSD: PLIST,v 1.1 2001/11/01 02:16:57 zuntum Exp $
 bin/htmldoc
 man/man1/htmldoc.1
+share/doc/htmldoc/help.html
+share/doc/htmldoc/htmldoc.pdf
+share/htmldoc/afm/Courier
+share/htmldoc/afm/Courier-Bold
+share/htmldoc/afm/Courier-BoldOblique
+share/htmldoc/afm/Courier-Oblique
+share/htmldoc/afm/Helvetica
+share/htmldoc/afm/Helvetica-Bold
+share/htmldoc/afm/Helvetica-BoldOblique
+share/htmldoc/afm/Helvetica-Oblique
+share/htmldoc/afm/Symbol
+share/htmldoc/afm/Times-Bold
+share/htmldoc/afm/Times-BoldItalic
+share/htmldoc/afm/Times-Italic
+share/htmldoc/afm/Times-Roman
+share/htmldoc/data/iso-8859-1
+share/htmldoc/data/iso-8859-14
+share/htmldoc/data/iso-8859-15
+share/htmldoc/data/iso-8859-2
+share/htmldoc/data/iso-8859-3
+share/htmldoc/data/iso-8859-4
+share/htmldoc/data/iso-8859-5
+share/htmldoc/data/iso-8859-6
+share/htmldoc/data/iso-8859-7
+share/htmldoc/data/iso-8859-8
+share/htmldoc/data/iso-8859-9
+share/htmldoc/data/koi8-r
+share/htmldoc/data/prolog.ps
+share/htmldoc/data/psglyphs
+@dirrm share/htmldoc/afm
+@dirrm share/htmldoc/data
+@dirrm share/doc/htmldoc
>Release-Note:
>Audit-Trail:
>Unformatted: