pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

htmldoc[-x11]: Remove, used to update www/htmldoc[-x11]



Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By:	micha
Date:		Fri Oct 18 13:15:19 2019 +0200
Changeset:	023c76d2b1957a65dae847f3b417ec0a17a6d3cb

Modified Files:
	Makefile
Removed Files:
	htmldoc-x11/DESCR
	htmldoc-x11/Makefile
	htmldoc-x11/TODO
	htmldoc/DESCR
	htmldoc/Makefile
	htmldoc/Makefile.common
	htmldoc/PLIST
	htmldoc/TODO
	htmldoc/distinfo
	htmldoc/options.mk
	htmldoc/patches/patch-htmldoc_http-addrlist.c

Log Message:
htmldoc[-x11]: Remove, used to update www/htmldoc[-x11]

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=023c76d2b1957a65dae847f3b417ec0a17a6d3cb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                      |  2 -
 htmldoc-x11/DESCR                             |  6 --
 htmldoc-x11/Makefile                          | 12 ----
 htmldoc-x11/TODO                              |  4 --
 htmldoc/DESCR                                 |  3 -
 htmldoc/Makefile                              |  6 --
 htmldoc/Makefile.common                       | 35 ------------
 htmldoc/PLIST                                 | 81 ---------------------------
 htmldoc/TODO                                  | 10 ----
 htmldoc/distinfo                              |  7 ---
 htmldoc/options.mk                            | 19 -------
 htmldoc/patches/patch-htmldoc_http-addrlist.c | 15 -----
 12 files changed, 200 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 95d61a342e..6b21896e6d 100644
--- a/Makefile
+++ b/Makefile
@@ -1578,8 +1578,6 @@ SUBDIR+=	hs-zip-archive
 SUBDIR+=	ht2html
 SUBDIR+=	html-xml-utils
 SUBDIR+=	html2latex
-SUBDIR+=	htmldoc
-SUBDIR+=	htmldoc-x11
 SUBDIR+=	htslib
 SUBDIR+=	httrack
 SUBDIR+=	hu-go
diff --git a/htmldoc-x11/DESCR b/htmldoc-x11/DESCR
deleted file mode 100644
index f0c15b5110..0000000000
--- a/htmldoc-x11/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index 5e39476f5b..0000000000
--- a/htmldoc-x11/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD$
-
-PKGNAME=	htmldoc-x11-${VERSION}
-
-CONFIGURE_ARGS+=	--with-gui
-
-# FLTK version 1.4 is supported too
-#.include "../../x11/fltk13/buildlink3.mk"
-.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-x11/TODO b/htmldoc-x11/TODO
deleted file mode 100644
index 2a255f8d30..0000000000
--- a/htmldoc-x11/TODO
+++ /dev/null
@@ -1,4 +0,0 @@
-[X] Switch from FLTK 1.1 to FLTK 1.3
-    Test with FLTK 1.4 development snapshot was successful too.
-
-[ ] Remove references to wip in Makefile
diff --git a/htmldoc/DESCR b/htmldoc/DESCR
deleted file mode 100644
index 9889d9e3d9..0000000000
--- a/htmldoc/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 7d92fee044..0000000000
--- a/htmldoc/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $NetBSD$
-
-CONFIGURE_ARGS+=	--without-gui
-
-.include "${.CURDIR}/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/htmldoc/Makefile.common b/htmldoc/Makefile.common
deleted file mode 100644
index 7acfc004f9..0000000000
--- a/htmldoc/Makefile.common
+++ /dev/null
@@ -1,35 +0,0 @@
-# $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.7
-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++
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
diff --git a/htmldoc/PLIST b/htmldoc/PLIST
deleted file mode 100644
index f47290a825..0000000000
--- a/htmldoc/PLIST
+++ /dev/null
@@ -1,81 +0,0 @@
-@comment $NetBSD$
-bin/htmldoc
-man/man1/htmldoc.1
-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
diff --git a/htmldoc/TODO b/htmldoc/TODO
deleted file mode 100644
index 948e91159b..0000000000
--- a/htmldoc/TODO
+++ /dev/null
@@ -1,10 +0,0 @@
-[X] Update to version 1.9.7
-[X] patch-ab/patch-ac/patch-ad/patch-ae/patch-htmldoc_htmlsep.cxx removed
-    Already merged upstream
-[X] INSTALL_MAKE_FLAGS removed from Makefile
-    No longer required (autotools do the right things)
-[X] Remove OpenSSL option
-    OpenSSL support was dropped in version 1.8.29
-    Always use GnuTLS for "ssl" option
-
-[ ] Remove references to wip in Makefile
diff --git a/htmldoc/distinfo b/htmldoc/distinfo
deleted file mode 100644
index a3918858de..0000000000
--- a/htmldoc/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD$
-
-SHA1 (htmldoc/v1.9.7.tar.gz) = c2c3c6a73dfc2bd779bb186b0497eb8de28b25b7
-RMD160 (htmldoc/v1.9.7.tar.gz) = 18908dcd30e36eb1fcdf208146ca704f391b382a
-SHA512 (htmldoc/v1.9.7.tar.gz) = e9481d32318902b5179f8d2dbaa382bcb0084bf3cc57958f8f05f52be5019ab54da5c265bbb674ca8808198c35d04bf19ad2149c2add18cfb630e66a2b9dc8f2
-Size (htmldoc/v1.9.7.tar.gz) = 4502752 bytes
-SHA1 (patch-htmldoc_http-addrlist.c) = 7c2db39b43cdbb31da0d884fbbba63e2ab258354
diff --git a/htmldoc/options.mk b/htmldoc/options.mk
deleted file mode 100644
index eafecff86d..0000000000
--- a/htmldoc/options.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD$
-
-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-htmldoc_http-addrlist.c b/htmldoc/patches/patch-htmldoc_http-addrlist.c
deleted file mode 100644
index 45216aea06..0000000000
--- a/htmldoc/patches/patch-htmldoc_http-addrlist.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Portability fix, s6_addr32 is not a standard.
-
---- htmldoc/http-addrlist.c.orig	2019-10-08 18:56:34.000000000 +0000
-+++ htmldoc/http-addrlist.c
-@@ -804,7 +804,7 @@ httpAddrGetList(const char *hostname,	/*
- #  ifdef WIN32
- 	temp->addr.ipv6.sin6_addr.u.Byte[15]   = 1;
- #  else
--	temp->addr.ipv6.sin6_addr.s6_addr32[3] = htonl(1);
-+	temp->addr.ipv6.sin6_addr.s6_addr[15] = 1;
- #  endif /* WIN32 */
- 
-         if (!first)


Home | Main Index | Thread Index | Old Index