pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

enlightenment-current: add linux as platform



Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Tue Nov 24 15:55:55 2020 +0100
Changeset:	7f685e4f588fc71d50e93c453b90e76c023f1db2

Modified Files:
	enlightenment-current/Makefile
	enlightenment-current/PLIST
	enlightenment-current/distinfo
	enlightenment-current/patches/patch-data_etc_meson.build
	enlightenment-current/patches/patch-src_bin_system_e__system__power.c
	enlightenment-current/patches/patch-src_modules_battery_e__mod__main.c
	enlightenment-current/patches/patch-src_modules_battery_e__mod__main.h
	enlightenment-current/patches/patch-src_modules_battery_e__mod__sysctl.c
	enlightenment-current/patches/patch-src_modules_battery_e__mod__upower.c
	enlightenment-current/patches/patch-src_modules_wizard_page__011.c
	enlightenment-current/patches/patch-src_modules_wizard_page__120.c
	enlightenment-current/patches/patch-src_modules_xkbswitch_e__mod__parse.c
Added Files:
	enlightenment-current/patches/patch-meson.build

Log Message:
enlightenment-current: add linux as platform

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7f685e4f588fc71d50e93c453b90e76c023f1db2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 enlightenment-current/Makefile                     |  30 +++-
 enlightenment-current/PLIST                        | 157 +++++++++++----------
 enlightenment-current/distinfo                     |  19 +--
 .../patches/patch-data_etc_meson.build             |   2 +-
 enlightenment-current/patches/patch-meson.build    |  16 +++
 .../patch-src_bin_system_e__system__power.c        |   2 +-
 .../patch-src_modules_battery_e__mod__main.c       |   2 +-
 .../patch-src_modules_battery_e__mod__main.h       |   2 +-
 .../patch-src_modules_battery_e__mod__sysctl.c     |   4 +-
 .../patch-src_modules_battery_e__mod__upower.c     |   2 +-
 .../patches/patch-src_modules_wizard_page__011.c   |   2 +-
 .../patches/patch-src_modules_wizard_page__120.c   |  27 +++-
 .../patch-src_modules_xkbswitch_e__mod__parse.c    |   2 +-
 13 files changed, 168 insertions(+), 99 deletions(-)

diffs:
diff --git a/enlightenment-current/Makefile b/enlightenment-current/Makefile
index b1d84fa86c..9567522ff7 100644
--- a/enlightenment-current/Makefile
+++ b/enlightenment-current/Makefile
@@ -32,12 +32,6 @@ INSTALLATION_DIRS=	${EGDIR}
 MAKE_DIRS=		${PKG_SYSCONFDIR}/enlightenment
 MAKE_DIRS+=		${PKG_SYSCONFBASE}/xdg/menus
 
-MESON_ARGS+=	-Dsystemd=false
-MESON_ARGS+=	-Ddevice-udev=false
-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
@@ -48,6 +42,28 @@ SUBST_VARS.prefix=	PREFIX
 
 .include "../../mk/bsd.prefs.mk"
 
+PLIST_VARS+=	cpufreq sysinfo temperature
+
+.if ${OPSYS} != "NetBSD"
+PLIST.cpufreq=		yes
+PLIST.sysinfo=		yes
+PLIST.temperature=	yes
+.endif
+
+.if ${OPSYS} == "Linux"
+PLIST_SUBST+=	PLATFORM="linux-gnu"
+.else
+PLIST_SUBST+=	PLATFORM=${LOWER_OPSYS}
+.endif
+
+.if ${OPSYS} == "NetBSD"
+MESON_ARGS+=		-Dcpufreq=false
+MESON_ARGS+=		-Dsysinfo=false
+MESON_ARGS+=		-Dtemperature=false
+.endif
+MESON_ARGS+=		-Ddevice-udev=false
+MESON_ARGS+=		-Dsystemd=false
+
 .if ${X11_TYPE} == "modular"
 CPPFLAGS+=	-DPKGSRC_X11BASE=\"${X11BASE:Q}\"
 .endif
