Various fixes to get this package to work on non-NetBSD.

Bump PKGREVISION.

4 files changed, 118 insertions, 85 deletions

diff --git a/x11/enlightenment/Makefile b/x11/enlightenment/Makefile
index 306d0093a08..6a98d36dae4 100644
--- a/x11/enlightenment/Makefile
+++ b/x11/enlightenment/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2013/06/16 18:56:06 sno Exp $
+# $NetBSD: Makefile,v 1.28 2013/06/19 15:07:40 jperkin Exp $
 #
 
 DISTNAME=	enlightenment-0.17.3
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://download.enlightenment.org/releases/
 EXTRACT_SUFX=	.tar.bz2
@@ -18,26 +19,38 @@ USE_LIBTOOL=	yes
 USE_TOOLS=	gmake pkg-config automake autoconf
 
 PKG_SYSCONFSUBDIR=	enlightenment
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE:Q}
 
 EGDIR=		${PREFIX}/share/examples/enlightenment
 CONF_FILES=	${EGDIR}/sysactions.conf \
-		${PKG_SYSCONFDIR}/sysactions.conf \
-		${PKG_SYSCONFDIR}/enlightenment/sysactions.conf \
-		${PKG_SYSCONFDIR}/xdg/menus/enlightenment.menu
+		${PKG_SYSCONFDIR}/sysactions.conf
+CONF_FILES+=	${EGDIR}/enlightenment.menu \
+		${PKG_SYSCONFBASE}/xdg/menus/enlightenment.menu
 
 CONFIGURE_ARGS+=	--disable-mount-hal --disable-mount-udisks \
 			--disable-mount-eeze
 CONFIGURE_ENV+=		MODULE_ARCH="${LOWER_OPSYS}-${MACHINE_ARCH}"
 
+BUILD_DEFS+=		PKG_SYSCONFBASE
+
 INSTALLATION_DIRS=	${EGDIR}
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+SUBST_CLASSES+=		solhost
+SUBST_STAGE.solhost=	pre-configure
+SUBST_FILES.solhost=	configure
+SUBST_SED.solhost=	-e '/^MODULE_ARCH=/s/.host_os/solaris/'
+.endif
+
 pre-install:
