[arch-commits] Commit in sdd/repos (8 files)

Sergej Pupykin spupykin at nymeria.archlinux.org
Tue Jul 1 15:35:09 UTC 2014


    Date: Tuesday, July 1, 2014 @ 17:35:08
  Author: spupykin
Revision: 114402

archrelease: copy trunk to community-i686, community-x86_64

Added:
  sdd/repos/community-i686/PKGBUILD
    (from rev 114401, sdd/trunk/PKGBUILD)
  sdd/repos/community-i686/build-fix.patch
    (from rev 114401, sdd/trunk/build-fix.patch)
  sdd/repos/community-x86_64/PKGBUILD
    (from rev 114401, sdd/trunk/PKGBUILD)
  sdd/repos/community-x86_64/build-fix.patch
    (from rev 114401, sdd/trunk/build-fix.patch)
Deleted:
  sdd/repos/community-i686/PKGBUILD
  sdd/repos/community-i686/build-fix.patch
  sdd/repos/community-x86_64/PKGBUILD
  sdd/repos/community-x86_64/build-fix.patch

----------------------------------+
 /PKGBUILD                        |   76 ++++++++++++++++++
 /build-fix.patch                 |  156 +++++++++++++++++++++++++++++++++++++
 community-i686/PKGBUILD          |   33 -------
 community-i686/build-fix.patch   |   78 ------------------
 community-x86_64/PKGBUILD        |   33 -------
 community-x86_64/build-fix.patch |   78 ------------------
 6 files changed, 232 insertions(+), 222 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2014-07-01 15:34:55 UTC (rev 114401)