@@ -55,7 +71,9 @@ CPPFLAGS+=	-DPKGSRC_X11BASE=\"${X11BASE:Q}\"
 .include "../../devel/meson/build.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.if ${OPSYS} == "NetBSD"
 .include "../../sysutils/upower/buildlink3.mk"
+.endif
 .include "../../wip/efl/buildlink3.mk"
 .include "../../x11/xcb-util-keysyms/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/enlightenment-current/PLIST b/enlightenment-current/PLIST
index e144712b9f..770ff2ec5d 100644
--- a/enlightenment-current/PLIST
+++ b/enlightenment-current/PLIST
@@ -176,145 +176,154 @@ include/enlightenment/evry_api.h
 include/enlightenment/evry_types.h
 lib/enlightenment/modules/appmenu/e-module-appmenu.edj
 lib/enlightenment/modules/appmenu/module.desktop
-lib/enlightenment/modules/appmenu/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/appmenu/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/backlight/e-module-backlight.edj
 lib/enlightenment/modules/backlight/module.desktop
-lib/enlightenment/modules/backlight/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/backlight/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/battery/e-module-battery.edj
 lib/enlightenment/modules/battery/module.desktop
-lib/enlightenment/modules/battery/netbsd-x86_64-${PKGVERSION}/batget
-lib/enlightenment/modules/battery/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/battery/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/batget
+lib/enlightenment/modules/battery/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/bluez5/e-module-bluez5.edj
 lib/enlightenment/modules/bluez5/module.desktop
-lib/enlightenment/modules/bluez5/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/bluez5/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/clock/e-module-clock.edj
 lib/enlightenment/modules/clock/module.desktop
-lib/enlightenment/modules/clock/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/clock/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/conf/e-module-conf.edj
 lib/enlightenment/modules/conf/module.desktop
-lib/enlightenment/modules/conf/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/conf/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/conf_applications/e-module-conf_applications.edj
 lib/enlightenment/modules/conf_applications/module.desktop
-lib/enlightenment/modules/conf_applications/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/conf_applications/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/conf_bindings/module.desktop
-lib/enlightenment/modules/conf_bindings/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/conf_bindings/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/conf_dialogs/e-module-conf_dialogs.edj
 lib/enlightenment/modules/conf_dialogs/module.desktop
-lib/enlightenment/modules/conf_dialogs/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/conf_dialogs/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/conf_display/module.desktop
-lib/enlightenment/modules/conf_display/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/conf_display/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/conf_interaction/e-module-conf_interaction.edj
 lib/enlightenment/modules/conf_interaction/module.desktop
-lib/enlightenment/modules/conf_interaction/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/conf_interaction/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/conf_intl/module.desktop
-lib/enlightenment/modules/conf_intl/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/conf_intl/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/conf_menus/e-module-conf_menus.edj
 lib/enlightenment/modules/conf_menus/module.desktop
-lib/enlightenment/modules/conf_menus/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/conf_menus/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/conf_paths/e-module-conf_paths.edj
 lib/enlightenment/modules/conf_paths/module.desktop
-lib/enlightenment/modules/conf_paths/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/conf_paths/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/conf_performance/e-module-conf_performance.edj
 lib/enlightenment/modules/conf_performance/module.desktop
-lib/enlightenment/modules/conf_performance/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/conf_performance/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/conf_randr/e-module-conf_randr.edj
 lib/enlightenment/modules/conf_randr/module.desktop
-lib/enlightenment/modules/conf_randr/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/conf_randr/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/conf_shelves/e-module-conf_shelves.edj
 lib/enlightenment/modules/conf_shelves/module.desktop
-lib/enlightenment/modules/conf_shelves/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/conf_shelves/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/conf_theme/module.desktop
-lib/enlightenment/modules/conf_theme/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/conf_theme/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/conf_window_manipulation/e-module-conf_window_manipulation.edj
 lib/enlightenment/modules/conf_window_manipulation/module.desktop
