pkg/47946: x11/enlightenment patches for DragonFly 3.5 x86_64

[davshao%gmail.com@localhost]

>Number:         47946
>Category:       pkg
>Synopsis:       x11/enlightenment patches for DragonFly 3.5 x86_64
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu Jun 20 22:50:00 +0000 2013
>Originator:     David Shao
>Release:        DragonFly 3.5-DEVELOPMENT x86_64
>Organization:
>Environment:
DragonFly 3.5-DEVELOPMENT x86_64
>Description:
The included patches address three issues with running enlightenment from 
current pkgsrc on DragonFly 3.5-DEVELOPMENT x86_64:

1) ptrace usage needs to be commented out similar to that used for the other 
BSDs in one file.  (DragonFly issue only, prevents build.)

2) In the Makefile, bumping the pkgversion apparently is not accounted for in 
PLIST substitution variable MODULE_ARCH which causes many entries in the PLIST 
to not be found.  (Might apply to everyone, prevents build)

3) There are two files that apparently want the path to xkb rules.  The patch 
adds the pkg path.  (Might apply to all platforms not using native xorg, effect 
of omission not tested.)
>How-To-Repeat:

>Fix:
diff --git a/x11/enlightenment/Makefile b/x11/enlightenment/Makefile
index 41f0fa0..47e2aad 100644
--- a/x11/enlightenment/Makefile
+++ b/x11/enlightenment/Makefile
@@ -2,7 +2,7 @@
 #
 
 DISTNAME=      enlightenment-0.17.3
-PKGREVISION=   1
+#PKGREVISION=  1
 CATEGORIES=    x11
 MASTER_SITES=  http://download.enlightenment.org/releases/
 EXTRACT_SUFX=  .tar.bz2
diff --git a/x11/enlightenment/distinfo b/x11/enlightenment/distinfo
index f06ec3e..f7cbacb 100644
--- a/x11/enlightenment/distinfo
+++ b/x11/enlightenment/distinfo
@@ -4,3 +4,6 @@ SHA1 (enlightenment-0.17.3.tar.bz2) = 
a0bda02d3dcd0105ffbb33de6411bbc910ba4585
 RMD160 (enlightenment-0.17.3.tar.bz2) = 
a0997f99a8fb0857cadc9b1f99b6e3217461b5dd
 Size (enlightenment-0.17.3.tar.bz2) = 29332256 bytes
 SHA1 (patch-data_etc_Makefile.in) = 3772b93a19bf3f8bd33a5493504fb0fc5b007eab
+SHA1 (patch-src_bin_e__start__main.c) = 
7a85a035e99938c947bed536db91ba5122d0e71e
+SHA1 (patch-src_modules_wizard_page__011.c) = 
2d2e7a6b7912523d88828042d4215c4151d56557
+SHA1 (patch-src_modules_xkbswitch_e__mod__parse.c) = 
cda0b08a98ed0d71a6b491d192a5681173aa0a20
diff --git a/x11/enlightenment/patches/patch-src_bin_e__start__main.c 
b/x11/enlightenment/patches/patch-src_bin_e__start__main.c
new file mode 100644
index 0000000..3995ea7
--- /dev/null
+++ b/x11/enlightenment/patches/patch-src_bin_e__start__main.c
@@ -0,0 +1,28 @@
+$NetBSD$
+
+--- src/bin/e_start_main.c.orig        2013-04-04 19:44:46.000000000 +0000
++++ src/bin/e_start_main.c
+@@ -245,6 +245,7 @@ main(int argc, char **argv)
+    Eina_Bool really_know = EINA_FALSE;
+    struct sigaction action;
+ #if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__) && 
\
++   !defined(__DragonFly__) && \
+    !(defined (__MACH__) && defined (__APPLE__))
+    Eina_Bool restart = EINA_TRUE;
+ #endif
+@@ -408,6 +409,7 @@ main(int argc, char **argv)
+      really_know = EINA_TRUE;
+ 
+ #if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || \
++   defined(__DragonFly__) || \
+    (defined (__MACH__) && defined (__APPLE__))
+    execv(args[0], args);
+ #endif
+@@ -415,6 +417,7 @@ main(int argc, char **argv)
+    /* not run at the moment !! */
+ 
+ #if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__) && 
\
++   !defined(__DragonFly__) && \
+    !(defined (__MACH__) && defined (__APPLE__))
+    /* Now looping until */
+    while (restart)
diff --git a/x11/enlightenment/patches/patch-src_modules_wizard_page__011.c 
b/x11/enlightenment/patches/patch-src_modules_wizard_page__011.c
new file mode 100644
index 0000000..9b343d4
--- /dev/null
+++ b/x11/enlightenment/patches/patch-src_modules_wizard_page__011.c
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/modules/wizard/page_011.c.orig 2013-06-20 06:51:49.490470000 +0000
++++ src/modules/wizard/page_011.c
+@@ -23,6 +23,7 @@ find_rules(void)
+ #elif defined __OpenBSD__
+       "/usr/X11R6/share/X11/xkb/rules/base.lst",
+ #endif
++      "/usr/pkg/share/X11/xkb/rules/base.lst",
+       "/usr/share/X11/xkb/rules/xorg.lst",
+       "/usr/share/X11/xkb/rules/xfree86.lst",
+       "/usr/local/share/X11/xkb/rules/xorg.lst",
diff --git 
a/x11/enlightenment/patches/patch-src_modules_xkbswitch_e__mod__parse.c 
b/x11/enlightenment/patches/patch-src_modules_xkbswitch_e__mod__parse.c
new file mode 100644
index 0000000..0d8f9ee
--- /dev/null
+++ b/x11/enlightenment/patches/patch-src_modules_xkbswitch_e__mod__parse.c
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/modules/xkbswitch/e_mod_parse.c.orig   2013-06-20 06:46:03.757592000 
+0000
++++ src/modules/xkbswitch/e_mod_parse.c
+@@ -19,6 +19,7 @@ find_rules(void)
+ #elif defined __OpenBSD__
+       "/usr/X11R6/share/X11/xkb/rules/base.lst",
+ #endif
++      "/usr/pkg/share/X11/xkb/rules/base.lst",
+       "/usr/share/X11/xkb/rules/xorg.lst",
+       "/usr/share/X11/xkb/rules/xfree86.lst",
+       "/usr/local/share/X11/xkb/rules/xorg.lst",