Attachment #227906 for bug #258507

View | Details | Raw Unified | Return to bug 258507
Collapse All | Expand All




# Created by: Glenn Trewitt <glenn@trewitt.org>

PORTNAME=		htmldoc
PORTVERSION=		1.9.12
PORTREVISION=	1
DISTVERSIONPREFIX=	v
CATEGORIES=		textproc



LIB_DEPENDS=	libpng.so:graphics/png

USES=		compiler:c11 jpeg pkgconfig
USE_GITHUB=	yes
GH_ACCOUNT=	michaelrsweet


HTMLDOCGUI_LIB_DEPENDS=		libfltk.so:x11-toolkits/fltk \
				libfontconfig.so:x11-fonts/fontconfig
HTMLDOCGUI_USES=		xorg
HTMLDOCGUI_USE=			XORG=x11,xrender,xcursor,xfixes,xext,xft,xinerama
				xext,xft,xinerama jpeg
GNUTLS_CONFIGURE_ENABLE=	gnutls
GNUTLS_USES=			pkgconfig
GNUTLS_LIB_DEPENDS=		libgnutls.so:security/gnutls

.include <bsd.port.pre.mk>

# Fix arm64 build
.if ${ARCH} == "aarch64"
pre-build:
	${REINPLACE_CMD} -e '/PNG_FILTER_OPTIMIZATIONS(pp, bpp);/d' ${WRKSRC}/png/pngrutil.c
.endif

post-install:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/htmldoc

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/textproc/htmldoc/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1535061183	1	TIMESTAMP = 1631647902
2	SHA256 (michaelrsweet-htmldoc-v1.9.3_GH0.tar.gz) = 601ad21f6aa7adf57a6fcfeab180dc39d6b99ec2f52f0e559df5bb57f087eb2e	2	SHA256 (michaelrsweet-htmldoc-v1.9.12_GH0.tar.gz) = abeb50b9a0247fee4a83af98c56ba3bc35804f593af1893899de084830315a05
3	SIZE (michaelrsweet-htmldoc-v1.9.3_GH0.tar.gz) = 4482204	3	SIZE (michaelrsweet-htmldoc-v1.9.12_GH0.tar.gz) = 3422902




--- png/pngpriv.h.orig	2021-03-16 01:04:47 UTC
+++ png/pngpriv.h
@@ -193,11 +193,7 @@
 #endif
 
 #ifndef PNG_POWERPC_VSX_OPT
-#  if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__)
-#     define PNG_POWERPC_VSX_OPT 2
-#  else
 #     define PNG_POWERPC_VSX_OPT 0
-#  endif
 #endif
 
 #ifndef PNG_INTEL_SSE_OPT
- 

Return to bug 258507

Lines 1-8 Link Here

(-)b/textproc/htmldoc/Makefile (-15 / +4 lines)
1	# Created by: Glenn Trewitt <glenn@trewitt.org>	1	# Created by: Glenn Trewitt <glenn@trewitt.org>
2		2
3	PORTNAME= htmldoc	3	PORTNAME= htmldoc
4	PORTVERSION= 1.9.3	4	PORTVERSION= 1.9.12
5	PORTREVISION= 1
6	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
7	CATEGORIES= textproc	6	CATEGORIES= textproc
8		7
Lines 16-22 BROKEN_mips= Complains of expecting ) before png_ptr Link Here
16		15
17	LIB_DEPENDS= libpng.so:graphics/png	16	LIB_DEPENDS= libpng.so:graphics/png
18		17
19	USES= compiler:c11	18	USES= compiler:c11 jpeg pkgconfig
20	USE_GITHUB= yes	19	USE_GITHUB= yes
21	GH_ACCOUNT= michaelrsweet	20	GH_ACCOUNT= michaelrsweet
22		21
Lines 30-50 HTMLDOCGUI_CONFIGURE_WITH= gui=yes Link Here
30	HTMLDOCGUI_LIB_DEPENDS= libfltk.so:x11-toolkits/fltk \	29	HTMLDOCGUI_LIB_DEPENDS= libfltk.so:x11-toolkits/fltk \
31	libfontconfig.so:x11-fonts/fontconfig	30	libfontconfig.so:x11-fonts/fontconfig
32	HTMLDOCGUI_USES= xorg	31	HTMLDOCGUI_USES= xorg
33	HTMLDOCGUI_USE= XORG=x11,xrender,xcursor,xfixes \	32	HTMLDOCGUI_USE= XORG=x11,xrender,xcursor,xfixes,xext,xft,xinerama
34	xext,xft,xinerama jpeg
35	GNUTLS_CONFIGURE_ENABLE= gnutls	33	GNUTLS_CONFIGURE_ENABLE= gnutls
36	GNUTLS_USES= pkgconfig
37	GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls	34	GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
38		35
39	.include <bsd.port.pre.mk>
40
41	# Fix arm64 build
42	.if ${ARCH} == "aarch64"
43	pre-build:
44	${REINPLACE_CMD} -e '/PNG_FILTER_OPTIMIZATIONS(pp, bpp);/d' ${WRKSRC}/png/pngrutil.c
45	.endif
46
47	post-install:	36	post-install:
48	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/htmldoc	37	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/htmldoc
49		38
50	.include <bsd.port.post.mk>	39	.include <bsd.port.mk>

Removed Link Here

(-)a/textproc/htmldoc/files/patch-png_pngpriv.h (-15 lines)
1	--- png/pngpriv.h.orig 2021-03-16 01:04:47 UTC
2	+++ png/pngpriv.h
3	@@ -193,11 +193,7 @@
4	#endif
5
6	#ifndef PNG_POWERPC_VSX_OPT
7	-# if defined(__PPC64__) && defined(__ALTIVEC__) && defined(__VSX__)
8	-# define PNG_POWERPC_VSX_OPT 2
9	-# else
10	# define PNG_POWERPC_VSX_OPT 0
11	-# endif
12	#endif
13
14	#ifndef PNG_INTEL_SSE_OPT
15	-