diff options
author | adam <adam> | 2005-03-24 08:53:28 +0000 |
---|---|---|
committer | adam <adam> | 2005-03-24 08:53:28 +0000 |
commit | 4699e48ee24052c8aafaa02d465551b3ac09c532 (patch) | |
tree | 20a7c8ab0f7596674a49e3d2551909fbb7e3a31e /textproc/html2text | |
parent | 923bd085d0064aeb7c3b3133b5348aba8cff484e (diff) | |
download | pkgsrc-4699e48ee24052c8aafaa02d465551b3ac09c532.tar.gz |
Changes 1.3.2a:
* Compatible with modern compilers
Diffstat (limited to 'textproc/html2text')
-rw-r--r-- | textproc/html2text/Makefile | 11 | ||||
-rw-r--r-- | textproc/html2text/distinfo | 12 | ||||
-rw-r--r-- | textproc/html2text/patches/patch-aa | 34 | ||||
-rw-r--r-- | textproc/html2text/patches/patch-ab | 34 |
4 files changed, 39 insertions, 52 deletions
diff --git a/textproc/html2text/Makefile b/textproc/html2text/Makefile index fa9ee58643b..d64a1eb4681 100644 --- a/textproc/html2text/Makefile +++ b/textproc/html2text/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2004/02/13 14:43:18 minskim Exp $ -# +# $NetBSD: Makefile,v 1.7 2005/03/24 08:53:28 adam Exp $ -DISTNAME= html2text-1.3.2 +DISTNAME= html2text-1.3.2a CATEGORIES= textproc MASTER_SITES= http://userpage.fu-berlin.de/~mbayer/tools/ @@ -9,9 +8,9 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://userpage.fu-berlin.de/~mbayer/tools/html2text.html COMMENT= Advanced HTML-to-text converter -HAS_CONFIGURE= YES - -CONFIGURE_ENV+= ECHO="${ECHO}" +USE_LANGUAGES= c c++ +HAS_CONFIGURE= yes +CONFIGURE_ENV+= ECHO="${ECHO}" post-build: ${GUNZIP_CMD} -d ${WRKSRC}/html2text.1.gz ${WRKSRC}/html2textrc.5.gz diff --git a/textproc/html2text/distinfo b/textproc/html2text/distinfo index 00dcdf4fb29..29a364f91fe 100644 --- a/textproc/html2text/distinfo +++ b/textproc/html2text/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.6 2005/02/24 14:48:42 agc Exp $ +$NetBSD: distinfo,v 1.7 2005/03/24 08:53:29 adam Exp $ -SHA1 (html2text-1.3.2.tar.gz) = 4ef3e6b30a2ac323693975da3ca8ce96013daa58 -RMD160 (html2text-1.3.2.tar.gz) = 10a5c4cf324302d6571abd28a8f0eebf26708750 -Size (html2text-1.3.2.tar.gz) = 131336 bytes -SHA1 (patch-aa) = 31a5f816eb48285a04bec0198018f5ab1cf89c9f -SHA1 (patch-ab) = 68a3131fdc36711975c7752490ade480dbbe1358 +SHA1 (html2text-1.3.2a.tar.gz) = 91d46e3218d05b0783bebee96a14f0df0eb9773e +RMD160 (html2text-1.3.2a.tar.gz) = 2771c52ea3ff6c97a13d6171839e61bb19226311 +Size (html2text-1.3.2a.tar.gz) = 130088 bytes +SHA1 (patch-aa) = dc72dfb31997df0fd0c33aadcb9af6a5df39000f +SHA1 (patch-ab) = 4282aa51557fcd4e8a322dfe4f1849d5100d6cdc diff --git a/textproc/html2text/patches/patch-aa b/textproc/html2text/patches/patch-aa index 41551232075..620011c2c51 100644 --- a/textproc/html2text/patches/patch-aa +++ b/textproc/html2text/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.2 2003/07/31 02:49:53 jschauma Exp $ +$NetBSD: patch-aa,v 1.3 2005/03/24 08:53:29 adam Exp $ ---- configure.orig 2002-04-07 10:05:48.000000000 -0400 -+++ configure 2003-07-30 22:29:10.000000000 -0400 -@@ -18,7 +18,7 @@ - # Sun Apr 7 12:04:48 CEST 2002 +--- configure.orig 2004-01-12 15:47:18.000000000 +0000 ++++ configure +@@ -19,7 +19,7 @@ + # Tue Nov 11 21:30:26 CET 2003 -echo='/bin/echo -e' @@ -11,16 +11,16 @@ $NetBSD: patch-aa,v 1.2 2003/07/31 02:49:53 jschauma Exp $ rm -rf configure-tmp || exit 1; mkdir configure-tmp || exit 1; -@@ -29,7 +29,7 @@ +@@ -30,7 +30,7 @@ makedirs="."; # $CXX # -$echo 'Checking C++ compiler... \c'; +$echo -n 'Checking C++ compiler... '; cat <<EOF >$tmp_file.C; - #include <iostream.h> + #include <iostream> int main(int, char **) { -@@ -54,7 +54,7 @@ +@@ -55,7 +55,7 @@ $echo "use \"$CXX\""; # $SYS_POLL_MISSING # @@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.2 2003/07/31 02:49:53 jschauma Exp $ SYS_POLL_MISSING=unknown; cat <<EOF >$tmp_file.C; #ifdef SYS_POLL_MISSING /* { */ -@@ -94,7 +94,7 @@ +@@ -95,7 +95,7 @@ esac; # $SOCKET_LIBRARIES # @@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.2 2003/07/31 02:49:53 jschauma Exp $ SOCKET_LIBRARIES=unknown; cat >$tmp_file.C <<EOF; extern "C" int socket(); -@@ -125,7 +125,7 @@ +@@ -126,7 +126,7 @@ fi; # $BOOL_DEFINITION # @@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.2 2003/07/31 02:49:53 jschauma Exp $ BOOL_DEFINITION=unknown; cat <<EOF >$tmp_file.C; #ifdef BOOL_DEFINITION -@@ -162,7 +162,7 @@ +@@ -163,7 +163,7 @@ esac; # $EXPLICIT # @@ -56,7 +56,7 @@ $NetBSD: patch-aa,v 1.2 2003/07/31 02:49:53 jschauma Exp $ EXPLICIT=unknown; cat <<EOF >$tmp_file.C; struct C { -@@ -193,7 +193,7 @@ +@@ -194,7 +194,7 @@ esac; # $LIBSTDCXX_INCLUDES, $LIBSTDCXX_LIBS # @@ -65,7 +65,7 @@ $NetBSD: patch-aa,v 1.2 2003/07/31 02:49:53 jschauma Exp $ cat <<EOF >$tmp_file.C; #include <string> #include <list> -@@ -221,7 +221,7 @@ +@@ -222,7 +222,7 @@ fi; # $AUTO_PTR_BROKEN # AUTO_PTR_BROKEN=""; @@ -74,16 +74,16 @@ $NetBSD: patch-aa,v 1.2 2003/07/31 02:49:53 jschauma Exp $ cat <<EOF >$tmp_file.C; #include <memory> #include <string> -@@ -253,7 +253,7 @@ +@@ -254,7 +254,7 @@ fi; # $MAKEDEPEND_INCLUDES # MAKEDEPEND_INCLUDES=""; -$echo 'Checking "makedepend" includes... \c'; -+$echo -n 'Checking "makedepend" includes... '; - echo "#include <iostream.h>" >$tmp_file.C; ++$echo -n 'Checking "makedepend" includes... \c'; + echo "#include <iostream>" >$tmp_file.C; MAKEDEPEND_INCLUDES=`$CXX -E $tmp_file.C 2>/dev/null | sed -n \ -@@ -286,7 +286,7 @@ +@@ -287,7 +287,7 @@ for i in \ MAKEDEPEND_INCLUDES; \ do cmd="$cmd -e \"s|@$i@|\$$i|g\""; done; for dir in $makedirs; do diff --git a/textproc/html2text/patches/patch-ab b/textproc/html2text/patches/patch-ab index 14fca54f80f..15b58916173 100644 --- a/textproc/html2text/patches/patch-ab +++ b/textproc/html2text/patches/patch-ab @@ -1,25 +1,13 @@ -$NetBSD: patch-ab,v 1.1 2004/01/11 20:31:44 jschauma Exp $ +$NetBSD: patch-ab,v 1.2 2005/03/24 08:53:29 adam Exp $ ---- format.C.orig 2004-01-11 15:24:46.000000000 -0500 -+++ format.C 2004-01-11 15:28:14.000000000 -0500 -@@ -34,10 +34,9 @@ - /***************************************************************************/ +--- Makefile.in.orig 2004-01-14 13:47:02.000000000 +0000 ++++ Makefile.in +@@ -48,7 +48,7 @@ DEBUG=-O2 -g + INCLUDES = $(LIBSTDCXX_INCLUDES) + DEFINES = -DVERSION=$(VERSION) $(SYS_POLL_MISSING) $(BOOL_DEFINITION) $(EXPLICIT) $(AUTO_PTR_BROKEN) + CPPFLAGS = $(INCLUDES) $(DEFINES) +-CXXFLAGS = $(CPPFLAGS) $(DEBUG) ++CXXFLAGS += $(CPPFLAGS) + LDFLAGS = $(DEBUG) + LOADLIBES = $(LIBSTDCXX_LIBS) $(SOCKET_LIBRARIES) - --#include <strstream.h> -- - #include <stdlib.h> - #include <ctype.h> -+#include <strstream> - #include <vector> - #include <map> - -@@ -374,7 +374,7 @@ - case CUSTOM3: bullet = custom3_bullet; break; - case ARABIC_NUMBERS: - { -- ostrstream oss; -+ std::ostrstream oss; - oss << number << '.' << std::ends; - bullet = oss.str(); - oss.rdbuf()->freeze(0); |