From 953dab6d21249fb66a208f362c11c271f840026e Mon Sep 17 00:00:00 2001 From: joerg Date: Mon, 24 Dec 2012 21:16:40 +0000 Subject: Fix void usage. Follow one patch per file rule. --- x11/xmove/distinfo | 6 ++++-- x11/xmove/patches/patch-Imakefile | 13 ++++++++++++ x11/xmove/patches/patch-aa | 21 +++++-------------- x11/xmove/patches/patch-xmovectrl_xmovectrl.c | 30 +++++++++++++++++++++++++++ 4 files changed, 52 insertions(+), 18 deletions(-) create mode 100644 x11/xmove/patches/patch-Imakefile create mode 100644 x11/xmove/patches/patch-xmovectrl_xmovectrl.c diff --git a/x11/xmove/distinfo b/x11/xmove/distinfo index 0523e8c4caa..264d5624543 100644 --- a/x11/xmove/distinfo +++ b/x11/xmove/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.4 2005/07/20 16:03:24 kristerw Exp $ +$NetBSD: distinfo,v 1.5 2012/12/24 21:16:40 joerg Exp $ SHA1 (xmove.2.0beta2.tar.gz) = a34292d88c72db2e1839fe27ddd18456ef069429 RMD160 (xmove.2.0beta2.tar.gz) = 9ae8a107c50ff971f15aa2027da9e581ba7f06b8 Size (xmove.2.0beta2.tar.gz) = 639187 bytes -SHA1 (patch-aa) = 2fbfc09858f5e56fa2660bd265591672c5771d59 +SHA1 (patch-Imakefile) = f71d9f465e5613d41a8fbd4d693473c54f4a50ee +SHA1 (patch-aa) = 19ab7f53c89486a716bfcdffde9f62f86f2fe10e SHA1 (patch-ab) = 5686c72036483df2681fa8ab34f37b0837c27702 SHA1 (patch-ac) = 61b893d8a66d6fdda3f702ec40f5550008e2c1fc SHA1 (patch-ad) = 322eeadb73b7a83699525d8946e1ebc72d85f60e @@ -12,3 +13,4 @@ SHA1 (patch-af) = 5a3f23106b0dc43df2b5c9e44f58e4c5c7752375 SHA1 (patch-ag) = 21804f2e2ff83e2eb6a5f22572ac4eee68468374 SHA1 (patch-ah) = eb696d37af7c5e63600dc143fed8f7343d3e6f81 SHA1 (patch-ai) = 8be5a5942b8bfe5a1aa44ad5a11b720821b02921 +SHA1 (patch-xmovectrl_xmovectrl.c) = 2333017acc191cbd609c2a67560a7000cfc61f59 diff --git a/x11/xmove/patches/patch-Imakefile b/x11/xmove/patches/patch-Imakefile new file mode 100644 index 00000000000..3f60d03b030 --- /dev/null +++ b/x11/xmove/patches/patch-Imakefile @@ -0,0 +1,13 @@ +$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) diff --git a/x11/xmove/patches/patch-aa b/x11/xmove/patches/patch-aa index 0e74d8944f2..90420b6d7c3 100644 --- a/x11/xmove/patches/patch-aa +++ b/x11/xmove/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.3 2005/07/20 16:03:24 kristerw Exp $ +$NetBSD: patch-aa,v 1.4 2012/12/24 21:16:40 joerg Exp $ ---- xmove/Imakefile 1998/03/10 22:54:16 1.1 -+++ xmove/Imakefile 1998/03/10 23:01:21 +--- xmove/Imakefile.orig 1997-05-24 04:22:14.000000000 +0000 ++++ xmove/Imakefile @@ -18,7 +18,7 @@ # compile it and if you have compiler complaints about the function # dlopen() (among many other things) then change the line to NO. @@ -16,11 +16,11 @@ $NetBSD: patch-aa,v 1.3 2005/07/20 16:03:24 kristerw Exp $ # should be set to the directory where those libraries will be placed. -ATOM_MAPPING_LIBRARY_PATH=\"/home/ethan/release/xmove/lib\" -+ATOM_MAPPING_LIBRARY_PATH=\"@x11base@/lib\" ++ATOM_MAPPING_LIBRARY_PATH=\"/usr/pkg/lib\" ## Standard parameters -@@ -36,7 +36,7 @@ +@@ -36,7 +36,7 @@ ATOM_MAPPING_LIBRARY_PATH=\"/home/ethan/ #if XMOVE_USE_DLLIBS DLLIBSRC = DLLIBOBJ = @@ -29,14 +29,3 @@ $NetBSD: patch-aa,v 1.3 2005/07/20 16:03:24 kristerw Exp $ DLDEFINE = -DDL_WOUT_PRAGMA #else DLLIBSRC = libatommap.c ---- /dev/null Wed Mar 11 00:03:54 1998 -+++ Imakefile Wed Mar 11 00:58:37 1998 -@@ -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) diff --git a/x11/xmove/patches/patch-xmovectrl_xmovectrl.c b/x11/xmove/patches/patch-xmovectrl_xmovectrl.c new file mode 100644 index 00000000000..b2f0964e412 --- /dev/null +++ b/x11/xmove/patches/patch-xmovectrl_xmovectrl.c @@ -0,0 +1,30 @@ +$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 + #include + #include /* needed by sys/socket.h and netinet/in.h */ + #include /* 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]; -- cgit v1.2.3