+++ community-i686/PKGBUILD	2014-07-01 15:35:08 UTC (rev 114402)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgname=sdd
-pkgver=1.52
-pkgrel=7
-pkgdesc="Faster replacement for a program called dd"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://freshmeat.net/projects/sdd/"
-source=(ftp://ftp.berlios.de/pub/sdd/sdd-$pkgver.tar.gz
-	build-fix.patch)
-options=(!emptydirs)
-md5sums=('efb6f2d8a39080c8ad085211e01293d6'
-         '3c7af325869c648be045f7c86431200c')
-
-build() {
-  cd $srcdir/$pkgname-${pkgver}
-  if [ $CARCH = "x86_64" ]; then
-	cp RULES/i686-linux-cc.rul RULES/x86_64-linux-cc.rul
-	cp RULES/i686-linux-gcc.rul RULES/x86_64-linux-gcc.rul
-  fi
-  patch -p1 <$srcdir/build-fix.patch
-  make
-  make INS_BASE=$pkgdir/usr install
-  mkdir -p $pkgdir/usr/share/man
-  rm -rf $pkgdir/usr/include/ \
-	$pkgdir/usr/lib/ \
-	$pkgdir/usr/man/man3/ \
-	$pkgdir/usr/man/man5/
-  mv $pkgdir/usr/man/* $pkgdir/usr/share/man/
-  chown -R root.root $pkgdir
-}

Copied: sdd/repos/community-i686/PKGBUILD (from rev 114401, sdd/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2014-07-01 15:35:08 UTC (rev 114402)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=sdd
+pkgver=1.52
+pkgrel=8
+pkgdesc="Faster replacement for a program called dd"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://freshmeat.net/projects/sdd/"
+#source=(ftp://ftp.berlios.de/pub/sdd/sdd-$pkgver.tar.gz
+source=(http://arch.p5n.pp.ru/~sergej/dl/2014/sdd-$pkgver.tar.gz
+	build-fix.patch)
+options=(!emptydirs)
+md5sums=('efb6f2d8a39080c8ad085211e01293d6'
+         '3c7af325869c648be045f7c86431200c')
+
+build() {
+  cd $srcdir/$pkgname-${pkgver}
+  if [ $CARCH = "x86_64" ]; then
+	cp RULES/i686-linux-cc.rul RULES/x86_64-linux-cc.rul
+	cp RULES/i686-linux-gcc.rul RULES/x86_64-linux-gcc.rul
+  fi
+  patch -p1 <$srcdir/build-fix.patch
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-${pkgver}
+  make INS_BASE=$pkgdir/usr install
+  mkdir -p $pkgdir/usr/share/man
+  rm -rf $pkgdir/usr/include/ \
+	$pkgdir/usr/lib/ \
+	$pkgdir/usr/man/man3/ \
+	$pkgdir/usr/man/man5/
+  mv $pkgdir/usr/man/* $pkgdir/usr/share/man/
+  chown -R root.root $pkgdir
+}

Deleted: community-i686/build-fix.patch
===================================================================
--- community-i686/build-fix.patch	2014-07-01 15:34:55 UTC (rev 114401)
+++ community-i686/build-fix.patch	2014-07-01 15:35:08 UTC (rev 114402)
@@ -1,78 +0,0 @@
-diff -wbBur sdd-1.52/include/schily.h sdd-1.52.my/include/schily.h
---- sdd-1.52/include/schily.h	2004-03-05 00:30:40.000000000 +0000
-+++ sdd-1.52.my/include/schily.h	2010-07-08 14:00:07.000000000 +0000
-@@ -108,14 +108,14 @@
- 		/* 6th arg not const, fexecv forces av[ac] = NULL */
- extern	int	fexecv __PR((const char *, FILE *, FILE *, FILE *, int,
- 							char **));
--extern	int	fexecve __PR((const char *, FILE *, FILE *, FILE *,
--					char * const *, char * const *));
-+//extern	int	fexecve __PR((const char *, FILE *, FILE *, FILE *,
-+//					char * const *, char * const *));
- extern	int	fspawnv __PR((FILE *, FILE *, FILE *, int, char * const *));
- extern	int	fspawnl __PR((FILE *, FILE *, FILE *,
- 					const char *, const char *, ...));
- extern	int	fspawnv_nowait __PR((FILE *, FILE *, FILE *,
- 					const char *, int, char *const*));
--extern	int	fgetline __PR((FILE *, char *, int));
-+extern	int	xfgetline __PR((FILE *, char *, int));
- extern	int	fgetstr __PR((FILE *, char *, int));
- extern	void	file_raise __PR((FILE *, int));
- extern	int	fileclose __PR((FILE *));
-@@ -187,7 +187,7 @@
- extern	char	*findbytes __PR((const void *, int, char));
- extern	int	findline __PR((const char *, char, const char *,
- 							int, char **, int));
--extern	int	getline __PR((char *, int));
-+extern	int	xgetline __PR((char *, int));
- extern	int	getstr __PR((char *, int));
- extern	int	breakline __PR((char *, char, char **, int));
- extern	int	getallargs __PR((int *, char * const**, const char *, ...));
-diff -wbBur sdd-1.52/libschily/stdio/fgetline.c sdd-1.52.my/libschily/stdio/fgetline.c
---- sdd-1.52/libschily/stdio/fgetline.c	2004-08-08 11:02:05.000000000 +0000
-+++ sdd-1.52.my/libschily/stdio/fgetline.c	2010-07-08 14:02:08.000000000 +0000
-@@ -26,7 +26,7 @@
-  */
- 
- EXPORT int
--fgetline(f, buf, len)
-+xfgetline(f, buf, len)
- 	register	FILE	*f;
- 			char	*buf;
- 	register	int	len;
-@@ -64,9 +64,9 @@
- }
- 
- EXPORT int
--getline(buf, len)
-+xgetline(buf, len)
- 	char	*buf;
- 	int	len;
- {
--	return (fgetline(stdin, buf, len));
-+	return (xfgetline(stdin, buf, len));
- }
-diff -wbBur sdd-1.52/RULES/mk-gmake.id sdd-1.52.my/RULES/mk-gmake.id
---- sdd-1.52/RULES/mk-gmake.id	2004-08-03 21:33:18.000000000 +0000
-+++ sdd-1.52.my/RULES/mk-gmake.id	2010-07-08 14:00:07.000000000 +0000
-@@ -37,7 +37,7 @@
- 
- ifndef		ARCH_DONE
- 
--__gmake_warn:=	$(shell cat $(SRCROOT)/$(RULESDIR)/gmake.wrn 1>&2; sleep 15)
-+__gmake_warn:=	$(shell cat $(SRCROOT)/$(RULESDIR)/gmake.wrn 1>&2)
- 
- _MACHCMD=	(mach || uname -p || true)	2> /dev/null
- _ARCHCMD=	(arch || /usr/ucb/arch || true)	2> /dev/null
-diff -wbBur sdd-1.52/sdd/sdd.c sdd-1.52.my/sdd/sdd.c
---- sdd-1.52/sdd/sdd.c	2004-07-27 10:49:31.000000000 +0000
-+++ sdd-1.52.my/sdd/sdd.c	2010-07-08 14:01:20.000000000 +0000
-@@ -850,7 +850,7 @@
- 						inout, num);
- 		(void) fflush(stderr);
- 		ap = answer;
--		if (fgetline(tty, ap, 16) == EOF)
-+		if (xfgetline(tty, ap, 16) == EOF)
- 			return (FALSE);
- 		while (*ap == ' ' || *ap == '\t')
- 			ap++;

