Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/text
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18436/10.3/unstable/main/finkinfo/text

Modified Files:
        unrtf.info unrtf.patch 
Log Message:
Backport new %v from 10.4T


Index: unrtf.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/text/unrtf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- unrtf.patch 19 Nov 2004 00:10:25 -0000      1.1
+++ unrtf.patch 20 Dec 2005 19:45:03 -0000      1.2
@@ -1,7 +1,8 @@
---- 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 @@
- 
+diff -Naur unrtf-0.19.7/Makefile unrtf-0.19.7-new/Makefile
+--- unrtf-0.19.7/Makefile      2005-06-05 20:46:38.000000000 +0200
++++ unrtf-0.19.7-new/Makefile  2005-12-04 18:48:37.000000000 +0100
+@@ -31,7 +31,7 @@
+ EXEEXT=
  
  CFLAGS=-g -Wall
 -CC=gcc
@@ -9,63 +10,67 @@
  
  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
+@@ -40,7 +40,7 @@
+ TARGET=unrtf${EXEEXT}
  
  ${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
+       rm -f ${OBJS} ${TARGET} 
+@@ -61,7 +61,7 @@
+ install:      ${TARGET}
+       -mkdir -p ${prefix}/bin
+       -mkdir -p ${mandir}
+-      cp ${TARGET} /usr/local/bin
++      cp ${TARGET} ${prefix}/bin
+       cp unrtf.1 ${mandir}
  
- 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 @@
+ attr.o: attr.c defs.h error.h attr.h main.h malloc.h
+diff -Naur unrtf-0.19.7/error.c unrtf-0.19.7-new/error.c
+--- unrtf-0.19.7/error.c       2005-06-05 20:46:34.000000000 +0200
++++ unrtf-0.19.7-new/error.c   2005-12-04 18:52:26.000000000 +0100
+@@ -39,9 +39,7 @@
  
  
  #include <stdio.h>
--#if linux /* daved - 0.19.1 */
+-#if linux || __DJGPP__ /* daved - 0.19.1, st001906 - 0.19.6 */
  #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 @@
+ 
+diff -Naur unrtf-0.19.7/main.c unrtf-0.19.7-new/main.c
+--- unrtf-0.19.7/main.c        2005-06-05 20:46:37.000000000 +0200
++++ unrtf-0.19.7-new/main.c    2005-12-04 18:52:53.000000000 +0100
+@@ -45,9 +45,7 @@
+ 
  
  #include <stdio.h>
- #include <string.h>
--#if linux /* daved - 0.19.0 */
+-#if linux || __DJGPP__ /* daved - 0.19.0, st001906 - 0.19.6 */
  #include <stdlib.h>
 -#endif
+ #include <string.h>
  
  #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 @@
+diff -Naur unrtf-0.19.7/malloc.c unrtf-0.19.7-new/malloc.c
+--- unrtf-0.19.7/malloc.c      2005-06-05 20:46:39.000000000 +0200
++++ unrtf-0.19.7-new/malloc.c  2005-12-04 18:54:35.000000000 +0100
+@@ -38,20 +38,8 @@
+ 
  
  #include <stdio.h>
+-#if linux /* daved - 0.19.0 */
+-#include <stdlib.h>
+-#endif
  #include <string.h>
 -#if linux /* daved - 0.19.0 */
- #include <stdlib.h>
+-#include <stdlib.h>
 -#endif
 -
 -#if AMIGA
--#include <stdlib.h>
+ #include <stdlib.h>
 -#else
 -#include <malloc.h>
 -#endif
@@ -73,16 +78,16 @@
  #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
+diff -Naur unrtf-0.19.7/output.c unrtf-0.19.7-new/output.c
+--- unrtf-0.19.7/output.c      2005-06-05 20:57:25.000000000 +0200
++++ unrtf-0.19.7-new/output.c  2005-12-04 18:55:11.000000000 +0100
 @@ -36,9 +36,7 @@
  
+ 
  #include <stdio.h>
- #include <string.h>
--#if linux /* daved - 0.19.0 */
+-#if linux || __DJGPP__ /* daved - 0.19.0,  st001906 - 0.19.6 */
  #include <stdlib.h>
 -#endif
+ #include <string.h>
  #include "malloc.h"
  #include "defs.h"
- #include "error.h"

Index: unrtf.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/text/unrtf.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- unrtf.info  7 Mar 2005 16:28:19 -0000       1.3
+++ unrtf.info  20 Dec 2005 19:45:03 -0000      1.4
@@ -1,8 +1,8 @@
 Package: unrtf
-Version: 0.19.3
-Revision: 2
-Source: gnu
-Source-MD5: e7eedca559efd94baf6f9541d7510a9b
+Version: 0.19.7
+Revision: 1
+Source: http://www.gnu.org/software/%n/%n-%v.tar.gz
+Source-MD5: 1cddb206f3ff5451c8d7699acba26a77
 Patch: %n.patch
 SetCPPFLAGS: -no-cpp-precomp
 CompileScript: make
@@ -13,7 +13,7 @@
 cp unrtf.1 %i/share/man/man1
 <<
 Description: Converts rtf format to several other formats
-DocFiles: AUTHORS CHANGES COPYING README TODO doc/%n.html
+DocFiles: CHANGES COPYING README
 DescDetail: <<
 UnRTF is a moderately complicated converter from RTF to other formats,
 including HTML, LaTeX, text, and PostScript. Converting to HTML, it



-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to