-lib/enlightenment/modules/conf_window_manipulation/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/conf_window_manipulation/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/conf_window_remembers/e-module-conf_window_remembers.edj
 lib/enlightenment/modules/conf_window_remembers/module.desktop
-lib/enlightenment/modules/conf_window_remembers/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/conf_window_remembers/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/connman/e-module-connman.edj
 lib/enlightenment/modules/connman/module.desktop
-lib/enlightenment/modules/connman/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/connman/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
+${PLIST.cpufreq}lib/enlightenment/modules/cpufreq/e-module-cpufreq.edj
+${PLIST.cpufreq}lib/enlightenment/modules/cpufreq/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
+${PLIST.cpufreq}lib/enlightenment/modules/cpufreq/module.desktop
 lib/enlightenment/modules/everything/e-module-everything-start.edj
 lib/enlightenment/modules/everything/e-module-everything.edj
 lib/enlightenment/modules/everything/module.desktop
-lib/enlightenment/modules/everything/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/everything/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/fileman/e-module-fileman.edj
 lib/enlightenment/modules/fileman/module.desktop
-lib/enlightenment/modules/fileman/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/fileman/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/fileman_opinfo/e-module-fileman_opinfo.edj
 lib/enlightenment/modules/fileman_opinfo/module.desktop
-lib/enlightenment/modules/fileman_opinfo/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/fileman_opinfo/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/gadman/e-module-gadman.edj
 lib/enlightenment/modules/gadman/module.desktop
-lib/enlightenment/modules/gadman/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/gadman/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/geolocation/e-module-geolocation.edj
 lib/enlightenment/modules/geolocation/module.desktop
-lib/enlightenment/modules/geolocation/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/geolocation/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/ibar/e-module-ibar.edj
 lib/enlightenment/modules/ibar/module.desktop
-lib/enlightenment/modules/ibar/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/ibar/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/ibox/e-module-ibox.edj
 lib/enlightenment/modules/ibox/module.desktop
-lib/enlightenment/modules/ibox/netbsd-x86_64-${PKGVERSION}/module.so
-lib/enlightenment/modules/lokker/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/ibox/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
+lib/enlightenment/modules/lokker/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/luncher/e-module-luncher.edj
 lib/enlightenment/modules/luncher/module.desktop
-lib/enlightenment/modules/luncher/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/luncher/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/mixer/e-module-mixer.edj
 lib/enlightenment/modules/mixer/module.desktop
-lib/enlightenment/modules/mixer/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/mixer/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/msgbus/e-module-msgbus.edj
 lib/enlightenment/modules/msgbus/module.desktop
-lib/enlightenment/modules/msgbus/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/msgbus/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/music-control/e-module-music-control.edj
 lib/enlightenment/modules/music-control/module.desktop
-lib/enlightenment/modules/music-control/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/music-control/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/notification/e-module-notification.edj
 lib/enlightenment/modules/notification/module.desktop
-lib/enlightenment/modules/notification/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/notification/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/packagekit/e-module-packagekit.edj
 lib/enlightenment/modules/packagekit/module.desktop
-lib/enlightenment/modules/packagekit/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/packagekit/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/pager/e-module-pager.edj
 lib/enlightenment/modules/pager/module.desktop
-lib/enlightenment/modules/pager/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/pager/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/polkit/e-module-polkit.edj
 lib/enlightenment/modules/polkit/module.desktop
-lib/enlightenment/modules/polkit/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/polkit/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/quickaccess/e-module-quickaccess.edj
 lib/enlightenment/modules/quickaccess/module.desktop
-lib/enlightenment/modules/quickaccess/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/quickaccess/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/shot/IndieFlower.ttf
 lib/enlightenment/modules/shot/Puk-Regular.ttf
 lib/enlightenment/modules/shot/Yantiq.ttf
 lib/enlightenment/modules/shot/e-module-shot.edj
 lib/enlightenment/modules/shot/intuitive.ttf
 lib/enlightenment/modules/shot/module.desktop
