diff options
author | obache <obache@pkgsrc.org> | 2013-09-02 11:08:16 +0000 |
---|---|---|
committer | obache <obache@pkgsrc.org> | 2013-09-02 11:08:16 +0000 |
commit | e8d004784b9aece798f093c8f8959565a348494d (patch) | |
tree | 9f9375009c6ce0492160e251576f31c3cdecc83c | |
parent | 53fae387b37ae0eb8e7c0a68bc0ec415d0a0a53a (diff) | |
download | pkgsrc-e8d004784b9aece798f093c8f8959565a348494d.tar.gz |
fixes PR pkg/47946
* fixes build on DragonFly, treat same as other BSDs
* tell location of xkb rule for the case using x11 from pkgsrc.
Bump PKGREVISION for 2nd fix.
-rw-r--r-- | x11/enlightenment/Makefile | 8 | ||||
-rw-r--r-- | x11/enlightenment/distinfo | 5 | ||||
-rw-r--r-- | x11/enlightenment/patches/patch-src_bin_e__start__main.c | 30 | ||||
-rw-r--r-- | x11/enlightenment/patches/patch-src_modules_wizard_page__011.c | 16 | ||||
-rw-r--r-- | x11/enlightenment/patches/patch-src_modules_xkbswitch_e__mod__parse.c | 16 |
5 files changed, 72 insertions, 3 deletions
diff --git a/x11/enlightenment/Makefile b/x11/enlightenment/Makefile index da745a92f2e..638b5619d68 100644 --- a/x11/enlightenment/Makefile +++ b/x11/enlightenment/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.31 2013/07/05 13:29:44 ryoon Exp $ +# $NetBSD: Makefile,v 1.32 2013/09/02 11:08:16 obache Exp $ # DISTNAME= enlightenment-0.17.3 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= x11 MASTER_SITES= http://download.enlightenment.org/releases/ EXTRACT_SUFX= .tar.bz2 @@ -44,6 +44,10 @@ SUBST_FILES.solhost= configure SUBST_SED.solhost= -e '/^MODULE_ARCH=/s/.host_os/solaris/' .endif +.if ${X11_TYPE} == "modular" +CPPFLAGS+= -DPKGSRC_X11BASE=\"${X11BASE:Q}\" +.endif + pre-install: ${INSTALL_DATA} ${WRKSRC}/data/etc/enlightenment.menu ${DESTDIR}${EGDIR} ${INSTALL_DATA} ${WRKSRC}/data/etc/sysactions.conf ${DESTDIR}${EGDIR} diff --git a/x11/enlightenment/distinfo b/x11/enlightenment/distinfo index c906fe8ecfc..845d8efbcc7 100644 --- a/x11/enlightenment/distinfo +++ b/x11/enlightenment/distinfo @@ -1,6 +1,9 @@ -$NetBSD: distinfo,v 1.2 2013/06/19 15:07:40 jperkin Exp $ +$NetBSD: distinfo,v 1.3 2013/09/02 11:08:16 obache Exp $ 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) = f413dff4c0d1b61385767ed630001d1b013662a5 +SHA1 (patch-src_modules_wizard_page__011.c) = f2345a188ea819212b74e620439b1371afc34e99 +SHA1 (patch-src_modules_xkbswitch_e__mod__parse.c) = 049a532825311db1007d55169adc5d5e727b7067 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 00000000000..70eeb899c3f --- /dev/null +++ b/x11/enlightenment/patches/patch-src_bin_e__start__main.c @@ -0,0 +1,30 @@ +$NetBSD: patch-src_bin_e__start__main.c,v 1.1 2013/09/02 11:08:16 obache Exp $ + +* treat DragonFly same as other BSDs + +--- 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 00000000000..c22bb13be67 --- /dev/null +++ b/x11/enlightenment/patches/patch-src_modules_wizard_page__011.c @@ -0,0 +1,16 @@ +$NetBSD: patch-src_modules_wizard_page__011.c,v 1.1 2013/09/02 11:08:16 obache Exp $ + +* teach location from pkgsrc. + +--- src/modules/wizard/page_011.c.orig 2013-04-04 19:44:46.000000000 +0000 ++++ src/modules/wizard/page_011.c +@@ -18,6 +18,9 @@ find_rules(void) + { + int i = 0; + const char *lstfiles[] = { ++#if defined PKGSRC_X11BASE ++ PKGSRC_X11BASE "/share/X11/xkb/rules/base.lst", ++#endif + #if defined __NetBSD__ + "/usr/X11R7/lib/X11/xkb/rules/xorg.lst", + #elif defined __OpenBSD__ 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 00000000000..8ebb412bc82 --- /dev/null +++ b/x11/enlightenment/patches/patch-src_modules_xkbswitch_e__mod__parse.c @@ -0,0 +1,16 @@ +$NetBSD: patch-src_modules_xkbswitch_e__mod__parse.c,v 1.1 2013/09/02 11:08:16 obache Exp $ + +* teach location from pkgsrc + +--- src/modules/xkbswitch/e_mod_parse.c.orig 2013-04-04 19:44:46.000000000 +0000 ++++ src/modules/xkbswitch/e_mod_parse.c +@@ -14,6 +14,9 @@ find_rules(void) + { + int i = 0; + const char *lstfiles[] = { ++#if defined PKGSRC_X11BASE ++ PKGSRC_X11BASE "/share/X11/xkb/rules/base.lst", ++#endif + #if defined __NetBSD__ + "/usr/X11R7/lib/X11/xkb/rules/xorg.lst", + #elif defined __OpenBSD__ |