summaryrefslogtreecommitdiff
path: root/units/units-1.80
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-11-09 00:36:47 +0000
committerChris Larson <clarson@kergoth.com>2004-11-09 00:36:47 +0000
commitf96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch)
treeedb17ec2c4ea13c5acb1c7350957a249a820e28d /units/units-1.80
parentb6588aa6851fb220cedc387d21c51513ef8d67f4 (diff)
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'units/units-1.80')
-rw-r--r--units/units-1.80/makefile.patch73
-rw-r--r--units/units-1.80/units.c.patch19
2 files changed, 92 insertions, 0 deletions
diff --git a/units/units-1.80/makefile.patch b/units/units-1.80/makefile.patch
index e69de29bb2..376e58fdb3 100644
--- a/units/units-1.80/makefile.patch
+++ b/units/units-1.80/makefile.patch
@@ -0,0 +1,73 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- units-1.80/Makefile.in~makefile 2002-05-03 02:15:08.000000000 +0100
++++ units-1.80/Makefile.in 2003-11-04 16:53:31.000000000 +0000
+@@ -26,6 +26,7 @@
+ srcdir = @srcdir@
+
+ CC = @CC@
++DESTDIR =
+
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+@@ -95,19 +96,19 @@
+ $(CC) $(LDFLAGS) -o units $(OBJECTS) parse.tab.o getopt.o getopt1.o @STRFUNC@ $(LIBS)
+
+ install: units units.dat install-doc
+- $(srcdir)/mkinstalldirs $(bindir) $(datadir)
+- $(INSTALL_PROGRAM) units $(bindir)/`echo units|sed '$(transform)'`
+- $(INSTALL_DATA) $(srcdir)/units.dat $(datadir)/units.dat
++ $(srcdir)/mkinstalldirs $(DESTDIR)/$(bindir) $(datadir)
++ $(INSTALL_PROGRAM) units $(DESTDIR)/$(bindir)/`echo units|sed '$(transform)'`
++ $(INSTALL_DATA) $(srcdir)/units.dat $(DESTDIR)/$(datadir)/units.dat
+
+ install-strip: units units.dat install-doc
+- $(INSTALL_PROGRAM) -s units $(bindir)/`echo units|sed '$(transform)'`
+- $(INSTALL_DATA) $(srcdir)/units.dat $(datadir)/units.dat
++ $(INSTALL_PROGRAM) -s units $(DESTDIR)/$(bindir)/`echo units|sed '$(transform)'`
++ $(INSTALL_DATA) $(srcdir)/units.dat $(DESTDIR)/$(datadir)/units.dat
+
+ install-doc: install-man install-info
+
+ install-man: units.1
+- $(srcdir)/mkinstalldirs $(mandir)/man1
+- $(INSTALL_DATA) units.1 $(mandir)/man1/`echo units|sed '$(transform)'`.1
++ $(srcdir)/mkinstalldirs $(DESTDIR)/$(mandir)/man1
++ $(INSTALL_DATA) units.1 $(DESTDIR)/$(mandir)/man1/`echo units|sed '$(transform)'`.1
+
+ units.man: units.texinfo texi2man
+ ./texi2man units.texinfo > units.man
+@@ -115,10 +116,10 @@
+ units.1: units.man
+ sed s!@DATAFILE@!@UDAT@units.dat! $(srcdir)/units.man > units.1
+
+-install-info: $(infodir)/units.info
++install-info: $(DESTDIR)/$(infodir)/units.info
+
+-$(infodir)/units.info: units.info
+- $(srcdir)/mkinstalldirs $(infodir)
++$(DESTDIR)/$(infodir)/units.info: units.info
++ $(srcdir)/mkinstalldirs $(DESTDIR)/$(infodir)
+ # There may be a newer info file in . than in srcdir.
+ -if test -f units.info; then d=.; \
+ else d=$(srcdir); fi; \
+@@ -128,11 +129,11 @@
+ # line so we notice real errors from install-info.
+ # We use `$(SHELL) -c' because some shells do not
+ # fail gracefully when there is an unknown command.
+- if test -f $(infodir)/dir; then \
++ if test -f $(DESTDIR)/$(infodir)/dir; then \
+ if $(SHELL) -c 'install-info --version' \
+ >/dev/null 2>&1; then \
+- install-info --dir-file=$(infodir)/dir \
+- $(infodir)/units.info; \
++ install-info --dir-file=$(DESTDIR)/$(infodir)/dir \
++ $(DESTDIR)/$(infodir)/units.info; \
+ else true; fi \
+ else true; fi
+
+--- units-1.80/vim~makefile
++++ units-1.80/vim
diff --git a/units/units-1.80/units.c.patch b/units/units-1.80/units.c.patch
index e69de29bb2..55867ba5e3 100644
--- a/units/units-1.80/units.c.patch
+++ b/units/units-1.80/units.c.patch
@@ -0,0 +1,19 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- units-1.80/units.c~units.c 2003-11-04 16:45:07.000000000 +0000
++++ units-1.80/units.c 2003-11-04 16:45:54.000000000 +0000
+@@ -2356,11 +2356,3 @@
+ crude example to convert lines in a file 'feet' from ft to m might be:
+ */
+
+-#if 0
+-
+- "sed 's/.*/& ft\"
+- "m/' feet|units -q|sed 's/^[[:space:]]*\* //"
+- "/^[[:space:]]*\//d'"
+-
+-#endif
+-