Copied: sdd/repos/community-i686/build-fix.patch (from rev 114401, sdd/trunk/build-fix.patch)
===================================================================
--- community-i686/build-fix.patch	                        (rev 0)
+++ community-i686/build-fix.patch	2014-07-01 15:35:08 UTC (rev 114402)
@@ -0,0 +1,78 @@
+diff -wbBur sdd-1.52/include/schily.h sdd-1.52.my/include/schily.h
+--- sdd-1.52/include/schily.h	2004-03-05 00:30:40.000000000 +0000
++++ sdd-1.52.my/include/schily.h	2010-07-08 14:00:07.000000000 +0000
+@@ -108,14 +108,14 @@
+ 		/* 6th arg not const, fexecv forces av[ac] = NULL */
+ extern	int	fexecv __PR((const char *, FILE *, FILE *, FILE *, int,
+ 							char **));
+-extern	int	fexecve __PR((const char *, FILE *, FILE *, FILE *,
+-					char * const *, char * const *));
++//extern	int	fexecve __PR((const char *, FILE *, FILE *, FILE *,
++//					char * const *, char * const *));
+ extern	int	fspawnv __PR((FILE *, FILE *, FILE *, int, char * const *));
+ extern	int	fspawnl __PR((FILE *, FILE *, FILE *,
+ 					const char *, const char *, ...));
+ extern	int	fspawnv_nowait __PR((FILE *, FILE *, FILE *,
+ 					const char *, int, char *const*));
+-extern	int	fgetline __PR((FILE *, char *, int));
++extern	int	xfgetline __PR((FILE *, char *, int));
+ extern	int	fgetstr __PR((FILE *, char *, int));
+ extern	void	file_raise __PR((FILE *, int));
+ extern	int	fileclose __PR((FILE *));
+@@ -187,7 +187,7 @@
+ extern	char	*findbytes __PR((const void *, int, char));
+ extern	int	findline __PR((const char *, char, const char *,
+ 							int, char **, int));
+-extern	int	getline __PR((char *, int));
++extern	int	xgetline __PR((char *, int));
+ extern	int	getstr __PR((char *, int));
+ extern	int	breakline __PR((char *, char, char **, int));
+ extern	int	getallargs __PR((int *, char * const**, const char *, ...));
+diff -wbBur sdd-1.52/libschily/stdio/fgetline.c sdd-1.52.my/libschily/stdio/fgetline.c
+--- sdd-1.52/libschily/stdio/fgetline.c	2004-08-08 11:02:05.000000000 +0000
++++ sdd-1.52.my/libschily/stdio/fgetline.c	2010-07-08 14:02:08.000000000 +0000
+@@ -26,7 +26,7 @@
+  */
+ 
+ EXPORT int
+-fgetline(f, buf, len)
++xfgetline(f, buf, len)
+ 	register	FILE	*f;
+ 			char	*buf;
+ 	register	int	len;
+@@ -64,9 +64,9 @@
+ }
+ 
+ EXPORT int
+-getline(buf, len)
++xgetline(buf, len)
+ 	char	*buf;
+ 	int	len;
+ {
+-	return (fgetline(stdin, buf, len));
++	return (xfgetline(stdin, buf, len));
+ }
+diff -wbBur sdd-1.52/RULES/mk-gmake.id sdd-1.52.my/RULES/mk-gmake.id
+--- sdd-1.52/RULES/mk-gmake.id	2004-08-03 21:33:18.000000000 +0000
++++ sdd-1.52.my/RULES/mk-gmake.id	2010-07-08 14:00:07.000000000 +0000
+@@ -37,7 +37,7 @@
+ 
+ ifndef		ARCH_DONE
+ 
+-__gmake_warn:=	$(shell cat $(SRCROOT)/$(RULESDIR)/gmake.wrn 1>&2; sleep 15)
++__gmake_warn:=	$(shell cat $(SRCROOT)/$(RULESDIR)/gmake.wrn 1>&2)
+ 
+ _MACHCMD=	(mach || uname -p || true)	2> /dev/null
+ _ARCHCMD=	(arch || /usr/ucb/arch || true)	2> /dev/null
+diff -wbBur sdd-1.52/sdd/sdd.c sdd-1.52.my/sdd/sdd.c
+--- sdd-1.52/sdd/sdd.c	2004-07-27 10:49:31.000000000 +0000
++++ sdd-1.52.my/sdd/sdd.c	2010-07-08 14:01:20.000000000 +0000
+@@ -850,7 +850,7 @@
+ 						inout, num);
+ 		(void) fflush(stderr);
+ 		ap = answer;
+-		if (fgetline(tty, ap, 16) == EOF)
++		if (xfgetline(tty, ap, 16) == EOF)
+ 			return (FALSE);
+ 		while (*ap == ' ' || *ap == '\t')
+ 			ap++;

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2014-07-01 15:34:55 UTC (rev 114401)
+++ community-x86_64/PKGBUILD	2014-07-01 15:35:08 UTC (rev 114402)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgname=sdd
-pkgver=1.52
-pkgrel=7
-pkgdesc="Faster replacement for a program called dd"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://freshmeat.net/projects/sdd/"
-source=(ftp://ftp.berlios.de/pub/sdd/sdd-$pkgver.tar.gz
-	build-fix.patch)
-options=(!emptydirs)
-md5sums=('efb6f2d8a39080c8ad085211e01293d6'
-         '3c7af325869c648be045f7c86431200c')
-
-build() {
-  cd $srcdir/$pkgname-${pkgver}
-  if [ $CARCH = "x86_64" ]; then
-	cp RULES/i686-linux-cc.rul RULES/x86_64-linux-cc.rul
-	cp RULES/i686-linux-gcc.rul RULES/x86_64-linux-gcc.rul
-  fi
-  patch -p1 <$srcdir/build-fix.patch
-  make
-  make INS_BASE=$pkgdir/usr install
-  mkdir -p $pkgdir/usr/share/man
-  rm -rf $pkgdir/usr/include/ \
-	$pkgdir/usr/lib/ \
-	$pkgdir/usr/man/man3/ \
-	$pkgdir/usr/man/man5/
-  mv $pkgdir/usr/man/* $pkgdir/usr/share/man/
-  chown -R root.root $pkgdir
-}

Copied: sdd/repos/community-x86_64/PKGBUILD (from rev 114401, sdd/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2014-07-01 15:35:08 UTC (rev 114402)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=sdd
+pkgver=1.52
+pkgrel=8
+pkgdesc="Faster replacement for a program called dd"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://freshmeat.net/projects/sdd/"
+#source=(ftp://ftp.berlios.de/pub/sdd/sdd-$pkgver.tar.gz
+source=(http://arch.p5n.pp.ru/~sergej/dl/2014/sdd-$pkgver.tar.gz
+	build-fix.patch)
+options=(!emptydirs)
+md5sums=('efb6f2d8a39080c8ad085211e01293d6'
+         '3c7af325869c648be045f7c86431200c')
+
+build() {
+  cd $srcdir/$pkgname-${pkgver}
+  if [ $CARCH = "x86_64" ]; then
+	cp RULES/i686-linux-cc.rul RULES/x86_64-linux-cc.rul
+	cp RULES/i686-linux-gcc.rul RULES/x86_64-linux-gcc.rul
+  fi
+  patch -p1 <$srcdir/build-fix.patch
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-${pkgver}
+  make INS_BASE=$pkgdir/usr install
+  mkdir -p $pkgdir/usr/share/man
+  rm -rf $pkgdir/usr/include/ \
+	$pkgdir/usr/lib/ \
+	$pkgdir/usr/man/man3/ \
+	$pkgdir/usr/man/man5/
+  mv $pkgdir/usr/man/* $pkgdir/usr/share/man/
+  chown -R root.root $pkgdir
+}

Deleted: community-x86_64/build-fix.patch
===================================================================
--- community-x86_64/build-fix.patch	2014-07-01 15:34:55 UTC (rev 114401)
+++ community-x86_64/build-fix.patch	2014-07-01 15:35:08 UTC (rev 114402)
@@ -1,78 +0,0 @@
-diff -wbBur sdd-1.52/include/schily.h sdd-1.52.my/include/schily.h
---- sdd-1.52/include/schily.h	2004-03-05 00:30:40.000000000 +0000
-+++ sdd-1.52.my/include/schily.h	2010-07-08 14:00:07.000000000 +0000
-@@ -108,14 +108,14 @@
- 		/* 6th arg not const, fexecv forces av[ac] = NULL */
- extern	int	fexecv __PR((const char *, FILE *, FILE *, FILE *, int,
- 							char **));
--extern	int	fexecve __PR((const char *, FILE *, FILE *, FILE *,
--					char * const *, char * const *));
-+//extern	int	fexecve __PR((const char *, FILE *, FILE *, FILE *,
-+//					char * const *, char * const *));
- extern	int	fspawnv __PR((FILE *, FILE *, FILE *, int, char * const *));
- extern	int	fspawnl __PR((FILE *, FILE *, FILE *,
- 					const char *, const char *, ...));
- extern	int	fspawnv_nowait __PR((FILE *, FILE *, FILE *,
- 					const char *, int, char *const*));
--extern	int	fgetline __PR((FILE *, char *, int));
-+extern	int	xfgetline __PR((FILE *, char *, int));
- extern	int	fgetstr __PR((FILE *, char *, int));
- extern	void	file_raise __PR((FILE *, int));
- extern	int	fileclose __PR((FILE *));
-@@ -187,7 +187,7 @@
- extern	char	*findbytes __PR((const void *, int, char));
- extern	int	findline __PR((const char *, char, const char *,
- 							int, char **, int));
--extern	int	getline __PR((char *, int));
-+extern	int	xgetline __PR((char *, int));
- extern	int	getstr __PR((char *, int));
- extern	int	breakline __PR((char *, char, char **, int));
- extern	int	getallargs __PR((int *, char * const**, const char *, ...));
-diff -wbBur sdd-1.52/libschily/stdio/fgetline.c sdd-1.52.my/libschily/stdio/fgetline.c
---- sdd-1.52/libschily/stdio/fgetline.c	2004-08-08 11:02:05.000000000 +0000
-+++ sdd-1.52.my/libschily/stdio/fgetline.c	2010-07-08 14:02:08.000000000 +0000
-@@ -26,7 +26,7 @@
-  */
- 
- EXPORT int
--fgetline(f, buf, len)
-+xfgetline(f, buf, len)
- 	register	FILE	*f;
- 			char	*buf;
- 	register	int	len;
-@@ -64,9 +64,9 @@
- }
- 
- EXPORT int
--getline(buf, len)
-+xgetline(buf, len)
- 	char	*buf;
- 	int	len;
- {
--	return (fgetline(stdin, buf, len));
-+	return (xfgetline(stdin, buf, len));
- }
-diff -wbBur sdd-1.52/RULES/mk-gmake.id sdd-1.52.my/RULES/mk-gmake.id
---- sdd-1.52/RULES/mk-gmake.id	2004-08-03 21:33:18.000000000 +0000
-+++ sdd-1.52.my/RULES/mk-gmake.id	2010-07-08 14:00:07.000000000 +0000
-@@ -37,7 +37,7 @@
- 
- ifndef		ARCH_DONE
- 
--__gmake_warn:=	$(shell cat $(SRCROOT)/$(RULESDIR)/gmake.wrn 1>&2; sleep 15)
-+__gmake_warn:=	$(shell cat $(SRCROOT)/$(RULESDIR)/gmake.wrn 1>&2)
- 
- _MACHCMD=	(mach || uname -p || true)	2> /dev/null
- _ARCHCMD=	(arch || /usr/ucb/arch || true)	2> /dev/null
-diff -wbBur sdd-1.52/sdd/sdd.c sdd-1.52.my/sdd/sdd.c
---- sdd-1.52/sdd/sdd.c	2004-07-27 10:49:31.000000000 +0000
-+++ sdd-1.52.my/sdd/sdd.c	2010-07-08 14:01:20.000000000 +0000
-@@ -850,7 +850,7 @@
- 						inout, num);
- 		(void) fflush(stderr);
- 		ap = answer;
--		if (fgetline(tty, ap, 16) == EOF)
-+		if (xfgetline(tty, ap, 16) == EOF)
- 			return (FALSE);
- 		while (*ap == ' ' || *ap == '\t')
- 			ap++;

