pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
htmldoc: Update to 1.9.20
Module Name: pkgsrc-wip
Committed By: Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By: micha
Date: Fri Jan 24 12:20:14 2025 +0100
Changeset: dafeff8d7c866e82a143611e57a4ef6d865a01fa
Modified Files:
Makefile
Added Files:
htmldoc-x11/COMMIT_MSG
htmldoc-x11/DESCR
htmldoc-x11/Makefile
htmldoc/COMMIT_MSG
htmldoc/DESCR
htmldoc/Makefile
htmldoc/Makefile.common
htmldoc/PLIST
htmldoc/distinfo
htmldoc/options.mk
htmldoc/patches/patch-desktop_Makefile
Log Message:
htmldoc: Update to 1.9.20
- Switch to FLK 1.4.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=dafeff8d7c866e82a143611e57a4ef6d865a01fa
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 2 +
htmldoc-x11/COMMIT_MSG | 1 +
htmldoc-x11/DESCR | 6 +++
htmldoc-x11/Makefile | 12 +++++
htmldoc/COMMIT_MSG | 4 ++
htmldoc/DESCR | 3 ++
htmldoc/Makefile | 9 ++++
htmldoc/Makefile.common | 39 +++++++++++++++
htmldoc/PLIST | 86 ++++++++++++++++++++++++++++++++++
htmldoc/distinfo | 6 +++
htmldoc/options.mk | 19 ++++++++
htmldoc/patches/patch-desktop_Makefile | 22 +++++++++
12 files changed, 209 insertions(+)
diffs:
diff --git a/Makefile b/Makefile
index 0396f10757..230e9d9533 100644
--- a/Makefile
+++ b/Makefile
@@ -1670,6 +1670,8 @@ SUBDIR+= hs-xmobar
SUBDIR+= ht2html
SUBDIR+= html-xml-utils
SUBDIR+= html2latex
+SUBDIR+= htmldoc
+SUBDIR+= htmldoc-x11
SUBDIR+= htop-git
SUBDIR+= htslib
SUBDIR+= httrack
diff --git a/htmldoc-x11/COMMIT_MSG b/htmldoc-x11/COMMIT_MSG
new file mode 100644
index 0000000000..63e9c87748
--- /dev/null
+++ b/htmldoc-x11/COMMIT_MSG
@@ -0,0 +1 @@
+www/htmldoc-x11: Update to 1.9.20
diff --git a/htmldoc-x11/DESCR b/htmldoc-x11/DESCR
new file mode 100644
index 0000000000..f0c15b5110
--- /dev/null
+++ b/htmldoc-x11/DESCR
@@ -0,0 +1,6 @@
+HTMLDOC is a program that generates indexed HTML, PostScript, 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.
diff --git a/htmldoc-x11/Makefile b/htmldoc-x11/Makefile
new file mode 100644
index 0000000000..e1b1ca806f
--- /dev/null
+++ b/htmldoc-x11/Makefile
@@ -0,0 +1,12 @@
+# $NetBSD$
+
+PKGNAME= htmldoc-x11-${VERSION}
+#PKGREVISION= 3
+
+CONFIGURE_ARGS+= --with-gui
+
+.include "../../wip/fltk14-devel/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
+.include "../../wip/htmldoc/Makefile.common"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/htmldoc/COMMIT_MSG b/htmldoc/COMMIT_MSG
new file mode 100644
index 0000000000..895ca300cd
--- /dev/null
+++ b/htmldoc/COMMIT_MSG
@@ -0,0 +1,4 @@
+www/htmldoc: Update to 1.9.20
+
+- Remove pkgsrc patch that does no longer match.
+- Fix some pkglint warnings.
diff --git a/htmldoc/DESCR b/htmldoc/DESCR
new file mode 100644
index 0000000000..9889d9e3d9
--- /dev/null
+++ b/htmldoc/DESCR
@@ -0,0 +1,3 @@
+HTMLDOC is a program that generates indexed HTML, PostScript, and PDF
+files from HTML "source" files that you create using your favorite HTML
+editor.
diff --git a/htmldoc/Makefile b/htmldoc/Makefile
new file mode 100644
index 0000000000..35f0e2c658
--- /dev/null
+++ b/htmldoc/Makefile
@@ -0,0 +1,9 @@
+# $NetBSD$
+
+CONFIGURE_ARGS+= --without-gui
+
+#PKGREVISION= 9
+
+.include "Makefile.common"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/htmldoc/Makefile.common b/htmldoc/Makefile.common
new file mode 100644
index 0000000000..269604ff1c
--- /dev/null
+++ b/htmldoc/Makefile.common
@@ -0,0 +1,39 @@
+# $NetBSD$
+#
+# used by www/htmldoc/Makefile
+# used by www/htmldoc-x11/Makefile
+
+# This section contains variables that might be overridden.
+PKGNAME?= ${PKGNAME_BASE}-${VERSION}
+COMMENT?= Converts HTML to indexed HTML, PDF and/or PostScript
+
+# Normal package Makefile contents follow.
+VERSION= 1.9.20
+PKGNAME_BASE= htmldoc
+CATEGORIES= www
+DIST_SUBDIR= ${PKGNAME_BASE}
+DISTNAME= v${VERSION}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=michaelrsweet/htmldoc/archive/}
+EXTRACT_USING= bsdtar
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= https://www.msweet.org/htmldoc/
+LICENSE= gnu-gpl-v2
+
+PATCHDIR= ${.CURDIR}/../../wip/htmldoc/patches
+DISTINFO_FILE= ${.CURDIR}/../../wip/htmldoc/distinfo
+PLIST_SRC= ${.CURDIR}/../../wip/htmldoc/PLIST
+
+.include "${.CURDIR}/../../wip/htmldoc/options.mk"
+
+WRKSRC= ${WRKDIR}/${PKGNAME_BASE}-${PKGVERSION_NOREV}
+GNU_CONFIGURE= yes
+USE_LANGUAGES= c c++
+USE_CC_FEATURES+= c99
+
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../print/cups-base/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/htmldoc/PLIST b/htmldoc/PLIST
new file mode 100644
index 0000000000..b51f2c9a88
--- /dev/null
+++ b/htmldoc/PLIST
@@ -0,0 +1,86 @@
+@comment $NetBSD: PLIST,v 1.7 2021/12/09 10:14:53 fcambus Exp $
+bin/htmldoc
+man/man1/htmldoc.1
+share/applications/htmldoc.desktop
+share/doc/htmldoc/help.html
+share/doc/htmldoc/htmldoc.pdf
+share/htmldoc/data/cp-1250
+share/htmldoc/data/cp-1251
+share/htmldoc/data/cp-1252
+share/htmldoc/data/cp-1253
+share/htmldoc/data/cp-1254
+share/htmldoc/data/cp-1255
+share/htmldoc/data/cp-1256
+share/htmldoc/data/cp-1257
+share/htmldoc/data/cp-1258
+share/htmldoc/data/cp-874
+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
+share/htmldoc/fonts/Courier-Bold.afm
+share/htmldoc/fonts/Courier-Bold.pfa
+share/htmldoc/fonts/Courier-BoldOblique.afm
+share/htmldoc/fonts/Courier-BoldOblique.pfa
+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
+share/htmldoc/fonts/Helvetica-BoldOblique.pfa
+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
+share/htmldoc/fonts/Times-Bold.pfa
+share/htmldoc/fonts/Times-BoldItalic.afm
+share/htmldoc/fonts/Times-BoldItalic.pfa
+share/htmldoc/fonts/Times-Italic.afm
+share/htmldoc/fonts/Times-Italic.pfa
+share/htmldoc/fonts/Times-Roman.afm
+share/htmldoc/fonts/Times-Roman.pfa
+share/icons/hicolor/128x128/apps/htmldoc.png
+share/icons/hicolor/256x256/apps/htmldoc.png
+share/icons/hicolor/32x32/apps/htmldoc.png
+share/mime/packages/htmldoc.xml
diff --git a/htmldoc/distinfo b/htmldoc/distinfo
new file mode 100644
index 0000000000..bce12c8f1d
--- /dev/null
+++ b/htmldoc/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.24 2022/05/24 21:35:45 fcambus Exp $
+
+BLAKE2s (htmldoc/v1.9.20.tar.gz) = 76ed5022a462c327a8aa39648f2ab2e0d0c121c5b7007cf477b077c6e8d53da1
+SHA512 (htmldoc/v1.9.20.tar.gz) = f6ab62bb819eef4dbed8abb5a95bd61292f1fdd513cbdeb776822ef01c3fac0f3250fbab0568b6a828a6c5ad6ca13541827efe7a1ccfbed334361cf0d3624254
+Size (htmldoc/v1.9.20.tar.gz) = 3313590 bytes
+SHA1 (patch-desktop_Makefile) = 687b416d6b4189aa4b0242b23858daabd54a76ed
diff --git a/htmldoc/options.mk b/htmldoc/options.mk
new file mode 100644
index 0000000000..efd0467f12
--- /dev/null
+++ b/htmldoc/options.mk
@@ -0,0 +1,19 @@
+# $NetBSD: options.mk,v 1.5 2019/10/18 11:02:13 micha Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.htmldoc
+PKG_SUPPORTED_OPTIONS= ssl
+PKG_SUGGESTED_OPTIONS= ssl
+
+.include "../../mk/bsd.options.mk"
+
+###
+### SSL support
+###
+.if !empty(PKG_OPTIONS:Mssl)
+CONFIGURE_ARGS+= --enable-ssl
+. include "../../security/gnutls/buildlink3.mk"
+. include "../../security/gnutls/libgnutls-config.mk"
+CONFIGURE_ARGS+= --enable-gnutls
+.else
+CONFIGURE_ARGS+= --disable-ssl
+.endif
diff --git a/htmldoc/patches/patch-desktop_Makefile b/htmldoc/patches/patch-desktop_Makefile
new file mode 100644
index 0000000000..686808cc96
--- /dev/null
+++ b/htmldoc/patches/patch-desktop_Makefile
@@ -0,0 +1,22 @@
+$NetBSD$
+
+Ensure desktop files are always installed, not just on Linux.
+
+--- desktop/Makefile.orig 2020-12-24 21:58:42.000000000 +0000
++++ desktop/Makefile
+@@ -27,7 +27,6 @@ all:
+ #
+
+ install:
+- if test `uname` = Linux; then \
+ $(INSTALL_DIR) $(BUILDROOT)$(datadir)/applications; \
+ $(INSTALL_DATA) htmldoc.desktop $(BUILDROOT)$(datadir)/applications; \
+ $(INSTALL_DIR) $(BUILDROOT)$(datadir)/mime/packages; \
+@@ -38,7 +37,6 @@ install:
+ $(INSTALL_DATA) htmldoc-128.png $(BUILDROOT)$(datadir)/icons/hicolor/128x128/apps/htmldoc.png; \
+ $(INSTALL_DIR) $(BUILDROOT)$(datadir)/icons/hicolor/256x256/apps; \
+ $(INSTALL_DATA) htmldoc-256.png $(BUILDROOT)$(datadir)/icons/hicolor/256x256/apps/htmldoc.png; \
+- fi
+
+
+ #
Home |
Main Index |
Thread Index |
Old Index