Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/utils
In directory
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv4325/10.4-transitional/unstable/main/finkinfo/utils
Modified Files:
units.info units.patch
Log Message:
Take over (with permission of old Maintainer); backport new version
Index: units.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/utils/units.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- units.patch 27 Apr 2005 03:26:49 -0000 1.1
+++ units.patch 12 May 2006 17:27:44 -0000 1.2
@@ -1,11 +1,92 @@
---- units-1.74/units.c Thu Jan 27 18:57:50 2005
-+++ units-1.74/units.c.patched Thu Jan 27 18:58:32 2005
-@@ -2326,7 +2326,7 @@
+diff -Nurd -x'*~' units-1.85.orig/Makefile.in units-1.85/Makefile.in
+--- units-1.85.orig/Makefile.in 2005-04-24 14:14:54.000000000 -0400
++++ units-1.85/Makefile.in 2006-05-04 10:48:00.000000000 -0400
+@@ -45,20 +45,20 @@
+ datadir = @datadir@
+ DEFS = -DUNITSFILE=\"@[EMAIL PROTECTED]" @DEFIS@ @DEFS@
+ CFLAGS = @CFLAGS@
+-OBJECTS = [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL
PROTECTED]@ @STRFUNC@
++OBJECTS = [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @STRFUNC@
- #if 0
+ .SUFFIXES:
+ .SUFFIXES: .c [EMAIL PROTECTED]@
+-
++
+ [EMAIL PROTECTED]@:
+- $(CC) $(DEFS) $(CFLAGS) -I$(srcdir) -c $<
+-
++ $(CC) $(DEFS) $(CFLAGS) -I$(srcdir) $(CPPFLAGS) -c $<
++
+ # [EMAIL PROTECTED]@: %.c
+-# $(CC) $(DEFS) $(CFLAGS) -I$(srcdir) -c %.c
++# $(CC) $(DEFS) $(CFLAGS) -I$(srcdir) $(CPPFLAGS) -c %.c
-- "sed 's/.*/& ft\"
-+ "sed 's/.*/& ft\" "
- "m/' feet|units -q|sed 's/^[[:space:]]*\* //"
- "/^[[:space:]]*\//d'"
+-DISTFILES = README ChangeLog units.info units.doc getopt1.c units.dvi \
+- Makefile.in units.c getopt.c getopt.h units.dat units.man units.texinfo \
++DISTFILES = README ChangeLog units.info units.doc units.dvi \
++ Makefile.in units.c units.dat units.man units.texinfo \
+ configure.ac configure strfunc.c COPYING Makefile.dos install-sh \
+ mkinstalldirs NEWS texi2man INSTALL \
+ parse.tab.c parse.y units.h Makefile.OS2 makeobjs.cmd README.OS2
+@@ -199,8 +199,7 @@
+ echo units-`sed -n -e '/#.*VERSION/s/.*"\(.*\)"/\1/gp' \
+ $(srcdir)/units.c` > distname
+ -rm -r `cat distname` `cat distname`.tar `cat distname`.tar.gz
+- tar cf `cat distname`.tar units.c units.h parse.y parse.tab.c\
+- getopt1.c getopt.c getopt.h
++ tar cf `cat distname`.tar units.c units.h parse.y parse.tab.c
+ gzip `cat distname`.tar
+
+ # Tell versions [3.59,3.63) of GNU make not to export all variables.
+diff -Nurd -x'*~' units-1.85.orig/parse.y units-1.85/parse.y
+--- units-1.85.orig/parse.y 2005-04-24 14:14:55.000000000 -0400
++++ units-1.85/parse.y 2006-05-04 12:13:19.000000000 -0400
+@@ -22,6 +22,9 @@
+
+ %{
+
++void
++yyerror(char *s){}
++
+ #define YYPARSE_PARAM comm
+ #define YYLEX_PARAM comm
+
+@@ -30,7 +33,7 @@
+ #include "units.h"
+
+
+-int err; /* value used by parser to store return values */
++static int err; /* value used by parser to store return values */
+
+ #define CHECK if (err) { COMM->errorcode=err; YYABORT; }
+
+@@ -273,6 +276,7 @@
+ "**", EXPONENT,
+ 0, 0 };
+
++int
+ yylex(YYSTYPE *lvalp, struct commtype *comm)
+ {
+ int length, count;
+@@ -392,9 +396,6 @@
+ return UNIT;
+ }
+
+-
+-yyerror(char *s){}
+-
+ void
+ freelist(int startunit)
+ {
+diff -Nurd -x'*~' units-1.85.orig/units.c units-1.85/units.c
+--- units-1.85.orig/units.c 2005-05-20 15:16:58.000000000 -0400
++++ units-1.85/units.c 2006-05-04 10:58:42.000000000 -0400
+@@ -28,6 +28,7 @@
+
+ #ifdef READLINE
+ # include <readline/readline.h>
++# include <readline/history.h>
+ # define RVERSTR "with readline"
+ #else
+ # define RVERSTR "without readline"
Index: units.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/utils/units.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- units.info 27 Apr 2005 03:26:49 -0000 1.1
+++ units.info 12 May 2006 17:27:44 -0000 1.2
@@ -1,16 +1,31 @@
Package: units
-Version: 1.74
-Revision: 16
-Maintainer: Ashley Yakeley <[EMAIL PROTECTED]>
-BuildDepends: readline (>= 4.3-5), libncurses5
-Depends: readline-shlibs (>= 4.3-5)
+Version: 1.85
+Revision: 1
+Maintainer: Daniel Macks <[EMAIL PROTECTED]>
+BuildDepends: readline5, libncurses5
+Depends: readline5-shlibs
Source: gnu
-Source-MD5: 230d1cb0367f9f4ac345beda371bbb53
+Source-MD5: e2856ebf1082a8ed4f83d791e5a0b90b
Patch: %n.patch
-SetCFLAGS: -I%p/include
+PatchScript: <<
+ rm getopt*
+<<
+SetCPPFLAGS: -Wall
InstallScript: make install prefix=%i mandir=%i/share/man infodir=%i/share/info
DocFiles: COPYING NEWS README
InfoDocs: units.info
-Description: Units conversion and calculation
+Description: Unit conversion and calculation
+DescPort: <<
+ Expunge local getopt
+
+ Use local files in preference to system ones
+
+ Fix some implicit function declarations
+
+ Make sure the parser.y "err" variable exists (averts core-dump)
+<<
+DescPackaging: <<
+ Previous versions maintained by Ashley Yakeley
+<<
License: GPL
Homepage: http://www.gnu.org/software/units/units.html
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
