Mon Dec 24 21:16:40 2012 UTC ()
Fix void usage. Follow one patch per file rule.


(joerg)
diff -r1.4 -r1.5 pkgsrc/x11/xmove/distinfo
diff -r0 -r1.1 pkgsrc/x11/xmove/patches/patch-Imakefile
diff -r0 -r1.1 pkgsrc/x11/xmove/patches/patch-xmovectrl_xmovectrl.c
diff -r1.3 -r1.4 pkgsrc/x11/xmove/patches/patch-aa

cvs diff -r1.4 -r1.5 pkgsrc/x11/xmove/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/xmove/distinfo 2005/07/20 16:03:24 1.4
+++ pkgsrc/x11/xmove/distinfo 2012/12/24 21:16:40 1.5
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: distinfo,v 1.4 2005/07/20 16:03:24 kristerw Exp $ 1$NetBSD: distinfo,v 1.5 2012/12/24 21:16:40 joerg Exp $
2 2
3SHA1 (xmove.2.0beta2.tar.gz) = a34292d88c72db2e1839fe27ddd18456ef069429 3SHA1 (xmove.2.0beta2.tar.gz) = a34292d88c72db2e1839fe27ddd18456ef069429
4RMD160 (xmove.2.0beta2.tar.gz) = 9ae8a107c50ff971f15aa2027da9e581ba7f06b8 4RMD160 (xmove.2.0beta2.tar.gz) = 9ae8a107c50ff971f15aa2027da9e581ba7f06b8
5Size (xmove.2.0beta2.tar.gz) = 639187 bytes 5Size (xmove.2.0beta2.tar.gz) = 639187 bytes
6SHA1 (patch-aa) = 2fbfc09858f5e56fa2660bd265591672c5771d59 6SHA1 (patch-Imakefile) = f71d9f465e5613d41a8fbd4d693473c54f4a50ee
 7SHA1 (patch-aa) = 19ab7f53c89486a716bfcdffde9f62f86f2fe10e
7SHA1 (patch-ab) = 5686c72036483df2681fa8ab34f37b0837c27702 8SHA1 (patch-ab) = 5686c72036483df2681fa8ab34f37b0837c27702
8SHA1 (patch-ac) = 61b893d8a66d6fdda3f702ec40f5550008e2c1fc 9SHA1 (patch-ac) = 61b893d8a66d6fdda3f702ec40f5550008e2c1fc
9SHA1 (patch-ad) = 322eeadb73b7a83699525d8946e1ebc72d85f60e 10SHA1 (patch-ad) = 322eeadb73b7a83699525d8946e1ebc72d85f60e
10SHA1 (patch-ae) = 64a994ade7e94c57e69b37c8e7eab1be4d0973d0 11SHA1 (patch-ae) = 64a994ade7e94c57e69b37c8e7eab1be4d0973d0
11SHA1 (patch-af) = 5a3f23106b0dc43df2b5c9e44f58e4c5c7752375 12SHA1 (patch-af) = 5a3f23106b0dc43df2b5c9e44f58e4c5c7752375
12SHA1 (patch-ag) = 21804f2e2ff83e2eb6a5f22572ac4eee68468374 13SHA1 (patch-ag) = 21804f2e2ff83e2eb6a5f22572ac4eee68468374
13SHA1 (patch-ah) = eb696d37af7c5e63600dc143fed8f7343d3e6f81 14SHA1 (patch-ah) = eb696d37af7c5e63600dc143fed8f7343d3e6f81
14SHA1 (patch-ai) = 8be5a5942b8bfe5a1aa44ad5a11b720821b02921 15SHA1 (patch-ai) = 8be5a5942b8bfe5a1aa44ad5a11b720821b02921
 16SHA1 (patch-xmovectrl_xmovectrl.c) = 2333017acc191cbd609c2a67560a7000cfc61f59

File Added: pkgsrc/x11/xmove/patches/patch-Imakefile
$NetBSD: patch-Imakefile,v 1.1 2012/12/24 21:16:40 joerg Exp $

--- /dev/null	2012-12-23 00:41:02.000000000 +0000
+++ Imakefile
@@ -0,0 +1,8 @@
+#define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
+
+MakefileSubdirs(xmove xmovectrl)
+MakeSubdirs(xmove xmovectrl)
+DependSubdirs(xmove xmovectrl)
+ForceSubdirs(xmove xmovectrl)
+InstallSubdirs(xmove xmovectrl)
+InstallManSubdirs(xmove xmovectrl)

File Added: pkgsrc/x11/xmove/patches/patch-xmovectrl_xmovectrl.c
$NetBSD: patch-xmovectrl_xmovectrl.c,v 1.1 2012/12/24 21:16:40 joerg Exp $

