[Glibc-bsd-commits] r3382 - trunk/freebsd-moused/debian/patches

[Guillem Jover]

Author: guillem
Date: 2011-05-31 03:53:55 +0000 (Tue, 31 May 2011)
New Revision: 3382

Modified:
   trunk/freebsd-moused/debian/patches/glibc.patch
   trunk/freebsd-moused/debian/patches/libbsd.patch
   trunk/freebsd-moused/debian/patches/retry.patch
   trunk/freebsd-moused/debian/patches/series
Log:
Make freebsd-moused build with 8.2 based code


Modified: trunk/freebsd-moused/debian/patches/glibc.patch
===================================================================
--- trunk/freebsd-moused/debian/patches/glibc.patch	2011-05-31 03:39:11 UTC (rev 3381)
+++ trunk/freebsd-moused/debian/patches/glibc.patch	2011-05-31 03:53:55 UTC (rev 3382)
@@ -1,10 +1,11 @@
 ---
- usr.sbin/moused/moused.c |    5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
+ usr.sbin/moused/Makefile |    4 ++--
+ usr.sbin/moused/moused.c |   12 ++++++------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
 
 --- a/usr.sbin/moused/moused.c
 +++ b/usr.sbin/moused/moused.c
-@@ -45,10 +45,10 @@
+@@ -45,7 +45,6 @@
   **/
  
  #include <sys/cdefs.h>
@@ -12,11 +13,23 @@
  
  #include <sys/param.h>
  #include <sys/consio.h>
-+#include <sys/ttycom.h>
- #include <sys/mouse.h>
+@@ -53,6 +52,7 @@ __FBSDID("$FreeBSD$");
  #include <sys/socket.h>
  #include <sys/stat.h>
-@@ -533,8 +533,7 @@ static void	hup(int sig);
+ #include <sys/time.h>
++#include <sys/ttycom.h>
+ #include <sys/un.h>
+ 
+ #include <ctype.h>
+@@ -70,6 +70,7 @@ __FBSDID("$FreeBSD$");
+ #include <string.h>
+ #include <syslog.h>
+ #include <termios.h>
++#include <time.h>
+ #include <unistd.h>
+ #include <math.h>
+ 
+@@ -532,8 +533,7 @@ static void	hup(int sig);
  static void	cleanup(int sig);
  static void	pause_mouse(int sig);
  static void	usage(void);
@@ -26,3 +39,41 @@
  
  static int	r_identify(void);
  static const char *r_if(int type);
+@@ -1355,13 +1355,13 @@ moused(void)
+ }
+ 
+ static void
+-hup(__unused int sig)
++hup(int sig)
+ {
+     longjmp(env, 1);
+ }
+ 
+ static void
+-cleanup(__unused int sig)
++cleanup(int sig)
+ {
+     if (rodent.rtype == MOUSE_PROTO_X10MOUSEREM)
+ 	unlink(_PATH_MOUSEREMOTE);
+@@ -1369,7 +1369,7 @@ cleanup(__unused int sig)
+ }
+ 
+ static void
+-pause_mouse(__unused int sig)
++pause_mouse(int sig)
+ {
+     paused = !paused;
+ }
+--- a/usr.sbin/moused/Makefile
++++ b/usr.sbin/moused/Makefile
+@@ -5,8 +5,8 @@ MAN=	moused.8
+ 
+ WARNS?=6
+ 
+-DPADD=	${LIBUTIL}  ${LIBM}
+-LDADD=	-lutil -lm
++DPADD=	${LIBRT}  ${LIBM}
++LDADD=	-lrt -lm
+ 
+ #BINMODE=4555
+ #PRECIOUSPROG=

Modified: trunk/freebsd-moused/debian/patches/libbsd.patch
===================================================================
--- trunk/freebsd-moused/debian/patches/libbsd.patch	2011-05-31 03:39:11 UTC (rev 3381)
+++ trunk/freebsd-moused/debian/patches/libbsd.patch	2011-05-31 03:53:55 UTC (rev 3382)
@@ -1,25 +1,26 @@
 ---
- usr.sbin/moused/Makefile |    1 +
+ usr.sbin/moused/Makefile |    2 +-
  usr.sbin/moused/moused.c |    1 +
- 2 files changed, 2 insertions(+)
+ 2 files changed, 2 insertions(+), 1 deletion(-)
 
 --- a/usr.sbin/moused/Makefile
 +++ b/usr.sbin/moused/Makefile
-@@ -2,6 +2,7 @@
+@@ -6,7 +6,7 @@ MAN=	moused.8
+ WARNS?=6
  
- PROG=	moused
- MAN=	moused.8
-+LDADD=	-lbsd
+ DPADD=	${LIBRT}  ${LIBM}
+-LDADD=	-lrt -lm
++LDADD=	-lrt -lm -lbsd
  
- WARNS?=6
- 
+ #BINMODE=4555
+ #PRECIOUSPROG=
 --- a/usr.sbin/moused/moused.c
 +++ b/usr.sbin/moused/moused.c
-@@ -68,6 +68,7 @@ __FBSDID("$FreeBSD$");
+@@ -68,6 +68,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
 +#include <bsd/string.h>
  #include <syslog.h>
  #include <termios.h>
- #include <unistd.h>
+ #include <time.h>

Modified: trunk/freebsd-moused/debian/patches/retry.patch
===================================================================
--- trunk/freebsd-moused/debian/patches/retry.patch	2011-05-31 03:39:11 UTC (rev 3381)
+++ trunk/freebsd-moused/debian/patches/retry.patch	2011-05-31 03:53:55 UTC (rev 3382)
@@ -9,7 +9,7 @@
 
 --- a/usr.sbin/moused/moused.c
 +++ b/usr.sbin/moused/moused.c
-@@ -878,9 +878,9 @@ main(int argc, char *argv[])
+@@ -879,9 +879,9 @@ main(int argc, char *argv[])
  	usage();
      }
  
@@ -21,7 +21,7 @@
  	    retry = 5;
      }
  
-@@ -891,7 +891,7 @@ main(int argc, char *argv[])
+@@ -892,7 +892,7 @@ main(int argc, char *argv[])
  	    signal(SIGQUIT, cleanup);
  	    signal(SIGTERM, cleanup);
  	    signal(SIGUSR1, pause_mouse);

Modified: trunk/freebsd-moused/debian/patches/series
===================================================================
--- trunk/freebsd-moused/debian/patches/series	2011-05-31 03:39:11 UTC (rev 3381)
+++ trunk/freebsd-moused/debian/patches/series	2011-05-31 03:53:55 UTC (rev 3382)
@@ -1,3 +1,4 @@
 glibc.patch
 libbsd.patch
 retry.patch
+inline-kld_funcs.patch