cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r550869

Browse Source 
Revert the upgrade to 2.0.0 it is not backward compatible
and break minixmlto in some cases

bump portepoch

PR:		250028
Reported by:	Stefan Ehmann <shoesoft@gmx.net>
This commit is contained in:
Baptiste Daroussin 2020-10-01 19:50:02 +00:00
parent c0df4ba108
commit 6a234d2561
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2020Q4/; revision=550870
4 changed files with 65 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
textproc/html2text/Makefile
View File

@ -2,9 +2,11 @@
# $FreeBSD$
PORTNAME= html2text
PORTVERSION= 2.0.0
DISTVERSIONPREFIX= v
PORTVERSION= 1.3.2a
PORTEPOCH= 1
CATEGORIES= textproc
MASTER_SITES= SUNSITE/apps/www/converters \
http://www.mbayer.de/html2text/downloads/
MAINTAINER= bapt@FreeBSD.org
COMMENT= Converts HTML documents into plain text
@ -12,18 +14,36 @@ COMMENT= Converts HTML documents into plain text
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USE_GITHUB= yes
GH_ACCOUNT= grobian
HAS_CONFIGURE= yes
PORTDOCS= CHANGES CREDITS KNOWN_BUGS README TODO
PLIST_FILES= bin/html2text man/man1/html2text.1.gz man/man5/html2textrc.5.gz
CONFLICTS= py27-html2text-[0-9]*
PORTSCOUT= skipb:0 skipv:1.3.2
OPTIONS_DEFINE= DOCS
post-patch:
@${REINPLACE_CMD} -e '/echo=/s/ -e//' ${WRKSRC}/configure
.for fle in Makefile.in libstd/Makefile.in
@${REINPLACE_CMD} -e '/^DEBUG/s/^/#/; \
/^CXXFLAGS/s/=/+=/' ${WRKSRC}/${fle}
.endfor
.for fle in Area.h HTMLControl.h Properties.h format.h
@${REINPLACE_CMD} -e 's/<istream>/<iostream>/' ${WRKSRC}/${fle}
.endfor
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/html2text ${STAGEDIR}${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/html2text.1 ${STAGEDIR}${MANPREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/html2textrc.5 ${STAGEDIR}${MANPREFIX}/man/man5
${INSTALL_MAN} ${WRKSRC}/html2text.1.gz ${STAGEDIR}${MANPREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/html2textrc.5.gz ${STAGEDIR}${MANPREFIX}/man/man5
do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
.for f in ${PORTDOCS}
${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
.endfor
.include <bsd.port.mk>

6
textproc/html2text/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1601529583
SHA256 (grobian-html2text-v2.0.0_GH0.tar.gz) = 061125bfac658c6d89fa55e9519d90c5eeb3ba97b2105748ee62f3a3fa2449de
SIZE (grobian-html2text-v2.0.0_GH0.tar.gz) = 162901
TIMESTAMP = 1601581641
SHA256 (html2text-1.3.2a.tar.gz) = 000b39d5d910b867ff7e087177b470a1e26e2819920dcffd5991c33f6d480392
SIZE (html2text-1.3.2a.tar.gz) = 130088

34
textproc/html2text/files/patch-configure Normal file
View File

@ -0,0 +1,34 @@
--- configure.orig 2004-01-12 15:47:18 UTC
+++ configure
@@ -38,8 +38,7 @@ int main(int, char **) {
return 0;
}
EOF
-CXX=unknown;
-for i in "CC" "g++" "cc" "$CC"; do
+for i in "$CXX" "c++"; do
if $i -c $tmp_file.C 2>/dev/null; then
CXX="$i";
break;
@@ -205,12 +204,19 @@ cat <<EOF >$tmp_file.C;
#include <new>
#include <vector>
using namespace std;
-void func() { map<string, string> x; }
+int main(void) {
+ map<string, string> x;
+ return 0;
+}
EOF
-if $CXX -c $tmp_file.C 2>/dev/null; then
+if $CXX $tmp_file.C 2>/dev/null; then
LIBSTDCXX_INCLUDES="";
LIBSTDCXX_LIBS="";
$echo 'works; no need to make "./libstd"';
+elif $CXX $tmp_file.C -lstdc++ 2>/dev/null; then
+ LIBSTDCXX_INCLUDES="";
+ LIBSTDCXX_LIBS="-lstdc++";
+ $echo 'works with libstdc++; no need to make "./libstd"';
else
LIBSTDCXX_INCLUDES='-Ilibstd/include';
LIBSTDCXX_LIBS='libstd/libstd.a';

2
textproc/html2text/pkg-descr
View File

@ -11,4 +11,4 @@ accepts also syntactically incorrect input, attempting to interpret it
"reasonably". The rendering is largely customisable through an RC
file.
WWW: https://github.com/grobian/html2text
WWW: http://www.mbayer.de/html2text/