--- xmovectrl/xmovectrl.c.orig	2012-12-23 00:43:42.000000000 +0000
+++ xmovectrl/xmovectrl.c
@@ -15,6 +15,7 @@
  *   limitation a license to do the foregoing actions under any patents of
  *   the party supplying this software to the X Consortium.
  */
+#include <unistd.h>
 #include <stdio.h>
 #include <sys/types.h>         /* needed by sys/socket.h and netinet/in.h */
 #include <sys/socket.h>        /* for AF_INET, SOCK_STREAM, ... */
@@ -33,6 +34,8 @@ Bool littleEndian;
 int auth_namelen, auth_datalen;
 char *auth_name, *auth_data;
 
+void DoServerSetup(int server_fd);
+
 main(int argc, char **argv, char **envp)
 {
      char **cur_argv = argv + 1;
@@ -142,7 +145,7 @@ ConnectToServer()
     return(ServerFD);
 }     
 
-
+void
 DoServerSetup(int server_fd)
 {
      unsigned char iobuf[512];

cvs diff -r1.3 -r1.4 pkgsrc/x11/xmove/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/x11/xmove/patches/patch-aa 2005/07/20 16:03:24 1.3
+++ pkgsrc/x11/xmove/patches/patch-aa 2012/12/24 21:16:40 1.4
@@ -1,42 +1,31 @@ @@ -1,42 +1,31 @@
1$NetBSD: patch-aa,v 1.3 2005/07/20 16:03:24 kristerw Exp $ 1$NetBSD: patch-aa,v 1.4 2012/12/24 21:16:40 joerg Exp $
2 2
3--- xmove/Imakefile 1998/03/10 22:54:16 1.1 3--- xmove/Imakefile.orig 1997-05-24 04:22:14.000000000 +0000
4+++ xmove/Imakefile 1998/03/10 23:01:21 4+++ xmove/Imakefile
5@@ -18,7 +18,7 @@ 5@@ -18,7 +18,7 @@
6 # compile it and if you have compiler complaints about the function 6 # compile it and if you have compiler complaints about the function
7 # dlopen() (among many other things) then change the line to NO. 7 # dlopen() (among many other things) then change the line to NO.
8  8
9-#define XMOVE_USE_DLLIBS NO 9-#define XMOVE_USE_DLLIBS NO
10+#define XMOVE_USE_DLLIBS YES 10+#define XMOVE_USE_DLLIBS YES
11  11
12  12
13 # Use ATOM_MAPPING_LIBRARY_PATH if XMOVE_USE_DLLIBS is set to YES. 13 # Use ATOM_MAPPING_LIBRARY_PATH if XMOVE_USE_DLLIBS is set to YES.
14@@ -28,7 +28,7 @@ 14@@ -28,7 +28,7 @@
15 # need a separate subdirectory just for xmove's libraries. This variable 15 # need a separate subdirectory just for xmove's libraries. This variable
16 # should be set to the directory where those libraries will be placed. 16 # should be set to the directory where those libraries will be placed.
17  17
18-ATOM_MAPPING_LIBRARY_PATH=\"/home/ethan/release/xmove/lib\" 18-ATOM_MAPPING_LIBRARY_PATH=\"/home/ethan/release/xmove/lib\"
19+ATOM_MAPPING_LIBRARY_PATH=\"@x11base@/lib\" 19+ATOM_MAPPING_LIBRARY_PATH=\"/usr/pkg/lib\"
20  20
21  21
22 ## Standard parameters 22 ## Standard parameters
23@@ -36,7 +36,7 @@ 23@@ -36,7 +36,7 @@ ATOM_MAPPING_LIBRARY_PATH=\"/home/ethan/
24 #if XMOVE_USE_DLLIBS 24 #if XMOVE_USE_DLLIBS
25 DLLIBSRC = 25 DLLIBSRC =
26 DLLIBOBJ = 26 DLLIBOBJ =
27-DLLIB = -ldl 27-DLLIB = -ldl
28+DLLIB =  28+DLLIB =
29 DLDEFINE = -DDL_WOUT_PRAGMA 29 DLDEFINE = -DDL_WOUT_PRAGMA
30 #else 30 #else
31 DLLIBSRC = libatommap.c 31 DLLIBSRC = libatommap.c
32--- /dev/null Wed Mar 11 00:03:54 1998 
33+++ Imakefile Wed Mar 11 00:58:37 1998 
34@@ -0,0 +1,8 @@ 
35+#define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' 
36+ 
37+MakefileSubdirs(xmove xmovectrl) 
38+MakeSubdirs(xmove xmovectrl) 
39+DependSubdirs(xmove xmovectrl) 
40+ForceSubdirs(xmove xmovectrl) 
41+InstallSubdirs(xmove xmovectrl) 
42+InstallManSubdirs(xmove xmovectrl)