+	${INSTALL_DATA} ${WRKSRC}/data/etc/enlightenment.menu ${DESTDIR}${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/data/etc/sysactions.conf ${DESTDIR}${EGDIR}
 
 PKGCONFIG_OVERRIDE=	enlightenment.pc.in
 
-MODULE_ARCH=	${LOWER_OPSYS}-${LOWER_ARCH}-ver-pre-svn-08
+MODULE_ARCH=	${LOWER_OPSYS}-${LOWER_ARCH}-${PKGVERSION}
 PLIST_SUBST=	MODULE_ARCH=${MODULE_ARCH}
 PRINT_PLIST_AWK+=        { gsub(/${MODULE_ARCH}/, "$${MODULE_ARCH}") }
 
diff --git a/x11/enlightenment/PLIST b/x11/enlightenment/PLIST
index 3a02c116feb..c030e456b64 100644
--- a/x11/enlightenment/PLIST
+++ b/x11/enlightenment/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2013/06/16 18:56:06 sno Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/06/19 15:07:40 jperkin Exp $
 bin/enlightenment
 bin/enlightenment_filemanager
 bin/enlightenment_imc
@@ -163,104 +163,104 @@ include/enlightenment/evry_api.h
 include/enlightenment/evry_types.h
 lib/enlightenment/modules/backlight/e-module-backlight.edj
 lib/enlightenment/modules/backlight/module.desktop
-lib/enlightenment/modules/backlight/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/backlight/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/battery/e-module-battery.edj
 lib/enlightenment/modules/battery/module.desktop
-lib/enlightenment/modules/battery/netbsd-${MACHINE_ARCH}-${PKGVERSION}/batget
-lib/enlightenment/modules/battery/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/battery/${MODULE_ARCH}/batget
+lib/enlightenment/modules/battery/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/clock/e-module-clock.edj
 lib/enlightenment/modules/clock/module.desktop
-lib/enlightenment/modules/clock/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/clock/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/comp/e-module-comp.edj
 lib/enlightenment/modules/comp/module.desktop
-lib/enlightenment/modules/comp/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/comp/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/conf/e-module-conf.edj
 lib/enlightenment/modules/conf/module.desktop
-lib/enlightenment/modules/conf/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/conf_applications/e-module-conf_applications.edj
 lib/enlightenment/modules/conf_applications/module.desktop
-lib/enlightenment/modules/conf_applications/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf_applications/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/conf_dialogs/e-module-conf_dialogs.edj
 lib/enlightenment/modules/conf_dialogs/module.desktop
-lib/enlightenment/modules/conf_dialogs/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf_dialogs/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/conf_display/module.desktop
-lib/enlightenment/modules/conf_display/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf_display/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/conf_edgebindings/e-module-conf_edgebindings.edj
 lib/enlightenment/modules/conf_edgebindings/module.desktop
-lib/enlightenment/modules/conf_edgebindings/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf_edgebindings/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/conf_interaction/e-module-conf_interaction.edj
 lib/enlightenment/modules/conf_interaction/module.desktop
-lib/enlightenment/modules/conf_interaction/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf_interaction/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/conf_intl/module.desktop
-lib/enlightenment/modules/conf_intl/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf_intl/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/conf_keybindings/module.desktop
-lib/enlightenment/modules/conf_keybindings/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf_keybindings/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/conf_menus/e-module-conf_menus.edj
 lib/enlightenment/modules/conf_menus/module.desktop
-lib/enlightenment/modules/conf_menus/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf_menus/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/conf_paths/e-module-conf_paths.edj
 lib/enlightenment/modules/conf_paths/module.desktop
-lib/enlightenment/modules/conf_paths/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf_paths/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/conf_performance/e-module-conf_performance.edj
 lib/enlightenment/modules/conf_performance/module.desktop
-lib/enlightenment/modules/conf_performance/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf_performance/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/conf_randr/e-module-conf_randr.edj
 lib/enlightenment/modules/conf_randr/module.desktop
-lib/enlightenment/modules/conf_randr/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf_randr/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/conf_shelves/e-module-conf_shelves.edj
 lib/enlightenment/modules/conf_shelves/module.desktop
-lib/enlightenment/modules/conf_shelves/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf_shelves/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/conf_theme/module.desktop
-lib/enlightenment/modules/conf_theme/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf_theme/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/conf_window_manipulation/module.desktop
-lib/enlightenment/modules/conf_window_manipulation/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf_window_manipulation/${MODULE_ARCH}/module.la
 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-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/conf_window_remembers/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/connman/e-module-connman.edj
 lib/enlightenment/modules/connman/module.desktop
-lib/enlightenment/modules/connman/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/connman/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/cpufreq/e-module-cpufreq.edj
 lib/enlightenment/modules/cpufreq/module.desktop
-lib/enlightenment/modules/cpufreq/netbsd-${MACHINE_ARCH}-${PKGVERSION}/freqset
-lib/enlightenment/modules/cpufreq/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/cpufreq/${MODULE_ARCH}/freqset
+lib/enlightenment/modules/cpufreq/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/dropshadow/e-module-dropshadow.edj
 lib/enlightenment/modules/dropshadow/module.desktop
-lib/enlightenment/modules/dropshadow/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/dropshadow/${MODULE_ARCH}/module.la
 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-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/everything/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/fileman/e-module-fileman.edj
 lib/enlightenment/modules/fileman/module.desktop
-lib/enlightenment/modules/fileman/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/fileman/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/fileman_opinfo/e-module-fileman_opinfo.edj
 lib/enlightenment/modules/fileman_opinfo/module.desktop
-lib/enlightenment/modules/fileman_opinfo/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/fileman_opinfo/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/gadman/e-module-gadman.edj
 lib/enlightenment/modules/gadman/module.desktop
-lib/enlightenment/modules/gadman/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/gadman/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/ibar/e-module-ibar.edj
 lib/enlightenment/modules/ibar/module.desktop
-lib/enlightenment/modules/ibar/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/ibar/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/ibox/e-module-ibox.edj
 lib/enlightenment/modules/ibox/module.desktop
-lib/enlightenment/modules/ibox/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/ibox/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/illume-bluetooth/e-module-illume-bluetooth.edj
 lib/enlightenment/modules/illume-bluetooth/module.desktop
-lib/enlightenment/modules/illume-bluetooth/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/illume-bluetooth/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/illume-home-toggle/e-module-illume-home-toggle.edj
 lib/enlightenment/modules/illume-home-toggle/module.desktop
-lib/enlightenment/modules/illume-home-toggle/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/illume-home-toggle/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/illume-home/e-module-illume-home.edj
 lib/enlightenment/modules/illume-home/module.desktop
-lib/enlightenment/modules/illume-home/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/illume-home/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/illume-indicator/e-module-illume-indicator.edj
 lib/enlightenment/modules/illume-indicator/module.desktop
-lib/enlightenment/modules/illume-indicator/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/illume-indicator/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/illume-kbd-toggle/e-module-illume-kbd-toggle.edj
 lib/enlightenment/modules/illume-kbd-toggle/module.desktop
-lib/enlightenment/modules/illume-kbd-toggle/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/illume-kbd-toggle/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/illume-keyboard/dicts/English_US.dic
 lib/enlightenment/modules/illume-keyboard/dicts/English_US_Small.dic
 lib/enlightenment/modules/illume-keyboard/e-module-illume-keyboard.edj
@@ -280,90 +280,90 @@ lib/enlightenment/modules/illume-keyboard/keyboards/shift.png
 lib/enlightenment/modules/illume-keyboard/keyboards/tab.png
 lib/enlightenment/modules/illume-keyboard/keyboards/up.png
 lib/enlightenment/modules/illume-keyboard/module.desktop
-lib/enlightenment/modules/illume-keyboard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/illume-keyboard/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/illume-mode-toggle/e-module-illume-mode-toggle.edj
 lib/enlightenment/modules/illume-mode-toggle/module.desktop
-lib/enlightenment/modules/illume-mode-toggle/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/illume-mode-toggle/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/illume-softkey/e-module-illume-softkey.edj
 lib/enlightenment/modules/illume-softkey/module.desktop
-lib/enlightenment/modules/illume-softkey/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/illume-softkey/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/illume2/e-module-illume2.edj
 lib/enlightenment/modules/illume2/keyboards/ignore_built_in_keyboards
 lib/enlightenment/modules/illume2/module.desktop
-lib/enlightenment/modules/illume2/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
 lib/enlightenment/modules/illume2/policies/illume.la
 lib/enlightenment/modules/illume2/policies/tablet.la
+lib/enlightenment/modules/illume2/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/mixer/e-module-mixer.edj
 lib/enlightenment/modules/mixer/module.desktop
-lib/enlightenment/modules/mixer/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/mixer/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/msgbus/e-module-msgbus.edj
 lib/enlightenment/modules/msgbus/module.desktop
-lib/enlightenment/modules/msgbus/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/msgbus/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/notification/e-module-notification.edj
 lib/enlightenment/modules/notification/module.desktop
-lib/enlightenment/modules/notification/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/notification/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/pager/e-module-pager.edj
 lib/enlightenment/modules/pager/module.desktop
-lib/enlightenment/modules/pager/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/pager/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/quickaccess/e-module-quickaccess.edj
 lib/enlightenment/modules/quickaccess/module.desktop
-lib/enlightenment/modules/quickaccess/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/quickaccess/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/shot/e-module-shot.edj
 lib/enlightenment/modules/shot/module.desktop
-lib/enlightenment/modules/shot/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/shot/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/start/e-module-start.edj
 lib/enlightenment/modules/start/module.desktop
-lib/enlightenment/modules/start/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/start/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/syscon/e-module-syscon.edj
 lib/enlightenment/modules/syscon/module.desktop
-lib/enlightenment/modules/syscon/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/syscon/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/systray/e-module-systray.edj
 lib/enlightenment/modules/systray/module.desktop
-lib/enlightenment/modules/systray/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/systray/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/tasks/e-module-tasks.edj
 lib/enlightenment/modules/tasks/module.desktop
-lib/enlightenment/modules/tasks/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/tasks/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/temperature/e-module-temperature.edj
 lib/enlightenment/modules/temperature/module.desktop
-lib/enlightenment/modules/temperature/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
-lib/enlightenment/modules/temperature/netbsd-${MACHINE_ARCH}-${PKGVERSION}/tempget
+lib/enlightenment/modules/temperature/${MODULE_ARCH}/module.la
+lib/enlightenment/modules/temperature/${MODULE_ARCH}/tempget
 lib/enlightenment/modules/tiling/e-module-tiling.edj
 lib/enlightenment/modules/tiling/module.desktop
-lib/enlightenment/modules/tiling/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/tiling/${MODULE_ARCH}/module.la
 lib/enlightenment/modules/winlist/e-module-winlist.edj
 lib/enlightenment/modules/winlist/module.desktop
-lib/enlightenment/modules/winlist/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/winlist/${MODULE_ARCH}/module.la
 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/extra_desktops/mplayer.desktop
 lib/enlightenment/modules/wizard/extra_desktops/xterm.desktop
-lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
-lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_000.la
-lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_010.la
-lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_011.la
-lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_020.la
-lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_030.la
-lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_040.la
-lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_050.la
-lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_060.la
-lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_070.la
-lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_080.la
-lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_090.la
-lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_100.la
-lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_110.la
-lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_120.la
-lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_130.la
-lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_140.la
-lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_150.la
-lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_160.la
-lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_170.la
-lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_180.la
-lib/enlightenment/modules/wizard/netbsd-${MACHINE_ARCH}-${PKGVERSION}/page_200.la
+lib/enlightenment/modules/wizard/${MODULE_ARCH}/module.la
+lib/enlightenment/modules/wizard/${MODULE_ARCH}/page_000.la
+lib/enlightenment/modules/wizard/${MODULE_ARCH}/page_010.la
+lib/enlightenment/modules/wizard/${MODULE_ARCH}/page_011.la
+lib/enlightenment/modules/wizard/${MODULE_ARCH}/page_020.la
+lib/enlightenment/modules/wizard/${MODULE_ARCH}/page_030.la
+lib/enlightenment/modules/wizard/${MODULE_ARCH}/page_040.la
+lib/enlightenment/modules/wizard/${MODULE_ARCH}/page_050.la
+lib/enlightenment/modules/wizard/${MODULE_ARCH}/page_060.la
+lib/enlightenment/modules/wizard/${MODULE_ARCH}/page_070.la
+lib/enlightenment/modules/wizard/${MODULE_ARCH}/page_080.la
+lib/enlightenment/modules/wizard/${MODULE_ARCH}/page_090.la
+lib/enlightenment/modules/wizard/${MODULE_ARCH}/page_100.la
+lib/enlightenment/modules/wizard/${MODULE_ARCH}/page_110.la
+lib/enlightenment/modules/wizard/${MODULE_ARCH}/page_120.la
+lib/enlightenment/modules/wizard/${MODULE_ARCH}/page_130.la
+lib/enlightenment/modules/wizard/${MODULE_ARCH}/page_140.la
+lib/enlightenment/modules/wizard/${MODULE_ARCH}/page_150.la
+lib/enlightenment/modules/wizard/${MODULE_ARCH}/page_160.la
+lib/enlightenment/modules/wizard/${MODULE_ARCH}/page_170.la
+lib/enlightenment/modules/wizard/${MODULE_ARCH}/page_180.la
+lib/enlightenment/modules/wizard/${MODULE_ARCH}/page_200.la
 lib/enlightenment/modules/xkbswitch/e-module-xkbswitch.edj
 lib/enlightenment/modules/xkbswitch/module.desktop
-lib/enlightenment/modules/xkbswitch/netbsd-${MACHINE_ARCH}-${PKGVERSION}/module.la
+lib/enlightenment/modules/xkbswitch/${MODULE_ARCH}/module.la
 lib/enlightenment/utils/enlightenment_alert
 lib/enlightenment/utils/enlightenment_fm
 lib/enlightenment/utils/enlightenment_fm_op
@@ -568,6 +568,7 @@ share/enlightenment/doc/documentation.html
 share/enlightenment/doc/enlightenment.png
 share/enlightenment/doc/illume2.html
 share/enlightenment/doc/illume2.png
+share/examples/enlightenment/enlightenment.menu
 share/examples/enlightenment/sysactions.conf
 share/locale/ar/LC_MESSAGES/enlightenment.mo
 share/locale/bg/LC_MESSAGES/enlightenment.mo
diff --git a/x11/enlightenment/distinfo b/x11/enlightenment/distinfo
index ed783c42799..c906fe8ecfc 100644
--- a/x11/enlightenment/distinfo
+++ b/x11/enlightenment/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2013/06/16 18:56:06 sno Exp $
+$NetBSD: distinfo,v 1.2 2013/06/19 15:07:40 jperkin 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
diff --git a/x11/enlightenment/patches/patch-data_etc_Makefile.in b/x11/enlightenment/patches/patch-data_etc_Makefile.in
new file mode 100644
index 00000000000..c861c89a2f9
--- /dev/null
+++ b/x11/enlightenment/patches/patch-data_etc_Makefile.in
@@ -0,0 +1,18 @@
+$NetBSD: patch-data_etc_Makefile.in,v 1.1 2013/06/19 15:07:41 jperkin Exp $
+
+Install etc files to examples area.
+
+--- data/etc/Makefile.in.orig	2013-05-11 20:07:16.000000000 +0000
++++ data/etc/Makefile.in
+@@ -403,9 +403,9 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ version_info = @version_info@
+ MAINTAINERCLEANFILES = Makefile.in
+-filesdir = $(sysconfdir)/enlightenment
++filesdir = $(prefix)/share/examples/enlightenment
+ files_DATA = $(am__append_1)
+-menusdir = $(sysconfdir)/xdg/menus
++menusdir = $(prefix)/share/examples/enlightenment
+ menus_DATA = $(am__append_2)
+ EXTRA_DIST = $(files_DATA) $(menus_DATA)
+ all: all-am