From 4c30ecdddfa7b94d0ca99eaa83120b720430d5a3 Mon Sep 17 00:00:00 2001 From: seb Date: Mon, 6 May 2002 21:42:37 +0000 Subject: Update to version 1.8.19. There are really too many changes to mention them all here, previous version of the package was 20 htmldoc versions behind! See the file CHANGES.txt in the sources for more details. Anyway you should update. As suggested in PR pkg/14557 by the package had been strongly buildlinked. This update address part of this PR. Also introduce support for another package of htmldoc with the X Windows GUI activated. --- www/htmldoc/DESCR | 3 +-- www/htmldoc/Makefile | 28 +++++----------------------- www/htmldoc/Makefile.common | 23 +++++++++++++++++++++++ www/htmldoc/PLIST | 35 ++++++++++++++++++++++++++++++++++- www/htmldoc/distinfo | 8 +++----- www/htmldoc/patches/patch-aa | 15 --------------- www/htmldoc/patches/patch-ab | 18 ------------------ 7 files changed, 66 insertions(+), 64 deletions(-) create mode 100644 www/htmldoc/Makefile.common delete mode 100644 www/htmldoc/patches/patch-aa delete mode 100644 www/htmldoc/patches/patch-ab diff --git a/www/htmldoc/DESCR b/www/htmldoc/DESCR index b29672066e8..e745a326bb3 100644 --- a/www/htmldoc/DESCR +++ b/www/htmldoc/DESCR @@ -1,4 +1,3 @@ HTMLDOC is a program that generates indexed HTML, Adobe(R) PostScriptTM, and PDF files from HTML "source" files that you create using your favorite HTML -editor. HTMLDOC includes a simple GUI interface to manage your HTML files and -automatically (re)generate files for viewing and printing. +editor. diff --git a/www/htmldoc/Makefile b/www/htmldoc/Makefile index 3a079ef1b02..8acc1117c96 100644 --- a/www/htmldoc/Makefile +++ b/www/htmldoc/Makefile @@ -1,30 +1,12 @@ -# $NetBSD: Makefile,v 1.16 2002/03/17 15:43:43 fredb Exp $ +# $NetBSD: Makefile,v 1.17 2002/05/06 21:42:37 seb Exp $ # -DISTNAME= htmldoc-1.7-source -PKGNAME= htmldoc-1.7 -PKGREVISION= 1 -WRKSRC= ${WRKDIR}/htmldoc-1.7 -CATEGORIES= www -MASTER_SITES= ftp://ftp.easysw.com/pub/htmldoc/1.7/ +PKGNAME= htmldoc-${HTMLDOC_VERSION} -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.2.1:../../graphics/png +CONFIGURE_ARGS+= --without-gui --without-x -NOT_FOR_PLATFORM= NetBSD-1.[3-4]*-alpha #ps-pdf.cpp:3229: Internal compiler error. on 1.4 - 1.7 unknown +CONFLICTS= htmldoc-x11-[0-9]* -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 - -.include "../../mk/bsd.pkg.mk" +.include "${.CURDIR}/Makefile.common" diff --git a/www/htmldoc/Makefile.common b/www/htmldoc/Makefile.common new file mode 100644 index 00000000000..062bf3acf8f --- /dev/null +++ b/www/htmldoc/Makefile.common @@ -0,0 +1,23 @@ +# $NetBSD: Makefile.common,v 1.1 2002/05/06 21:42:37 seb Exp $ +# + +HTMLDOC_VERSION= 1.8.19 +DISTNAME= htmldoc-${HTMLDOC_VERSION}-source +WRKSRC= ${WRKDIR}/htmldoc-${HTMLDOC_VERSION} +CATEGORIES= www +MASTER_SITES= ftp://ftp.easysw.com/pub/htmldoc/1.8.19/ +EXTRACT_SUFX= .tar.bz2 + +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://www.easysw.com/htmldoc/ + +NOT_FOR_PLATFORM= NetBSD-1.[3-4]*-alpha #ps-pdf.cpp:3229: Internal compiler error. on 1.4 - 1.7 unknown + +GNU_CONFIGURE= YES + +BUILDLINK_ONLY= YES + +.include "../../graphics/jpeg/buildlink.mk" +.include "../../graphics/png/buildlink.mk" +.include "../../security/openssl/buildlink.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/www/htmldoc/PLIST b/www/htmldoc/PLIST index b9579af3d4d..8003adfe3a2 100644 --- a/www/htmldoc/PLIST +++ b/www/htmldoc/PLIST @@ -1,3 +1,36 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:16:57 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/05/06 21:42:37 seb 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/data +@dirrm share/htmldoc/afm +@dirrm share/htmldoc +@dirrm share/doc/htmldoc diff --git a/www/htmldoc/distinfo b/www/htmldoc/distinfo index 0bb69425138..0c721d450cc 100644 --- a/www/htmldoc/distinfo +++ b/www/htmldoc/distinfo @@ -1,6 +1,4 @@ -$NetBSD: distinfo,v 1.3 2001/05/13 01:16:23 dmcmahill Exp $ +$NetBSD: distinfo,v 1.4 2002/05/06 21:42:37 seb Exp $ -SHA1 (htmldoc-1.7-source.tar.gz) = a67eaecb5167143b0f58bae190f5a0136c3762ab -Size (htmldoc-1.7-source.tar.gz) = 765486 bytes -SHA1 (patch-aa) = e593fea22e12b62d1fd402c4d65dd8fb510204ac -SHA1 (patch-ab) = 4509f3409d3f18691575afbaa44bf0d0c1b2d860 +SHA1 (htmldoc-1.8.19-source.tar.bz2) = 98e3710f9d46346ae4043db37fa81d670df67eab +Size (htmldoc-1.8.19-source.tar.bz2) = 1740140 bytes diff --git a/www/htmldoc/patches/patch-aa b/www/htmldoc/patches/patch-aa deleted file mode 100644 index 39c560c5bda..00000000000 --- a/www/htmldoc/patches/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2000/02/05 14:03:27 wiz Exp $ - ---- Makefile.in.orig Thu Jun 3 18:03:15 1999 -+++ Makefile.in Thu Jun 3 18:03:33 1999 -@@ -35,8 +35,8 @@ - # Compiler options... - # - --CXXFLAGS = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ --LDFLAGS = @LDFLAGS@ -+CXXFLAGS = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ -I${LOCALBASE}/include -+LDFLAGS = @LDFLAGS@ -L${LOCALBASE}/lib - - LIBS = @LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ -lm - diff --git a/www/htmldoc/patches/patch-ab b/www/htmldoc/patches/patch-ab deleted file mode 100644 index cf29b9b00cd..00000000000 --- a/www/htmldoc/patches/patch-ab +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2001/05/13 01:16:23 dmcmahill Exp $ - ---- ps-pdf.cpp.orig Thu Jan 7 19:28:30 1999 -+++ ps-pdf.cpp Sat May 12 21:09:09 2001 -@@ -2807,5 +2807,5 @@ - - if (Verbosity) -- progress_update(100 - 100 * (*y) / PagePrintLength); -+ progress_update((int)(100 - 100 * (*y) / PagePrintLength)); - - if (t->halignment == ALIGN_LEFT) -@@ -2991,5 +2991,5 @@ - - if (Verbosity) -- progress_update(100 - 100 * (*y) / PagePrintLength); -+ progress_update((int)(100 - 100 * (*y) / PagePrintLength)); - }; - -- cgit v1.2.3