-lib/enlightenment/modules/shot/netbsd-x86_64-${PKGVERSION}/module.so
-lib/enlightenment/modules/shot/netbsd-x86_64-${PKGVERSION}/upload
+lib/enlightenment/modules/shot/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
+lib/enlightenment/modules/shot/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/upload
 lib/enlightenment/modules/shot/shotedit.edj
 lib/enlightenment/modules/shot/shots.desktop
 lib/enlightenment/modules/start/e-module-start.edj
 lib/enlightenment/modules/start/module.desktop
-lib/enlightenment/modules/start/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/start/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/syscon/e-module-syscon.edj
 lib/enlightenment/modules/syscon/module.desktop
-lib/enlightenment/modules/syscon/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/syscon/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
+${PLIST.sysinfo}lib/enlightenment/modules/sysinfo/e-module-sysinfo.edj
+${PLIST.sysinfo}lib/enlightenment/modules/sysinfo/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
+${PLIST.sysinfo}lib/enlightenment/modules/sysinfo/module.desktop
 lib/enlightenment/modules/systray/e-module-systray.edj
 lib/enlightenment/modules/systray/module.desktop
-lib/enlightenment/modules/systray/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/systray/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/tasks/e-module-tasks.edj
 lib/enlightenment/modules/tasks/module.desktop
-lib/enlightenment/modules/tasks/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/tasks/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/teamwork/e-module-teamwork.edj
 lib/enlightenment/modules/teamwork/module.desktop
-lib/enlightenment/modules/teamwork/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/teamwork/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
+${PLIST.temperature}lib/enlightenment/modules/temperature/e-module-temperature.edj
+${PLIST.temperature}lib/enlightenment/modules/temperature/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
+${PLIST.temperature}lib/enlightenment/modules/temperature/module.desktop
 lib/enlightenment/modules/tiling/e-module-tiling.edj
 lib/enlightenment/modules/tiling/module.desktop
-lib/enlightenment/modules/tiling/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/tiling/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/time/e-module-time.edj
 lib/enlightenment/modules/time/module.desktop
-lib/enlightenment/modules/time/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/time/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/vkbd/dicts/English_US.dic
 lib/enlightenment/modules/vkbd/dicts/English_US_Small.dic
 lib/enlightenment/modules/vkbd/e-module-vkbd.edj
@@ -334,43 +343,43 @@ lib/enlightenment/modules/vkbd/keyboards/spanner.png
 lib/enlightenment/modules/vkbd/keyboards/tab.png
 lib/enlightenment/modules/vkbd/keyboards/up.png
 lib/enlightenment/modules/vkbd/module.desktop
-lib/enlightenment/modules/vkbd/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/vkbd/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/vkbd/theme.edj
 lib/enlightenment/modules/winlist/e-module-winlist.edj
 lib/enlightenment/modules/winlist/module.desktop
-lib/enlightenment/modules/winlist/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/winlist/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/wireless/e-module-wireless.edj
 lib/enlightenment/modules/wireless/module.desktop
-lib/enlightenment/modules/wireless/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/wireless/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/modules/wizard/def-ibar.txt
 lib/enlightenment/modules/wizard/desktop/home.desktop
 lib/enlightenment/modules/wizard/desktop/root.desktop
 lib/enlightenment/modules/wizard/desktop/tmp.desktop
