diff options
author | dholland <dholland@pkgsrc.org> | 2014-09-12 05:22:09 +0000 |
---|---|---|
committer | dholland <dholland@pkgsrc.org> | 2014-09-12 05:22:09 +0000 |
commit | 6f9f75876beb937545ce91e4ea628b83d76d04f3 (patch) | |
tree | 8e8c2f3ce8b6d83d291931656efdf65866329cb2 | |
parent | 23349e82bf9579cd0fc2173d1d0a221e3a6713a6 (diff) | |
download | pkgsrc-6f9f75876beb937545ce91e4ea628b83d76d04f3.tar.gz |
Rev the distfile patch:
- remove references to <malloc.h>, which failed the build in MacOS
- silence a bunch more compiler warnings
- don't use index()
- roll in the two current pkgsrc patches
- some tidyup
PKGREVISION -> 7
-rw-r--r-- | x11/xmx/Makefile | 6 | ||||
-rw-r--r-- | x11/xmx/distinfo | 10 | ||||
-rw-r--r-- | x11/xmx/patches/patch-clients_xmtg_ui.c | 42 | ||||
-rw-r--r-- | x11/xmx/patches/patch-clients_xmxinit_xmxinit.c | 14 |
4 files changed, 7 insertions, 65 deletions
diff --git a/x11/xmx/Makefile b/x11/xmx/Makefile index d371ef96c28..040e45793e7 100644 --- a/x11/xmx/Makefile +++ b/x11/xmx/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.17 2012/10/29 05:07:16 asau Exp $ +# $NetBSD: Makefile,v 1.18 2014/09/12 05:22:09 dholland Exp $ DISTNAME= xmx-2.1alpha.pl7 PKGNAME= xmx-2.1a7 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= x11 MASTER_SITES= ftp://ftp.cs.brown.edu/pub/xmx/ -PATCHFILES= xmx-jumbo-patch-20120416.gz +PATCHFILES= xmx-jumbo-patch-20140912.gz PATCH_SITES= http://www.NetBSD.org/~dholland/patchkits/xmx/ PATCH_DIST_STRIP= -p1 diff --git a/x11/xmx/distinfo b/x11/xmx/distinfo index 90aaac02222..8ad85c0651e 100644 --- a/x11/xmx/distinfo +++ b/x11/xmx/distinfo @@ -1,10 +1,8 @@ -$NetBSD: distinfo,v 1.10 2013/02/26 10:18:42 joerg Exp $ +$NetBSD: distinfo,v 1.11 2014/09/12 05:22:09 dholland Exp $ SHA1 (xmx-2.1alpha.pl7.tar.gz) = b517b20a7bfa352b12ffb7dd260d50ea6c1ec21b RMD160 (xmx-2.1alpha.pl7.tar.gz) = 18560824a35ffc55ce90fa63d1894362afa45405 Size (xmx-2.1alpha.pl7.tar.gz) = 498352 bytes -SHA1 (xmx-jumbo-patch-20120416.gz) = 835a3a23e2b859aad26d0b2a7d8c3137dd063c5c -RMD160 (xmx-jumbo-patch-20120416.gz) = 9dcfd6b971f692512e066800f137946e38370596 -Size (xmx-jumbo-patch-20120416.gz) = 14223 bytes -SHA1 (patch-clients_xmtg_ui.c) = 6ff5036be15e098f2733d23abccaea2b11a8dd3b -SHA1 (patch-clients_xmxinit_xmxinit.c) = 010d08b5792888fd1853736529d830585ae8901e +SHA1 (xmx-jumbo-patch-20140912.gz) = 699468dc94002a4dd03275ec4d9cf5c76a69bd58 +RMD160 (xmx-jumbo-patch-20140912.gz) = c7a6a1cc2b408a2bd6e90b903bf80e8417751836 +Size (xmx-jumbo-patch-20140912.gz) = 16477 bytes diff --git a/x11/xmx/patches/patch-clients_xmtg_ui.c b/x11/xmx/patches/patch-clients_xmtg_ui.c deleted file mode 100644 index 32857178bdf..00000000000 --- a/x11/xmx/patches/patch-clients_xmtg_ui.c +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-clients_xmtg_ui.c,v 1.1 2013/02/26 10:18:42 joerg Exp $ - ---- clients/xmtg/ui.c.orig 2013-02-25 14:14:41.000000000 +0000 -+++ clients/xmtg/ui.c -@@ -51,6 +51,12 @@ typedef long intptr_t; /* best guess... - #include "ui.h" - #include "callbacks.h" - -+void -+ui_create_drop_dialog(dialog_t *dp, Widget parent, char *prompt); -+ -+void -+ui_create_add_dialog(dialog_t *dp, Widget parent, char *prompt, int floor, int seat, int view); -+ - dialog_t *open_d; - dialog_t *save_d; - dialog_t *add_d; -@@ -207,11 +213,7 @@ printf("BLORT!\n"); - } - - void --ui_create_add_dialog(dp, parent, prompt, floor, seat, view) -- dialog_t *dp; -- Widget parent; -- char *prompt; -- int floor, seat, view; -+ui_create_add_dialog(dialog_t *dp, Widget parent, char *prompt, int floor, int seat, int view) - { - Widget w, input, radio; - add_d_t *adp; -@@ -267,10 +269,7 @@ XtAddCallback(dp->enable, XtNcallback, b - } - - void --ui_create_drop_dialog(dp, parent, prompt) -- dialog_t *dp; -- Widget parent; -- char *prompt; -+ui_create_drop_dialog(dialog_t *dp, Widget parent, char *prompt) - { - Widget w; - diff --git a/x11/xmx/patches/patch-clients_xmxinit_xmxinit.c b/x11/xmx/patches/patch-clients_xmxinit_xmxinit.c deleted file mode 100644 index d713e5b1dc0..00000000000 --- a/x11/xmx/patches/patch-clients_xmxinit_xmxinit.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-clients_xmxinit_xmxinit.c,v 1.1 2013/02/26 10:18:42 joerg Exp $ - ---- clients/xmxinit/xmxinit.c.orig 2013-02-25 14:22:16.000000000 +0000 -+++ clients/xmxinit/xmxinit.c -@@ -146,8 +146,7 @@ sigUsr1(sig) - #endif - } - --static Execute (vec) -- char **vec; /* has room from up above */ -+static void Execute (char **vec) - { - execvp (vec[0], vec); - if (access (vec[0], R_OK) == 0) { |