Copied: sdd/repos/community-x86_64/build-fix.patch (from rev 114401, sdd/trunk/build-fix.patch)
===================================================================
--- community-x86_64/build-fix.patch	                        (rev 0)
+++ community-x86_64/build-fix.patch	2014-07-01 15:35:08 UTC (rev 114402)
@@ -0,0 +1,78 @@
+diff -wbBur sdd-1.52/include/schily.h sdd-1.52.my/include/schily.h
+--- sdd-1.52/include/schily.h	2004-03-05 00:30:40.000000000 +0000
++++ sdd-1.52.my/include/schily.h	2010-07-08 14:00:07.000000000 +0000
+@@ -108,14 +108,14 @@
+ 		/* 6th arg not const, fexecv forces av[ac] = NULL */
+ extern	int	fexecv __PR((const char *, FILE *, FILE *, FILE *, int,
+ 							char **));
+-extern	int	fexecve __PR((const char *, FILE *, FILE *, FILE *,
+-					char * const *, char * const *));
++//extern	int	fexecve __PR((const char *, FILE *, FILE *, FILE *,
++//					char * const *, char * const *));
+ extern	int	fspawnv __PR((FILE *, FILE *, FILE *, int, char * const *));
+ extern	int	fspawnl __PR((FILE *, FILE *, FILE *,
+ 					const char *, const char *, ...));
+ extern	int	fspawnv_nowait __PR((FILE *, FILE *, FILE *,
+ 					const char *, int, char *const*));
+-extern	int	fgetline __PR((FILE *, char *, int));
++extern	int	xfgetline __PR((FILE *, char *, int));
+ extern	int	fgetstr __PR((FILE *, char *, int));
+ extern	void	file_raise __PR((FILE *, int));
+ extern	int	fileclose __PR((FILE *));
+@@ -187,7 +187,7 @@
+ extern	char	*findbytes __PR((const void *, int, char));
+ extern	int	findline __PR((const char *, char, const char *,
+ 							int, char **, int));
+-extern	int	getline __PR((char *, int));
++extern	int	xgetline __PR((char *, int));
+ extern	int	getstr __PR((char *, int));
+ extern	int	breakline __PR((char *, char, char **, int));
+ extern	int	getallargs __PR((int *, char * const**, const char *, ...));
+diff -wbBur sdd-1.52/libschily/stdio/fgetline.c sdd-1.52.my/libschily/stdio/fgetline.c
+--- sdd-1.52/libschily/stdio/fgetline.c	2004-08-08 11:02:05.000000000 +0000
++++ sdd-1.52.my/libschily/stdio/fgetline.c	2010-07-08 14:02:08.000000000 +0000
+@@ -26,7 +26,7 @@
+  */
+ 
+ EXPORT int
+-fgetline(f, buf, len)
++xfgetline(f, buf, len)
+ 	register	FILE	*f;
+ 			char	*buf;
+ 	register	int	len;
+@@ -64,9 +64,9 @@
+ }
+ 
+ EXPORT int
+-getline(buf, len)
++xgetline(buf, len)
+ 	char	*buf;
+ 	int	len;
+ {
+-	return (fgetline(stdin, buf, len));
++	return (xfgetline(stdin, buf, len));
+ }
+diff -wbBur sdd-1.52/RULES/mk-gmake.id sdd-1.52.my/RULES/mk-gmake.id
+--- sdd-1.52/RULES/mk-gmake.id	2004-08-03 21:33:18.000000000 +0000
++++ sdd-1.52.my/RULES/mk-gmake.id	2010-07-08 14:00:07.000000000 +0000
+@@ -37,7 +37,7 @@
+ 
+ ifndef		ARCH_DONE
+ 
+-__gmake_warn:=	$(shell cat $(SRCROOT)/$(RULESDIR)/gmake.wrn 1>&2; sleep 15)
++__gmake_warn:=	$(shell cat $(SRCROOT)/$(RULESDIR)/gmake.wrn 1>&2)
+ 
+ _MACHCMD=	(mach || uname -p || true)	2> /dev/null
+ _ARCHCMD=	(arch || /usr/ucb/arch || true)	2> /dev/null
+diff -wbBur sdd-1.52/sdd/sdd.c sdd-1.52.my/sdd/sdd.c
+--- sdd-1.52/sdd/sdd.c	2004-07-27 10:49:31.000000000 +0000
++++ sdd-1.52.my/sdd/sdd.c	2010-07-08 14:01:20.000000000 +0000
+@@ -850,7 +850,7 @@
+ 						inout, num);
+ 		(void) fflush(stderr);
+ 		ap = answer;
+-		if (fgetline(tty, ap, 16) == EOF)
++		if (xfgetline(tty, ap, 16) == EOF)
+ 			return (FALSE);
+ 		while (*ap == ' ' || *ap == '\t')
+ 			ap++;




More information about the arch-commits mailing list