rtyler
/
pkgsrc-wip
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

enlightenment-current: rebuild with efl-1.25.0 

Add CONFLICTS, with x11/enlightenment and wm/enlightenment16
Fix hardcoded pkgsrc prefix in patches
This commit is contained in:
kikadf 2020-10-04 17:48:15 +02:00
parent 367dd03c56
commit e0c88731ed
5 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
enlightenment-current/Makefile
View File

@ -1,7 +1,9 @@
# $NetBSD: Makefile,v 0.2 2018/09/06 16:15:10 andyb Exp $
DISTNAME= enlightenment-0.24.2
PKGNAME= ${DISTNAME:S/enlightenment/enlightenment-current/}
CATEGORIES= wm
PKGREVISION= 1
MASTER_SITES= https://download.enlightenment.org/rel/apps/enlightenment/
EXTRACT_SUFX= .tar.xz
@ -10,6 +12,8 @@ HOMEPAGE= https://www.enlightenment.org/
COMMENT= The Enlightenment window manager
LICENSE= 2-clause-bsd
CONFLICTS= enlightenment-[0-9]*
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config
@ -36,6 +40,14 @@ MESON_ARGS+= -Dcpufreq=false
MESON_ARGS+= -Dsysinfo=false
MESON_ARGS+= -Dtemperature=false
SUBST_CLASSES+= prefix
SUBST_MESSAGE.prefix= Fix prefix
SUBST_STAGE.prefix= pre-configure
SUBST_FILES.prefix= src/bin/e_sys_main.c
SUBST_FILES.prefix+= src/bin/system/e_system_main.c
SUBST_FILES.prefix+= src/modules/conf_menus/e_int_config_menus.c
SUBST_VARS.prefix= PREFIX
.include "../../mk/bsd.prefs.mk"
.if ${X11_TYPE} == "modular"
@ -46,6 +58,6 @@ CPPFLAGS+= -DPKGSRC_X11BASE=\"${X11BASE:Q}\"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../sysutils/upower/buildlink3.mk"
.include "../../wip/efl-current/buildlink3.mk"
.include "../../wip/efl/buildlink3.mk"
.include "../../x11/xcb-util-keysyms/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

6
enlightenment-current/distinfo
View File

@ -5,14 +5,14 @@ RMD160 (enlightenment-0.24.2.tar.xz) = 3a5071ea54bcbffd67da9d416e4d1778457574ef
SHA512 (enlightenment-0.24.2.tar.xz) = 5d96b17d89e822271048a0a6a8356658fd02680f54da2f15dde7c632752bbf0a396eaf23986164402e61f631e68937b3ba7c29d9dd787ddd470cff4a390abace
Size (enlightenment-0.24.2.tar.xz) = 28716060 bytes
SHA1 (patch-data_etc_meson.build) = 164a5ebd5b046381f46226d05d0cb17fcd7edbd7
SHA1 (patch-src_bin_e__sys__main.c) = 06bad9a96c4acfdd9053ce7946c12d0350c357e5
SHA1 (patch-src_bin_system_e__system__main.c) = c960ae07353ba875f870d4612c62fdf0b5e78493
SHA1 (patch-src_bin_e__sys__main.c) = fd525e5ea548cc5276e7624ba1be1df36cb4451b
SHA1 (patch-src_bin_system_e__system__main.c) = 9777e50cc4114100b8068112d067d69753c786a4
SHA1 (patch-src_bin_system_e__system__power.c) = 93ba369fa12421cb1022a90e510a1044056724c3
SHA1 (patch-src_modules_battery_e__mod__main.c) = 40383429a6e9e7c1cee7daba36dca895b8397a16
SHA1 (patch-src_modules_battery_e__mod__main.h) = f5768702af131931b972e82bcc15c9946b9787ba
SHA1 (patch-src_modules_battery_e__mod__sysctl.c) = 4b1548a168212b0734e29a9e173e9faa016c20e9
SHA1 (patch-src_modules_battery_e__mod__upower.c) = 27d8a02084f7cf016ec46b524c8b697e880c7ddc
SHA1 (patch-src_modules_conf__menus_e__int__config__menus.c) = f1cfa659299c0dda17995ab070e0fc7334e4e64d
SHA1 (patch-src_modules_conf__menus_e__int__config__menus.c) = fbc29cfa5e6b809e74c3fe011e21b3b9ac8719cf
SHA1 (patch-src_modules_wizard_page__011.c) = a588344a09fef8abc007743518b39d76c415e549
SHA1 (patch-src_modules_wizard_page__120.c) = 6a3b89f1a60da6f67cc65acc6d3dd1e9ef29f882
SHA1 (patch-src_modules_xkbswitch_e__mod__parse.c) = 64f8ab82dc37340f7a5572438c88f4ac3a257b22

2
enlightenment-current/patches/patch-src_bin_e__sys__main.c
View File

@ -9,7 +9,7 @@ $NetBSD$
int deny = 0;
+#if defined (__NetBSD__)
+ snprintf(file, sizeof(file), "/usr/pkg/etc/enlightenment/sysactions.conf");
+ snprintf(file, sizeof(file), "@PREFIX@/etc/enlightenment/sysactions.conf");
+#else
snprintf(file, sizeof(file), "/etc/enlightenment/sysactions.conf");
+#endif

2
enlightenment-current/patches/patch-src_bin_system_e__system__main.c
View File

@ -9,7 +9,7 @@ $NetBSD$
char type[32], usergroup[256], cmd[32], glob[256], buf[1024];
Eina_Bool in_usergroup;
+#if defined (__NetBSD__)
+ FILE *f = fopen("/usr/pkg/etc/enlightenment/system.conf", "r");
+ FILE *f = fopen("@PREFIX@/etc/enlightenment/system.conf", "r");
+#else
FILE *f = fopen("/etc/enlightenment/system.conf", "r");
+#endif

2
enlightenment-current/patches/patch-src_modules_conf__menus_e__int__config__menus.c
View File

@ -8,7 +8,7 @@ $NetBSD$
"/etc/xdg",
"/usr/etc/xdg",
"/usr/local/etc/xdg",
+ "/usr/pkg/etc/xdg",
+ "@PREFIX@/etc/xdg",
"/usr/opt/etc/xdg",
"/usr/opt/xdg",
"/usr/local/opt/etc/xdg",