Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/text
In directory vz-cvs-3.sog:/tmp/cvs-serv5343/stable/main/finkinfo/text
Modified Files:
unrtf.info unrtf.patch
Log Message:
sync unrtf to stable
Index: unrtf.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/text/unrtf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- unrtf.patch 20 Jan 2006 20:12:58 -0000 1.1
+++ unrtf.patch 21 Nov 2011 10:26:58 -0000 1.2
@@ -1,88 +1,12 @@
---- unrtf-0.19.3/Makefile Thu Feb 19 00:35:03 2004
-+++ unrtf-patched-0.19.3/Makefile Thu Nov 18 12:32:56 2004
-@@ -26,7 +26,7 @@
-
-
- CFLAGS=-g -Wall
--CC=gcc
-+CC=cc
-
- OBJS=convert.o word.o error.o main.o hash.o \
- parse.o malloc.o attr.o util.o \
-@@ -35,7 +35,7 @@
- TARGET=unrtf
-
- ${TARGET}: ${OBJS}
-- gcc ${OBJS} -o ${TARGET}
-+ cc ${OBJS} -o ${TARGET}
-
- clean:
- rm -f ${OBJS} ${TARGET} bcount bcount.o
-@@ -51,7 +51,7 @@
- ${TARGET} test/fontsize.rtf > test/fontsize.html
-
- bcount: bcount.c
-- gcc bcount.c -o bcount
-+ cc bcount.c -o bcount
-
- all: ${TARGET} bcount
- rm -f ${OBJS}
-
---- unrtf-0.19.3/error.c Thu Feb 19 00:35:03 2004
-+++ unrtf-patched-0.19.3/error.c Thu Nov 18 12:22:39 2004
-@@ -38,9 +38,7 @@
-
-
- #include <stdio.h>
--#if linux /* daved - 0.19.1 */
- #include <stdlib.h>
--#endif
-
- #include "defs.h"
- #include "main.h"
-
---- unrtf-0.19.3/main.c Thu Feb 19 00:35:03 2004
-+++ unrtf-patched-0.19.3/main.c Thu Nov 18 12:28:20 2004
-@@ -43,9 +43,7 @@
-
- #include <stdio.h>
- #include <string.h>
--#if linux /* daved - 0.19.0 */
- #include <stdlib.h>
--#endif
-
- #include "defs.h"
- #include "error.h"
-
---- unrtf-0.19.3/malloc.c Thu Nov 18 20:30:10 2004
-+++ unrtf-patched-0.19.3/malloc.c Thu Nov 18 21:04:17 2004
-@@ -39,16 +39,7 @@
-
- #include <stdio.h>
- #include <string.h>
--#if linux /* daved - 0.19.0 */
- #include <stdlib.h>
--#endif
--
--#if AMIGA
--#include <stdlib.h>
--#else
--#include <malloc.h>
--#endif
--
- #include "error.h"
-
-
-
---- unrtf-0.19.3/output.c Thu Feb 19 00:35:03 2004
-+++ unrtf-patched-0.19.3/output.c Thu Nov 18 12:33:35 2004
-@@ -36,9 +36,7 @@
+diff -Nurd -x'*~' unrtf-0.20.5.orig/src/attr.c unrtf-0.20.5/src/attr.c
+--- unrtf-0.20.5.orig/src/attr.c 2007-12-22 07:30:37.000000000 -0500
++++ unrtf-0.20.5/src/attr.c 2008-01-20 16:33:49.000000000 -0500
+@@ -341,7 +341,7 @@
+ AttrStack *stack = stack_of_stacks_top;
+ if (!stack) {
+ warning_handler("No stack to get attribute from");
+- return;
++ return NULL;
+ }
- #include <stdio.h>
- #include <string.h>
--#if linux /* daved - 0.19.0 */
- #include <stdlib.h>
--#endif
- #include "malloc.h"
- #include "defs.h"
- #include "error.h"
+ i=stack->tos;
Index: unrtf.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/text/unrtf.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- unrtf.info 29 Mar 2009 22:20:00 -0000 1.4
+++ unrtf.info 21 Nov 2011 10:26:58 -0000 1.5
@@ -1,20 +1,16 @@
Package: unrtf
-Version: 0.19.3
-Revision: 2
-Source: gnu
-Source-MD5: e7eedca559efd94baf6f9541d7510a9b
+Version: 0.20.5
+Revision: 1
+Source: http://www.gnu.org/software/%n/%n-%v.tar.gz
+Source-MD5: 6a972d275bee7ca812458561a436095b
PatchFile: %n.patch
-PatchFile-MD5: c6b00ff2052721c918436ea6e6b25369
+PatchFile-MD5: 510998d703d0192fb074a8614042c565
BuildDepends: fink (>= 0.25.12-1)
-CompileScript: make
-InstallScript: <<
-mkdir -p %i/bin
-mkdir -p %i/share/man/man1
-cp unrtf %i/bin
-cp unrtf.1 %i/share/man/man1
-<<
+SetCPPFLAGS: -Wall
+ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
+InstallScript: make install DESTDIR=%d
Description: Converts rtf format to several other formats
-DocFiles: AUTHORS CHANGES COPYING README TODO doc/%n.html
+DocFiles: AUTHORS COPYING ChangeLog NEWS README
DescDetail: <<
UnRTF is a moderately complicated converter from RTF to other formats,
including HTML, LaTeX, text, and PostScript. Converting to HTML, it
@@ -24,9 +20,8 @@
Usage example: 'unrtf foo.rtf --html > foo.html'
See the man page for options, and the doc for limitations.
<<
-DescPackaging: Previous maintainer Michele Garoche
<michele.garo...@easyconnect.fr>.
DescPort: <<
-Previous versions by Matt Stephenson.
+Previous versions by Matt Stephenson and Michele Garoche.
Patched various c files to use 'stdlib.h' instead of 'malloc.h'.
Patched malloc.c to avoid warning casting pointer from integer.
<<
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure
contains a definitive record of customers, application performance,
security threats, fraudulent activity, and more. Splunk takes this
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