-lib/enlightenment/modules/wizard/netbsd-x86_64-${PKGVERSION}/module.so
-lib/enlightenment/modules/wizard/netbsd-x86_64-${PKGVERSION}/page_000.so
-lib/enlightenment/modules/wizard/netbsd-x86_64-${PKGVERSION}/page_010.so
-lib/enlightenment/modules/wizard/netbsd-x86_64-${PKGVERSION}/page_011.so
-lib/enlightenment/modules/wizard/netbsd-x86_64-${PKGVERSION}/page_020.so
-lib/enlightenment/modules/wizard/netbsd-x86_64-${PKGVERSION}/page_030.so
-lib/enlightenment/modules/wizard/netbsd-x86_64-${PKGVERSION}/page_040.so
-lib/enlightenment/modules/wizard/netbsd-x86_64-${PKGVERSION}/page_050.so
-lib/enlightenment/modules/wizard/netbsd-x86_64-${PKGVERSION}/page_060.so
-lib/enlightenment/modules/wizard/netbsd-x86_64-${PKGVERSION}/page_070.so
-lib/enlightenment/modules/wizard/netbsd-x86_64-${PKGVERSION}/page_080.so
-lib/enlightenment/modules/wizard/netbsd-x86_64-${PKGVERSION}/page_090.so
-lib/enlightenment/modules/wizard/netbsd-x86_64-${PKGVERSION}/page_100.so
-lib/enlightenment/modules/wizard/netbsd-x86_64-${PKGVERSION}/page_110.so
-lib/enlightenment/modules/wizard/netbsd-x86_64-${PKGVERSION}/page_115.so
-lib/enlightenment/modules/wizard/netbsd-x86_64-${PKGVERSION}/page_120.so
-lib/enlightenment/modules/wizard/netbsd-x86_64-${PKGVERSION}/page_130.so
-lib/enlightenment/modules/wizard/netbsd-x86_64-${PKGVERSION}/page_150.so
-lib/enlightenment/modules/wizard/netbsd-x86_64-${PKGVERSION}/page_160.so
-lib/enlightenment/modules/wizard/netbsd-x86_64-${PKGVERSION}/page_170.so
-lib/enlightenment/modules/wizard/netbsd-x86_64-${PKGVERSION}/page_180.so
-lib/enlightenment/modules/wizard/netbsd-x86_64-${PKGVERSION}/page_200.so
+lib/enlightenment/modules/wizard/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
+lib/enlightenment/modules/wizard/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/page_000.so
+lib/enlightenment/modules/wizard/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/page_010.so
+lib/enlightenment/modules/wizard/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/page_011.so
+lib/enlightenment/modules/wizard/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/page_020.so
+lib/enlightenment/modules/wizard/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/page_030.so
+lib/enlightenment/modules/wizard/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/page_040.so
+lib/enlightenment/modules/wizard/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/page_050.so
+lib/enlightenment/modules/wizard/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/page_060.so
+lib/enlightenment/modules/wizard/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/page_070.so
+lib/enlightenment/modules/wizard/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/page_080.so
+lib/enlightenment/modules/wizard/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/page_090.so
+lib/enlightenment/modules/wizard/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/page_100.so
+lib/enlightenment/modules/wizard/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/page_110.so
+lib/enlightenment/modules/wizard/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/page_115.so
+lib/enlightenment/modules/wizard/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/page_120.so
+lib/enlightenment/modules/wizard/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/page_130.so
+lib/enlightenment/modules/wizard/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/page_150.so
+lib/enlightenment/modules/wizard/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/page_160.so
+lib/enlightenment/modules/wizard/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/page_170.so
+lib/enlightenment/modules/wizard/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/page_180.so
+lib/enlightenment/modules/wizard/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/page_200.so
 lib/enlightenment/modules/xkbswitch/e-module-xkbswitch.edj
 lib/enlightenment/modules/xkbswitch/module.desktop
-lib/enlightenment/modules/xkbswitch/netbsd-x86_64-${PKGVERSION}/module.so
+lib/enlightenment/modules/xkbswitch/${PLATFORM}-${MACHINE_ARCH}-${PKGVERSION}/module.so
 lib/enlightenment/utils/enlightenment_alert
 lib/enlightenment/utils/enlightenment_ckpasswd
 lib/enlightenment/utils/enlightenment_elm_cfgtool
diff --git a/enlightenment-current/distinfo b/enlightenment-current/distinfo
index 1de5d9118c..772adbfa20 100644
--- a/enlightenment-current/distinfo
+++ b/enlightenment-current/distinfo
@@ -4,15 +4,16 @@ SHA1 (enlightenment-0.24.2.tar.xz) = 0d043a38fb805aeca3d398908e0a3eab6bf511ec
 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-data_etc_meson.build) = da003d08faf0634549a264799313be6382956068
+SHA1 (patch-meson.build) = b753950d9ab5aa6d8b596fc7bba0f9dc54a7c197
 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_bin_system_e__system__power.c) = 254d430d50f3a122b64cc70c390c48355cbad3a3
+SHA1 (patch-src_modules_battery_e__mod__main.c) = 024cd540ffc5dee129e662088e7f837820ac7b8a
+SHA1 (patch-src_modules_battery_e__mod__main.h) = b599d39991497faba70e5a62278e4f29b06fcc69
+SHA1 (patch-src_modules_battery_e__mod__sysctl.c) = 1db5e700635cfd428b2599ebb592d71847f23e7f
+SHA1 (patch-src_modules_battery_e__mod__upower.c) = 5bfe428696fbc165585fbfe3242e402174c5d178
 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
+SHA1 (patch-src_modules_wizard_page__011.c) = 4c63aa82af4ab9c94dad926cf6d023fe9410d011
+SHA1 (patch-src_modules_wizard_page__120.c) = 3635cab6a98393eae0353ccdaf83317f0376dc9e
+SHA1 (patch-src_modules_xkbswitch_e__mod__parse.c) = 68180fe3a4b9f131e7ac033aa324903827566fa2
diff --git a/enlightenment-current/patches/patch-data_etc_meson.build b/enlightenment-current/patches/patch-data_etc_meson.build
index 5130f6f759..7fa85281df 100644
--- a/enlightenment-current/patches/patch-data_etc_meson.build
+++ b/enlightenment-current/patches/patch-data_etc_meson.build
@@ -2,7 +2,7 @@ $NetBSD$
 
 * Install etc files to examples area
 
---- data/etc/meson.build.orig	2020-05-17 19:40:56.324665500 +0000
+--- data/etc/meson.build.orig	2020-11-24 12:08:01.856764864 +0000
 +++ data/etc/meson.build
 @@ -16,19 +16,19 @@ sysactions.set('EJECT'    , EJECT)
  if get_option('install-sysactions')
diff --git a/enlightenment-current/patches/patch-meson.build b/enlightenment-current/patches/patch-meson.build
new file mode 100644
index 0000000000..b6efb0e386
--- /dev/null
+++ b/enlightenment-current/patches/patch-meson.build
@@ -0,0 +1,16 @@
+$NetBSD$
+
+* Fix build without eeze on linux
+* If eeze disabled, build failed
+
+--- meson.build.orig	2020-07-26 16:39:12.000649500 +0000
++++ meson.build
+@@ -247,7 +247,7 @@ if get_option('systemd') == true
+   endif
+ endif
+ 
+-if host_os.startswith('linux') and cc.has_function('eeze_disk_function', dependencies: dependency('eeze')) == true
++if host_os.startswith('linux') and cc.has_function('eeze_disk_function', dependencies: dependency('eeze', required: false)) == true
+   config_h.set('HAVE_EEZE_MOUNT', '1')
+   eeze_mount = true
+ endif
diff --git a/enlightenment-current/patches/patch-src_bin_system_e__system__power.c b/enlightenment-current/patches/patch-src_bin_system_e__system__power.c
index c9cd23a9e4..d80aa223c4 100644
--- a/enlightenment-current/patches/patch-src_bin_system_e__system__power.c
+++ b/enlightenment-current/patches/patch-src_bin_system_e__system__power.c
@@ -2,7 +2,7 @@ $NetBSD$
 
 * Add NetBSD support
 
---- src/bin/system/e_system_power.c.orig	2020-05-31 18:22:37.498920400 +0000
+--- src/bin/system/e_system_power.c.orig	2020-07-26 16:39:12.083981300 +0000
 +++ src/bin/system/e_system_power.c
 @@ -32,7 +32,7 @@ _cb_power_hibernate(void *data EINA_UNUS
  static void
diff --git a/enlightenment-current/patches/patch-src_modules_battery_e__mod__main.c b/enlightenment-current/patches/patch-src_modules_battery_e__mod__main.c
index da4441723a..ca97088b07 100644
--- a/enlightenment-current/patches/patch-src_modules_battery_e__mod__main.c
+++ b/enlightenment-current/patches/patch-src_modules_battery_e__mod__main.c
@@ -3,7 +3,7 @@ $NetBSD$
 * NetBSD's sysctl is different than in other BSD's,
 * use upower backend
 
---- src/modules/battery/e_mod_main.c.orig	2020-05-31 18:22:37.502253800 +0000
+--- src/modules/battery/e_mod_main.c.orig	2020-07-26 16:39:12.087314600 +0000
 +++ src/modules/battery/e_mod_main.c
 @@ -366,7 +366,7 @@ _battery_config_updated(void)
       {
diff --git a/enlightenment-current/patches/patch-src_modules_battery_e__mod__main.h b/enlightenment-current/patches/patch-src_modules_battery_e__mod__main.h
index 19ebf36e33..c780a7f6ac 100644
--- a/enlightenment-current/patches/patch-src_modules_battery_e__mod__main.h
+++ b/enlightenment-current/patches/patch-src_modules_battery_e__mod__main.h
@@ -3,7 +3,7 @@ $NetBSD$
 * NetBSD's sysctl is different than in other BSD's,
 * use upower backend
 
---- src/modules/battery/e_mod_main.h.orig	2020-05-31 18:22:37.502253800 +0000
+--- src/modules/battery/e_mod_main.h.orig	2020-07-26 16:39:12.087314600 +0000
 +++ src/modules/battery/e_mod_main.h
 @@ -53,7 +53,7 @@ struct _Config
     Eeze_Udev_Watch     *acwatch;
diff --git a/enlightenment-current/patches/patch-src_modules_battery_e__mod__sysctl.c b/enlightenment-current/patches/patch-src_modules_battery_e__mod__sysctl.c
index e50d5993c7..57dfc50088 100644
--- a/enlightenment-current/patches/patch-src_modules_battery_e__mod__sysctl.c
+++ b/enlightenment-current/patches/patch-src_modules_battery_e__mod__sysctl.c
@@ -3,7 +3,7 @@ $NetBSD$
 * NetBSD's sysctl is different than in other BSD's,
 * use upower backend
 
---- src/modules/battery/e_mod_sysctl.c.orig	2020-05-31 18:22:37.502253800 +0000
+--- src/modules/battery/e_mod_sysctl.c.orig	2020-07-26 16:39:12.087314600 +0000
 +++ src/modules/battery/e_mod_sysctl.c
 @@ -1,12 +1,12 @@
  #include "e.h"
@@ -56,7 +56,7 @@ $NetBSD$
         charge = 0;
  
         /* last full capacity */
-@@ -313,7 +313,7 @@ _battery_sysctl_battery_update()
+@@ -312,7 +312,7 @@ _battery_sysctl_battery_update()
  
     if (ac)
       {
diff --git a/enlightenment-current/patches/patch-src_modules_battery_e__mod__upower.c b/enlightenment-current/patches/patch-src_modules_battery_e__mod__upower.c
index 0be08c5a05..c6715996b5 100644
--- a/enlightenment-current/patches/patch-src_modules_battery_e__mod__upower.c
+++ b/enlightenment-current/patches/patch-src_modules_battery_e__mod__upower.c
@@ -3,7 +3,7 @@ $NetBSD$
 * NetBSD's sysctl is different than in other BSD's,
 * use upower backend
 
---- src/modules/battery/e_mod_upower.c.orig	2020-05-31 18:22:37.502253800 +0000
+--- src/modules/battery/e_mod_upower.c.orig	2020-07-26 16:39:12.087314600 +0000
 +++ src/modules/battery/e_mod_upower.c
 @@ -1,7 +1,7 @@
  #include "e.h"
diff --git a/enlightenment-current/patches/patch-src_modules_wizard_page__011.c b/enlightenment-current/patches/patch-src_modules_wizard_page__011.c
index 1e9c2644e9..3825229b40 100644
--- a/enlightenment-current/patches/patch-src_modules_wizard_page__011.c
+++ b/enlightenment-current/patches/patch-src_modules_wizard_page__011.c
@@ -2,7 +2,7 @@ $NetBSD$
 
 * teach location from pkgsrc
 
---- src/modules/wizard/page_011.c.orig	2020-05-17 19:40:56.441332600 +0000
+--- src/modules/wizard/page_011.c.orig	2020-07-26 16:39:12.133980300 +0000
 +++ src/modules/wizard/page_011.c
 @@ -23,6 +23,9 @@ find_rules(void)
        XKB_BASE "/rules/xorg.lst",
diff --git a/enlightenment-current/patches/patch-src_modules_wizard_page__120.c b/enlightenment-current/patches/patch-src_modules_wizard_page__120.c
index 35b88bd2df..a67f15ba17 100644
--- a/enlightenment-current/patches/patch-src_modules_wizard_page__120.c
+++ b/enlightenment-current/patches/patch-src_modules_wizard_page__120.c
@@ -1,8 +1,9 @@
 $NetBSD$
 
 * Add NetBSD support
+* Fix build without eeze on linux
 
---- src/modules/wizard/page_120.c.orig	2020-05-17 19:40:56.441332600 +0000
+--- src/modules/wizard/page_120.c.orig	2020-11-24 12:08:02.226764880 +0000
 +++ src/modules/wizard/page_120.c
 @@ -34,7 +34,7 @@
     }
@@ -22,3 +23,27 @@ $NetBSD$
     // figure out on bsd if we have temp sensors
  #else
     const char *sensor_path[] = {
+@@ -116,11 +116,11 @@ wizard_page_show(E_Wizard_Page *pg EINA_
+ 
+ #ifdef HAVE_EEZE
+    tempdevs = eeze_udev_find_by_type(EEZE_UDEV_TYPE_IS_IT_HOT_OR_IS_IT_COLD_SENSOR, NULL);
+-#endif
+    if (tempdevs && (eina_list_count(tempdevs)))
+      hav_temperature = 1;
+    else
+      {
++#endif
+         int i = 0;
+ 
+         while(sensor_path[i] != NULL)
+@@ -170,8 +170,10 @@ wizard_page_show(E_Wizard_Page *pg EINA_
+                   eina_list_free(therms);
+                }
+           }
++#ifdef HAVE_EEZE
+      }
+ #endif
++#endif
+    if (!hav_temperature)
+      {
+         E_Config_Module *em;
diff --git a/enlightenment-current/patches/patch-src_modules_xkbswitch_e__mod__parse.c b/enlightenment-current/patches/patch-src_modules_xkbswitch_e__mod__parse.c
index cd49155d58..9c8b7ec693 100644
--- a/enlightenment-current/patches/patch-src_modules_xkbswitch_e__mod__parse.c
+++ b/enlightenment-current/patches/patch-src_modules_xkbswitch_e__mod__parse.c
@@ -2,7 +2,7 @@ $NetBSD$
 
 * teach location from pkgsrc
 
---- src/modules/xkbswitch/e_mod_parse.c.orig	2020-05-17 19:40:56.451332600 +0000
+--- src/modules/xkbswitch/e_mod_parse.c.orig	2020-07-26 16:39:12.143980000 +0000
 +++ src/modules/xkbswitch/e_mod_parse.c
 @@ -67,6 +67,9 @@ find_rules(void)
          XKB_BASE "/rules/xorg.lst",


Home | Main Index | Thread Index | Old Index