aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.efl.mk109
-rw-r--r--audio/emphasis/Makefile4
-rw-r--r--converters/ecore-txt/Makefile4
-rw-r--r--deskutils/estickies/Makefile4
-rw-r--r--devel/Makefile1
-rw-r--r--devel/e_dbus/Makefile52
-rw-r--r--devel/e_dbus/distinfo5
-rw-r--r--devel/e_dbus/pkg-descr2
-rw-r--r--devel/e_dbus/pkg-plist39
-rw-r--r--devel/ecore-file/Makefile48
-rw-r--r--devel/ecore-file/distinfo5
-rw-r--r--devel/ecore-file/pkg-plist7
-rw-r--r--devel/ecore-ipc/Makefile44
-rw-r--r--devel/ecore-ipc/distinfo5
-rw-r--r--devel/ecore-ipc/files/patch-configure89
-rw-r--r--devel/ecore-ipc/pkg-plist7
-rw-r--r--devel/ecore-job/Makefile4
-rw-r--r--devel/ecore-main/Makefile32
-rw-r--r--devel/ecore-main/Makefile.inc17
-rw-r--r--devel/ecore-main/distinfo5
-rw-r--r--devel/ecore-main/pkg-plist16
-rw-r--r--devel/ecore/Makefile7
-rw-r--r--devel/eet/Makefile17
-rw-r--r--devel/eet/distinfo5
-rw-r--r--devel/eet/pkg-descr2
-rw-r--r--devel/eet/pkg-plist7
-rw-r--r--devel/eina/Makefile26
-rw-r--r--devel/eina/distinfo2
-rw-r--r--devel/eina/pkg-descr4
-rw-r--r--devel/eina/pkg-plist59
-rw-r--r--devel/engrave/Makefile4
-rw-r--r--devel/evfs/Makefile4
-rw-r--r--devel/ruby-ecore/Makefile4
-rw-r--r--graphics/Makefile3
-rw-r--r--graphics/ecore-evas/Makefile62
-rw-r--r--graphics/ecore-evas/distinfo5
-rw-r--r--graphics/ecore-evas/pkg-plist6
-rw-r--r--graphics/ecore-sdl/Makefile43
-rw-r--r--graphics/ecore-sdl/distinfo5
-rw-r--r--graphics/ecore-sdl/pkg-plist6
-rw-r--r--graphics/edje/Makefile29
-rw-r--r--graphics/edje/distinfo5
-rw-r--r--graphics/edje/files/patch-src_lib_edje_private.h11
-rw-r--r--graphics/edje/pkg-descr2
-rw-r--r--graphics/edje/pkg-plist13
-rw-r--r--graphics/edje_viewer/Makefile18
-rw-r--r--graphics/edje_viewer/distinfo5
-rw-r--r--graphics/edje_viewer/pkg-plist7
-rw-r--r--graphics/epsilon/Makefile4
-rw-r--r--graphics/esmart/Makefile5
-rw-r--r--graphics/ethumb/Makefile52
-rw-r--r--graphics/ethumb/distinfo2
-rw-r--r--graphics/ethumb/pkg-descr7
-rw-r--r--graphics/ethumb/pkg-plist24
-rw-r--r--graphics/evas-core/Makefile46
-rw-r--r--graphics/evas-core/Makefile.inc23
-rw-r--r--graphics/evas-core/distinfo5
-rw-r--r--graphics/evas-core/files/patch-configure11
-rw-r--r--graphics/evas-core/files/patch-src_lib_canvas_evas_main.c77
-rw-r--r--graphics/evas-core/files/patch-src_lib_include_evas_common.h11
-rw-r--r--graphics/evas-core/pkg-plist18
-rw-r--r--graphics/evas-engine-buffer/Makefile38
-rw-r--r--graphics/evas-engine-buffer/distinfo5
-rw-r--r--graphics/evas-engine-buffer/pkg-plist5
-rw-r--r--graphics/evas-engine-opengl/Makefile40
-rw-r--r--graphics/evas-engine-opengl/distinfo5
-rw-r--r--graphics/evas-engine-opengl/pkg-plist5
-rw-r--r--graphics/evas-engine-sdl/Makefile38
-rw-r--r--graphics/evas-engine-sdl/distinfo5
-rw-r--r--graphics/evas-engine-sdl/pkg-plist5
-rw-r--r--graphics/evas-engine-x11/Makefile38
-rw-r--r--graphics/evas-engine-x11/distinfo5
-rw-r--r--graphics/evas-engine-x11/pkg-plist5
-rw-r--r--graphics/evas-engine-xrender/Makefile38
-rw-r--r--graphics/evas-engine-xrender/distinfo5
-rw-r--r--graphics/evas-engine-xrender/pkg-plist5
-rw-r--r--graphics/evas-loader-bmp/Makefile46
-rw-r--r--graphics/evas-loader-bmp/distinfo2
-rw-r--r--graphics/evas-loader-bmp/pkg-descr6
-rw-r--r--graphics/evas-loader-bmp/pkg-plist6
-rw-r--r--graphics/evas-loader-edb/distinfo1
-rw-r--r--graphics/evas-loader-eet/Makefile46
-rw-r--r--graphics/evas-loader-eet/distinfo5
-rw-r--r--graphics/evas-loader-eet/pkg-plist4
-rw-r--r--graphics/evas-loader-gif/Makefile46
-rw-r--r--graphics/evas-loader-gif/distinfo5
-rw-r--r--graphics/evas-loader-gif/pkg-plist2
-rw-r--r--graphics/evas-loader-jpeg/Makefile46
-rw-r--r--graphics/evas-loader-jpeg/distinfo5
-rw-r--r--graphics/evas-loader-jpeg/pkg-plist4
-rw-r--r--graphics/evas-loader-pmaps/Makefile46
-rw-r--r--graphics/evas-loader-pmaps/distinfo2
-rw-r--r--graphics/evas-loader-pmaps/pkg-descr6
-rw-r--r--graphics/evas-loader-pmaps/pkg-plist6
-rw-r--r--graphics/evas-loader-png/Makefile46
-rw-r--r--graphics/evas-loader-png/distinfo5
-rw-r--r--graphics/evas-loader-png/files/patch-evas_image_load_png.c20
-rw-r--r--graphics/evas-loader-png/pkg-plist4
-rw-r--r--graphics/evas-loader-svg/Makefile46
-rw-r--r--graphics/evas-loader-svg/distinfo5
-rw-r--r--graphics/evas-loader-svg/files/patch-evas_image_load_png.c20
-rw-r--r--graphics/evas-loader-svg/pkg-plist2
-rw-r--r--graphics/evas-loader-tga/Makefile46
-rw-r--r--graphics/evas-loader-tga/distinfo2
-rw-r--r--graphics/evas-loader-tga/pkg-descr6
-rw-r--r--graphics/evas-loader-tga/pkg-plist6
-rw-r--r--graphics/evas-loader-tiff/Makefile46
-rw-r--r--graphics/evas-loader-tiff/distinfo5
-rw-r--r--graphics/evas-loader-tiff/pkg-plist4
-rw-r--r--graphics/evas-loader-xpm/Makefile46
-rw-r--r--graphics/evas-loader-xpm/distinfo5
-rw-r--r--graphics/evas-loader-xpm/pkg-plist2
-rw-r--r--graphics/evas/Makefile8
-rw-r--r--graphics/exact-image/Makefile1
-rw-r--r--graphics/exact-image/files/patch-edisplay_Makefile15
-rw-r--r--graphics/exact-image/files/patch-edisplay_edisplay.cc24
-rw-r--r--graphics/exhibit/Makefile4
-rw-r--r--graphics/imlib2_loaders/Makefile2
-rw-r--r--graphics/ruby-edje/Makefile4
-rw-r--r--graphics/ruby-esmart/Makefile4
-rw-r--r--graphics/ruby-evas/Makefile4
-rw-r--r--graphics/ruby-redact/Makefile4
-rw-r--r--lang/embryo/Makefile14
-rw-r--r--lang/embryo/distinfo5
-rw-r--r--lang/embryo/files/patch-src_lib_embryo_str.c11
-rw-r--r--lang/embryo/pkg-descr2
-rw-r--r--lang/embryo/pkg-plist7
-rw-r--r--multimedia/eclair/Makefile4
-rw-r--r--multimedia/emotion/Makefile16
-rw-r--r--multimedia/emotion/distinfo5
-rw-r--r--multimedia/emotion/pkg-plist17
-rw-r--r--net/ecore-con/Makefile43
-rw-r--r--net/ecore-con/distinfo5
-rw-r--r--net/ecore-con/files/patch-configure89
-rw-r--r--net/ecore-con/pkg-plist7
-rw-r--r--sysutils/ecore-config/Makefile4
-rw-r--r--sysutils/empower/Makefile28
-rw-r--r--sysutils/empower/distinfo5
-rw-r--r--sysutils/empower/pkg-plist72
-rw-r--r--sysutils/extrackt/Makefile4
-rw-r--r--textproc/exml/Makefile4
-rw-r--r--x11-fm/entropyfm/Makefile4
-rw-r--r--x11-themes/e17-splash-azul/Makefile4
-rw-r--r--x11-themes/e17-splash-blue/Makefile4
-rw-r--r--x11-themes/e17-splash-clean/Makefile4
-rw-r--r--x11-themes/e17-splash-fortune/Makefile4
-rw-r--r--x11-themes/e17-splash-logo/Makefile4
-rw-r--r--x11-themes/e17-splash-shiny/Makefile4
-rw-r--r--x11-themes/e17-splash-takara/Makefile4
-rw-r--r--x11-themes/e17-theme-blue_eyed/Makefile4
-rw-r--r--x11-themes/e17-theme-cthulhain/Makefile7
-rw-r--r--x11-themes/e17-theme-cthulhain/distinfo5
-rw-r--r--x11-themes/e17-theme-cthulhain/pkg-descr2
-rw-r--r--x11-themes/e17-theme-dali/Makefile4
-rw-r--r--x11-themes/e17-theme-darkness/Makefile12
-rw-r--r--x11-themes/e17-theme-darkness/distinfo5
-rw-r--r--x11-themes/e17-theme-gant/Makefile4
-rw-r--r--x11-themes/e17-theme-japan2007/Makefile4
-rw-r--r--x11-themes/e17-theme-kor/Makefile4
-rw-r--r--x11-themes/e17-theme-milky/Makefile4
-rw-r--r--x11-themes/e17-theme-night_bling/Makefile4
-rw-r--r--x11-themes/e17-theme-simply_white/Makefile4
-rw-r--r--x11-toolkits/Makefile1
-rw-r--r--x11-toolkits/elementary/Makefile33
-rw-r--r--x11-toolkits/elementary/distinfo2
-rw-r--r--x11-toolkits/elementary/files/patch-configure11
-rw-r--r--x11-toolkits/elementary/pkg-descr5
-rw-r--r--x11-toolkits/elementary/pkg-plist91
-rw-r--r--x11-toolkits/enhance/Makefile4
-rw-r--r--x11-toolkits/etk/Makefile4
-rw-r--r--x11-toolkits/ewl/Makefile4
-rw-r--r--x11-wm/Makefile28
-rw-r--r--x11-wm/e17-module-alarm/Makefile37
-rw-r--r--x11-wm/e17-module-alarm/distinfo2
-rw-r--r--x11-wm/e17-module-alarm/pkg-descr3
-rw-r--r--x11-wm/e17-module-alarm/pkg-plist96
-rw-r--r--x11-wm/e17-module-bling/Makefile6
-rw-r--r--x11-wm/e17-module-bling/distinfo1
-rw-r--r--x11-wm/e17-module-bling/pkg-plist2
-rw-r--r--x11-wm/e17-module-calendar/Makefile17
-rw-r--r--x11-wm/e17-module-calendar/distinfo5
-rw-r--r--x11-wm/e17-module-calendar/pkg-plist102
-rw-r--r--x11-wm/e17-module-cpu/Makefile16
-rw-r--r--x11-wm/e17-module-cpu/distinfo5
-rw-r--r--x11-wm/e17-module-cpu/pkg-plist91
-rw-r--r--x11-wm/e17-module-deskshow/Makefile14
-rw-r--r--x11-wm/e17-module-deskshow/distinfo5
-rw-r--r--x11-wm/e17-module-deskshow/pkg-plist3
-rw-r--r--x11-wm/e17-module-diskio/Makefile37
-rw-r--r--x11-wm/e17-module-diskio/distinfo2
-rw-r--r--x11-wm/e17-module-diskio/pkg-descr3
-rw-r--r--x11-wm/e17-module-diskio/pkg-plist7
-rw-r--r--x11-wm/e17-module-drawer/Makefile39
-rw-r--r--x11-wm/e17-module-drawer/distinfo2
-rw-r--r--x11-wm/e17-module-drawer/pkg-descr3
-rw-r--r--x11-wm/e17-module-drawer/pkg-plist68
-rw-r--r--x11-wm/e17-module-efm_nav/Makefile37
-rw-r--r--x11-wm/e17-module-efm_nav/distinfo2
-rw-r--r--x11-wm/e17-module-efm_nav/pkg-descr3
-rw-r--r--x11-wm/e17-module-efm_nav/pkg-plist89
-rw-r--r--x11-wm/e17-module-efm_path/Makefile37
-rw-r--r--x11-wm/e17-module-efm_path/distinfo2
-rw-r--r--x11-wm/e17-module-efm_path/pkg-descr3
-rw-r--r--x11-wm/e17-module-efm_path/pkg-plist86
-rw-r--r--x11-wm/e17-module-efm_pathbar/Makefile37
-rw-r--r--x11-wm/e17-module-efm_pathbar/distinfo2
-rw-r--r--x11-wm/e17-module-efm_pathbar/pkg-descr3
-rw-r--r--x11-wm/e17-module-efm_pathbar/pkg-plist74
-rw-r--r--x11-wm/e17-module-engage/Makefile37
-rw-r--r--x11-wm/e17-module-engage/distinfo2
-rw-r--r--x11-wm/e17-module-engage/pkg-descr12
-rw-r--r--x11-wm/e17-module-engage/pkg-plist19
-rw-r--r--x11-wm/e17-module-everything-mpris/Makefile37
-rw-r--r--x11-wm/e17-module-everything-mpris/distinfo2
-rw-r--r--x11-wm/e17-module-everything-mpris/pkg-descr8
-rw-r--r--x11-wm/e17-module-everything-mpris/pkg-plist17
-rw-r--r--x11-wm/e17-module-everything-pidgin/Makefile37
-rw-r--r--x11-wm/e17-module-everything-pidgin/distinfo2
-rw-r--r--x11-wm/e17-module-everything-pidgin/pkg-descr4
-rw-r--r--x11-wm/e17-module-everything-pidgin/pkg-plist17
-rw-r--r--x11-wm/e17-module-everything-places/Makefile37
-rw-r--r--x11-wm/e17-module-everything-places/distinfo2
-rw-r--r--x11-wm/e17-module-everything-places/pkg-descr3
-rw-r--r--x11-wm/e17-module-everything-places/pkg-plist14
-rw-r--r--x11-wm/e17-module-everything-wallpaper/Makefile37
-rw-r--r--x11-wm/e17-module-everything-wallpaper/distinfo2
-rw-r--r--x11-wm/e17-module-everything-wallpaper/pkg-descr3
-rw-r--r--x11-wm/e17-module-everything-wallpaper/pkg-plist7
-rw-r--r--x11-wm/e17-module-everything-websearch/Makefile37
-rw-r--r--x11-wm/e17-module-everything-websearch/distinfo2
-rw-r--r--x11-wm/e17-module-everything-websearch/pkg-descr5
-rw-r--r--x11-wm/e17-module-everything-websearch/pkg-plist17
-rw-r--r--x11-wm/e17-module-exebuf/Makefile37
-rw-r--r--x11-wm/e17-module-exebuf/distinfo2
-rw-r--r--x11-wm/e17-module-exebuf/pkg-descr3
-rw-r--r--x11-wm/e17-module-exebuf/pkg-plist7
-rw-r--r--x11-wm/e17-module-execwatch/Makefile37
-rw-r--r--x11-wm/e17-module-execwatch/distinfo2
-rw-r--r--x11-wm/e17-module-execwatch/pkg-descr5
-rw-r--r--x11-wm/e17-module-execwatch/pkg-plist8
-rw-r--r--x11-wm/e17-module-flame/Makefile14
-rw-r--r--x11-wm/e17-module-flame/distinfo5
-rw-r--r--x11-wm/e17-module-flame/pkg-plist83
-rw-r--r--x11-wm/e17-module-forecasts/Makefile37
-rw-r--r--x11-wm/e17-module-forecasts/distinfo2
-rw-r--r--x11-wm/e17-module-forecasts/pkg-descr4
-rw-r--r--x11-wm/e17-module-forecasts/pkg-plist90
-rw-r--r--x11-wm/e17-module-iiirk/Makefile37
-rw-r--r--x11-wm/e17-module-iiirk/distinfo2
-rw-r--r--x11-wm/e17-module-iiirk/pkg-descr22
-rw-r--r--x11-wm/e17-module-iiirk/pkg-plist56
-rw-r--r--x11-wm/e17-module-itask-ng/Makefile37
-rw-r--r--x11-wm/e17-module-itask-ng/distinfo2
-rw-r--r--x11-wm/e17-module-itask-ng/pkg-descr12
-rw-r--r--x11-wm/e17-module-itask-ng/pkg-plist19
-rw-r--r--x11-wm/e17-module-language/Makefile24
-rw-r--r--x11-wm/e17-module-language/distinfo5
-rw-r--r--x11-wm/e17-module-language/files/patch-configure26
-rw-r--r--x11-wm/e17-module-language/pkg-descr3
-rw-r--r--x11-wm/e17-module-language/pkg-plist205
-rw-r--r--x11-wm/e17-module-mail/Makefile14
-rw-r--r--x11-wm/e17-module-mail/distinfo5
-rw-r--r--x11-wm/e17-module-mail/pkg-plist80
-rw-r--r--x11-wm/e17-module-mem/Makefile14
-rw-r--r--x11-wm/e17-module-mem/distinfo5
-rw-r--r--x11-wm/e17-module-mem/pkg-plist84
-rw-r--r--x11-wm/e17-module-mixer/Makefile6
-rw-r--r--x11-wm/e17-module-mixer/distinfo1
-rw-r--r--x11-wm/e17-module-mixer/pkg-plist2
-rw-r--r--x11-wm/e17-module-moon/Makefile14
-rw-r--r--x11-wm/e17-module-moon/distinfo5
-rw-r--r--x11-wm/e17-module-moon/pkg-plist88
-rw-r--r--x11-wm/e17-module-mpdule/Makefile38
-rw-r--r--x11-wm/e17-module-mpdule/distinfo2
-rw-r--r--x11-wm/e17-module-mpdule/pkg-descr8
-rw-r--r--x11-wm/e17-module-mpdule/pkg-plist8
-rw-r--r--x11-wm/e17-module-net/Makefile37
-rw-r--r--x11-wm/e17-module-net/distinfo2
-rw-r--r--x11-wm/e17-module-net/pkg-descr3
-rw-r--r--x11-wm/e17-module-net/pkg-plist90
-rw-r--r--x11-wm/e17-module-notification/Makefile37
-rw-r--r--x11-wm/e17-module-notification/distinfo2
-rw-r--r--x11-wm/e17-module-notification/pkg-descr3
-rw-r--r--x11-wm/e17-module-notification/pkg-plist89
-rw-r--r--x11-wm/e17-module-penguins/Makefile37
-rw-r--r--x11-wm/e17-module-penguins/distinfo2
-rw-r--r--x11-wm/e17-module-penguins/pkg-descr3
-rw-r--r--x11-wm/e17-module-penguins/pkg-plist86
-rw-r--r--x11-wm/e17-module-photo/Makefile37
-rw-r--r--x11-wm/e17-module-photo/distinfo2
-rw-r--r--x11-wm/e17-module-photo/pkg-descr3
-rw-r--r--x11-wm/e17-module-photo/pkg-plist68
-rw-r--r--x11-wm/e17-module-places/Makefile37
-rw-r--r--x11-wm/e17-module-places/distinfo2
-rw-r--r--x11-wm/e17-module-places/pkg-descr3
-rw-r--r--x11-wm/e17-module-places/pkg-plist62
-rw-r--r--x11-wm/e17-module-quickaccess/Makefile37
-rw-r--r--x11-wm/e17-module-quickaccess/distinfo2
-rw-r--r--x11-wm/e17-module-quickaccess/pkg-descr12
-rw-r--r--x11-wm/e17-module-quickaccess/pkg-plist7
-rw-r--r--x11-wm/e17-module-rain/Makefile14
-rw-r--r--x11-wm/e17-module-rain/distinfo5
-rw-r--r--x11-wm/e17-module-rain/pkg-plist80
-rw-r--r--x11-wm/e17-module-screenshot/Makefile22
-rw-r--r--x11-wm/e17-module-screenshot/distinfo5
-rw-r--r--x11-wm/e17-module-screenshot/pkg-plist38
-rw-r--r--x11-wm/e17-module-slideshow/Makefile14
-rw-r--r--x11-wm/e17-module-slideshow/distinfo5
-rw-r--r--x11-wm/e17-module-slideshow/pkg-plist82
-rw-r--r--x11-wm/e17-module-snow/Makefile14
-rw-r--r--x11-wm/e17-module-snow/distinfo5
-rw-r--r--x11-wm/e17-module-snow/pkg-plist92
-rw-r--r--x11-wm/e17-module-taskbar/Makefile37
-rw-r--r--x11-wm/e17-module-taskbar/distinfo2
-rw-r--r--x11-wm/e17-module-taskbar/pkg-descr3
-rw-r--r--x11-wm/e17-module-taskbar/pkg-plist96
-rw-r--r--x11-wm/e17-module-tclock/Makefile37
-rw-r--r--x11-wm/e17-module-tclock/distinfo2
-rw-r--r--x11-wm/e17-module-tclock/pkg-descr3
-rw-r--r--x11-wm/e17-module-tclock/pkg-plist90
-rw-r--r--x11-wm/e17-module-tiling/Makefile37
-rw-r--r--x11-wm/e17-module-tiling/distinfo2
-rw-r--r--x11-wm/e17-module-tiling/pkg-descr4
-rw-r--r--x11-wm/e17-module-tiling/pkg-plist74
-rw-r--r--x11-wm/e17-module-uptime/Makefile18
-rw-r--r--x11-wm/e17-module-uptime/distinfo5
-rw-r--r--x11-wm/e17-module-uptime/files/extra::e_mod_main.c58
-rw-r--r--x11-wm/e17-module-uptime/files/patch-src_e_mod_main.c63
-rw-r--r--x11-wm/e17-module-uptime/pkg-plist85
-rw-r--r--x11-wm/e17-module-weather/Makefile16
-rw-r--r--x11-wm/e17-module-weather/distinfo5
-rw-r--r--x11-wm/e17-module-weather/pkg-plist189
-rw-r--r--x11-wm/e17-module-winselector/Makefile25
-rw-r--r--x11-wm/e17-module-winselector/distinfo5
-rw-r--r--x11-wm/e17-module-winselector/pkg-plist8
-rw-r--r--x11-wm/e17-module-wlan/Makefile37
-rw-r--r--x11-wm/e17-module-wlan/distinfo2
-rw-r--r--x11-wm/e17-module-wlan/pkg-descr3
-rw-r--r--x11-wm/e17-module-wlan/pkg-plist96
-rw-r--r--x11-wm/e17-modules/Makefile58
-rw-r--r--x11-wm/e17-modules/pkg-descr3
-rw-r--r--x11-wm/e17-utils/Makefile4
-rw-r--r--x11-wm/enlightenment/Makefile45
-rw-r--r--x11-wm/enlightenment/distinfo5
-rw-r--r--x11-wm/enlightenment/files/patch-configure11
-rw-r--r--x11-wm/enlightenment/files/patch-src_bin_Makefile.in11
-rw-r--r--x11-wm/enlightenment/files/patch-src_modules_cpufreq_Makefile.in11
-rw-r--r--x11-wm/enlightenment/pkg-plist566
-rw-r--r--x11/Makefile2
-rw-r--r--x11/ecore-desktop/Makefile4
-rw-r--r--x11/ecore-imf/Makefile37
-rw-r--r--x11/ecore-imf/distinfo5
-rw-r--r--x11/ecore-imf/pkg-plist7
-rw-r--r--x11/ecore-imf_evas/Makefile39
-rw-r--r--x11/ecore-imf_evas/distinfo5
-rw-r--r--x11/ecore-imf_evas/pkg-plist7
-rw-r--r--x11/ecore-input/Makefile45
-rw-r--r--x11/ecore-input/distinfo2
-rw-r--r--x11/ecore-input/pkg-descr5
-rw-r--r--x11/ecore-input/pkg-plist5
-rw-r--r--x11/ecore-input_evas/Makefile49
-rw-r--r--x11/ecore-input_evas/distinfo2
-rw-r--r--x11/ecore-input_evas/pkg-descr5
-rw-r--r--x11/ecore-input_evas/pkg-plist5
-rw-r--r--x11/ecore-x11/Makefile44
-rw-r--r--x11/ecore-x11/distinfo5
-rw-r--r--x11/ecore-x11/files/patch-src_lib_ecore_x_xlib_ecore_x_randr_12.c44
-rw-r--r--x11/ecore-x11/pkg-plist11
-rw-r--r--x11/efreet/Makefile19
-rw-r--r--x11/efreet/distinfo5
-rw-r--r--x11/efreet/pkg-descr2
-rw-r--r--x11/efreet/pkg-plist34
-rw-r--r--x11/elicit/Makefile6
-rw-r--r--x11/emprint/Makefile13
-rw-r--r--x11/emprint/distinfo5
-rw-r--r--x11/enity/Makefile4
-rw-r--r--x11/enterminus/Makefile2
-rw-r--r--x11/examine/Makefile4
378 files changed, 6326 insertions, 1989 deletions
diff --git a/Mk/bsd.efl.mk b/Mk/bsd.efl.mk
index 7b4162ded80f..9ecb6cd9425b 100644
--- a/Mk/bsd.efl.mk
+++ b/Mk/bsd.efl.mk
@@ -39,8 +39,9 @@ EFL_Include_MAINTAINER= stas@FreeBSD.org
#
# Define all supported libraries
#
-_USE_EFL_ALL= ecore edb edje eet efreet embryo emotion engrave enhance epeg \
- epsilon etk etox evas evfs ewl exml imlib2 edbus
+_USE_EFL_ALL= ecore edb edbus edje eet efreet eina elementary embryo emotion \
+ engrave enhance epeg epsilon etk etox evas evfs ewl exml \
+ imlib2
# For each library supported we define the following variables:
# _%%LIB%%_CATEGORY - category the port belongs to
@@ -53,93 +54,84 @@ _USE_EFL_ALL= ecore edb edje eet efreet embryo emotion engrave enhance epeg \
#
_ecore_CATEGORY= devel
+_ecore_DEPENDS= eina
_ecore_PORTNAME= ecore-main
-_ecore_PREFIX= ${LOCALBASE}
-_ecore_VERSION= 9
+_ecore_VERSION= 1
_edb_CATEGORY= databases
-_edb_PREFIX= ${LOCALBASE}
_edb_VERSION= 1
_edbus_CATEGORY= devel
_edbus_PORTNAME= e_dbus
-_edbus_PREFIX= ${LOCALBASE}
_edbus_VERSION= 1
_eet_CATEGORY= devel
-_eet_PREFIX= ${LOCALBASE}
-_eet_VERSION= 9
+_eet_DEPENDS= eina
+_eet_VERSION= 5
_efreet_CATEGORY= x11
-_efreet_DEPENDS= ecore
-_efreet_PREFIX= ${LOCALBASE}
-_efreet_VERSION= 0
+_efreet_DEPENDS= ecore eina
+_efreet_VERSION= 1
_edje_CATEGORY= graphics
-_edje_DEPENDS= embryo eet imlib2 evas ecore
-_edje_PREFIX= ${LOCALBASE}
-_edje_VERSION= 5
+_edje_DEPENDS= ecore eet embryo evas
+_edje_VERSION= 1
+
+_eina_CATEGORY= devel
+_eina_VERSION= 1
+
+_elementary_CATEGORY= x11-toolkits
+_elementary_DEPENDS= ecore embryo edje
+_elementary_VERSION= 7
_embryo_CATEGORY= lang
-_embryo_PREFIX= ${LOCALBASE}
-_embryo_VERSION= 9
+_embryo_VERSION= 1
_emotion_CATEGORY= multimedia
_emotion_DEPENDS= ecore edje eet embryo evas
-_emotion_PREFIX= ${LOCALBASE}
-_emotion_VERSION= 1
+_emotion_VERSION= 2
_engrave_CATEGORY= devel
_engrave_DEPENDS= ecore evas
-_engrave_PREFIX= ${LOCALBASE}
_engrave_VERSION= 1
_enhance_CATEGORY= x11-toolkits
_enhance_DEPENDS= ecore etk exml
-_enhance_PREFIX= ${LOCALBASE}
_enhance_VERSION= 0
_epeg_CATEGORY= graphics
-_epeg_PREFIX= ${LOCALBASE}
_epeg_VERSION= 9
_epsilon_CATEGORY= graphics
_epsilon_DEPENDS= epeg edje imlib2 ecore
-_epsilon_PREFIX= ${LOCALBASE}
_epsilon_VERSION= 3
_etk_CATEGORY= x11-toolkits
_etk_DEPENDS= evas ecore edje
-_etk_PREFIX= ${LOCALBASE}
_etk_VERSION= 1
_etox_CATEGORY= x11-toolkits
_etox_DEPENDS= edb evas ecore
-_etox_PREFIX= ${LOCALBASE}
_etox_VERSION= 0
_evas_CATEGORY= graphics
+_evas_DEPENDS= eina eet
_evas_PORTNAME= evas-core
-_evas_PREFIX= ${LOCALBASE}
-_evas_VERSION= 9
+_evas_VERSION= 1
_evfs_CATEGORY= devel
_evfs_DEPENDS= eet ecore
-_evfs_PREFIX= ${LOCALBASE}
_evfs_VERSION= 0
_ewl_CATEGORY= x11-toolkits
_ewl_DEPENDS= evas ecore edje epsilon
-_ewl_PREFIX= ${LOCALBASE}
_ewl_VERSION= 1
_exml_CATEGORY= textproc
_exml_DEPENDS= ecore
-_exml_PREFIX= ${LOCALBASE}
_exml_VERSION= 1
_imlib2_CATEGORY= graphics
-_imlib2_PREFIX= ${LOCALBASE}
_imlib2_VERSION= 5
_imlib2_SLIB= Imlib2
@@ -156,6 +148,9 @@ _${LIB}_SLIB=${LIB}
. if !defined(_${LIB}_PORTNAME)
_${LIB}_PORTNAME=${LIB}
. endif
+. if !defined(_${LIB}_PREFIX)
+_${LIB}_PREFIX=${LOCALBASE}
+. endif
.endfor
#
@@ -216,7 +211,7 @@ _esmart_${COMP}_VERSION= ${_EFL_ESMART_VERSION}
# All components that are currently supported
_EFL_EVAS_ENGINES_ALL= buffer opengl sdl x11 xrender
-_EFL_EVAS_LOADERS_ALL= edb eet gif jpeg png svg tiff xpm
+_EFL_EVAS_LOADERS_ALL= bmp edb eet gif jpeg png pmaps svg tga tiff xpm
#
# Generic evas engines definitions
@@ -272,7 +267,8 @@ _evas_loader_${COMP}_DIR= ${COMP}
#
# All components that are currently supported
-_EFL_ECORE_ALL= con config desktop evas file ipc job sdl txt x11 imf imf_evas
+_EFL_ECORE_ALL= con config desktop evas file imf imf_evas input \
+ input_evas ipc job sdl txt x11
#
# Generic ecore definitions
@@ -292,6 +288,8 @@ _ecore_sdl_CATEGORY= graphics
_ecore_txt_CATEGORY= converters
_ecore_imf_CATEGORY= x11
_ecore_imf_evas_CATEGORY= x11
+_ecore_input_CATEGORY= x11
+_ecore_input_evas_CATEGORY= x11
_ecore_x11_CATEGORY= x11
_ecore_x11_NAME= ecore_x
@@ -484,12 +482,22 @@ EFL_Include_post= bsd.efl.mk
#
# Check if we have all libraries requiested and build depends list
#
+.if ${USE_EFL:Mlibrt_hack}
+_USE_EFL_LIBRT_HACK= yes
+.endif
+.if ${USE_EFL:Mmodarch_hack}
+_USE_EFL_MODARCH_HACK= yes
+.endif
+.if ${USE_EFL:Mlibtool_hack}
+_USE_EFL_LIBTOOL_HACK= yes
+.endif
_USE_EFL= #empty
-.for LIB in ${USE_EFL}
+.for LIB in ${USE_EFL:Nlibrt_hack:Nmodarch_hack:Nlibtool_hack}
. if ${_USE_EFL_ALL:M${LIB}}==""
IGNORE= cannot install: unknown library ${LIB}
-. endif
+. else
_USE_EFL+= ${_${LIB}_DEPENDS} ${LIB}
+. endif
.endfor
#
@@ -518,6 +526,39 @@ CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
PLIST_SUB+= E17_ARCH=freebsd${OSREL}-${ARCH}
+.if defined(_USE_EFL_LIBRT_HACK)
+#
+# Don't use librt
+#
+post-patch: efl_drop_librt
+efl_drop_librt:
+ @${REINPLACE_CMD} -E \
+ -e '/^[[:space:]]+freebsd\*/,/^[[:space:]];;/s/-lrt//g' \
+ ${WRKSRC}/configure
+.endif
+
+.if defined(_USE_EFL_MODARCH_HACK)
+#
+# Use correct module arch path
+#
+post-patch: efl_patch_modarch
+efl_patch_modarch:
+ @${REINPLACE_CMD} -E \
+ -e 's/(MODULE_ARCH="\$$host_os-\$$host_cpu)-[^"]+"/\1"/g' \
+ -e 's/(MODULE_EDJE="\$$host_os-\$$host_cpu)-[^"]+"/\1"/g' \
+ ${WRKSRC}/configure
+.endif
+
+.if defined(_USE_EFL_LIBTOOL_HACK)
+#
+# Get rid of .la and static library files
+#
+post-configure: efl_drop_la
+efl_drop_la:
+ ${REINPLACE_CMD} -E -e \
+ '/Install the pseudo-library/,/staticlibs=/s,^,#,' ${WRKSRC}/libtool
+.endif
+
.endif #USE_EFL
.endif #EFL_Include_post
diff --git a/audio/emphasis/Makefile b/audio/emphasis/Makefile
index 9f8920c39e9f..d97f3b0f154d 100644
--- a/audio/emphasis/Makefile
+++ b/audio/emphasis/Makefile
@@ -24,4 +24,8 @@ USE_EFL= ecore enhance etk
USE_EFL_ECORE= config
GNU_CONFIGURE= yes
+BROKEN= does not compile
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
.include <bsd.port.mk>
diff --git a/converters/ecore-txt/Makefile b/converters/ecore-txt/Makefile
index 24dcaa9e8648..a7af38153ac4 100644
--- a/converters/ecore-txt/Makefile
+++ b/converters/ecore-txt/Makefile
@@ -26,6 +26,10 @@ USE_ICONV= yes
BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_txt
INSTALL_WRKSRC= ${BUILD_WRKSRC}
+BROKEN= does not compile
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
CONFIGURE_ARGS= --disable-ecore-con \
--disable-ecore-config \
--disable-ecore-desktop \
diff --git a/deskutils/estickies/Makefile b/deskutils/estickies/Makefile
index e42600a5d81c..2de537a84a43 100644
--- a/deskutils/estickies/Makefile
+++ b/deskutils/estickies/Makefile
@@ -21,4 +21,8 @@ USE_GNOME= gnomehack pkgconfig gnometarget
USE_EFL= etk eet
GNU_CONFIGURE= yes
+BROKEN= does not compile
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
.include <bsd.port.mk>
diff --git a/devel/Makefile b/devel/Makefile
index a85eb6877a8e..5d63ab478d0f 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -350,6 +350,7 @@
SUBDIR += egypt
SUBDIR += eieio
SUBDIR += eiffelstudio
+ SUBDIR += eina
SUBDIR += elf
SUBDIR += elfio
SUBDIR += elfkickers
diff --git a/devel/e_dbus/Makefile b/devel/e_dbus/Makefile
index 0856f347e867..a931aa17404e 100644
--- a/devel/e_dbus/Makefile
+++ b/devel/e_dbus/Makefile
@@ -6,26 +6,32 @@
#
PORTNAME= e_dbus
-PORTVERSION= 20080223
-PORTREVISION= 2
-CATEGORIES= devel
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
- http://download.enlightenment.org/snapshots/2008-01-25/
+DISTVERSION= 1.0.0.beta
+PORTEPOCH= 1
+CATEGORIES= devel enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
MAINTAINER= stas@FreeBSD.org
COMMENT= EFL DBUS connectivity library
LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus
-GNU_CONFIGURE= yes
+LICENSE= BSD
+DIST_SUBDIR= e17
USE_BZIP2= yes
+GNU_CONFIGURE= yes
+USE_EFL= eina ecore libtool_hack librt_hack
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_EFL= ecore
USE_LDCONFIG= yes
-OPTIONS= EHAL "Build E HAL module" on \
- ENM "Build E NM module" on \
- ENOT "Build E notify module" on
+CONFIGURE_ARGS= --disable-ebluez # Linux specific ??
+
+OPTIONS= EHAL "Build E HAL module" on \
+ EUKIT "Build E upower module" on \
+ ECONNM "Build E connman module" on \
+ EOFONO "Build E oFono module" on \
+ ENOT "Build E notify module" on
.include <bsd.port.pre.mk>
@@ -37,12 +43,28 @@ CONFIGURE_ARGS+= --disable-ehal
PLIST_SUB+= EHAL="@comment "
.endif
-.if !defined(WITHOUT_ENM)
-CONFIGURE_ARGS+= --enable-enm
-PLIST_SUB+= ENM=""
+.if !defined(WITHOUT_EUKIT)
+CONFIGURE_ARGS+= --enable-eukit
+PLIST_SUB+= EUKIT=""
+.else
+CONFIGURE_ARGS+= --disable-eukit
+PLIST_SUB+= EUKIT="@comment "
+.endif
+
+.if !defined(WITHOUT_ECONNM)
+CONFIGURE_ARGS+= --enable-econnman
+PLIST_SUB+= ECONNM=""
+.else
+CONFIGURE_ARGS+= --disable-econnman
+PLIST_SUB+= ECONNM="@comment "
+.endif
+
+.if !defined(WITHOUT_EOFONO)
+CONFIGURE_ARGS+= --enable-eofono
+PLIST_SUB+= EOFONO=""
.else
-CONFIGURE_ARGS+= --disable-enm
-PLIST_SUB+= ENM="@comment "
+CONFIGURE_ARGS+= --disable-eofono
+PLIST_SUB+= EOFONO="@comment "
.endif
.if !defined(WITHOUT_ENOT)
diff --git a/devel/e_dbus/distinfo b/devel/e_dbus/distinfo
index 486c69fb2ee8..559646f643ad 100644
--- a/devel/e_dbus/distinfo
+++ b/devel/e_dbus/distinfo
@@ -1,3 +1,2 @@
-MD5 (e_dbus-20080223.tar.bz2) = d709ffed87f71253a62cda1484b0aa64
-SHA256 (e_dbus-20080223.tar.bz2) = f27382a51c16f7d10b3e2757c4b8c3a483b3afc137cafae4321252b3d4cf59c0
-SIZE (e_dbus-20080223.tar.bz2) = 252568
+SHA256 (e17/e_dbus-1.0.0.beta.tar.bz2) = b6eff6419b0ad5e76a47705fd29128e96bc59a9ed5d18b36e0a55a5520806d76
+SIZE (e17/e_dbus-1.0.0.beta.tar.bz2) = 390574
diff --git a/devel/e_dbus/pkg-descr b/devel/e_dbus/pkg-descr
index 141e4ab49806..0c9865dc7820 100644
--- a/devel/e_dbus/pkg-descr
+++ b/devel/e_dbus/pkg-descr
@@ -1,3 +1,3 @@
Enlightenment DBUS compatibility layer.
-WWW: http://www.enlightenment.org/
+WWW: http://docs.enlightenment.org/api/e_dbus/html/
diff --git a/devel/e_dbus/pkg-plist b/devel/e_dbus/pkg-plist
index 5699855209ab..dae1f604ee20 100644
--- a/devel/e_dbus/pkg-plist
+++ b/devel/e_dbus/pkg-plist
@@ -1,31 +1,34 @@
-%%EHAL%%bin/e_dbus_hal
-%%ENM%%bin/e_dbus_nm
+%%ENOT%%bin/e-notify-send
+%%ECONNM%%bin/e_dbus_connman_test
%%ENOT%%bin/e_dbus_notification_daemon
%%ENOT%%bin/e_dbus_notify
+%%EOFONO%%bin/e_dbus_ofono_test
bin/e_dbus_test
bin/e_dbus_test_client
-include/E_DBus.h
-%%EHAL%%include/E_Hal.h
-%%ENM%%include/E_Nm.h
-%%ENOT%%include/E_Notification_Daemon.h
-%%ENOT%%include/E_Notify.h
-lib/libedbus.a
-lib/libedbus.la
+%%EUKIT%%bin/e_dbus_ukit_test
+%%ECONNM%%include/e_dbus-1/E_Connman.h
+include/e_dbus-1/E_DBus.h
+%%EHAL%%include/e_dbus-1/E_Hal.h
+%%ENOT%%include/e_dbus-1/E_Notification_Daemon.h
+%%ENOT%%include/e_dbus-1/E_Notify.h
+%%EOFONO%%include/e_dbus-1/E_Ofono.h
+%%EUKIT%%include/e_dbus-1/E_Ukit.h
+%%ECONNM%%lib/libeconnman.so
+%%ECONNM%%lib/libeconnman.so.1
lib/libedbus.so
lib/libedbus.so.1
-%%EHAL%%lib/libehal.a
-%%EHAL%%lib/libehal.la
%%EHAL%%lib/libehal.so
%%EHAL%%lib/libehal.so.1
-%%ENM%%lib/libenm.a
-%%ENM%%lib/libenm.la
-%%ENM%%lib/libenm.so
-%%ENM%%lib/libenm.so.1
-%%ENOT%%lib/libenotify.a
-%%ENOT%%lib/libenotify.la
%%ENOT%%lib/libenotify.so
%%ENOT%%lib/libenotify.so.1
+%%EOFONO%%lib/libeofono.so
+%%EOFONO%%lib/libeofono.so.1
+%%EUKIT%%lib/libeukit.so
+%%EUKIT%%lib/libeukit.so.1
+%%ECONNM%%libdata/pkgconfig/econnman.pc
libdata/pkgconfig/edbus.pc
%%EHAL%%libdata/pkgconfig/ehal.pc
-%%ENM%%libdata/pkgconfig/enm.pc
%%ENOT%%libdata/pkgconfig/enotify.pc
+%%EOFONO%%libdata/pkgconfig/eofono.pc
+%%EUKIT%%libdata/pkgconfig/eukit.pc
+@dirrm include/e_dbus-1
diff --git a/devel/ecore-file/Makefile b/devel/ecore-file/Makefile
index dd666eaa26f6..9372c81162cb 100644
--- a/devel/ecore-file/Makefile
+++ b/devel/ecore-file/Makefile
@@ -6,55 +6,55 @@
#
PORTNAME= file
-PORTVERSION= 0.9.9.042
-PORTREVISION= 2
-CATEGORIES= devel
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
- http://download.enlightenment.org/snapshots/2008-01-25/
+DISTVERSION= 1.0.0.beta
+PORTREVISION= 0
+CATEGORIES= devel enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
PKGNAMEPREFIX= ecore-
-DISTNAME= ecore-${PORTVERSION}
+DISTNAME= ecore-${DISTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= Enlightenment core abstraction library (file module)
-GNU_CONFIGURE= yes
+LICENSE= BSD
+DIST_SUBDIR= e17
USE_BZIP2= yes
+GNU_CONFIGURE= yes
+USE_EFL= ecore libtool_hack
USE_GNOME= gnomehack pkgconfig gnometarget
USE_LDCONFIG= yes
-USE_EFL= ecore
BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_file
INSTALL_WRKSRC= ${BUILD_WRKSRC}
-CONFIGURE_ARGS= --disable-ecore-con \
- --disable-ecore-config \
- --disable-ecore-desktop \
- --disable-ecore-directfb \
- --disable-ecore-evas \
- --enable-ecore-file \
- --disable-ecore-ipc \
- --disable-ecore-job \
- --disable-ecore-sdl \
- --disable-ecore-txt \
- --disable-ecore-x \
- --disable-ecore-imf \
- --disable-ecore-imf_evas
+.include <../ecore-main/Makefile.inc>
+
+CONFIGURE_ARGS+= --enable-ecore-file
OPTIONS= CURL "Enable Curl support" on
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_CURL)
-CONFIGURE_ARGS+= --enable-curl
+USE_EFL_ECORE= con
+CONFIGURE_ARGS+= --enable-ecore-con \
+ --enable-curl
LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl
.else
CONFIGURE_ARGS+= --disable-curl
.endif
post-patch:
- @${REINPLACE_CMD} -E -e \
- 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
+ @${REINPLACE_CMD} -E \
+ -e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
-e 's,\$$\(top_builddir\)/src/lib/ecore/libecore\.la,-lecore,'\
${BUILD_WRKSRC}/Makefile.in
+.if !defined(WITHOUT_CURL)
+ @${REINPLACE_CMD} -E \
+ -e 's,\$$\(top_builddir\)/src/lib/ecore_con/\.libs,${LOCALBASE}/lib,'\
+ -e 's,\$$\(top_builddir\)/src/lib/ecore_con/libecore_con\.la,-lecore_con,'\
+ ${BUILD_WRKSRC}/Makefile.in
+.endif
post-install:
${INSTALL_DATA} ${WRKSRC}/ecore-file.pc \
diff --git a/devel/ecore-file/distinfo b/devel/ecore-file/distinfo
index 4672f6a1c167..36d07e85437a 100644
--- a/devel/ecore-file/distinfo
+++ b/devel/ecore-file/distinfo
@@ -1,3 +1,2 @@
-MD5 (ecore-0.9.9.042.tar.bz2) = a66df2b5f0b1a6abc47bb50bf2b26846
-SHA256 (ecore-0.9.9.042.tar.bz2) = 26486fd2c80e4000b673f81ce637aa50c17c767e4c2af8f56de5d110e387d136
-SIZE (ecore-0.9.9.042.tar.bz2) = 5285732
+SHA256 (e17/ecore-1.0.0.beta.tar.bz2) = 9fd367f9ff10568082e65c1def46e64fb96b359221e0d6aea11c6c3f6bd5282f
+SIZE (e17/ecore-1.0.0.beta.tar.bz2) = 916635
diff --git a/devel/ecore-file/pkg-plist b/devel/ecore-file/pkg-plist
index f007fefe0c41..1be78d64f6e8 100644
--- a/devel/ecore-file/pkg-plist
+++ b/devel/ecore-file/pkg-plist
@@ -1,6 +1,5 @@
-include/Ecore_File.h
-lib/libecore_file.a
-lib/libecore_file.la
+include/ecore-1/Ecore_File.h
lib/libecore_file.so
-lib/libecore_file.so.9
+lib/libecore_file.so.1
libdata/pkgconfig/ecore-file.pc
+@dirrmtry include/ecore-1
diff --git a/devel/ecore-ipc/Makefile b/devel/ecore-ipc/Makefile
index 7d14d0932480..7257fb8d7b53 100644
--- a/devel/ecore-ipc/Makefile
+++ b/devel/ecore-ipc/Makefile
@@ -6,43 +6,30 @@
#
PORTNAME= ipc
-PORTVERSION= 0.9.9.042
-PORTREVISION= 2
-CATEGORIES= devel
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
- http://download.enlightenment.org/snapshots/2008-01-25/
+DISTVERSION= 1.0.0.beta
+CATEGORIES= devel enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
PKGNAMEPREFIX= ecore-
-DISTNAME= ecore-${PORTVERSION}
+DISTNAME= ecore-${DISTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= Enlightenment core abstraction library (ipc module)
-GNU_CONFIGURE= yes
+LICENSE= BSD
+DIST_SUBDIR= e17
USE_BZIP2= yes
+GNU_CONFIGURE= yes
+USE_EFL= ecore libtool_hack
+USE_EFL_ECORE= con
USE_GNOME= gnomehack pkgconfig gnometarget
USE_LDCONFIG= yes
-USE_EFL= ecore
-USE_EFL_ECORE= con
BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_ipc
INSTALL_WRKSRC= ${BUILD_WRKSRC}
-CONFIGURE_ARGS= --enable-ecore-con \
- --disable-ecore-config \
- --disable-ecore-desktop \
- --disable-ecore-directfb \
- --disable-ecore-evas \
- --disable-ecore-file \
- --enable-ecore-ipc \
- --disable-ecore-job \
- --disable-ecore-sdl \
- --disable-ecore-txt \
- --disable-ecore-x \
- --disable-ecore-imf \
- --disable-ecore-imf_evas
+OPTIONS= SSL "Enable SSL support" on
-OPTIONS= SSL "Enable SSL support" on
-
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if !defined(WITHOUT_SSL)
CONFIGURE_ARGS+= --enable-openssl
@@ -50,6 +37,11 @@ CONFIGURE_ARGS+= --enable-openssl
CONFIGURE_ARGS+= --disable-openssl
.endif
+.include <../ecore-main/Makefile.inc>
+
+CONFIGURE_ARGS+= --enable-ecore-con \
+ --enable-ecore-ipc
+
post-patch:
@${REINPLACE_CMD} -E \
-e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
@@ -62,4 +54,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/ecore-ipc.pc \
${PREFIX}/libdata/pkgconfig/
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/ecore-ipc/distinfo b/devel/ecore-ipc/distinfo
index 4672f6a1c167..36d07e85437a 100644
--- a/devel/ecore-ipc/distinfo
+++ b/devel/ecore-ipc/distinfo
@@ -1,3 +1,2 @@
-MD5 (ecore-0.9.9.042.tar.bz2) = a66df2b5f0b1a6abc47bb50bf2b26846
-SHA256 (ecore-0.9.9.042.tar.bz2) = 26486fd2c80e4000b673f81ce637aa50c17c767e4c2af8f56de5d110e387d136
-SIZE (ecore-0.9.9.042.tar.bz2) = 5285732
+SHA256 (e17/ecore-1.0.0.beta.tar.bz2) = 9fd367f9ff10568082e65c1def46e64fb96b359221e0d6aea11c6c3f6bd5282f
+SIZE (e17/ecore-1.0.0.beta.tar.bz2) = 916635
diff --git a/devel/ecore-ipc/files/patch-configure b/devel/ecore-ipc/files/patch-configure
deleted file mode 100644
index 9887d0720831..000000000000
--- a/devel/ecore-ipc/files/patch-configure
+++ /dev/null
@@ -1,89 +0,0 @@
---- configure.orig 2008-03-17 11:36:38.000000000 +0300
-+++ configure 2008-03-17 11:38:49.000000000 +0300
-@@ -20552,70 +20552,9 @@
- { echo "$as_me:$LINENO: checking for SSL" >&5
- echo $ECHO_N "checking for SSL... $ECHO_C" >&6; }
-
--if test -n "$PKG_CONFIG"; then
-- if test -n "$SSL_CFLAGS"; then
-- pkg_cv_SSL_CFLAGS="$SSL_CFLAGS"
-- else
-- if test -n "$PKG_CONFIG" && \
-- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openssl\"") >&5
-- ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- pkg_cv_SSL_CFLAGS=`$PKG_CONFIG --cflags "openssl" 2>/dev/null`
--else
-- pkg_failed=yes
--fi
-- fi
--else
-- pkg_failed=untried
--fi
--if test -n "$PKG_CONFIG"; then
-- if test -n "$SSL_LIBS"; then
-- pkg_cv_SSL_LIBS="$SSL_LIBS"
-- else
-- if test -n "$PKG_CONFIG" && \
-- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openssl\"") >&5
-- ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- pkg_cv_SSL_LIBS=`$PKG_CONFIG --libs "openssl" 2>/dev/null`
--else
-- pkg_failed=yes
--fi
-- fi
--else
-- pkg_failed=untried
--fi
--
--
--
--if test $pkg_failed = yes; then
--
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-- _pkg_short_errors_supported=yes
--else
-- _pkg_short_errors_supported=no
--fi
-- if test $_pkg_short_errors_supported = yes; then
-- SSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "openssl"`
-- else
-- SSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "openssl"`
-- fi
-- # Put the nasty error message in config.log where it belongs
-- echo "$SSL_PKG_ERRORS" >&5
--
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-- have_openssl="no"
-
--elif test $pkg_failed = untried; then
-- have_openssl="no"
--
--else
-- SSL_CFLAGS=$pkg_cv_SSL_CFLAGS
-- SSL_LIBS=$pkg_cv_SSL_LIBS
-+ SSL_CFLAGS=""
-+ SSL_LIBS="-lssl -lcrypto"
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
-
-@@ -20623,13 +20562,9 @@
- cat >>confdefs.h <<\_ACEOF
- #define USE_OPENSSL 1
- _ACEOF
--
-- requirements_ecore_con="$requirements_ecore_con openssl"
- # no need to add it to req_ecore_ipc, since they
- # depends on ecore_con anyway.
- have_openssl="yes"
--
--fi
- fi
-
- want_curl="yes"
diff --git a/devel/ecore-ipc/pkg-plist b/devel/ecore-ipc/pkg-plist
index 3607cfe8c6b6..684339caa68e 100644
--- a/devel/ecore-ipc/pkg-plist
+++ b/devel/ecore-ipc/pkg-plist
@@ -1,6 +1,5 @@
-include/Ecore_Ipc.h
-lib/libecore_ipc.a
-lib/libecore_ipc.la
+include/ecore-1/Ecore_Ipc.h
lib/libecore_ipc.so
-lib/libecore_ipc.so.9
+lib/libecore_ipc.so.1
libdata/pkgconfig/ecore-ipc.pc
+@dirrmtry include/ecore-1
diff --git a/devel/ecore-job/Makefile b/devel/ecore-job/Makefile
index 19ea9a2d43ed..4e26f5c92b09 100644
--- a/devel/ecore-job/Makefile
+++ b/devel/ecore-job/Makefile
@@ -25,6 +25,10 @@ USE_EFL= ecore
BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_job
INSTALL_WRKSRC= ${BUILD_WRKSRC}
+BROKEN= does not compile
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
CONFIGURE_ARGS= --disable-ecore-con \
--disable-ecore-config \
--disable-ecore-desktop \
diff --git a/devel/ecore-main/Makefile b/devel/ecore-main/Makefile
index 38c26cb32926..df8e3b9285a5 100644
--- a/devel/ecore-main/Makefile
+++ b/devel/ecore-main/Makefile
@@ -6,34 +6,26 @@
#
PORTNAME= main
-PORTVERSION= 0.9.9.042
-PORTREVISION= 0
-CATEGORIES= devel
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
- http://download.enlightenment.org/snapshots/2008-01-25/
+DISTVERSION= 1.0.0.beta
+CATEGORIES= devel enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
PKGNAMEPREFIX= ecore-
-DISTNAME= ecore-${PORTVERSION}
+DISTNAME= ecore-${DISTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= Enlightenment core abstraction library (main library)
-GNU_CONFIGURE= yes
+LICENSE= BSD
+DIST_SUBDIR= e17
USE_BZIP2= yes
+GNU_CONFIGURE= yes
+USE_EFL= eina libtool_hack
+USE_GETTEXT= yes
USE_GNOME= gnomehack pkgconfig gnometarget
+USE_ICONV= yes
USE_LDCONFIG= yes
-CONFIGURE_ARGS= --disable-ecore-con \
- --disable-ecore-config \
- --disable-ecore-desktop \
- --disable-ecore-directfb \
- --disable-ecore-evas \
- --disable-ecore-file \
- --disable-ecore-ipc \
- --disable-ecore-job \
- --disable-ecore-sdl \
- --disable-ecore-txt \
- --disable-ecore-x \
- --disable-ecore-imf \
- --disable-ecore-imf_evas
+.include "Makefile.inc"
.include <bsd.port.mk>
diff --git a/devel/ecore-main/Makefile.inc b/devel/ecore-main/Makefile.inc
new file mode 100644
index 000000000000..acd6e9a32173
--- /dev/null
+++ b/devel/ecore-main/Makefile.inc
@@ -0,0 +1,17 @@
+CONFIGURE_ARGS= --disable-ecore-con \
+ --disable-ecore-directfb \
+ --disable-ecore-evas \
+ --disable-ecore-file \
+ --disable-glib \
+ --disable-gnutls \
+ --disable-ecore-imf \
+ --disable-ecore-imf_evas \
+ --disable-ecore-input \
+ --disable-ecore-input_evas \
+ --disable-ecore-ipc \
+ --disable-ecore-sdl \
+ --disable-ecore-x
+
+post-patch: ecore_drop_librt
+ecore_drop_librt:
+ @${REINPLACE_CMD} -E -e 's,(rt_libs=).*,\1,g' ${WRKSRC}/configure
diff --git a/devel/ecore-main/distinfo b/devel/ecore-main/distinfo
index 4672f6a1c167..36d07e85437a 100644
--- a/devel/ecore-main/distinfo
+++ b/devel/ecore-main/distinfo
@@ -1,3 +1,2 @@
-MD5 (ecore-0.9.9.042.tar.bz2) = a66df2b5f0b1a6abc47bb50bf2b26846
-SHA256 (ecore-0.9.9.042.tar.bz2) = 26486fd2c80e4000b673f81ce637aa50c17c767e4c2af8f56de5d110e387d136
-SIZE (ecore-0.9.9.042.tar.bz2) = 5285732
+SHA256 (e17/ecore-1.0.0.beta.tar.bz2) = 9fd367f9ff10568082e65c1def46e64fb96b359221e0d6aea11c6c3f6bd5282f
+SIZE (e17/ecore-1.0.0.beta.tar.bz2) = 916635
diff --git a/devel/ecore-main/pkg-plist b/devel/ecore-main/pkg-plist
index 69033dfea741..c5410f86f381 100644
--- a/devel/ecore-main/pkg-plist
+++ b/devel/ecore-main/pkg-plist
@@ -1,8 +1,12 @@
-include/Ecore.h
-include/Ecore_Data.h
-include/Ecore_Str.h
-lib/libecore.a
-lib/libecore.la
+include/ecore-1/Ecore.h
+include/ecore-1/Ecore_Getopt.h
lib/libecore.so
-lib/libecore.so.9
+lib/libecore.so.1
libdata/pkgconfig/ecore.pc
+share/locale/cs/LC_MESSAGES/ecore.mo
+share/locale/de/LC_MESSAGES/ecore.mo
+share/locale/el/LC_MESSAGES/ecore.mo
+share/locale/fr/LC_MESSAGES/ecore.mo
+share/locale/it/LC_MESSAGES/ecore.mo
+share/locale/pt/LC_MESSAGES/ecore.mo
+@dirrmtry include/ecore-1
diff --git a/devel/ecore/Makefile b/devel/ecore/Makefile
index 1aae80640bf3..b276c39a5d07 100644
--- a/devel/ecore/Makefile
+++ b/devel/ecore/Makefile
@@ -6,10 +6,9 @@
#
PORTNAME= ecore
-PORTVERSION= 0.9.9.042
-PORTREVISION= 2
+DISTVERSION= 1.0.0.beta
PORTEPOCH= 2
-CATEGORIES= devel
+CATEGORIES= devel enlightenment
MASTER_SITES= # none
DISTFILES= # none
EXTRACT_ONLY= # none
@@ -20,7 +19,7 @@ COMMENT= Enlightenment core abstraction library (meta port)
NO_BUILD= yes
USE_EFL= ecore
-ECORE_MODULES= con config desktop evas file ipc job sdl txt x11 imf imf_evas
+ECORE_MODULES= con evas file imf imf_evas input input_evas ipc sdl x11
ECORE_sdl_off= yes
.for NODE in ${ECORE_MODULES}
diff --git a/devel/eet/Makefile b/devel/eet/Makefile
index 6c58dee8e378..633aac75ec5b 100644
--- a/devel/eet/Makefile
+++ b/devel/eet/Makefile
@@ -6,23 +6,26 @@
#
PORTNAME= eet
-PORTVERSION= 0.9.10.042
-PORTREVISION= 2
+DISTVERSION= 1.4.0.beta
PORTEPOCH= 2
-CATEGORIES= devel
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
- http://download.enlightenment.org/snapshots/2008-01-25/
+CATEGORIES= devel enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
MAINTAINER= stas@FreeBSD.org
COMMENT= Enlightenment Data Handling Library
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg
+LICENSE= BSD
+DIST_SUBDIR= e17
USE_BZIP2= yes
GNU_CONFIGURE= yes
+USE_EFL= eina librt_hack libtool_hack
USE_GNOME= gnomehack pkgconfig gnometarget
USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+USE_OPENSSL= yes
+
+CONFIGURE_ARGS= --disable-gnutls
.include <bsd.port.mk>
diff --git a/devel/eet/distinfo b/devel/eet/distinfo
index d76b0f17d26a..d14b083fe457 100644
--- a/devel/eet/distinfo
+++ b/devel/eet/distinfo
@@ -1,3 +1,2 @@
-MD5 (eet-0.9.10.042.tar.bz2) = af0f46c29dcdc4725f4de491b7350bbb
-SHA256 (eet-0.9.10.042.tar.bz2) = c96643666ca8c70c71884affc4f3dc8b4cdb7c745d5f2a9c9366ad76aac8a38a
-SIZE (eet-0.9.10.042.tar.bz2) = 1497375
+SHA256 (e17/eet-1.4.0.beta.tar.bz2) = f8f509a7e071b63175d294b50c90d1fb5b44d04be7540318b6d38cd5b1a04fa4
+SIZE (e17/eet-1.4.0.beta.tar.bz2) = 503183
diff --git a/devel/eet/pkg-descr b/devel/eet/pkg-descr
index d7d3fde946c2..1353957da759 100644
--- a/devel/eet/pkg-descr
+++ b/devel/eet/pkg-descr
@@ -4,4 +4,4 @@ zip file) and allow fast random-access reading of the file later
on. It does not do zip as a zip itself has more complexity than is
needed, and it was much simpler to implement this once here.
-WWW: http://www.enlightenment.org/Libraries/Eet/index.html
+WWW: http://docs.enlightenment.org/auto/eet/
diff --git a/devel/eet/pkg-plist b/devel/eet/pkg-plist
index b5e86bdaeaf9..04c5e5a7aa24 100644
--- a/devel/eet/pkg-plist
+++ b/devel/eet/pkg-plist
@@ -1,7 +1,6 @@
bin/eet
-include/Eet.h
-lib/libeet.a
-lib/libeet.la
+include/eet-1/Eet.h
lib/libeet.so
-lib/libeet.so.9
+lib/libeet.so.5
libdata/pkgconfig/eet.pc
+@dirrm include/eet-1
diff --git a/devel/eina/Makefile b/devel/eina/Makefile
new file mode 100644
index 000000000000..e343da92f275
--- /dev/null
+++ b/devel/eina/Makefile
@@ -0,0 +1,26 @@
+# New ports collection makefile for: eina
+# Date created: Dec 10 2009
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= eina
+DISTVERSION= 1.0.0.beta
+CATEGORIES= devel enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
+
+MAINTAINER= magik@roorback.net
+COMMENT= Enlightenment API for data types
+
+LICENSE= LGPL21
+DIST_SUBDIR= e17
+USE_BZIP2= yes
+GNU_CONFIGURE= yes
+USE_GNOME= gnomehack pkgconfig gnometarget
+USE_EFL= librt_hack libtool_hack
+USE_ICONV= yes
+USE_LDCONFIG= yes
+
+.include <bsd.port.mk>
diff --git a/devel/eina/distinfo b/devel/eina/distinfo
new file mode 100644
index 000000000000..c9c9fad906d5
--- /dev/null
+++ b/devel/eina/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/eina-1.0.0.beta.tar.bz2) = 16170403ad9b8ca52f7ec895852ededb507ceb6794dc5bbd9224cff2c94de4d8
+SIZE (e17/eina-1.0.0.beta.tar.bz2) = 539629
diff --git a/devel/eina/pkg-descr b/devel/eina/pkg-descr
new file mode 100644
index 000000000000..f8b871c780a1
--- /dev/null
+++ b/devel/eina/pkg-descr
@@ -0,0 +1,4 @@
+Eina is a multi-platform library that provides optimized data types
+and a few tools that could be used for projects.
+
+WWW: http://docs.enlightenment.org/auto/eina/
diff --git a/devel/eina/pkg-plist b/devel/eina/pkg-plist
new file mode 100644
index 000000000000..b70a24416fcd
--- /dev/null
+++ b/devel/eina/pkg-plist
@@ -0,0 +1,59 @@
+include/eina-1/Eina.h
+include/eina-1/eina/eina_accessor.h
+include/eina-1/eina/eina_array.h
+include/eina-1/eina/eina_benchmark.h
+include/eina-1/eina/eina_binshare.h
+include/eina-1/eina/eina_convert.h
+include/eina-1/eina/eina_counter.h
+include/eina-1/eina/eina_cpu.h
+include/eina-1/eina/eina_error.h
+include/eina-1/eina/eina_file.h
+include/eina-1/eina/eina_fp.h
+include/eina-1/eina/eina_hamster.h
+include/eina-1/eina/eina_hash.h
+include/eina-1/eina/eina_inline_array.x
+include/eina-1/eina/eina_inline_f16p16.x
+include/eina-1/eina/eina_inline_f32p32.x
+include/eina-1/eina/eina_inline_f8p24.x
+include/eina-1/eina/eina_inline_fp.x
+include/eina-1/eina/eina_inline_hash.x
+include/eina-1/eina/eina_inline_list.x
+include/eina-1/eina/eina_inline_log.x
+include/eina-1/eina/eina_inline_mempool.x
+include/eina-1/eina/eina_inline_rbtree.x
+include/eina-1/eina/eina_inline_rectangle.x
+include/eina-1/eina/eina_inline_str.x
+include/eina-1/eina/eina_inline_stringshare.x
+include/eina-1/eina/eina_inline_tiler.x
+include/eina-1/eina/eina_inline_trash.x
+include/eina-1/eina/eina_inline_ustringshare.x
+include/eina-1/eina/eina_inlist.h
+include/eina-1/eina/eina_iterator.h
+include/eina-1/eina/eina_lalloc.h
+include/eina-1/eina/eina_list.h
+include/eina-1/eina/eina_log.h
+include/eina-1/eina/eina_magic.h
+include/eina-1/eina/eina_main.h
+include/eina-1/eina/eina_matrixsparse.h
+include/eina-1/eina/eina_mempool.h
+include/eina-1/eina/eina_module.h
+include/eina-1/eina/eina_quadtree.h
+include/eina-1/eina/eina_rbtree.h
+include/eina-1/eina/eina_rectangle.h
+include/eina-1/eina/eina_safety_checks.h
+include/eina-1/eina/eina_sched.h
+include/eina-1/eina/eina_str.h
+include/eina-1/eina/eina_strbuf.h
+include/eina-1/eina/eina_stringshare.h
+include/eina-1/eina/eina_tiler.h
+include/eina-1/eina/eina_trash.h
+include/eina-1/eina/eina_types.h
+include/eina-1/eina/eina_unicode.h
+include/eina-1/eina/eina_ustrbuf.h
+include/eina-1/eina/eina_ustringshare.h
+include/eina-1/eina_config.h
+lib/libeina.so
+lib/libeina.so.1
+libdata/pkgconfig/eina.pc
+@dirrm include/eina-1/eina
+@dirrm include/eina-1
diff --git a/devel/engrave/Makefile b/devel/engrave/Makefile
index 996db568906d..88aa347750c3 100644
--- a/devel/engrave/Makefile
+++ b/devel/engrave/Makefile
@@ -22,4 +22,8 @@ USE_EFL_ECORE= evas
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
+BROKEN= does not compile
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
.include <bsd.port.mk>
diff --git a/devel/evfs/Makefile b/devel/evfs/Makefile
index e27a5e3a7c2c..cd92c91dd6da 100644
--- a/devel/evfs/Makefile
+++ b/devel/evfs/Makefile
@@ -29,6 +29,10 @@ OPTIONS= SAMBA "Build samba plugin" off \
TAGLIB "Use taglib for audio metadata extraction" on \
XTRACT "Enable extended metadata extraction via libextractor" on
+BROKEN= does not compile
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
.include <bsd.port.pre.mk>
.if defined(WITH_SAMBA)
diff --git a/devel/ruby-ecore/Makefile b/devel/ruby-ecore/Makefile
index b889eaf0f249..2382b7087759 100644
--- a/devel/ruby-ecore/Makefile
+++ b/devel/ruby-ecore/Makefile
@@ -26,6 +26,10 @@ USE_EFL_ECORE= x11 con job evas
RUBY_SA= ${RUBY_SITEARCHLIBDIR}
+BROKEN= does not compile
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
.include <bsd.port.pre.mk>
do-build:
diff --git a/graphics/Makefile b/graphics/Makefile
index 2aece6c15bc8..30581403e6fc 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -148,12 +148,15 @@
SUBDIR += evas-engine-sdl
SUBDIR += evas-engine-x11
SUBDIR += evas-engine-xrender
+ SUBDIR += evas-loader-bmp
SUBDIR += evas-loader-edb
SUBDIR += evas-loader-eet
SUBDIR += evas-loader-gif
SUBDIR += evas-loader-jpeg
+ SUBDIR += evas-loader-pmaps
SUBDIR += evas-loader-png
SUBDIR += evas-loader-svg
+ SUBDIR += evas-loader-tga
SUBDIR += evas-loader-tiff
SUBDIR += evas-loader-xpm
SUBDIR += evince
diff --git a/graphics/ecore-evas/Makefile b/graphics/ecore-evas/Makefile
index 73c6b99e7ba8..91b2ed36a1a0 100644
--- a/graphics/ecore-evas/Makefile
+++ b/graphics/ecore-evas/Makefile
@@ -6,38 +6,32 @@
#
PORTNAME= evas
-PORTVERSION= 0.9.9.042
-PORTREVISION= 2
-CATEGORIES= graphics
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
- http://download.enlightenment.org/snapshots/2008-01-25/
+DISTVERSION= 1.0.0.beta
+CATEGORIES= graphics enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
PKGNAMEPREFIX= ecore-
-DISTNAME= ecore-${PORTVERSION}
+DISTNAME= ecore-${DISTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= Enlightenment core abstraction library (evas module)
-GNU_CONFIGURE= yes
+LICENSE= BSD
+DIST_SUBDIR= e17
USE_BZIP2= yes
+GNU_CONFIGURE= yes
+USE_EFL= evas ecore libtool_hack
+USE_EFL_ECORE= input input_evas sdl
USE_GNOME= gnomehack pkgconfig gnometarget
USE_LDCONFIG= yes
-USE_EFL= ecore evas
BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_evas
INSTALL_WRKSRC= ${BUILD_WRKSRC}
-CONFIGURE_ARGS= --disable-ecore-con \
- --disable-ecore-config \
- --disable-ecore-desktop \
- --disable-ecore-directfb \
- --enable-ecore-evas \
- --disable-ecore-file \
- --disable-ecore-ipc \
- --disable-ecore-job \
- --disable-ecore-sdl \
- --disable-ecore-txt \
- --disable-ecore-x \
- --disable-ecore-imf \
- --disable-ecore-imf_evas
+.include <../../devel/ecore-main/Makefile.inc>
+
+CONFIGURE_ARGS+= --enable-ecore-evas \
+ --enable-ecore-input \
+ --enable-ecore-input_evas
OPTIONS= X11 "Enable Evas X11 support" on \
GL "Enable Evas GL support" on \
@@ -48,22 +42,22 @@ OPTIONS= X11 "Enable Evas X11 support" on \
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_GL)
-CONFIGURE_ARGS+= --enable-ecore-evas-gl
+CONFIGURE_ARGS+= --enable-ecore-evas-opengl-x11
USE_EFL_EVAS_ENGINES+= opengl
-USE_X= yes
+WITH_X= yes
.else
-CONFIGURE_ARGS+= --disable-ecore-evas-gl
+CONFIGURE_ARGS+= --disable-ecore-evas-opengl-x11
.endif
.if !defined(WITHOUT_XRENDER)
-CONFIGURE_ARGS+= --enable-ecore-evas-xrender
+CONFIGURE_ARGS+= --enable-ecore-evas-xrender-x11
USE_EFL_EVAS_ENGINES+= xrender
-USE_X= yes
+WITH_X= yes
.else
-CONFIGURE_ARGS+= --disable-ecore-evas-xrender
+CONFIGURE_ARGS+= --disable-ecore-evas-xrender-x11
.endif
-.if !defined(WITHOUT_X11) || defined(USE_X)
+.if !defined(WITHOUT_X11) || defined(WITH_X)
CONFIGURE_ARGS+= --enable-ecore-x
USE_EFL_ECORE+= x11
USE_EFL_EVAS_ENGINES+= x11
@@ -72,18 +66,18 @@ CONFIGURE_ARGS+= --disable-ecore-x
.endif
.if !defined(WITHOUT_BUFFER)
-CONFIGURE_ARGS+= --enable-ecore-evas-buffer
+CONFIGURE_ARGS+= --enable-ecore-evas-software-buffer
USE_EFL_EVAS_ENGINES+= buffer
.else
-CONFIGURE_ARGS+= --disable-ecore-evas-buffer
+CONFIGURE_ARGS+= --disable-ecore-evas-software-buffer
.endif
.if !defined(WITHOUT_SDL)
-CONFIGURE_ARGS+= --enable-ecore-evas-sdl
+CONFIGURE_ARGS+= --enable-ecore-evas-software-sdl --enable-ecore-sdl
USE_EFL_EVAS_ENGINES+= sdl
USE_EFL_ECORE+= sdl
.else
-CONFIGURE_ARGS+= --disable-ecore-evas-sdl
+CONFIGURE_ARGS+= --disable-ecore-evas-software-sdl --enable-ecore-sdl
.endif
post-patch:
@@ -91,9 +85,13 @@ post-patch:
-e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
-e 's,\$$\(top_builddir\)/src/lib/ecore_x/\.libs,${LOCALBASE}/lib,'\
-e 's,\$$\(top_builddir\)/src/lib/ecore_sdl/\.libs,${LOCALBASE}/lib,'\
+ -e 's,\$$\(top_builddir\)/src/lib/ecore_input/\.libs,${LOCALBASE}/lib,'\
+ -e 's,\$$\(top_builddir\)/src/lib/ecore_input_evas/\.libs,${LOCALBASE}/lib,'\
-e 's,\$$\(top_builddir\)/src/lib/ecore/libecore\.la,-lecore,'\
-e 's,\$$\(top_builddir\)/src/lib/ecore_x/libecore_x\.la,-lecore_x,'\
-e 's,\$$\(top_builddir\)/src/lib/ecore_sdl/libecore_sdl\.la,-lecore_sdl,'\
+ -e 's,\$$\(top_builddir\)/src/lib/ecore_input/libecore_input\.la,-lecore_input,'\
+ -e 's,\$$\(top_builddir\)/src/lib/ecore_input_evas/libecore_input_evas\.la,-lecore_input_evas,'\
${BUILD_WRKSRC}/Makefile.in
post-install:
diff --git a/graphics/ecore-evas/distinfo b/graphics/ecore-evas/distinfo
index 4672f6a1c167..36d07e85437a 100644
--- a/graphics/ecore-evas/distinfo
+++ b/graphics/ecore-evas/distinfo
@@ -1,3 +1,2 @@
-MD5 (ecore-0.9.9.042.tar.bz2) = a66df2b5f0b1a6abc47bb50bf2b26846
-SHA256 (ecore-0.9.9.042.tar.bz2) = 26486fd2c80e4000b673f81ce637aa50c17c767e4c2af8f56de5d110e387d136
-SIZE (ecore-0.9.9.042.tar.bz2) = 5285732
+SHA256 (e17/ecore-1.0.0.beta.tar.bz2) = 9fd367f9ff10568082e65c1def46e64fb96b359221e0d6aea11c6c3f6bd5282f
+SIZE (e17/ecore-1.0.0.beta.tar.bz2) = 916635
diff --git a/graphics/ecore-evas/pkg-plist b/graphics/ecore-evas/pkg-plist
index b57e551bce8b..eddc4ed4a8db 100644
--- a/graphics/ecore-evas/pkg-plist
+++ b/graphics/ecore-evas/pkg-plist
@@ -1,6 +1,4 @@
-include/Ecore_Evas.h
-lib/libecore_evas.a
-lib/libecore_evas.la
+include/ecore-1/Ecore_Evas.h
lib/libecore_evas.so
-lib/libecore_evas.so.9
+lib/libecore_evas.so.1
libdata/pkgconfig/ecore-evas.pc
diff --git a/graphics/ecore-sdl/Makefile b/graphics/ecore-sdl/Makefile
index dd3db299e0d6..15cd6f03406b 100644
--- a/graphics/ecore-sdl/Makefile
+++ b/graphics/ecore-sdl/Makefile
@@ -6,44 +6,39 @@
#
PORTNAME= sdl
-PORTVERSION= 0.9.9.042
-PORTREVISION= 0
-CATEGORIES= graphics
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
- http://download.enlightenment.org/snapshots/2008-01-25/
+DISTVERSION= 1.0.0.beta
+CATEGORIES= graphics enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
PKGNAMEPREFIX= ecore-
-DISTNAME= ecore-${PORTVERSION}
+DISTNAME= ecore-${DISTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= Enlightenment core abstraction library (sdl module)
-GNU_CONFIGURE= yes
+LICENSE= BSD
+DIST_SUBDIR= e17
USE_BZIP2= yes
+GNU_CONFIGURE= yes
+USE_SDL= sdl
+USE_EFL= ecore libtool_hack
+USE_EFL_ECORE= input
USE_GNOME= gnomehack pkgconfig gnometarget
USE_LDCONFIG= yes
-USE_EFL= ecore
-USE_SDL= sdl
BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_sdl
INSTALL_WRKSRC= ${BUILD_WRKSRC}
-CONFIGURE_ARGS= --disable-ecore-con \
- --disable-ecore-config \
- --disable-ecore-desktop \
- --disable-ecore-directfb \
- --disable-ecore-evas \
- --disable-ecore-file \
- --disable-ecore-ipc \
- --disable-ecore-job \
- --enable-ecore-sdl \
- --disable-ecore-txt \
- --disable-ecore-x \
- --disable-ecore-imf \
- --disable-ecore-imf_evas
+.include <../../devel/ecore-main/Makefile.inc>
+
+CONFIGURE_ARGS+= --enable-ecore-sdl \
+ --enable-ecore-input
post-patch:
- @${REINPLACE_CMD} -E -e \
- 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
+ @${REINPLACE_CMD} -E \
+ -e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
+ -e 's,\$$\(top_builddir\)/src/lib/ecore_input/\.libs,${LOCALBASE}/lib,'\
-e 's,\$$\(top_builddir\)/src/lib/ecore/libecore\.la,-lecore,'\
+ -e 's,\$$\(top_builddir\)/src/lib/ecore_input/libecore_input\.la,-lecore_input,'\
${BUILD_WRKSRC}/Makefile.in
post-install:
diff --git a/graphics/ecore-sdl/distinfo b/graphics/ecore-sdl/distinfo
index 4672f6a1c167..36d07e85437a 100644
--- a/graphics/ecore-sdl/distinfo
+++ b/graphics/ecore-sdl/distinfo
@@ -1,3 +1,2 @@
-MD5 (ecore-0.9.9.042.tar.bz2) = a66df2b5f0b1a6abc47bb50bf2b26846
-SHA256 (ecore-0.9.9.042.tar.bz2) = 26486fd2c80e4000b673f81ce637aa50c17c767e4c2af8f56de5d110e387d136
-SIZE (ecore-0.9.9.042.tar.bz2) = 5285732
+SHA256 (e17/ecore-1.0.0.beta.tar.bz2) = 9fd367f9ff10568082e65c1def46e64fb96b359221e0d6aea11c6c3f6bd5282f
+SIZE (e17/ecore-1.0.0.beta.tar.bz2) = 916635
diff --git a/graphics/ecore-sdl/pkg-plist b/graphics/ecore-sdl/pkg-plist
index 5a7aaa3868c3..d8ac3404ceef 100644
--- a/graphics/ecore-sdl/pkg-plist
+++ b/graphics/ecore-sdl/pkg-plist
@@ -1,6 +1,4 @@
-include/Ecore_Sdl.h
-lib/libecore_sdl.a
-lib/libecore_sdl.la
+include/ecore-1/Ecore_Sdl.h
lib/libecore_sdl.so
-lib/libecore_sdl.so.9
+lib/libecore_sdl.so.1
libdata/pkgconfig/ecore-sdl.pc
diff --git a/graphics/edje/Makefile b/graphics/edje/Makefile
index a048d160c51a..ec5f0ca675cc 100644
--- a/graphics/edje/Makefile
+++ b/graphics/edje/Makefile
@@ -6,30 +6,27 @@
#
PORTNAME= edje
-PORTVERSION= 0.5.0.042
-PORTREVISION= 3
+DISTVERSION= 1.0.0.beta
PORTEPOCH= 2
-CATEGORIES= graphics
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
- http://download.enlightenment.org/snapshots/2008-01-25/
+CATEGORIES= graphics enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
MAINTAINER= stas@FreeBSD.org
COMMENT= Edje is a complex graphical design and layout engine
-GNU_CONFIGURE= yes
+LIB_DEPENDS= lua-5.1:${PORTSDIR}/lang/lua
+
+LICENSE= BSD
+DIST_SUBDIR= e17
USE_BZIP2= yes
+GNU_CONFIGURE= yes
+USE_EFL= eet evas ecore embryo libtool_hack librt_hack
+USE_EFL_EVAS_LOADERS= eet jpeg png
+USE_EFL_ECORE= evas file imf imf_evas
USE_GNOME= gnomehack pkgconfig gnometarget
-USE_EFL= embryo eet evas ecore imlib2
-USE_EFL_ECORE= evas job
-USE_EVAS_LOADERS= edb eet jpeg png
USE_LDCONFIG= yes
CONFIGURE_ARGS+= --without-vim
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "ia64"
-BROKEN= edje is broken on ia64
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/edje/distinfo b/graphics/edje/distinfo
index ae788d7305fa..45b52db1fb2e 100644
--- a/graphics/edje/distinfo
+++ b/graphics/edje/distinfo
@@ -1,3 +1,2 @@
-MD5 (edje-0.5.0.042.tar.bz2) = fc95528409351acea7a48862331eaffd
-SHA256 (edje-0.5.0.042.tar.bz2) = 352f1a9d600e85cddd9e5dbf6becad87f4be49a15b7e87f46e011c9d48e50af2
-SIZE (edje-0.5.0.042.tar.bz2) = 2819823
+SHA256 (e17/edje-1.0.0.beta.tar.bz2) = 7d7949b13209f517b452187b641940f5027e4d2619d8b20378f52a5e66c04952
+SIZE (e17/edje-1.0.0.beta.tar.bz2) = 600360
diff --git a/graphics/edje/files/patch-src_lib_edje_private.h b/graphics/edje/files/patch-src_lib_edje_private.h
new file mode 100644
index 000000000000..a95da457f57c
--- /dev/null
+++ b/graphics/edje/files/patch-src_lib_edje_private.h
@@ -0,0 +1,11 @@
+--- src/lib/edje_private.h.orig 2010-12-11 00:51:59.000000000 -0800
++++ src/lib/edje_private.h 2010-12-11 00:52:57.000000000 -0800
+@@ -11,6 +11,8 @@
+
+ #ifdef HAVE_ALLOCA_H
+ # include <alloca.h>
++#elif defined __FreeBSD__
++# include <stdlib.h>
+ #elif defined __GNUC__
+ # define alloca __builtin_alloca
+ #elif defined _AIX
diff --git a/graphics/edje/pkg-descr b/graphics/edje/pkg-descr
index 7db97f52810d..c6e5a3e9811e 100644
--- a/graphics/edje/pkg-descr
+++ b/graphics/edje/pkg-descr
@@ -13,4 +13,4 @@ elements. Anything more complex is likely the domain of an application
or widget set that may use Edje as a conveneient way of being able to
configure parts of the display.
-WWW: http://enlightenment.sourceforge.net/Libraries/Edje/
+WWW: http://docs.enlightenment.org/auto/edje/
diff --git a/graphics/edje/pkg-plist b/graphics/edje/pkg-plist
index d2264d98c8b9..3a36bdb52547 100644
--- a/graphics/edje/pkg-plist
+++ b/graphics/edje/pkg-plist
@@ -1,12 +1,17 @@
bin/edje_cc
+bin/edje_convert
bin/edje_decc
bin/edje_recc
-include/Edje.h
-lib/libedje.a
-lib/libedje.la
+bin/edje_player
+include/edje-1/Edje.h
+include/edje-1/Edje_Edit.h
lib/libedje.so
-lib/libedje.so.5
+lib/libedje.so.1
libdata/pkgconfig/edje.pc
%%DATADIR%%/include/edje.inc
+share/mime/packages/edje.xml
+@dirrmtry share/mime/packages
+@dirrmtry share/mime
+@dirrm include/edje-1
@dirrm %%DATADIR%%/include
@dirrm %%DATADIR%%
diff --git a/graphics/edje_viewer/Makefile b/graphics/edje_viewer/Makefile
index fb67538abedb..1c7f1ff2776f 100644
--- a/graphics/edje_viewer/Makefile
+++ b/graphics/edje_viewer/Makefile
@@ -7,19 +7,21 @@
#
PORTNAME= edje_viewer
-PORTVERSION= 20080223
-PORTREVISION= 4
-CATEGORIES= graphics
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
+PORTVERSION= 20101003
+PORTREVISION= 1
+CATEGORIES= graphics enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/extra/
MAINTAINER= stas@FreeBSD.org
COMMENT= A simple viewer for .edj files
+DIST_SUBDIR= e17
USE_BZIP2= yes
-USE_GMAKE= yes
-USE_GNOME= gnomehack pkgconfig gnometarget
-USE_EFL= evas ecore edje etk
-USE_EFL_ECORE= config
GNU_CONFIGURE= yes
+USE_EFL= evas ecore edje elementary
+USE_EFL_ECORE= file
+USE_GNOME= gnomehack pkgconfig gnometarget
+USE_GMAKE= yes
+USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/graphics/edje_viewer/distinfo b/graphics/edje_viewer/distinfo
index eccbb851c5c1..e18f65ebe19a 100644
--- a/graphics/edje_viewer/distinfo
+++ b/graphics/edje_viewer/distinfo
@@ -1,3 +1,2 @@
-MD5 (edje_viewer-20080223.tar.bz2) = 7bce25a1a71d51a97533813695999da4
-SHA256 (edje_viewer-20080223.tar.bz2) = 0c293a7d71ad2492114959351c9a3920c2d470f82ce7d60a2665edf2a581b1ca
-SIZE (edje_viewer-20080223.tar.bz2) = 265289
+SHA256 (e17/edje_viewer-20101003.tar.bz2) = 198489616f44fe43ad5670421f7d37d04e1ccf44d055ce06f99b073ea20d8ed1
+SIZE (e17/edje_viewer-20101003.tar.bz2) = 261503
diff --git a/graphics/edje_viewer/pkg-plist b/graphics/edje_viewer/pkg-plist
index 68c7efe3f953..e7eb30dbd9c4 100644
--- a/graphics/edje_viewer/pkg-plist
+++ b/graphics/edje_viewer/pkg-plist
@@ -1,7 +1,4 @@
bin/edje_viewer
-%%DATADIR%%/data/images/bg.png
-%%DATADIR%%/data/images/border.png
-%%DATADIR%%/data/images/shadow.png
-@dirrm %%DATADIR%%/data/images
-@dirrm %%DATADIR%%/data
+share/applications/edje_viewer.desktop
+%%DATADIR%%/edje_viewer.edj
@dirrm %%DATADIR%%
diff --git a/graphics/epsilon/Makefile b/graphics/epsilon/Makefile
index 7317a3218955..1d1882f84c82 100644
--- a/graphics/epsilon/Makefile
+++ b/graphics/epsilon/Makefile
@@ -23,6 +23,10 @@ USE_EFL= edje imlib2 ecore
USE_EFL_ECORE= file ipc
USE_LDCONFIG= yes
+BROKEN= does not compile
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
OPTIONS= PNG "Enable PNG thumbnailer" on \
EPEG "Enable Epeg thumbnailer" on \
XINE "Enable Xine thumbnailer" off
diff --git a/graphics/esmart/Makefile b/graphics/esmart/Makefile
index 39047cc299c4..238d8d015e0d 100644
--- a/graphics/esmart/Makefile
+++ b/graphics/esmart/Makefile
@@ -16,7 +16,6 @@ MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
MAINTAINER= stas@FreeBSD.org
COMMENT= Evas smart objects development libraries
-
GNU_CONFIGURE= yes
USE_AUTOTOOLS= libltdl
USE_BZIP2= yes
@@ -26,4 +25,8 @@ USE_EFL_ECORE= x11 evas
USE_EFL_EVAS_LOADERS= png jpeg
USE_LDCONFIG= yes
+BROKEN= does not compile
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
.include <bsd.port.mk>
diff --git a/graphics/ethumb/Makefile b/graphics/ethumb/Makefile
new file mode 100644
index 000000000000..7a16e3e34244
--- /dev/null
+++ b/graphics/ethumb/Makefile
@@ -0,0 +1,52 @@
+# New ports collection makefile for: ethumb
+# Date created: 29 August 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= ethumb
+PORTVERSION= 0.1.0.52995
+CATEGORIES= graphics enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/extra/
+
+MAINTAINER= magik@roorback.net
+COMMENT= Thumbnail generator library
+
+LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif
+
+LICENSE= LGPL21
+DIST_SUBDIR= e17
+USE_BZIP2= yes
+GNU_CONFIGURE= yes
+USE_EFL= eina evas ecore edje libtool_hack
+USE_EFL_ECORE= evas file x11 input_evas
+USE_GNOME= gnomehack gnometarget pkgconfig
+USE_LDCONFIG= yes
+
+CONFIGURE_ARGS= --disable-epdf
+
+OPTIONS= EMOTION "Build with Emotion module" on \
+ ETHUMBD "Build ethumbd daemon (requires dbus)" on
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_EMOTION)
+USE_EFL+= emotion
+CONFIGURE_ARGS+= --enable-emotion
+PLIST_SUB+= EMOTION=""
+.else
+CONFIGURE_ARGS+= --disable-emotion
+PLIST_SUB+= EMOTION="@comment "
+.endif
+
+.if !defined(WITHOUT_ETHUMBD)
+USE_EFL+= edbus
+PLIST_SUB+= ETHUMBD=""
+CONFIGURE_ARGS+= --enable-ethumbd
+.else
+PLIST_SUB+= ETHUMBD="@comment "
+CONFIGURE_ARGS+= --disable-ethumbd
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/graphics/ethumb/distinfo b/graphics/ethumb/distinfo
new file mode 100644
index 000000000000..6e72e7b5a6fa
--- /dev/null
+++ b/graphics/ethumb/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/ethumb-0.1.0.52995.tar.bz2) = 344e63cb10395df56cb1c3cf2f588591faa0d34757ed63245944842e1e25bd7a
+SIZE (e17/ethumb-0.1.0.52995.tar.bz2) = 576217
diff --git a/graphics/ethumb/pkg-descr b/graphics/ethumb/pkg-descr
new file mode 100644
index 000000000000..720753f0d779
--- /dev/null
+++ b/graphics/ethumb/pkg-descr
@@ -0,0 +1,7 @@
+Ethumb -- thumbnail generation library for e17.
+
+Create thumbnails with a predefined frame (possibly an edje frame).
+Have an option to create fdo-like thumbnails.
+Have a client/server utility.
+
+WWW: http://www.enlightenment.org/
diff --git a/graphics/ethumb/pkg-plist b/graphics/ethumb/pkg-plist
new file mode 100644
index 000000000000..84c474c43abd
--- /dev/null
+++ b/graphics/ethumb/pkg-plist
@@ -0,0 +1,24 @@
+bin/ethumb
+%%ETHUMBD%%bin/ethumbd
+%%ETHUMBD%%bin/ethumbd_client
+include/ethumb-0/Ethumb.h
+include/ethumb-0/Ethumb_Plugin.h
+%%ETHUMBD%%include/ethumb-0/Ethumb_Client.h
+lib/libethumb.so
+lib/libethumb.so.1
+%%ETHUMBD%%lib/libethumb_client.so
+%%ETHUMBD%%lib/libethumb_client.so.1
+%%EMOTION%%lib/ethumb/plugins/data/emotion_template.edj
+%%EMOTION%%lib/ethumb/plugins/emotion.so
+libdata/pkgconfig/ethumb.pc
+%%ETHUMBD%%libdata/pkgconfig/ethumb_client.pc
+%%ETHUMBD%%libexec/ethumbd_slave
+%%DATADIR%%/data/frames/default.edj
+%%ETHUMBD%%share/dbus-1/services/org.enlightenment.Ethumb.service
+@dirrm include/ethumb-0
+@dirrmtry lib/ethumb/plugins/data
+@dirrmtry lib/ethumb/plugins
+@dirrmtry lib/ethumb
+@dirrm %%DATADIR%%/data/frames
+@dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%
diff --git a/graphics/evas-core/Makefile b/graphics/evas-core/Makefile
index a8cbf53f3596..3db233942db1 100644
--- a/graphics/evas-core/Makefile
+++ b/graphics/evas-core/Makefile
@@ -6,47 +6,32 @@
#
PORTNAME= core
-PORTVERSION= 0.9.9.042
-PORTREVISION= 2
-CATEGORIES= graphics
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
- http://download.enlightenment.org/snapshots/2008-01-25/
+DISTVERSION= 1.0.0.beta
+PORTREVISION= 0
+CATEGORIES= graphics enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
PKGNAMEPREFIX= evas-
-DISTNAME= evas-${PORTVERSION}
+DISTNAME= evas-${DISTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= A hardware accelerated canvas API (core library)
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
+LICENSE= BSD
+DIST_SUBDIR= e17
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GNOME= gnomehack pkgconfig gnometarget
+USE_EFL= librt_hack libtool_hack
+DATADIR= ${PREFIX}/share/evas
-CONFIGURE_ARGS= --disable-software-x11 \
- --disable-software-16-x11 \
- --disable-software-xcb \
- --disable-directfb \
- --disable-sdl \
- --disable-buffer \
- --disable-software-qtopia \
- --disable-gl-x11 \
- --disable-cairo-x11 \
- --disable-xrender-x11 \
- --disable-xrender-xcb \
- --disable-glitz-x11 \
- --disable-image-loader-gif \
- --disable-image-loader-png \
- --disable-image-loader-jpeg \
- --disable-image-loader-eet \
- --disable-image-loader-edb \
- --disable-image-loader-tiff \
- --disable-image-loader-xpm \
- --disable-image-loader-svg \
- --disable-pthreads
+.include "Makefile.inc"
OPTIONS= FONTCONFIG "Enable fontconfig support" on \
+ FRIBIDI "Enable bidirectional text support" on \
EET "Enable EET font loader" on
.include <bsd.port.pre.mk>
@@ -58,6 +43,13 @@ LIB_DEPENDS+= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
CONFIGURE_ARGS+= --disable-fontconfig
.endif
+.if !defined(WITHOUT_FRIBIDI)
+CONFIGURE_ARGS+= --enable-fribidi
+LIB_DEPENDS+= fribidi.3:${PORTSDIR}/converters/fribidi
+.else
+CONFIGURE_ARGS+= --disable-fribidi
+.endif
+
.if !defined(WITHOUT_EET)
CONFIGURE_ARGS+= --enable-font-loader-eet
USE_EFL+= eet
diff --git a/graphics/evas-core/Makefile.inc b/graphics/evas-core/Makefile.inc
new file mode 100644
index 000000000000..e3713e7cca6c
--- /dev/null
+++ b/graphics/evas-core/Makefile.inc
@@ -0,0 +1,23 @@
+CONFIGURE_ARGS= --disable-software-xlib \
+ --disable-software-8-x11 \
+ --disable-software-16-x11 \
+ --disable-software-xcb \
+ --disable-directfb \
+ --disable-software-sdl \
+ --disable-buffer \
+ --disable-gl-x11 \
+ --disable-xrender-x11 \
+ --disable-xrender-xcb \
+ --disable-image-loader-bmp \
+ --disable-image-loader-edb \
+ --disable-image-loader-eet \
+ --disable-image-loader-gif \
+ --disable-image-loader-png \
+ --disable-image-loader-jpeg \
+ --disable-image-loader-pmaps \
+ --disable-image-loader-svg \
+ --disable-image-loader-tga \
+ --disable-image-loader-tiff \
+ --disable-image-loader-xpm \
+
+PATCHDIR= "${PORTSDIR}/graphics/evas-core/files"
diff --git a/graphics/evas-core/distinfo b/graphics/evas-core/distinfo
index 5e8e2bc542ac..252e7b0fa992 100644
--- a/graphics/evas-core/distinfo
+++ b/graphics/evas-core/distinfo
@@ -1,3 +1,2 @@
-MD5 (evas-0.9.9.042.tar.bz2) = 6811e52b0607ce21061a23462a1f9854
-SHA256 (evas-0.9.9.042.tar.bz2) = e7ebc64a983950979b5488cc0b6fe2b3220f24da554c12c96a4f9131e5a76440
-SIZE (evas-0.9.9.042.tar.bz2) = 7373199
+SHA256 (e17/evas-1.0.0.beta.tar.bz2) = 7ff9a3015e5c5a0bee3c1a13b65358905fb6c81386bc22bf98bd7f73a893be1d
+SIZE (e17/evas-1.0.0.beta.tar.bz2) = 1054215
diff --git a/graphics/evas-core/files/patch-configure b/graphics/evas-core/files/patch-configure
new file mode 100644
index 000000000000..aa03310ecf5c
--- /dev/null
+++ b/graphics/evas-core/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig 2010-12-06 00:59:17.000000000 -0800
++++ configure 2010-12-06 00:59:35.000000000 -0800
+@@ -11897,7 +11897,7 @@
+ MODULE_ARCH="$host_os-$host_cpu"
+ ;;
+ *)
+- MODULE_ARCH="$host_os-$host_cpu-1.0.0"
++ MODULE_ARCH="$host_os-$host_cpu"
+ ;;
+ esac
+
diff --git a/graphics/evas-core/files/patch-src_lib_canvas_evas_main.c b/graphics/evas-core/files/patch-src_lib_canvas_evas_main.c
index 27b068acdb84..c2a27438204f 100644
--- a/graphics/evas-core/files/patch-src_lib_canvas_evas_main.c
+++ b/graphics/evas-core/files/patch-src_lib_canvas_evas_main.c
@@ -1,60 +1,47 @@
---- src/lib/canvas/evas_main.c.orig 2007-10-08 23:06:27.000000000 +0400
-+++ src/lib/canvas/evas_main.c 2008-02-23 18:03:58.000000000 +0300
-@@ -702,58 +702,23 @@
- {
- Evas_List *methods = NULL;
-
-- /* FIXME: get from modules - this is currently coded-in */
--#ifdef BUILD_ENGINE_SOFTWARE_DDRAW
- methods = evas_list_append(methods, strdup("software_ddraw"));
--#endif
--#ifdef BUILD_ENGINE_SOFTWARE_16_DDRAW
- methods = evas_list_append(methods, strdup("software_16_ddraw"));
--#endif
--#ifdef BUILD_ENGINE_DIRECT3D
- methods = evas_list_append(methods, strdup("direct3d"));
--#endif
+--- src/lib/canvas/evas_main.c.orig 2010-12-11 14:16:03.000000000 -0800
++++ src/lib/canvas/evas_main.c 2010-12-11 14:17:30.000000000 -0800
+@@ -808,45 +808,29 @@
+ #ifdef BUILD_ENGINE_SOFTWARE_16_WINCE
+ methods = eina_list_append(methods, "software_16_wince");
+ #endif
-#ifdef BUILD_ENGINE_SOFTWARE_X11
- methods = evas_list_append(methods, strdup("software_x11"));
+ methods = eina_list_append(methods, "software_x11");
-#endif
-#ifdef BUILD_ENGINE_XRENDER_X11
- methods = evas_list_append(methods, strdup("xrender_x11"));
--#endif
--#ifdef BUILD_ENGINE_SOFTWARE_XCB
- methods = evas_list_append(methods, strdup("software_xcb"));
+ methods = eina_list_append(methods, "xrender_x11");
-#endif
-#ifdef BUILD_ENGINE_XRENDER_XCB
- methods = evas_list_append(methods, strdup("xrender_xcb"));
+ methods = eina_list_append(methods, "xrender_xcb");
-#endif
-#ifdef BUILD_ENGINE_SOFTWARE_16_X11
- methods = evas_list_append(methods, strdup("software_16_x11"));
+ methods = eina_list_append(methods, "software_16_x11");
-#endif
-#ifdef BUILD_ENGINE_GL_X11
- methods = evas_list_append(methods, strdup("gl_x11"));
--#endif
--#ifdef BUILD_ENGINE_GL_GLEW
- methods = evas_list_append(methods, strdup("gl_glew"));
+ methods = eina_list_append(methods, "gl_x11");
-#endif
+ #ifdef BUILD_ENGINE_GL_GLEW
+ methods = eina_list_append(methods, "gl_glew");
+ #endif
-#ifdef BUILD_ENGINE_CAIRO_X11
- methods = evas_list_append(methods, strdup("cairo_x11"));
--#endif
--#ifdef BUILD_ENGINE_DIRECTFB
- methods = evas_list_append(methods, strdup("directfb"));
--#endif
--#ifdef BUILD_ENGINE_FB
- methods = evas_list_append(methods, strdup("fb"));
--#endif
+ methods = eina_list_append(methods, "cairo_x11");
+-#endif
+ #ifdef BUILD_ENGINE_DIRECTFB
+ methods = eina_list_append(methods, "directfb");
+ #endif
+ #ifdef BUILD_ENGINE_FB
+ methods = eina_list_append(methods, "fb");
+ #endif
-#ifdef BUILD_ENGINE_BUFFER
- methods = evas_list_append(methods, strdup("buffer"));
--#endif
--#ifdef BUILD_ENGINE_SOFTWARE_WIN32_GDI
- methods = evas_list_append(methods, strdup("software_win32_gdi"));
--#endif
--#ifdef BUILD_ENGINE_SOFTWARE_QTOPIA
- methods = evas_list_append(methods, strdup("software_qtopia"));
--#endif
--#ifdef BUILD_ENGINE_SDL
- methods = evas_list_append(methods, strdup("software_sdl"));
+ methods = eina_list_append(methods, "buffer");
+-#endif
+ #ifdef BUILD_ENGINE_SOFTWARE_WIN32_GDI
+ methods = eina_list_append(methods, "software_win32_gdi");
+ #endif
+ #ifdef BUILD_ENGINE_SOFTWARE_QTOPIA
+ methods = eina_list_append(methods, "software_qtopia");
+ #endif
+-#ifdef BUILD_ENGINE_SOFTWARE_SDL
+ methods = eina_list_append(methods, "software_sdl");
-#endif
return methods;
diff --git a/graphics/evas-core/files/patch-src_lib_include_evas_common.h b/graphics/evas-core/files/patch-src_lib_include_evas_common.h
new file mode 100644
index 000000000000..f62aa7d4bf36
--- /dev/null
+++ b/graphics/evas-core/files/patch-src_lib_include_evas_common.h
@@ -0,0 +1,11 @@
+--- src/lib/include/evas_common.h.orig 2010-12-06 01:26:44.000000000 -0800
++++ src/lib/include/evas_common.h 2010-12-06 01:27:46.000000000 -0800
+@@ -192,7 +192,7 @@
+
+ #ifdef HAVE_ALLOCA_H
+ # include <alloca.h>
+-#elif defined __GNUC__
++#elif defined __GNUC__ && !defined __FreeBSD__
+ # define alloca __builtin_alloca
+ #elif defined _AIX
+ # define alloca __alloca
diff --git a/graphics/evas-core/pkg-plist b/graphics/evas-core/pkg-plist
index 721e67856696..3cd2e84578f4 100644
--- a/graphics/evas-core/pkg-plist
+++ b/graphics/evas-core/pkg-plist
@@ -1,14 +1,14 @@
-include/Evas.h
-lib/libevas.a
-lib/libevas.la
+include/evas-1/Evas.h
lib/libevas.so
-lib/libevas.so.9
-lib/evas/modules/engines/software_generic/%%E17_ARCH%%/module.a
-lib/evas/modules/engines/software_generic/%%E17_ARCH%%/module.la
+lib/libevas.so.1
lib/evas/modules/engines/software_generic/%%E17_ARCH%%/module.so
libdata/pkgconfig/evas.pc
+%%DATADIR%%/examples/evas-buffer-simple.c
+@dirrm include/evas-1
+@dirrm %%DATADIR%%/examples
+@dirrm %%DATADIR%%
@dirrm lib/evas/modules/engines/software_generic/%%E17_ARCH%%
@dirrm lib/evas/modules/engines/software_generic
-@dirrm lib/evas/modules/engines
-@dirrm lib/evas/modules
-@dirrm lib/evas
+@dirrmtry lib/evas/modules/engines
+@dirrmtry lib/evas/modules
+@dirrmtry lib/evas
diff --git a/graphics/evas-engine-buffer/Makefile b/graphics/evas-engine-buffer/Makefile
index 6723de2e67e6..e470f84dcecb 100644
--- a/graphics/evas-engine-buffer/Makefile
+++ b/graphics/evas-engine-buffer/Makefile
@@ -6,47 +6,31 @@
#
PORTNAME= engine-buffer
-PORTVERSION= 0.9.9.042
-PORTREVISION= 2
-CATEGORIES= graphics
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
- http://download.enlightenment.org/snapshots/2008-01-25/
+DISTVERSION= 1.0.0.beta
+PORTREVISION= 0
+CATEGORIES= graphics enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
PKGNAMEPREFIX= evas-
-DISTNAME= evas-${PORTVERSION}
+DISTNAME= evas-${DISTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= A hardware accelerated canvas API (buffer engine)
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
+LICENSE= BSD
+DIST_SUBDIR= e17
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GNOME= gnomehack pkgconfig gnometarget
-USE_EFL= evas
+USE_EFL= evas librt_hack libtool_hack
BUILD_WRKSRC= ${WRKSRC}/src/modules/engines/buffer
INSTALL_WRKSRC= ${BUILD_WRKSRC}
-CONFIGURE_ARGS= --disable-software-x11 \
- --disable-software-16-x11 \
- --disable-software-xcb \
- --disable-directfb \
- --disable-sdl \
- --enable-buffer \
- --disable-software-qtopia \
- --disable-gl-x11 \
- --disable-cairo-x11 \
- --disable-xrender-x11 \
- --disable-xrender-xcb \
- --disable-glitz-x11 \
- --disable-image-loader-gif \
- --disable-image-loader-png \
- --disable-image-loader-jpeg \
- --disable-image-loader-eet \
- --disable-image-loader-edb \
- --disable-image-loader-tiff \
- --disable-image-loader-xpm \
- --disable-image-loader-svg
+.include "../evas-core/Makefile.inc"
+CONFIGURE_ARGS+= --enable-buffer
post-patch:
@${REINPLACE_CMD} -E \
diff --git a/graphics/evas-engine-buffer/distinfo b/graphics/evas-engine-buffer/distinfo
index 5e8e2bc542ac..252e7b0fa992 100644
--- a/graphics/evas-engine-buffer/distinfo
+++ b/graphics/evas-engine-buffer/distinfo
@@ -1,3 +1,2 @@
-MD5 (evas-0.9.9.042.tar.bz2) = 6811e52b0607ce21061a23462a1f9854
-SHA256 (evas-0.9.9.042.tar.bz2) = e7ebc64a983950979b5488cc0b6fe2b3220f24da554c12c96a4f9131e5a76440
-SIZE (evas-0.9.9.042.tar.bz2) = 7373199
+SHA256 (e17/evas-1.0.0.beta.tar.bz2) = 7ff9a3015e5c5a0bee3c1a13b65358905fb6c81386bc22bf98bd7f73a893be1d
+SIZE (e17/evas-1.0.0.beta.tar.bz2) = 1054215
diff --git a/graphics/evas-engine-buffer/pkg-plist b/graphics/evas-engine-buffer/pkg-plist
index 51cff9a56868..5fab930ad771 100644
--- a/graphics/evas-engine-buffer/pkg-plist
+++ b/graphics/evas-engine-buffer/pkg-plist
@@ -1,6 +1,4 @@
-include/Evas_Engine_Buffer.h
-lib/evas/modules/engines/buffer/%%E17_ARCH%%/module.a
-lib/evas/modules/engines/buffer/%%E17_ARCH%%/module.la
+include/evas-1/Evas_Engine_Buffer.h
lib/evas/modules/engines/buffer/%%E17_ARCH%%/module.so
libdata/pkgconfig/evas-software-buffer.pc
@dirrm lib/evas/modules/engines/buffer/%%E17_ARCH%%
@@ -8,3 +6,4 @@ libdata/pkgconfig/evas-software-buffer.pc
@dirrmtry lib/evas/modules/engines
@dirrmtry lib/evas/modules
@dirrmtry lib/evas
+@dirrmtry include/evas-1
diff --git a/graphics/evas-engine-opengl/Makefile b/graphics/evas-engine-opengl/Makefile
index 9798c35bb1b7..00c760a3f95f 100644
--- a/graphics/evas-engine-opengl/Makefile
+++ b/graphics/evas-engine-opengl/Makefile
@@ -6,49 +6,33 @@
#
PORTNAME= engine-opengl
-PORTVERSION= 0.9.9.042
-PORTREVISION= 2
-CATEGORIES= graphics
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
- http://download.enlightenment.org/snapshots/2008-01-25/
+DISTVERSION= 1.0.0.beta
+PORTREVISION= 0
+CATEGORIES= graphics enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
PKGNAMEPREFIX= evas-
-DISTNAME= evas-${PORTVERSION}
+DISTNAME= evas-${DISTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= A hardware accelerated canvas API (OpenGL engine)
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
+LICENSE= BSD
+DIST_SUBDIR= e17
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GNOME= gnomehack pkgconfig gnometarget
-USE_EFL= evas
-USE_XORG= x11 xext
+USE_EFL= evas librt_hack libtool_hack
+USE_XORG= x11 xext xrender
USE_GL= gl glu
BUILD_WRKSRC= ${WRKSRC}/src/modules/engines/gl_x11
INSTALL_WRKSRC= ${BUILD_WRKSRC}
-CONFIGURE_ARGS= --disable-software-x11 \
- --disable-software-16-x11 \
- --disable-software-xcb \
- --disable-directfb \
- --disable-sdl \
- --disable-buffer \
- --disable-software-qtopia \
- --enable-gl-x11 \
- --disable-cairo-x11 \
- --disable-xrender-x11 \
- --disable-xrender-xcb \
- --disable-glitz-x11 \
- --disable-image-loader-gif \
- --disable-image-loader-png \
- --disable-image-loader-jpeg \
- --disable-image-loader-eet \
- --disable-image-loader-edb \
- --disable-image-loader-tiff \
- --disable-image-loader-xpm \
- --disable-image-loader-svg
+.include "../evas-core/Makefile.inc"
+CONFIGURE_ARGS+= --enable-gl-x11
post-patch:
@${REINPLACE_CMD} -E \
diff --git a/graphics/evas-engine-opengl/distinfo b/graphics/evas-engine-opengl/distinfo
index 5e8e2bc542ac..252e7b0fa992 100644
--- a/graphics/evas-engine-opengl/distinfo
+++ b/graphics/evas-engine-opengl/distinfo
@@ -1,3 +1,2 @@
-MD5 (evas-0.9.9.042.tar.bz2) = 6811e52b0607ce21061a23462a1f9854
-SHA256 (evas-0.9.9.042.tar.bz2) = e7ebc64a983950979b5488cc0b6fe2b3220f24da554c12c96a4f9131e5a76440
-SIZE (evas-0.9.9.042.tar.bz2) = 7373199
+SHA256 (e17/evas-1.0.0.beta.tar.bz2) = 7ff9a3015e5c5a0bee3c1a13b65358905fb6c81386bc22bf98bd7f73a893be1d
+SIZE (e17/evas-1.0.0.beta.tar.bz2) = 1054215
diff --git a/graphics/evas-engine-opengl/pkg-plist b/graphics/evas-engine-opengl/pkg-plist
index 9280f3414b1e..e07e427e07a4 100644
--- a/graphics/evas-engine-opengl/pkg-plist
+++ b/graphics/evas-engine-opengl/pkg-plist
@@ -1,6 +1,4 @@
-include/Evas_Engine_GL_X11.h
-lib/evas/modules/engines/gl_x11/%%E17_ARCH%%/module.a
-lib/evas/modules/engines/gl_x11/%%E17_ARCH%%/module.la
+include/evas-1/Evas_Engine_GL_X11.h
lib/evas/modules/engines/gl_x11/%%E17_ARCH%%/module.so
libdata/pkgconfig/evas-opengl-x11.pc
@dirrm lib/evas/modules/engines/gl_x11/%%E17_ARCH%%
@@ -8,3 +6,4 @@ libdata/pkgconfig/evas-opengl-x11.pc
@dirrmtry lib/evas/modules/engines
@dirrmtry lib/evas/modules
@dirrmtry lib/evas
+@dirrmtry include/evas-1
diff --git a/graphics/evas-engine-sdl/Makefile b/graphics/evas-engine-sdl/Makefile
index 6efe656d324a..c24c125e51e4 100644
--- a/graphics/evas-engine-sdl/Makefile
+++ b/graphics/evas-engine-sdl/Makefile
@@ -6,48 +6,32 @@
#
PORTNAME= engine-sdl
-PORTVERSION= 0.9.9.042
-PORTREVISION= 2
-CATEGORIES= graphics
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
- http://download.enlightenment.org/snapshots/2008-01-25/
+DISTVERSION= 1.0.0.beta
+PORTREVISION= 0
+CATEGORIES= graphics enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
PKGNAMEPREFIX= evas-
-DISTNAME= evas-${PORTVERSION}
+DISTNAME= evas-${DISTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= A hardware accelerated canvas API (SDL engine)
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
+LICENSE= BSD
+DIST_SUBDIR= e17
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GNOME= gnomehack pkgconfig gnometarget
-USE_EFL= evas
+USE_EFL= evas librt_hack libtool_hack
USE_SDL= sdl
BUILD_WRKSRC= ${WRKSRC}/src/modules/engines/software_sdl
INSTALL_WRKSRC= ${BUILD_WRKSRC}
-CONFIGURE_ARGS= --disable-software-x11 \
- --disable-software-16-x11 \
- --disable-software-xcb \
- --disable-directfb \
- --enable-sdl \
- --disable-buffer \
- --disable-software-qtopia \
- --disable-gl-x11 \
- --disable-cairo-x11 \
- --disable-xrender-x11 \
- --disable-xrender-xcb \
- --disable-glitz-x11 \
- --disable-image-loader-gif \
- --disable-image-loader-png \
- --disable-image-loader-jpeg \
- --disable-image-loader-eet \
- --disable-image-loader-edb \
- --disable-image-loader-tiff \
- --disable-image-loader-xpm \
- --disable-image-loader-svg
+.include "../evas-core/Makefile.inc"
+CONFIGURE_ARGS+= --enable-software-sdl
post-patch:
@${REINPLACE_CMD} -E \
diff --git a/graphics/evas-engine-sdl/distinfo b/graphics/evas-engine-sdl/distinfo
index 5e8e2bc542ac..252e7b0fa992 100644
--- a/graphics/evas-engine-sdl/distinfo
+++ b/graphics/evas-engine-sdl/distinfo
@@ -1,3 +1,2 @@
-MD5 (evas-0.9.9.042.tar.bz2) = 6811e52b0607ce21061a23462a1f9854
-SHA256 (evas-0.9.9.042.tar.bz2) = e7ebc64a983950979b5488cc0b6fe2b3220f24da554c12c96a4f9131e5a76440
-SIZE (evas-0.9.9.042.tar.bz2) = 7373199
+SHA256 (e17/evas-1.0.0.beta.tar.bz2) = 7ff9a3015e5c5a0bee3c1a13b65358905fb6c81386bc22bf98bd7f73a893be1d
+SIZE (e17/evas-1.0.0.beta.tar.bz2) = 1054215
diff --git a/graphics/evas-engine-sdl/pkg-plist b/graphics/evas-engine-sdl/pkg-plist
index d4e48bc99e8b..811329701542 100644
--- a/graphics/evas-engine-sdl/pkg-plist
+++ b/graphics/evas-engine-sdl/pkg-plist
@@ -1,6 +1,4 @@
-include/Evas_Engine_SDL.h
-lib/evas/modules/engines/software_sdl/%%E17_ARCH%%/module.a
-lib/evas/modules/engines/software_sdl/%%E17_ARCH%%/module.la
+include/evas-1/Evas_Engine_SDL.h
lib/evas/modules/engines/software_sdl/%%E17_ARCH%%/module.so
libdata/pkgconfig/evas-software-sdl.pc
@dirrm lib/evas/modules/engines/software_sdl/%%E17_ARCH%%
@@ -8,3 +6,4 @@ libdata/pkgconfig/evas-software-sdl.pc
@dirrmtry lib/evas/modules/engines
@dirrmtry lib/evas/modules
@dirrmtry lib/evas
+@dirrmtry include/evas-1
diff --git a/graphics/evas-engine-x11/Makefile b/graphics/evas-engine-x11/Makefile
index aca91cf54d14..6d9bc0eeacc9 100644
--- a/graphics/evas-engine-x11/Makefile
+++ b/graphics/evas-engine-x11/Makefile
@@ -6,48 +6,32 @@
#
PORTNAME= engine-x11
-PORTVERSION= 0.9.9.042
-PORTREVISION= 2
-CATEGORIES= graphics
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
- http://download.enlightenment.org/snapshots/2008-01-25/
+DISTVERSION= 1.0.0.beta
+PORTREVISION= 0
+CATEGORIES= graphics enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
PKGNAMEPREFIX= evas-
-DISTNAME= evas-${PORTVERSION}
+DISTNAME= evas-${DISTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= A hardware accelerated canvas API (X11 engine)
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
+LICENSE= BSD
+DIST_SUBDIR= e17
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GNOME= gnomehack pkgconfig gnometarget
-USE_EFL= evas
+USE_EFL= evas librt_hack libtool_hack
USE_XORG= x11 xext
BUILD_WRKSRC= ${WRKSRC}/src/modules/engines/software_x11
INSTALL_WRKSRC= ${BUILD_WRKSRC}
-CONFIGURE_ARGS= --enable-software-x11 \
- --disable-software-16-x11 \
- --disable-software-xcb \
- --disable-directfb \
- --disable-sdl \
- --disable-buffer \
- --disable-software-qtopia \
- --disable-gl-x11 \
- --disable-cairo-x11 \
- --disable-xrender-x11 \
- --disable-xrender-xcb \
- --disable-glitz-x11 \
- --disable-image-loader-gif \
- --disable-image-loader-png \
- --disable-image-loader-jpeg \
- --disable-image-loader-eet \
- --disable-image-loader-edb \
- --disable-image-loader-tiff \
- --disable-image-loader-xpm \
- --disable-image-loader-svg
+.include "../evas-core/Makefile.inc"
+CONFIGURE_ARGS+= --enable-software-xlib
post-patch:
@${REINPLACE_CMD} -E \
diff --git a/graphics/evas-engine-x11/distinfo b/graphics/evas-engine-x11/distinfo
index 5e8e2bc542ac..252e7b0fa992 100644
--- a/graphics/evas-engine-x11/distinfo
+++ b/graphics/evas-engine-x11/distinfo
@@ -1,3 +1,2 @@
-MD5 (evas-0.9.9.042.tar.bz2) = 6811e52b0607ce21061a23462a1f9854
-SHA256 (evas-0.9.9.042.tar.bz2) = e7ebc64a983950979b5488cc0b6fe2b3220f24da554c12c96a4f9131e5a76440
-SIZE (evas-0.9.9.042.tar.bz2) = 7373199
+SHA256 (e17/evas-1.0.0.beta.tar.bz2) = 7ff9a3015e5c5a0bee3c1a13b65358905fb6c81386bc22bf98bd7f73a893be1d
+SIZE (e17/evas-1.0.0.beta.tar.bz2) = 1054215
diff --git a/graphics/evas-engine-x11/pkg-plist b/graphics/evas-engine-x11/pkg-plist
index 24851a75542c..67482b477760 100644
--- a/graphics/evas-engine-x11/pkg-plist
+++ b/graphics/evas-engine-x11/pkg-plist
@@ -1,6 +1,4 @@
-include/Evas_Engine_Software_X11.h
-lib/evas/modules/engines/software_x11/%%E17_ARCH%%/module.a
-lib/evas/modules/engines/software_x11/%%E17_ARCH%%/module.la
+include/evas-1/Evas_Engine_Software_X11.h
lib/evas/modules/engines/software_x11/%%E17_ARCH%%/module.so
libdata/pkgconfig/evas-software-x11.pc
@dirrm lib/evas/modules/engines/software_x11/%%E17_ARCH%%
@@ -8,3 +6,4 @@ libdata/pkgconfig/evas-software-x11.pc
@dirrmtry lib/evas/modules/engines
@dirrmtry lib/evas/modules
@dirrmtry lib/evas
+@dirrmtry include/evas-1
diff --git a/graphics/evas-engine-xrender/Makefile b/graphics/evas-engine-xrender/Makefile
index ea7dadffa20b..85fa95805cb0 100644
--- a/graphics/evas-engine-xrender/Makefile
+++ b/graphics/evas-engine-xrender/Makefile
@@ -6,48 +6,32 @@
#
PORTNAME= engine-xrender
-PORTVERSION= 0.9.9.042
-PORTREVISION= 2
-CATEGORIES= graphics
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
- http://download.enlightenment.org/snapshots/2008-01-25/
+DISTVERSION= 1.0.0.beta
+PORTREVISION= 0
+CATEGORIES= graphics enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
PKGNAMEPREFIX= evas-
-DISTNAME= evas-${PORTVERSION}
+DISTNAME= evas-${DISTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= A hardware accelerated canvas API (XRender engine)
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
+LICENSE= BSD
+DIST_SUBDIR= e17
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GNOME= gnomehack pkgconfig gnometarget
-USE_EFL= evas
+USE_EFL= evas librt_hack libtool_hack
USE_XORG= x11 xrender xext
BUILD_WRKSRC= ${WRKSRC}/src/modules/engines/xrender_x11
INSTALL_WRKSRC= ${BUILD_WRKSRC}
-CONFIGURE_ARGS= --disable-software-x11 \
- --disable-software-16-x11 \
- --disable-software-xcb \
- --disable-directfb \
- --disable-sdl \
- --disable-buffer \
- --disable-software-qtopia \
- --disable-gl-x11 \
- --disable-cairo-x11 \
- --enable-xrender-x11 \
- --disable-xrender-xcb \
- --disable-glitz-x11 \
- --disable-image-loader-gif \
- --disable-image-loader-png \
- --disable-image-loader-jpeg \
- --disable-image-loader-eet \
- --disable-image-loader-edb \
- --disable-image-loader-tiff \
- --disable-image-loader-xpm \
- --disable-image-loader-svg
+.include "../evas-core/Makefile.inc"
+CONFIGURE_ARGS+= --enable-xrender-x11
post-patch:
@${REINPLACE_CMD} -E \
diff --git a/graphics/evas-engine-xrender/distinfo b/graphics/evas-engine-xrender/distinfo
index 5e8e2bc542ac..252e7b0fa992 100644
--- a/graphics/evas-engine-xrender/distinfo
+++ b/graphics/evas-engine-xrender/distinfo
@@ -1,3 +1,2 @@
-MD5 (evas-0.9.9.042.tar.bz2) = 6811e52b0607ce21061a23462a1f9854
-SHA256 (evas-0.9.9.042.tar.bz2) = e7ebc64a983950979b5488cc0b6fe2b3220f24da554c12c96a4f9131e5a76440
-SIZE (evas-0.9.9.042.tar.bz2) = 7373199
+SHA256 (e17/evas-1.0.0.beta.tar.bz2) = 7ff9a3015e5c5a0bee3c1a13b65358905fb6c81386bc22bf98bd7f73a893be1d
+SIZE (e17/evas-1.0.0.beta.tar.bz2) = 1054215
diff --git a/graphics/evas-engine-xrender/pkg-plist b/graphics/evas-engine-xrender/pkg-plist
index 367f934f5d4b..997f7879d0e4 100644
--- a/graphics/evas-engine-xrender/pkg-plist
+++ b/graphics/evas-engine-xrender/pkg-plist
@@ -1,6 +1,4 @@
-include/Evas_Engine_XRender_X11.h
-lib/evas/modules/engines/xrender_x11/%%E17_ARCH%%/module.a
-lib/evas/modules/engines/xrender_x11/%%E17_ARCH%%/module.la
+include/evas-1/Evas_Engine_XRender_X11.h
lib/evas/modules/engines/xrender_x11/%%E17_ARCH%%/module.so
libdata/pkgconfig/evas-xrender-x11.pc
@dirrm lib/evas/modules/engines/xrender_x11/%%E17_ARCH%%
@@ -8,3 +6,4 @@ libdata/pkgconfig/evas-xrender-x11.pc
@dirrmtry lib/evas/modules/engines
@dirrmtry lib/evas/modules
@dirrmtry lib/evas
+@dirrmtry include/evas-1
diff --git a/graphics/evas-loader-bmp/Makefile b/graphics/evas-loader-bmp/Makefile
new file mode 100644
index 000000000000..cf8bc4066485
--- /dev/null
+++ b/graphics/evas-loader-bmp/Makefile
@@ -0,0 +1,46 @@
+# New ports collection makefile for: evas-loader-bmp
+# Date created: 14 June 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= loader-bmp
+DISTVERSION= 1.0.0.beta
+CATEGORIES= graphics enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
+PKGNAMEPREFIX= evas-
+DISTNAME= evas-${DISTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= A hardware accelerated canvas API (BMP loader)
+
+LICENSE= BSD
+DIST_SUBDIR= e17
+USE_BZIP2= yes
+GNU_CONFIGURE= yes
+USE_EFL= evas librt_hack libtool_hack
+USE_GNOME= gnomehack pkgconfig gnometarget
+USE_LDCONFIG= yes
+
+MAKEDIRS= ${WRKSRC}/src/modules/loaders/bmp
+
+.include "../evas-core/Makefile.inc"
+CONFIGURE_ARGS+= --enable-image-loader-bmp
+
+post-patch:
+ @${REINPLACE_CMD} -E \
+ -e 's,\$$\(top_builddir\)/src/lib/\.libs,${LOCALBASE}/lib,' \
+ -e 's,\$$\(top_builddir\)/src/lib/libevas\.la,-levas,' \
+ ${MAKEDIRS:S,$,/Makefile.in,}
+
+do-build:
+ @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} \
+ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done)
+
+do-install:
+ @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} \
+ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done)
+
+.include <bsd.port.mk>
diff --git a/graphics/evas-loader-bmp/distinfo b/graphics/evas-loader-bmp/distinfo
new file mode 100644
index 000000000000..252e7b0fa992
--- /dev/null
+++ b/graphics/evas-loader-bmp/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/evas-1.0.0.beta.tar.bz2) = 7ff9a3015e5c5a0bee3c1a13b65358905fb6c81386bc22bf98bd7f73a893be1d
+SIZE (e17/evas-1.0.0.beta.tar.bz2) = 1054215
diff --git a/graphics/evas-loader-bmp/pkg-descr b/graphics/evas-loader-bmp/pkg-descr
new file mode 100644
index 000000000000..e525449b6c61
--- /dev/null
+++ b/graphics/evas-loader-bmp/pkg-descr
@@ -0,0 +1,6 @@
+A hardware-accelerated canvas API for X-Windows that can draw anti-aliased
+text, smooth super and sub-sampled images, alpha-blend, as well as drop down to
+using normal X11 primitives such as pixmaps, lines and rectangles for speed if
+your CPU or graphics hardware is too slow.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Evas/
diff --git a/graphics/evas-loader-bmp/pkg-plist b/graphics/evas-loader-bmp/pkg-plist
new file mode 100644
index 000000000000..bc2140b0a3af
--- /dev/null
+++ b/graphics/evas-loader-bmp/pkg-plist
@@ -0,0 +1,6 @@
+lib/evas/modules/loaders/bmp/%%E17_ARCH%%/module.so
+@dirrm lib/evas/modules/loaders/bmp/%%E17_ARCH%%
+@dirrm lib/evas/modules/loaders/bmp
+@dirrmtry lib/evas/modules/loaders
+@dirrmtry lib/evas/modules
+@dirrmtry lib/evas
diff --git a/graphics/evas-loader-edb/distinfo b/graphics/evas-loader-edb/distinfo
index 5e8e2bc542ac..1f41f12b303e 100644
--- a/graphics/evas-loader-edb/distinfo
+++ b/graphics/evas-loader-edb/distinfo
@@ -1,3 +1,2 @@
-MD5 (evas-0.9.9.042.tar.bz2) = 6811e52b0607ce21061a23462a1f9854
SHA256 (evas-0.9.9.042.tar.bz2) = e7ebc64a983950979b5488cc0b6fe2b3220f24da554c12c96a4f9131e5a76440
SIZE (evas-0.9.9.042.tar.bz2) = 7373199
diff --git a/graphics/evas-loader-eet/Makefile b/graphics/evas-loader-eet/Makefile
index 167ad7bb5f66..e9e2306fdcdb 100644
--- a/graphics/evas-loader-eet/Makefile
+++ b/graphics/evas-loader-eet/Makefile
@@ -6,48 +6,32 @@
#
PORTNAME= loader-eet
-PORTVERSION= 0.9.9.042
-PORTREVISION= 2
-CATEGORIES= graphics
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
- http://download.enlightenment.org/snapshots/2008-01-25/
+DISTVERSION= 1.0.0.beta
+PORTREVISION= 0
+CATEGORIES= graphics enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
PKGNAMEPREFIX= evas-
-DISTNAME= evas-${PORTVERSION}
+DISTNAME= evas-${DISTVERSION}
MAINTAINER= stas@FreeBSD.org
-COMMENT= A hardware accelerated canvas API (EET engine)
+COMMENT= A hardware accelerated canvas API (EET loader)
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
+LICENSE= BSD
+DIST_SUBDIR= e17
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GNOME= gnomehack pkgconfig gnometarget
-USE_EFL= evas eet
+USE_EFL= evas eet librt_hack libtool_hack
MAKEDIRS= ${WRKSRC}/src/modules/loaders/eet \
${WRKSRC}/src/modules/savers/eet
-CONFIGURE_ARGS= --disable-software-x11 \
- --disable-software-16-x11 \
- --disable-software-xcb \
- --disable-directfb \
- --disable-sdl \
- --disable-buffer \
- --disable-software-qtopia \
- --disable-gl-x11 \
- --disable-cairo-x11 \
- --disable-xrender-x11 \
- --disable-xrender-xcb \
- --disable-glitz-x11 \
- --disable-image-loader-gif \
- --disable-image-loader-png \
- --disable-image-loader-jpeg \
- --enable-image-loader-eet \
- --disable-image-loader-edb \
- --disable-image-loader-tiff \
- --disable-image-loader-xpm \
- --disable-image-loader-svg
+.include "../evas-core/Makefile.inc"
+CONFIGURE_ARGS+= --enable-image-loader-eet
post-patch:
@${REINPLACE_CMD} -E \
@@ -56,9 +40,11 @@ post-patch:
${MAKEDIRS:S,$,/Makefile.in,}
do-build:
- @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done)
+ @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} \
+ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done)
do-install:
- @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done)
+ @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} \
+ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done)
.include <bsd.port.mk>
diff --git a/graphics/evas-loader-eet/distinfo b/graphics/evas-loader-eet/distinfo
index 5e8e2bc542ac..252e7b0fa992 100644
--- a/graphics/evas-loader-eet/distinfo
+++ b/graphics/evas-loader-eet/distinfo
@@ -1,3 +1,2 @@
-MD5 (evas-0.9.9.042.tar.bz2) = 6811e52b0607ce21061a23462a1f9854
-SHA256 (evas-0.9.9.042.tar.bz2) = e7ebc64a983950979b5488cc0b6fe2b3220f24da554c12c96a4f9131e5a76440
-SIZE (evas-0.9.9.042.tar.bz2) = 7373199
+SHA256 (e17/evas-1.0.0.beta.tar.bz2) = 7ff9a3015e5c5a0bee3c1a13b65358905fb6c81386bc22bf98bd7f73a893be1d
+SIZE (e17/evas-1.0.0.beta.tar.bz2) = 1054215
diff --git a/graphics/evas-loader-eet/pkg-plist b/graphics/evas-loader-eet/pkg-plist
index 71d8ae1eddc3..d9ae8ba5fc1c 100644
--- a/graphics/evas-loader-eet/pkg-plist
+++ b/graphics/evas-loader-eet/pkg-plist
@@ -1,8 +1,4 @@
-lib/evas/modules/loaders/eet/%%E17_ARCH%%/module.a
-lib/evas/modules/loaders/eet/%%E17_ARCH%%/module.la
lib/evas/modules/loaders/eet/%%E17_ARCH%%/module.so
-lib/evas/modules/savers/eet/%%E17_ARCH%%/module.a
-lib/evas/modules/savers/eet/%%E17_ARCH%%/module.la
lib/evas/modules/savers/eet/%%E17_ARCH%%/module.so
@dirrm lib/evas/modules/loaders/eet/%%E17_ARCH%%
@dirrm lib/evas/modules/loaders/eet
diff --git a/graphics/evas-loader-gif/Makefile b/graphics/evas-loader-gif/Makefile
index dff3b3231f55..afd5a4a49706 100644
--- a/graphics/evas-loader-gif/Makefile
+++ b/graphics/evas-loader-gif/Makefile
@@ -6,48 +6,32 @@
#
PORTNAME= loader-gif
-PORTVERSION= 0.9.9.042
-PORTREVISION= 2
-CATEGORIES= graphics
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
- http://download.enlightenment.org/snapshots/2008-01-25/
+DISTVERSION= 1.0.0.beta
+PORTREVISION= 0
+CATEGORIES= graphics enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
PKGNAMEPREFIX= evas-
-DISTNAME= evas-${PORTVERSION}
+DISTNAME= evas-${DISTVERSION}
MAINTAINER= stas@FreeBSD.org
-COMMENT= A hardware accelerated canvas API (GIF engine)
+COMMENT= A hardware accelerated canvas API (GIF loader)
LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \
freetype.9:${PORTSDIR}/print/freetype2
+LICENSE= BSD
+DIST_SUBDIR= e17
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GNOME= gnomehack pkgconfig gnometarget
-USE_EFL= evas
+USE_EFL= evas librt_hack libtool_hack
MAKEDIRS= ${WRKSRC}/src/modules/loaders/gif
-CONFIGURE_ARGS= --disable-software-x11 \
- --disable-software-16-x11 \
- --disable-software-xcb \
- --disable-directfb \
- --disable-sdl \
- --disable-buffer \
- --disable-software-qtopia \
- --disable-gl-x11 \
- --disable-cairo-x11 \
- --disable-xrender-x11 \
- --disable-xrender-xcb \
- --disable-glitz-x11 \
- --enable-image-loader-gif \
- --disable-image-loader-png \
- --disable-image-loader-jpeg \
- --disable-image-loader-eet \
- --disable-image-loader-edb \
- --disable-image-loader-tiff \
- --disable-image-loader-xpm \
- --disable-image-loader-svg
+.include "../evas-core/Makefile.inc"
+CONFIGURE_ARGS+= --enable-image-loader-gif
post-patch:
@${REINPLACE_CMD} -E \
@@ -56,9 +40,11 @@ post-patch:
${MAKEDIRS:S,$,/Makefile.in,}
do-build:
- @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done)
+ @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} \
+ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done)
do-install:
- @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done)
+ @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} \
+ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done)
.include <bsd.port.mk>
diff --git a/graphics/evas-loader-gif/distinfo b/graphics/evas-loader-gif/distinfo
index 5e8e2bc542ac..252e7b0fa992 100644
--- a/graphics/evas-loader-gif/distinfo
+++ b/graphics/evas-loader-gif/distinfo
@@ -1,3 +1,2 @@
-MD5 (evas-0.9.9.042.tar.bz2) = 6811e52b0607ce21061a23462a1f9854
-SHA256 (evas-0.9.9.042.tar.bz2) = e7ebc64a983950979b5488cc0b6fe2b3220f24da554c12c96a4f9131e5a76440
-SIZE (evas-0.9.9.042.tar.bz2) = 7373199
+SHA256 (e17/evas-1.0.0.beta.tar.bz2) = 7ff9a3015e5c5a0bee3c1a13b65358905fb6c81386bc22bf98bd7f73a893be1d
+SIZE (e17/evas-1.0.0.beta.tar.bz2) = 1054215
diff --git a/graphics/evas-loader-gif/pkg-plist b/graphics/evas-loader-gif/pkg-plist
index 3c7863fd7ac2..6642a4def6d2 100644
--- a/graphics/evas-loader-gif/pkg-plist
+++ b/graphics/evas-loader-gif/pkg-plist
@@ -1,5 +1,3 @@
-lib/evas/modules/loaders/gif/%%E17_ARCH%%/module.a
-lib/evas/modules/loaders/gif/%%E17_ARCH%%/module.la
lib/evas/modules/loaders/gif/%%E17_ARCH%%/module.so
@dirrm lib/evas/modules/loaders/gif/%%E17_ARCH%%
@dirrm lib/evas/modules/loaders/gif
diff --git a/graphics/evas-loader-jpeg/Makefile b/graphics/evas-loader-jpeg/Makefile
index 4471ca4b74f2..396ee97bca02 100644
--- a/graphics/evas-loader-jpeg/Makefile
+++ b/graphics/evas-loader-jpeg/Makefile
@@ -6,49 +6,33 @@
#
PORTNAME= loader-jpeg
-PORTVERSION= 0.9.9.042
-PORTREVISION= 2
-CATEGORIES= graphics
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
- http://download.enlightenment.org/snapshots/2008-01-25/
+DISTVERSION= 1.0.0.beta
+PORTREVISION= 0
+CATEGORIES= graphics enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
PKGNAMEPREFIX= evas-
-DISTNAME= evas-${PORTVERSION}
+DISTNAME= evas-${DISTVERSION}
MAINTAINER= stas@FreeBSD.org
-COMMENT= A hardware accelerated canvas API (JPEG engine)
+COMMENT= A hardware accelerated canvas API (JPEG loader)
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
freetype.9:${PORTSDIR}/print/freetype2
+LICENSE= BSD
+DIST_SUBDIR= e17
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GNOME= gnomehack pkgconfig gnometarget
-USE_EFL= evas
+USE_EFL= evas librt_hack libtool_hack
MAKEDIRS= ${WRKSRC}/src/modules/loaders/jpeg \
${WRKSRC}/src/modules/savers/jpeg
-CONFIGURE_ARGS= --disable-software-x11 \
- --disable-software-16-x11 \
- --disable-software-xcb \
- --disable-directfb \
- --disable-sdl \
- --disable-buffer \
- --disable-software-qtopia \
- --disable-gl-x11 \
- --disable-cairo-x11 \
- --disable-xrender-x11 \
- --disable-xrender-xcb \
- --disable-glitz-x11 \
- --disable-image-loader-gif \
- --disable-image-loader-png \
- --enable-image-loader-jpeg \
- --disable-image-loader-eet \
- --disable-image-loader-edb \
- --disable-image-loader-tiff \
- --disable-image-loader-xpm \
- --disable-image-loader-svg
+.include "../evas-core/Makefile.inc"
+CONFIGURE_ARGS+= --enable-image-loader-jpeg
post-patch:
@${REINPLACE_CMD} -E \
@@ -57,9 +41,11 @@ post-patch:
${MAKEDIRS:S,$,/Makefile.in,}
do-build:
- @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done)
+ @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} \
+ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done)
do-install:
- @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done)
+ @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} \
+ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done)
.include <bsd.port.mk>
diff --git a/graphics/evas-loader-jpeg/distinfo b/graphics/evas-loader-jpeg/distinfo
index 5e8e2bc542ac..252e7b0fa992 100644
--- a/graphics/evas-loader-jpeg/distinfo
+++ b/graphics/evas-loader-jpeg/distinfo
@@ -1,3 +1,2 @@
-MD5 (evas-0.9.9.042.tar.bz2) = 6811e52b0607ce21061a23462a1f9854
-SHA256 (evas-0.9.9.042.tar.bz2) = e7ebc64a983950979b5488cc0b6fe2b3220f24da554c12c96a4f9131e5a76440
-SIZE (evas-0.9.9.042.tar.bz2) = 7373199
+SHA256 (e17/evas-1.0.0.beta.tar.bz2) = 7ff9a3015e5c5a0bee3c1a13b65358905fb6c81386bc22bf98bd7f73a893be1d
+SIZE (e17/evas-1.0.0.beta.tar.bz2) = 1054215
diff --git a/graphics/evas-loader-jpeg/pkg-plist b/graphics/evas-loader-jpeg/pkg-plist
index 34e0bea43f96..841b8be33c7a 100644
--- a/graphics/evas-loader-jpeg/pkg-plist
+++ b/graphics/evas-loader-jpeg/pkg-plist
@@ -1,8 +1,4 @@
-lib/evas/modules/loaders/jpeg/%%E17_ARCH%%/module.a
-lib/evas/modules/loaders/jpeg/%%E17_ARCH%%/module.la
lib/evas/modules/loaders/jpeg/%%E17_ARCH%%/module.so
-lib/evas/modules/savers/jpeg/%%E17_ARCH%%/module.a
-lib/evas/modules/savers/jpeg/%%E17_ARCH%%/module.la
lib/evas/modules/savers/jpeg/%%E17_ARCH%%/module.so
@dirrm lib/evas/modules/loaders/jpeg/%%E17_ARCH%%
@dirrm lib/evas/modules/loaders/jpeg
diff --git a/graphics/evas-loader-pmaps/Makefile b/graphics/evas-loader-pmaps/Makefile
new file mode 100644
index 000000000000..38a79c34e611
--- /dev/null
+++ b/graphics/evas-loader-pmaps/Makefile
@@ -0,0 +1,46 @@
+# New ports collection makefile for: evas-loader-pmaps
+# Date created: 15 May 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= loader-pmaps
+DISTVERSION= 1.0.0.beta
+CATEGORIES= graphics enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
+PKGNAMEPREFIX= evas-
+DISTNAME= evas-${DISTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= A hardware accelerated canvas API (PMAPS loader)
+
+LICENSE= BSD
+DIST_SUBDIR= e17
+USE_BZIP2= yes
+GNU_CONFIGURE= yes
+USE_EFL= evas librt_hack libtool_hack
+USE_GNOME= gnomehack pkgconfig gnometarget
+USE_LDCONFIG= yes
+
+MAKEDIRS= ${WRKSRC}/src/modules/loaders/pmaps
+
+.include "../evas-core/Makefile.inc"
+CONFIGURE_ARGS+= --enable-image-loader-pmaps
+
+post-patch:
+ @${REINPLACE_CMD} -E \
+ -e 's,\$$\(top_builddir\)/src/lib/\.libs,${LOCALBASE}/lib,' \
+ -e 's,\$$\(top_builddir\)/src/lib/libevas\.la,-levas,' \
+ ${MAKEDIRS:S,$,/Makefile.in,}
+
+do-build:
+ @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} \
+ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done)
+
+do-install:
+ @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} \
+ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done)
+
+.include <bsd.port.mk>
diff --git a/graphics/evas-loader-pmaps/distinfo b/graphics/evas-loader-pmaps/distinfo
new file mode 100644
index 000000000000..252e7b0fa992
--- /dev/null
+++ b/graphics/evas-loader-pmaps/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/evas-1.0.0.beta.tar.bz2) = 7ff9a3015e5c5a0bee3c1a13b65358905fb6c81386bc22bf98bd7f73a893be1d
+SIZE (e17/evas-1.0.0.beta.tar.bz2) = 1054215
diff --git a/graphics/evas-loader-pmaps/pkg-descr b/graphics/evas-loader-pmaps/pkg-descr
new file mode 100644
index 000000000000..e525449b6c61
--- /dev/null
+++ b/graphics/evas-loader-pmaps/pkg-descr
@@ -0,0 +1,6 @@
+A hardware-accelerated canvas API for X-Windows that can draw anti-aliased
+text, smooth super and sub-sampled images, alpha-blend, as well as drop down to
+using normal X11 primitives such as pixmaps, lines and rectangles for speed if
+your CPU or graphics hardware is too slow.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Evas/
diff --git a/graphics/evas-loader-pmaps/pkg-plist b/graphics/evas-loader-pmaps/pkg-plist
new file mode 100644
index 000000000000..6f67e6a0d0e1
--- /dev/null
+++ b/graphics/evas-loader-pmaps/pkg-plist
@@ -0,0 +1,6 @@
+lib/evas/modules/loaders/pmaps/%%E17_ARCH%%/module.so
+@dirrm lib/evas/modules/loaders/pmaps/%%E17_ARCH%%
+@dirrm lib/evas/modules/loaders/pmaps
+@dirrmtry lib/evas/modules/loaders
+@dirrmtry lib/evas/modules
+@dirrmtry lib/evas
diff --git a/graphics/evas-loader-png/Makefile b/graphics/evas-loader-png/Makefile
index 2ebbc93f2645..863c9ac25e17 100644
--- a/graphics/evas-loader-png/Makefile
+++ b/graphics/evas-loader-png/Makefile
@@ -6,49 +6,33 @@
#
PORTNAME= loader-png
-PORTVERSION= 0.9.9.042
-PORTREVISION= 5
-CATEGORIES= graphics
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
- http://download.enlightenment.org/snapshots/2008-01-25/
+DISTVERSION= 1.0.0.beta
+PORTREVISION= 0
+CATEGORIES= graphics enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
PKGNAMEPREFIX= evas-
-DISTNAME= evas-${PORTVERSION}
+DISTNAME= evas-${DISTVERSION}
MAINTAINER= stas@FreeBSD.org
-COMMENT= A hardware accelerated canvas API (PNG engine)
+COMMENT= A hardware accelerated canvas API (PNG loader)
LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
freetype.9:${PORTSDIR}/print/freetype2
+LICENSE= BSD
+DIST_SUBDIR= e17
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GNOME= gnomehack pkgconfig gnometarget
-USE_EFL= evas
+USE_EFL= evas librt_hack libtool_hack
MAKEDIRS= ${WRKSRC}/src/modules/loaders/png \
${WRKSRC}/src/modules/savers/png
-CONFIGURE_ARGS= --disable-software-x11 \
- --disable-software-16-x11 \
- --disable-software-xcb \
- --disable-directfb \
- --disable-sdl \
- --disable-buffer \
- --disable-software-qtopia \
- --disable-gl-x11 \
- --disable-cairo-x11 \
- --disable-xrender-x11 \
- --disable-xrender-xcb \
- --disable-glitz-x11 \
- --disable-image-loader-gif \
- --enable-image-loader-png \
- --disable-image-loader-jpeg \
- --disable-image-loader-eet \
- --disable-image-loader-edb \
- --disable-image-loader-tiff \
- --disable-image-loader-xpm \
- --disable-image-loader-svg
+.include "../evas-core/Makefile.inc"
+CONFIGURE_ARGS+= --enable-image-loader-png
post-patch:
@${REINPLACE_CMD} -E \
@@ -57,9 +41,11 @@ post-patch:
${MAKEDIRS:S,$,/Makefile.in,}
do-build:
- @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done)
+ @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} \
+ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done)
do-install:
- @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done)
+ @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} \
+ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done)
.include <bsd.port.mk>
diff --git a/graphics/evas-loader-png/distinfo b/graphics/evas-loader-png/distinfo
index 5e8e2bc542ac..252e7b0fa992 100644
--- a/graphics/evas-loader-png/distinfo
+++ b/graphics/evas-loader-png/distinfo
@@ -1,3 +1,2 @@
-MD5 (evas-0.9.9.042.tar.bz2) = 6811e52b0607ce21061a23462a1f9854
-SHA256 (evas-0.9.9.042.tar.bz2) = e7ebc64a983950979b5488cc0b6fe2b3220f24da554c12c96a4f9131e5a76440
-SIZE (evas-0.9.9.042.tar.bz2) = 7373199
+SHA256 (e17/evas-1.0.0.beta.tar.bz2) = 7ff9a3015e5c5a0bee3c1a13b65358905fb6c81386bc22bf98bd7f73a893be1d
+SIZE (e17/evas-1.0.0.beta.tar.bz2) = 1054215
diff --git a/graphics/evas-loader-png/files/patch-evas_image_load_png.c b/graphics/evas-loader-png/files/patch-evas_image_load_png.c
deleted file mode 100644
index b3de3f645163..000000000000
--- a/graphics/evas-loader-png/files/patch-evas_image_load_png.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/modules/loaders/png/evas_image_load_png.c.orig 2007-10-28 11:35:13.000000000 +0100
-+++ src/modules/loaders/png/evas_image_load_png.c 2010-04-01 07:26:03.000000000 +0200
-@@ -44,7 +44,7 @@
- fclose(f);
- return 0;
- }
-- if (!png_check_sig(buf, PNG_BYTES_TO_CHECK))
-+ if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK))
- {
- fclose(f);
- return 0;
-@@ -121,7 +121,7 @@
-
- /* if we havent read the header before, set the header data */
- fread(buf, 1, PNG_BYTES_TO_CHECK, f);
-- if (!png_check_sig(buf, PNG_BYTES_TO_CHECK))
-+ if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK))
- {
- fclose(f);
- return 0;
diff --git a/graphics/evas-loader-png/pkg-plist b/graphics/evas-loader-png/pkg-plist
index 32dc2697ac80..44439d5a4832 100644
--- a/graphics/evas-loader-png/pkg-plist
+++ b/graphics/evas-loader-png/pkg-plist
@@ -1,8 +1,4 @@
-lib/evas/modules/loaders/png/%%E17_ARCH%%/module.a
-lib/evas/modules/loaders/png/%%E17_ARCH%%/module.la
lib/evas/modules/loaders/png/%%E17_ARCH%%/module.so
-lib/evas/modules/savers/png/%%E17_ARCH%%/module.a
-lib/evas/modules/savers/png/%%E17_ARCH%%/module.la
lib/evas/modules/savers/png/%%E17_ARCH%%/module.so
@dirrm lib/evas/modules/loaders/png/%%E17_ARCH%%
@dirrm lib/evas/modules/loaders/png
diff --git a/graphics/evas-loader-svg/Makefile b/graphics/evas-loader-svg/Makefile
index 9e68f39712b1..7bbcfc198fc1 100644
--- a/graphics/evas-loader-svg/Makefile
+++ b/graphics/evas-loader-svg/Makefile
@@ -6,48 +6,32 @@
#
PORTNAME= loader-svg
-PORTVERSION= 0.9.9.042
-PORTREVISION= 5
-CATEGORIES= graphics
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
- http://download.enlightenment.org/snapshots/2008-01-25/
+DISTVERSION= 1.0.0.beta
+PORTREVISION= 0
+CATEGORIES= graphics enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
PKGNAMEPREFIX= evas-
-DISTNAME= evas-${PORTVERSION}
+DISTNAME= evas-${DISTVERSION}
MAINTAINER= stas@FreeBSD.org
-COMMENT= A hardware accelerated canvas API (SVG engine)
+COMMENT= A hardware accelerated canvas API (SVG loader)
LIB_DEPENDS= svg-cairo.1:${PORTSDIR}/graphics/libsvg-cairo \
freetype.9:${PORTSDIR}/print/freetype2
+LICENSE= BSD
+DIST_SUBDIR= e17
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GNOME= gnomehack pkgconfig gnometarget librsvg2
-USE_EFL= evas
+USE_EFL= evas librt_hack libtool_hack
MAKEDIRS= ${WRKSRC}/src/modules/loaders/svg
-CONFIGURE_ARGS= --disable-software-x11 \
- --disable-software-16-x11 \
- --disable-software-xcb \
- --disable-directfb \
- --disable-sdl \
- --disable-buffer \
- --disable-software-qtopia \
- --disable-gl-x11 \
- --disable-cairo-x11 \
- --disable-xrender-x11 \
- --disable-xrender-xcb \
- --disable-glitz-x11 \
- --disable-image-loader-gif \
- --disable-image-loader-png \
- --disable-image-loader-jpeg \
- --disable-image-loader-eet \
- --disable-image-loader-edb \
- --disable-image-loader-tiff \
- --disable-image-loader-xpm \
- --enable-image-loader-svg
+.include "../evas-core/Makefile.inc"
+CONFIGURE_ARGS+= --enable-image-loader-svg
post-patch:
@${REINPLACE_CMD} -E \
@@ -56,9 +40,11 @@ post-patch:
${MAKEDIRS:S,$,/Makefile.in,}
do-build:
- @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done)
+ @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} \
+ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done)
do-install:
- @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done)
+ @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} \
+ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done)
.include <bsd.port.mk>
diff --git a/graphics/evas-loader-svg/distinfo b/graphics/evas-loader-svg/distinfo
index 5e8e2bc542ac..252e7b0fa992 100644
--- a/graphics/evas-loader-svg/distinfo
+++ b/graphics/evas-loader-svg/distinfo
@@ -1,3 +1,2 @@
-MD5 (evas-0.9.9.042.tar.bz2) = 6811e52b0607ce21061a23462a1f9854
-SHA256 (evas-0.9.9.042.tar.bz2) = e7ebc64a983950979b5488cc0b6fe2b3220f24da554c12c96a4f9131e5a76440
-SIZE (evas-0.9.9.042.tar.bz2) = 7373199
+SHA256 (e17/evas-1.0.0.beta.tar.bz2) = 7ff9a3015e5c5a0bee3c1a13b65358905fb6c81386bc22bf98bd7f73a893be1d
+SIZE (e17/evas-1.0.0.beta.tar.bz2) = 1054215
diff --git a/graphics/evas-loader-svg/files/patch-evas_image_load_png.c b/graphics/evas-loader-svg/files/patch-evas_image_load_png.c
deleted file mode 100644
index b3de3f645163..000000000000
--- a/graphics/evas-loader-svg/files/patch-evas_image_load_png.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/modules/loaders/png/evas_image_load_png.c.orig 2007-10-28 11:35:13.000000000 +0100
-+++ src/modules/loaders/png/evas_image_load_png.c 2010-04-01 07:26:03.000000000 +0200
-@@ -44,7 +44,7 @@
- fclose(f);
- return 0;
- }
-- if (!png_check_sig(buf, PNG_BYTES_TO_CHECK))
-+ if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK))
- {
- fclose(f);
- return 0;
-@@ -121,7 +121,7 @@
-
- /* if we havent read the header before, set the header data */
- fread(buf, 1, PNG_BYTES_TO_CHECK, f);
-- if (!png_check_sig(buf, PNG_BYTES_TO_CHECK))
-+ if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK))
- {
- fclose(f);
- return 0;
diff --git a/graphics/evas-loader-svg/pkg-plist b/graphics/evas-loader-svg/pkg-plist
index 1c02d558442a..f22ed3eb7b6f 100644
--- a/graphics/evas-loader-svg/pkg-plist
+++ b/graphics/evas-loader-svg/pkg-plist
@@ -1,5 +1,3 @@
-lib/evas/modules/loaders/svg/%%E17_ARCH%%/module.a
-lib/evas/modules/loaders/svg/%%E17_ARCH%%/module.la
lib/evas/modules/loaders/svg/%%E17_ARCH%%/module.so
@dirrm lib/evas/modules/loaders/svg/%%E17_ARCH%%
@dirrm lib/evas/modules/loaders/svg
diff --git a/graphics/evas-loader-tga/Makefile b/graphics/evas-loader-tga/Makefile
new file mode 100644
index 000000000000..cc0565fbe071
--- /dev/null
+++ b/graphics/evas-loader-tga/Makefile
@@ -0,0 +1,46 @@
+# New ports collection makefile for: evas-loader-tga
+# Date created: 14 June 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= loader-tga
+DISTVERSION= 1.0.0.beta
+CATEGORIES= graphics enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
+PKGNAMEPREFIX= evas-
+DISTNAME= evas-${DISTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= A hardware accelerated canvas API (TGA loader)
+
+LICENSE= BSD
+DIST_SUBDIR= e17
+USE_BZIP2= yes
+GNU_CONFIGURE= yes
+USE_EFL= evas librt_hack libtool_hack
+USE_GNOME= gnomehack pkgconfig gnometarget
+USE_LDCONFIG= yes
+
+MAKEDIRS= ${WRKSRC}/src/modules/loaders/tga
+
+.include "../evas-core/Makefile.inc"
+CONFIGURE_ARGS+= --enable-image-loader-tga
+
+post-patch:
+ @${REINPLACE_CMD} -E \
+ -e 's,\$$\(top_builddir\)/src/lib/\.libs,${LOCALBASE}/lib,' \
+ -e 's,\$$\(top_builddir\)/src/lib/libevas\.la,-levas,' \
+ ${MAKEDIRS:S,$,/Makefile.in,}
+
+do-build:
+ @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} \
+ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done)
+
+do-install:
+ @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} \
+ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done)
+
+.include <bsd.port.mk>
diff --git a/graphics/evas-loader-tga/distinfo b/graphics/evas-loader-tga/distinfo
new file mode 100644
index 000000000000..252e7b0fa992
--- /dev/null
+++ b/graphics/evas-loader-tga/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/evas-1.0.0.beta.tar.bz2) = 7ff9a3015e5c5a0bee3c1a13b65358905fb6c81386bc22bf98bd7f73a893be1d
+SIZE (e17/evas-1.0.0.beta.tar.bz2) = 1054215
diff --git a/graphics/evas-loader-tga/pkg-descr b/graphics/evas-loader-tga/pkg-descr
new file mode 100644
index 000000000000..e525449b6c61
--- /dev/null
+++ b/graphics/evas-loader-tga/pkg-descr
@@ -0,0 +1,6 @@
+A hardware-accelerated canvas API for X-Windows that can draw anti-aliased
+text, smooth super and sub-sampled images, alpha-blend, as well as drop down to
+using normal X11 primitives such as pixmaps, lines and rectangles for speed if
+your CPU or graphics hardware is too slow.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Evas/
diff --git a/graphics/evas-loader-tga/pkg-plist b/graphics/evas-loader-tga/pkg-plist
new file mode 100644
index 000000000000..a023768682b6
--- /dev/null
+++ b/graphics/evas-loader-tga/pkg-plist
@@ -0,0 +1,6 @@
+lib/evas/modules/loaders/tga/%%E17_ARCH%%/module.so
+@dirrm lib/evas/modules/loaders/tga/%%E17_ARCH%%
+@dirrm lib/evas/modules/loaders/tga
+@dirrmtry lib/evas/modules/loaders
+@dirrmtry lib/evas/modules
+@dirrmtry lib/evas
diff --git a/graphics/evas-loader-tiff/Makefile b/graphics/evas-loader-tiff/Makefile
index dbd1a77ed32f..4daf8818ed05 100644
--- a/graphics/evas-loader-tiff/Makefile
+++ b/graphics/evas-loader-tiff/Makefile
@@ -6,49 +6,33 @@
#
PORTNAME= loader-tiff
-PORTVERSION= 0.9.9.042
-PORTREVISION= 2
-CATEGORIES= graphics
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
- http://download.enlightenment.org/snapshots/2008-01-25/
+DISTVERSION= 1.0.0.beta
+PORTREVISION= 0
+CATEGORIES= graphics enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
PKGNAMEPREFIX= evas-
-DISTNAME= evas-${PORTVERSION}
+DISTNAME= evas-${DISTVERSION}
MAINTAINER= stas@FreeBSD.org
-COMMENT= A hardware accelerated canvas API (TIFF engine)
+COMMENT= A hardware accelerated canvas API (TIFF loader)
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
freetype.9:${PORTSDIR}/print/freetype2
+LICENSE= BSD
+DIST_SUBDIR= e17
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GNOME= gnomehack pkgconfig gnometarget
-USE_EFL= evas
+USE_EFL= evas librt_hack libtool_hack
MAKEDIRS= ${WRKSRC}/src/modules/loaders/tiff \
${WRKSRC}/src/modules/savers/tiff
-CONFIGURE_ARGS= --disable-software-x11 \
- --disable-software-16-x11 \
- --disable-software-xcb \
- --disable-directfb \
- --disable-sdl \
- --disable-buffer \
- --disable-software-qtopia \
- --disable-gl-x11 \
- --disable-cairo-x11 \
- --disable-xrender-x11 \
- --disable-xrender-xcb \
- --disable-glitz-x11 \
- --disable-image-loader-gif \
- --disable-image-loader-png \
- --disable-image-loader-jpeg \
- --disable-image-loader-eet \
- --disable-image-loader-edb \
- --enable-image-loader-tiff \
- --disable-image-loader-xpm \
- --disable-image-loader-svg
+.include "../evas-core/Makefile.inc"
+CONFIGURE_ARGS+= --enable-image-loader-tiff
post-patch:
@${REINPLACE_CMD} -E \
@@ -57,9 +41,11 @@ post-patch:
${MAKEDIRS:S,$,/Makefile.in,}
do-build:
- @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done)
+ @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} \
+ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done)
do-install:
- @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done)
+ @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} \
+ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done)
.include <bsd.port.mk>
diff --git a/graphics/evas-loader-tiff/distinfo b/graphics/evas-loader-tiff/distinfo
index 5e8e2bc542ac..252e7b0fa992 100644
--- a/graphics/evas-loader-tiff/distinfo
+++ b/graphics/evas-loader-tiff/distinfo
@@ -1,3 +1,2 @@
-MD5 (evas-0.9.9.042.tar.bz2) = 6811e52b0607ce21061a23462a1f9854
-SHA256 (evas-0.9.9.042.tar.bz2) = e7ebc64a983950979b5488cc0b6fe2b3220f24da554c12c96a4f9131e5a76440
-SIZE (evas-0.9.9.042.tar.bz2) = 7373199
+SHA256 (e17/evas-1.0.0.beta.tar.bz2) = 7ff9a3015e5c5a0bee3c1a13b65358905fb6c81386bc22bf98bd7f73a893be1d
+SIZE (e17/evas-1.0.0.beta.tar.bz2) = 1054215
diff --git a/graphics/evas-loader-tiff/pkg-plist b/graphics/evas-loader-tiff/pkg-plist
index b3b7226b0df4..e2ab16cd4e8c 100644
--- a/graphics/evas-loader-tiff/pkg-plist
+++ b/graphics/evas-loader-tiff/pkg-plist
@@ -1,8 +1,4 @@
-lib/evas/modules/loaders/tiff/%%E17_ARCH%%/module.a
-lib/evas/modules/loaders/tiff/%%E17_ARCH%%/module.la
lib/evas/modules/loaders/tiff/%%E17_ARCH%%/module.so
-lib/evas/modules/savers/tiff/%%E17_ARCH%%/module.a
-lib/evas/modules/savers/tiff/%%E17_ARCH%%/module.la
lib/evas/modules/savers/tiff/%%E17_ARCH%%/module.so
@dirrm lib/evas/modules/loaders/tiff/%%E17_ARCH%%
@dirrm lib/evas/modules/loaders/tiff
diff --git a/graphics/evas-loader-xpm/Makefile b/graphics/evas-loader-xpm/Makefile
index 28c5aed65767..f928780db5bc 100644
--- a/graphics/evas-loader-xpm/Makefile
+++ b/graphics/evas-loader-xpm/Makefile
@@ -6,48 +6,32 @@
#
PORTNAME= loader-xpm
-PORTVERSION= 0.9.9.042
-PORTREVISION= 2
-CATEGORIES= graphics
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
- http://download.enlightenment.org/snapshots/2008-01-25/
+DISTVERSION= 1.0.0.beta
+PORTREVISION= 0
+CATEGORIES= graphics enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
PKGNAMEPREFIX= evas-
-DISTNAME= evas-${PORTVERSION}
+DISTNAME= evas-${DISTVERSION}
MAINTAINER= stas@FreeBSD.org
-COMMENT= A hardware accelerated canvas API (XPM engine)
+COMMENT= A hardware accelerated canvas API (XPM loader)
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
+LICENSE= BSD
+DIST_SUBDIR= e17
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GNOME= gnomehack pkgconfig gnometarget
USE_XORG= xpm
-USE_EFL= evas
+USE_EFL= evas librt_hack libtool_hack
MAKEDIRS= ${WRKSRC}/src/modules/loaders/xpm
-CONFIGURE_ARGS= --disable-software-x11 \
- --disable-software-16-x11 \
- --disable-software-xcb \
- --disable-directfb \
- --disable-sdl \
- --disable-buffer \
- --disable-software-qtopia \
- --disable-gl-x11 \
- --disable-cairo-x11 \
- --disable-xrender-x11 \
- --disable-xrender-xcb \
- --disable-glitz-x11 \
- --disable-image-loader-gif \
- --disable-image-loader-png \
- --disable-image-loader-jpeg \
- --disable-image-loader-eet \
- --disable-image-loader-edb \
- --disable-image-loader-tiff \
- --enable-image-loader-xpm \
- --disable-image-loader-svg
+.include "../evas-core/Makefile.inc"
+CONFIGURE_ARGS+= --enable-image-loader-xpm
post-patch:
@${REINPLACE_CMD} -E \
@@ -56,9 +40,11 @@ post-patch:
${MAKEDIRS:S,$,/Makefile.in,}
do-build:
- @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done)
+ @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} \
+ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; done)
do-install:
- @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done)
+ @(for DIR in ${MAKEDIRS}; do cd $${DIR}; ${SETENV} ${MAKE_ENV} ${MAKE} \
+ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}; done)
.include <bsd.port.mk>
diff --git a/graphics/evas-loader-xpm/distinfo b/graphics/evas-loader-xpm/distinfo
index 5e8e2bc542ac..252e7b0fa992 100644
--- a/graphics/evas-loader-xpm/distinfo
+++ b/graphics/evas-loader-xpm/distinfo
@@ -1,3 +1,2 @@
-MD5 (evas-0.9.9.042.tar.bz2) = 6811e52b0607ce21061a23462a1f9854
-SHA256 (evas-0.9.9.042.tar.bz2) = e7ebc64a983950979b5488cc0b6fe2b3220f24da554c12c96a4f9131e5a76440
-SIZE (evas-0.9.9.042.tar.bz2) = 7373199
+SHA256 (e17/evas-1.0.0.beta.tar.bz2) = 7ff9a3015e5c5a0bee3c1a13b65358905fb6c81386bc22bf98bd7f73a893be1d
+SIZE (e17/evas-1.0.0.beta.tar.bz2) = 1054215
diff --git a/graphics/evas-loader-xpm/pkg-plist b/graphics/evas-loader-xpm/pkg-plist
index 45841362f182..95ee0286c3fe 100644
--- a/graphics/evas-loader-xpm/pkg-plist
+++ b/graphics/evas-loader-xpm/pkg-plist
@@ -1,5 +1,3 @@
-lib/evas/modules/loaders/xpm/%%E17_ARCH%%/module.a
-lib/evas/modules/loaders/xpm/%%E17_ARCH%%/module.la
lib/evas/modules/loaders/xpm/%%E17_ARCH%%/module.so
@dirrm lib/evas/modules/loaders/xpm/%%E17_ARCH%%
@dirrm lib/evas/modules/loaders/xpm
diff --git a/graphics/evas/Makefile b/graphics/evas/Makefile
index 08ef091c332d..0cec098bb9e5 100644
--- a/graphics/evas/Makefile
+++ b/graphics/evas/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= evas
-PORTVERSION= 0.9.9.042
-PORTREVISION= 4
+DISTVERSION= 1.0.0.beta
+PORTREVISION= 0
PORTEPOCH= 2
-CATEGORIES= graphics
+CATEGORIES= graphics enlightenment
MASTER_SITES= # none
DISTFILES= # none
EXTRACT_ONLY= # none
@@ -21,7 +21,7 @@ NO_BUILD= yes
USE_EFL= evas
EVAS_ENGINES= buffer opengl sdl x11 xrender
-EVAS_LOADERS= edb eet gif jpeg png svg tiff xpm
+EVAS_LOADERS= bmp eet gif jpeg png pmaps svg tga tiff xpm
.for NODE in ${EVAS_ENGINES}
OPTIONS+= ${NODE:U} "Install ${NODE} evas engine" on
diff --git a/graphics/exact-image/Makefile b/graphics/exact-image/Makefile
index 0abd3d46b154..7c7088585c10 100644
--- a/graphics/exact-image/Makefile
+++ b/graphics/exact-image/Makefile
@@ -7,6 +7,7 @@
PORTNAME= exact-image
PORTVERSION= 0.8.1
+PORTREVISION= 1
CATEGORIES= graphics perl5 python
MASTER_SITES= http://dl.exactcode.de/oss/${PORTNAME}/
diff --git a/graphics/exact-image/files/patch-edisplay_Makefile b/graphics/exact-image/files/patch-edisplay_Makefile
new file mode 100644
index 000000000000..61a4a180a8f2
--- /dev/null
+++ b/graphics/exact-image/files/patch-edisplay_Makefile
@@ -0,0 +1,15 @@
+Index: Makefile
+===================================================================
+--- edisplay/Makefile (revision 1751)
++++ edisplay/Makefile (revision 1752)
+@@ -4,7 +4,9 @@
+ BINARY = edisplay
+ BINARY_EXT = $(X_EXEEXT)
+
+-CPPFLAGS += -I . -I lib -I gfx $(shell pkg-config evas --atleast-version 0.9.9.050 && echo -D WITHEVAS_X11_CONNECTION)
++CPPFLAGS += -I . -I lib -I gfx
++CPPFLAGS += $(shell pkg-config evas --atleast-version 0.9.9.050 && echo -D WITHEVAS_X11_CONNECTION)
++CPPFLAGS += $(shell pkg-config evas --atleast-version 0.9.9.49898 && echo -D WITHEVAS_X11_SCREEN)
+
+ DEPS += $(X_OUTARCH)/gfx/X11Helper$(X_OBJEXT) $(X_OUTARCH)/gfx/EvasHelper$(X_OBJEXT) $(X_OUTARCH)/utility/Timer$(X_OBJEXT) $(X_OUTARCH)/utility/ArgumentList$(X_OBJEXT) $(lib_BINARY) $(codecs_BINARY)
+
diff --git a/graphics/exact-image/files/patch-edisplay_edisplay.cc b/graphics/exact-image/files/patch-edisplay_edisplay.cc
new file mode 100644
index 000000000000..4f909e6ed84f
--- /dev/null
+++ b/graphics/exact-image/files/patch-edisplay_edisplay.cc
@@ -0,0 +1,24 @@
+Index: edisplay.cc
+===================================================================
+--- edisplay/edisplay.cc (revision 1751)
++++ edisplay/edisplay.cc (revision 1752)
+@@ -269,12 +269,14 @@
+
+ /* the following is specific to the engine */
+ einfo->info.display = dpy;
+- einfo->info.visual =
+- einfo->func.best_visual_get (dpy, DefaultScreen(dpy));
+- einfo->info.colormap =
+- einfo->func.best_colormap_get(dpy,DefaultScreen(dpy));
+-
++#ifdef WITHEVAS_X11_SCREEN
++ einfo->info.screen = DefaultScreen(dpy);
++ einfo->info.visual = einfo->func.best_visual_get(einfo);
++ einfo->info.colormap = einfo->func.best_colormap_get(einfo);
++#else
++ einfo->info.visual = einfo->func.best_visual_get(dpy, DefaultScreen(dpy));
+ einfo->info.colormap = einfo->func.best_colormap_get(dpy, DefaultScreen(dpy));
++#endif
+ einfo->info.drawable = win;
+ einfo->info.depth = depth;
+
diff --git a/graphics/exhibit/Makefile b/graphics/exhibit/Makefile
index 95c3a518e8cd..1d9a7cce560f 100644
--- a/graphics/exhibit/Makefile
+++ b/graphics/exhibit/Makefile
@@ -23,6 +23,10 @@ USE_EFL_ECORE= evas file
WANT_EFL= yes
GNU_CONFIGURE= yes
+BROKEN= does not compile
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
OPTIONS= ENGRAVE "Enable E17 desktop wallpaper support" on \
ENLIGHTENMENT "Enable e17 desktop integration" off
diff --git a/graphics/imlib2_loaders/Makefile b/graphics/imlib2_loaders/Makefile
index 3bddc5b43b0c..7e180332c7a7 100644
--- a/graphics/imlib2_loaders/Makefile
+++ b/graphics/imlib2_loaders/Makefile
@@ -7,7 +7,7 @@
PORTNAME= imlib2_loaders
PORTVERSION= 1.4.1.000
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 2
CATEGORIES= graphics enlightenment
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
diff --git a/graphics/ruby-edje/Makefile b/graphics/ruby-edje/Makefile
index c5abfa168fd3..396ede47fd9c 100644
--- a/graphics/ruby-edje/Makefile
+++ b/graphics/ruby-edje/Makefile
@@ -25,6 +25,10 @@ USE_EFL= edje
RUBY_SA= ${RUBY_SITEARCHLIBDIR}
+BROKEN= does not compile
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
.include <bsd.port.pre.mk>
do-build:
diff --git a/graphics/ruby-esmart/Makefile b/graphics/ruby-esmart/Makefile
index 8c3926378444..14b69f873c1d 100644
--- a/graphics/ruby-esmart/Makefile
+++ b/graphics/ruby-esmart/Makefile
@@ -27,6 +27,10 @@ CFLAGS+= -I"${LOCALBASE}/include" -fPIC
RUBY_SA= ${RUBY_SITEARCHLIBDIR}
+BROKEN= does not compile
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
.include <bsd.port.pre.mk>
do-build:
diff --git a/graphics/ruby-evas/Makefile b/graphics/ruby-evas/Makefile
index 1b56281b839a..fbe31b93cfb7 100644
--- a/graphics/ruby-evas/Makefile
+++ b/graphics/ruby-evas/Makefile
@@ -21,6 +21,10 @@ USE_RUBY= yes
USE_RAKE= yes
USE_EFL= evas
+BROKEN= does not compile
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
.include <bsd.port.pre.mk>
do-build:
diff --git a/graphics/ruby-redact/Makefile b/graphics/ruby-redact/Makefile
index 56b3b8614d43..3722cd876102 100644
--- a/graphics/ruby-redact/Makefile
+++ b/graphics/ruby-redact/Makefile
@@ -22,6 +22,10 @@ USE_RUBY= yes
USE_RAKE= yes
NO_BUILD= yes
+BROKEN= does not compile
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
.include <bsd.port.pre.mk>
do-install:
diff --git a/lang/embryo/Makefile b/lang/embryo/Makefile
index a13b9a4b2be4..cd55310de583 100644
--- a/lang/embryo/Makefile
+++ b/lang/embryo/Makefile
@@ -6,18 +6,20 @@
#
PORTNAME= embryo
-PORTVERSION= 0.9.1.042
-PORTREVISION= 0
+DISTVERSION= 1.0.0.beta
PORTEPOCH= 2
-CATEGORIES= lang
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
- http://download.enlightenment.org/snapshots/2008-01-25/
+CATEGORIES= lang enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
MAINTAINER= stas@FreeBSD.org
COMMENT= A C like scripting language used in Enlightenment
-GNU_CONFIGURE= yes
+LICENSE= BSD
+DIST_SUBDIR= e17
USE_BZIP2= yes
+GNU_CONFIGURE= yes
+USE_EFL= libtool_hack librt_hack
USE_GNOME= gnomehack pkgconfig gnometarget
USE_LDCONFIG= yes
diff --git a/lang/embryo/distinfo b/lang/embryo/distinfo
index 85ce7b492130..50b27f4fd812 100644
--- a/lang/embryo/distinfo
+++ b/lang/embryo/distinfo
@@ -1,3 +1,2 @@
-MD5 (embryo-0.9.1.042.tar.bz2) = d6f08bb2eb9c5c466eef7c1951d3f6ba
-SHA256 (embryo-0.9.1.042.tar.bz2) = 913a9c1b9f7e513934a8c8e4873612bd79921122e9e4057ece9db793df02b463
-SIZE (embryo-0.9.1.042.tar.bz2) = 2826918
+SHA256 (e17/embryo-1.0.0.beta.tar.bz2) = a794c2aac72492db4319b34940121f15d17f49ff5a9e7a365ad68f7219b0a04a
+SIZE (e17/embryo-1.0.0.beta.tar.bz2) = 439798
diff --git a/lang/embryo/files/patch-src_lib_embryo_str.c b/lang/embryo/files/patch-src_lib_embryo_str.c
new file mode 100644
index 000000000000..8749635f9534
--- /dev/null
+++ b/lang/embryo/files/patch-src_lib_embryo_str.c
@@ -0,0 +1,11 @@
+--- src/lib/embryo_str.c.orig 2010-12-11 21:54:43.000000000 -0800
++++ src/lib/embryo_str.c 2010-12-11 21:55:03.000000000 -0800
+@@ -9,7 +9,7 @@
+
+ #ifdef HAVE_ALLOCA_H
+ # include <alloca.h>
+-#elif defined __GNUC__
++#elif defined __GNUC__ && !defined __FreeBSD__
+ # define alloca __builtin_alloca
+ #elif defined _AIX
+ # define alloca __alloca
diff --git a/lang/embryo/pkg-descr b/lang/embryo/pkg-descr
index 6b3d264db112..4b84bfe4b335 100644
--- a/lang/embryo/pkg-descr
+++ b/lang/embryo/pkg-descr
@@ -3,4 +3,4 @@ by the included scmall compiler. This is mostly cleaning up and reduction
in size of the original small abstract machine. The compiler itself has been
left alone almost completely.
-WWW: http://www.enlightenment.org/Libraries/Embryo/index.html
+WWW: http://docs.enlightenment.org/auto/embryo/
diff --git a/lang/embryo/pkg-plist b/lang/embryo/pkg-plist
index 538cc952a929..701fbd190353 100644
--- a/lang/embryo/pkg-plist
+++ b/lang/embryo/pkg-plist
@@ -1,10 +1,9 @@
bin/embryo_cc
-include/Embryo.h
-lib/libembryo.a
-lib/libembryo.la
+include/embryo-1/Embryo.h
lib/libembryo.so
-lib/libembryo.so.9
+lib/libembryo.so.1
libdata/pkgconfig/embryo.pc
%%DATADIR%%/include/default.inc
@dirrm %%DATADIR%%/include
@dirrm %%DATADIR%%
+@dirrm include/embryo-1
diff --git a/multimedia/eclair/Makefile b/multimedia/eclair/Makefile
index a66020a3799b..67dfbc336583 100644
--- a/multimedia/eclair/Makefile
+++ b/multimedia/eclair/Makefile
@@ -26,4 +26,8 @@ USE_EFL_ECORE= x11 evas file
USE_EFL_ESMART= draggies
USE_SQLITE= 3
+BROKEN= does not compile
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
.include <bsd.port.mk>
diff --git a/multimedia/emotion/Makefile b/multimedia/emotion/Makefile
index 0bdbc6385c93..6b41e6b8186c 100644
--- a/multimedia/emotion/Makefile
+++ b/multimedia/emotion/Makefile
@@ -7,23 +7,23 @@
#
PORTNAME= emotion
-PORTVERSION= 0.1.0.042
-PORTREVISION= 5
+PORTVERSION= 0.2.0.52995
PORTEPOCH= 1
-CATEGORIES= multimedia
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
- http://download.enlightenment.org/snapshots/2008-01-25/
+CATEGORIES= multimedia enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/extra/
MAINTAINER= stas@FreeBSD.org
COMMENT= Video playback wrapper library for Enlightenment
+LICENSE= BSD
+DIST_SUBDIR= e17
+GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GNOME= gnomehack pkgconfig gnometarget
-USE_EFL= ecore edje eet embryo evas
+USE_EFL= ecore edje eet embryo evas libtool_hack modarch_hack
USE_EFL_EVAS_LOADERS= png jpeg
+USE_GNOME= gnomehack pkgconfig gnometarget
USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
OPTIONS= XINE "Build Xine module" on \
GST "Build GStreamer module" on
diff --git a/multimedia/emotion/distinfo b/multimedia/emotion/distinfo
index 98aebfcf2332..47c1dcbcf4a0 100644
--- a/multimedia/emotion/distinfo
+++ b/multimedia/emotion/distinfo
@@ -1,3 +1,2 @@
-MD5 (emotion-0.1.0.042.tar.bz2) = 123c043d02f4da22fb36eede930a44e5
-SHA256 (emotion-0.1.0.042.tar.bz2) = dcbe478648df63d71482947415d8cc83f1b4d8cd373801d6b1e479315d27cb97
-SIZE (emotion-0.1.0.042.tar.bz2) = 404323
+SHA256 (e17/emotion-0.2.0.52995.tar.bz2) = 10715eea041420061dd1dd6307fdcd81e81c01eee5db4d70924d0d51bfc3143c
+SIZE (e17/emotion-0.2.0.52995.tar.bz2) = 1808785
diff --git a/multimedia/emotion/pkg-plist b/multimedia/emotion/pkg-plist
index ca64d8b743ee..e2f8008b39a2 100644
--- a/multimedia/emotion/pkg-plist
+++ b/multimedia/emotion/pkg-plist
@@ -1,17 +1,18 @@
bin/emotion_test
-include/Emotion.h
-%%GST%%lib/emotion/gstreamer.a
-%%GST%%lib/emotion/gstreamer.la
+include/emotion-0/Emotion.h
%%GST%%lib/emotion/gstreamer.so
-%%XINE%%lib/emotion/xine.a
-%%XINE%%lib/emotion/xine.la
%%XINE%%lib/emotion/xine.so
-lib/libemotion.a
-lib/libemotion.la
+lib/edje/modules/emotion/%%E17_ARCH%%/module.so
lib/libemotion.so
-lib/libemotion.so.1
+lib/libemotion.so.2
libdata/pkgconfig/emotion.pc
%%DATADIR%%/data/theme.edj
+%%DATADIR%%/data/icon.edj
+@dirrm lib/edje/modules/emotion/%%E17_ARCH%%
+@dirrm lib/edje/modules/emotion
+@dirrmtry lib/edje/modules
+@dirrmtry lib/edje
+@dirrm include/emotion-0
@dirrm %%DATADIR%%/data
@dirrm %%DATADIR%%
@dirrm lib/emotion
diff --git a/net/ecore-con/Makefile b/net/ecore-con/Makefile
index 72a9d5943247..1a53ed0b7303 100644
--- a/net/ecore-con/Makefile
+++ b/net/ecore-con/Makefile
@@ -6,44 +6,43 @@
#
PORTNAME= con
-PORTVERSION= 0.9.9.042
-PORTREVISION= 4
-CATEGORIES= net
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
- http://download.enlightenment.org/snapshots/2008-01-25/
+DISTVERSION= 1.0.0.beta
+CATEGORIES= net enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
PKGNAMEPREFIX= ecore-
-DISTNAME= ecore-${PORTVERSION}
+DISTNAME= ecore-${DISTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= Enlightenment core abstraction library (con module)
-GNU_CONFIGURE= yes
+LICENSE= BSD
+DIST_SUBDIR= e17
USE_BZIP2= yes
+GNU_CONFIGURE= yes
+USE_EFL= ecore libtool_hack
USE_GNOME= gnomehack pkgconfig gnometarget
USE_LDCONFIG= yes
-USE_EFL= ecore
BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_con
INSTALL_WRKSRC= ${BUILD_WRKSRC}
-CONFIGURE_ARGS= --enable-ecore-con \
- --disable-ecore-config \
- --disable-ecore-desktop \
- --disable-ecore-directfb \
- --disable-ecore-evas \
- --disable-ecore-file \
- --disable-ecore-ipc \
- --disable-ecore-job \
- --disable-ecore-sdl \
- --disable-ecore-txt \
- --disable-ecore-x \
- --disable-ecore-imf \
- --disable-ecore-imf_evas
+.include <../../devel/ecore-main/Makefile.inc>
+
+CONFIGURE_ARGS+= --enable-ecore-con
-OPTIONS= CURL "Enable Curl support" on \
+OPTIONS= CARES "Enable async DNS resolving via c-ares" on \
+ CURL "Enable Curl support" on \
SSL "Enable SSL support" on
.include <bsd.port.pre.mk>
+.if !defined(WITHOUT_CARES)
+CONFIGURE_ARGS+= --enable-cares
+LIB_DEPENDS+= cares.2:${PORTSDIR}/dns/c-ares
+.else
+CONFIGURE_ARGS+= --disable-cares
+.endif
+
.if !defined(WITHOUT_CURL)
CONFIGURE_ARGS+= --enable-curl
LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl
diff --git a/net/ecore-con/distinfo b/net/ecore-con/distinfo
index 4672f6a1c167..36d07e85437a 100644
--- a/net/ecore-con/distinfo
+++ b/net/ecore-con/distinfo
@@ -1,3 +1,2 @@
-MD5 (ecore-0.9.9.042.tar.bz2) = a66df2b5f0b1a6abc47bb50bf2b26846
-SHA256 (ecore-0.9.9.042.tar.bz2) = 26486fd2c80e4000b673f81ce637aa50c17c767e4c2af8f56de5d110e387d136
-SIZE (ecore-0.9.9.042.tar.bz2) = 5285732
+SHA256 (e17/ecore-1.0.0.beta.tar.bz2) = 9fd367f9ff10568082e65c1def46e64fb96b359221e0d6aea11c6c3f6bd5282f
+SIZE (e17/ecore-1.0.0.beta.tar.bz2) = 916635
diff --git a/net/ecore-con/files/patch-configure b/net/ecore-con/files/patch-configure
deleted file mode 100644
index 9887d0720831..000000000000
--- a/net/ecore-con/files/patch-configure
+++ /dev/null
@@ -1,89 +0,0 @@
---- configure.orig 2008-03-17 11:36:38.000000000 +0300
-+++ configure 2008-03-17 11:38:49.000000000 +0300
-@@ -20552,70 +20552,9 @@
- { echo "$as_me:$LINENO: checking for SSL" >&5
- echo $ECHO_N "checking for SSL... $ECHO_C" >&6; }
-
--if test -n "$PKG_CONFIG"; then
-- if test -n "$SSL_CFLAGS"; then
-- pkg_cv_SSL_CFLAGS="$SSL_CFLAGS"
-- else
-- if test -n "$PKG_CONFIG" && \
-- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openssl\"") >&5
-- ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- pkg_cv_SSL_CFLAGS=`$PKG_CONFIG --cflags "openssl" 2>/dev/null`
--else
-- pkg_failed=yes
--fi
-- fi
--else
-- pkg_failed=untried
--fi
--if test -n "$PKG_CONFIG"; then
-- if test -n "$SSL_LIBS"; then
-- pkg_cv_SSL_LIBS="$SSL_LIBS"
-- else
-- if test -n "$PKG_CONFIG" && \
-- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"openssl\"") >&5
-- ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- pkg_cv_SSL_LIBS=`$PKG_CONFIG --libs "openssl" 2>/dev/null`
--else
-- pkg_failed=yes
--fi
-- fi
--else
-- pkg_failed=untried
--fi
--
--
--
--if test $pkg_failed = yes; then
--
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-- _pkg_short_errors_supported=yes
--else
-- _pkg_short_errors_supported=no
--fi
-- if test $_pkg_short_errors_supported = yes; then
-- SSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "openssl"`
-- else
-- SSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "openssl"`
-- fi
-- # Put the nasty error message in config.log where it belongs
-- echo "$SSL_PKG_ERRORS" >&5
--
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-- have_openssl="no"
-
--elif test $pkg_failed = untried; then
-- have_openssl="no"
--
--else
-- SSL_CFLAGS=$pkg_cv_SSL_CFLAGS
-- SSL_LIBS=$pkg_cv_SSL_LIBS
-+ SSL_CFLAGS=""
-+ SSL_LIBS="-lssl -lcrypto"
- { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
-
-@@ -20623,13 +20562,9 @@
- cat >>confdefs.h <<\_ACEOF
- #define USE_OPENSSL 1
- _ACEOF
--
-- requirements_ecore_con="$requirements_ecore_con openssl"
- # no need to add it to req_ecore_ipc, since they
- # depends on ecore_con anyway.
- have_openssl="yes"
--
--fi
- fi
-
- want_curl="yes"
diff --git a/net/ecore-con/pkg-plist b/net/ecore-con/pkg-plist
index 47463672d77a..f3fc9d085686 100644
--- a/net/ecore-con/pkg-plist
+++ b/net/ecore-con/pkg-plist
@@ -1,6 +1,5 @@
-include/Ecore_Con.h
-lib/libecore_con.a
-lib/libecore_con.la
+include/ecore-1/Ecore_Con.h
lib/libecore_con.so
-lib/libecore_con.so.9
+lib/libecore_con.so.1
libdata/pkgconfig/ecore-con.pc
+@dirrmtry include/ecore-1
diff --git a/sysutils/ecore-config/Makefile b/sysutils/ecore-config/Makefile
index a367e3156c1b..30493eb02ced 100644
--- a/sysutils/ecore-config/Makefile
+++ b/sysutils/ecore-config/Makefile
@@ -26,6 +26,10 @@ USE_EFL_ECORE= ipc con
BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_config
INSTALL_WRKSRC= ${BUILD_WRKSRC}
+BROKEN= does not compile
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
CONFIGURE_ARGS= --enable-ecore-con \
--enable-ecore-config \
--disable-ecore-desktop \
diff --git a/sysutils/empower/Makefile b/sysutils/empower/Makefile
index c07191916eaa..606e0f69a329 100644
--- a/sysutils/empower/Makefile
+++ b/sysutils/empower/Makefile
@@ -7,22 +7,30 @@
#
PORTNAME= empower
-PORTVERSION= 20080223
-PORTREVISION= 5
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
+PORTVERSION= 20101003
+CATEGORIES= sysutils enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/extra/
MAINTAINER= stas@FreeBSD.org
COMMENT= A graphical sudo tool based on the EFL
+RUN_DEPENDS= sudo:${PORTSDIR}/security/sudo
+
+DIST_SUBDIR= e17
USE_BZIP2= yes
-USE_GMAKE= yes
-USE_GNOME= gnomehack pkgconfig gnometarget
-USE_EFL= evas ecore edje ewl etk
-WANT_EFL= yes
GNU_CONFIGURE= yes
+USE_EFL= evas ecore edje elementary
+USE_EFL_ECORE= file imf evas
+USE_GNOME= gnomehack pkgconfig gnometarget
+USE_GMAKE= yes
+USE_LDCONFIG= yes
-PLIST_FILES= bin/empower \
- bin/empower-askpass
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
.include <bsd.port.mk>
diff --git a/sysutils/empower/distinfo b/sysutils/empower/distinfo
index 370d4b13dd5a..cbffe73e9eec 100644
--- a/sysutils/empower/distinfo
+++ b/sysutils/empower/distinfo
@@ -1,3 +1,2 @@
-MD5 (empower-20080223.tar.bz2) = a7d231d6c71952305cbf6302606109cf
-SHA256 (empower-20080223.tar.bz2) = 95589809ec365df04ff81605ca8d8b1ad45ce17b6dd462b570827db8ec5605fc
-SIZE (empower-20080223.tar.bz2) = 218110
+SHA256 (e17/empower-20101003.tar.bz2) = f50ec279649f56f273f34e1dbfacc1030ce57c999ac5bea436557fa480987071
+SIZE (e17/empower-20101003.tar.bz2) = 473317
diff --git a/sysutils/empower/pkg-plist b/sysutils/empower/pkg-plist
new file mode 100644
index 000000000000..a54db2612783
--- /dev/null
+++ b/sysutils/empower/pkg-plist
@@ -0,0 +1,72 @@
+bin/empower
+bin/empower-askpass
+%%DATADIR%%/data/trans.png
+%%NLS%%share/locale/ar/LC_MESSAGES/empower.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/empower.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/empower.mo
+%%NLS%%share/locale/da/LC_MESSAGES/empower.mo
+%%NLS%%share/locale/de/LC_MESSAGES/empower.mo
+%%NLS%%share/locale/el/LC_MESSAGES/empower.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/empower.mo
+%%NLS%%share/locale/es/LC_MESSAGES/empower.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/empower.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/empower.mo
+%%NLS%%share/locale/he/LC_MESSAGES/empower.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/empower.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/empower.mo
+%%NLS%%share/locale/it/LC_MESSAGES/empower.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/empower.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/empower.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/empower.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/empower.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/empower.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/empower.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/empower.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/empower.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/empower.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/empower.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/empower.mo
+@dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%
+%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/zh_CN
+%%NLS%%@dirrmtry share/locale/uk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/uk
+%%NLS%%@dirrmtry share/locale/tr/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/tr
+%%NLS%%@dirrmtry share/locale/sv/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sv
+%%NLS%%@dirrmtry share/locale/sk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sk
+%%NLS%%@dirrmtry share/locale/ru/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ru
+%%NLS%%@dirrmtry share/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pt_BR
+%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pl
+%%NLS%%@dirrmtry share/locale/ja/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ja
+%%NLS%%@dirrmtry share/locale/it/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/it
+%%NLS%%@dirrmtry share/locale/hr/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/hr
+%%NLS%%@dirrmtry share/locale/he/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/he
+%%NLS%%@dirrmtry share/locale/fr/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fr
+%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fi
+%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/es
+%%NLS%%@dirrmtry share/locale/eo/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/eo
+%%NLS%%@dirrmtry share/locale/el/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/el
+%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/de
+%%NLS%%@dirrmtry share/locale/da/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/da
+%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/cs
+%%NLS%%@dirrmtry share/locale/bg/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/bg
diff --git a/sysutils/extrackt/Makefile b/sysutils/extrackt/Makefile
index 1fdac9f7fe55..e0e5d486e1bc 100644
--- a/sysutils/extrackt/Makefile
+++ b/sysutils/extrackt/Makefile
@@ -21,4 +21,8 @@ USE_GNOME= gnomehack pkgconfig gnometarget
USE_EFL= evas ecore eet etk enhance
GNU_CONFIGURE= yes
+BROKEN= does not compile
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
.include <bsd.port.mk>
diff --git a/textproc/exml/Makefile b/textproc/exml/Makefile
index 8c3b5755f2b7..604da2d09caf 100644
--- a/textproc/exml/Makefile
+++ b/textproc/exml/Makefile
@@ -20,4 +20,8 @@ USE_GNOME= libxml2 libxslt gnomehack gnometarget pkgconfig
USE_EFL= ecore
USE_LDCONFIG= yes
+BROKEN= does not compile
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
.include <bsd.port.mk>
diff --git a/x11-fm/entropyfm/Makefile b/x11-fm/entropyfm/Makefile
index b92e4c3126e8..d2059fa6c104 100644
--- a/x11-fm/entropyfm/Makefile
+++ b/x11-fm/entropyfm/Makefile
@@ -30,6 +30,10 @@ OPTIONS= XTRACT "Enable metadata extraction via libextractor" on \
DATADIR= ${PREFIX}/share/entropy
+BROKEN= does not compile
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_XTRACT)
diff --git a/x11-themes/e17-splash-azul/Makefile b/x11-themes/e17-splash-azul/Makefile
index f128187e18f2..3b017761324f 100644
--- a/x11-themes/e17-splash-azul/Makefile
+++ b/x11-themes/e17-splash-azul/Makefile
@@ -19,6 +19,10 @@ EXTRACT_SUFX= .edj
MAINTAINER= stas@FreeBSD.org
COMMENT= Azul splash screen for e17 window manager
+BROKEN= does not work with recent e17
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
NO_BUILD= yes
diff --git a/x11-themes/e17-splash-blue/Makefile b/x11-themes/e17-splash-blue/Makefile
index e9052bd6b0cc..979ec5b24c8c 100644
--- a/x11-themes/e17-splash-blue/Makefile
+++ b/x11-themes/e17-splash-blue/Makefile
@@ -19,6 +19,10 @@ EXTRACT_SUFX= .edj
MAINTAINER= stas@FreeBSD.org
COMMENT= Blue splash screen for e17 window manager
+BROKEN= does not work with recent e17
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
NO_BUILD= yes
diff --git a/x11-themes/e17-splash-clean/Makefile b/x11-themes/e17-splash-clean/Makefile
index b8bcf9e4b17e..f3f4c0339df8 100644
--- a/x11-themes/e17-splash-clean/Makefile
+++ b/x11-themes/e17-splash-clean/Makefile
@@ -19,6 +19,10 @@ EXTRACT_SUFX= .edj
MAINTAINER= stas@FreeBSD.org
COMMENT= Clean splash screen for e17 window manager
+BROKEN= does not work with recent e17
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
NO_BUILD= yes
diff --git a/x11-themes/e17-splash-fortune/Makefile b/x11-themes/e17-splash-fortune/Makefile
index fe5741492ec4..a9603fc6f4f2 100644
--- a/x11-themes/e17-splash-fortune/Makefile
+++ b/x11-themes/e17-splash-fortune/Makefile
@@ -20,6 +20,10 @@ EXTRACT_SUFX= .edj
MAINTAINER= stas@FreeBSD.org
COMMENT= Fortune splash screen for e17 window manager
+BROKEN= does not work with recent e17
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
NO_BUILD= yes
diff --git a/x11-themes/e17-splash-logo/Makefile b/x11-themes/e17-splash-logo/Makefile
index 1842e6a203cf..34921d5b7a7f 100644
--- a/x11-themes/e17-splash-logo/Makefile
+++ b/x11-themes/e17-splash-logo/Makefile
@@ -19,6 +19,10 @@ EXTRACT_SUFX= .edj
MAINTAINER= stas@FreeBSD.org
COMMENT= Logo splash screen for e17 window manager
+BROKEN= does not work with recent e17
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
NO_BUILD= yes
diff --git a/x11-themes/e17-splash-shiny/Makefile b/x11-themes/e17-splash-shiny/Makefile
index 650b61d3a0b9..781b0a0884b7 100644
--- a/x11-themes/e17-splash-shiny/Makefile
+++ b/x11-themes/e17-splash-shiny/Makefile
@@ -19,6 +19,10 @@ EXTRACT_SUFX= .edj
MAINTAINER= stas@FreeBSD.org
COMMENT= Shiny splash screen for e17 window manager
+BROKEN= does not work with recent e17
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
NO_BUILD= yes
diff --git a/x11-themes/e17-splash-takara/Makefile b/x11-themes/e17-splash-takara/Makefile
index 4e2bd1ac4fc7..ca3d1a258b69 100644
--- a/x11-themes/e17-splash-takara/Makefile
+++ b/x11-themes/e17-splash-takara/Makefile
@@ -20,6 +20,10 @@ EXTRACT_SUFX= .edj
MAINTAINER= stas@FreeBSD.org
COMMENT= Takara splash screen for e17 window manager
+BROKEN= does not work with recent e17
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
NO_BUILD= yes
diff --git a/x11-themes/e17-theme-blue_eyed/Makefile b/x11-themes/e17-theme-blue_eyed/Makefile
index 4b12a037127f..9ff45254f8d0 100644
--- a/x11-themes/e17-theme-blue_eyed/Makefile
+++ b/x11-themes/e17-theme-blue_eyed/Makefile
@@ -19,6 +19,10 @@ EXTRACT_SUFX= .edj
MAINTAINER= stas@FreeBSD.org
COMMENT= BlueEyed theme for use with e17 window manager
+BROKEN= does not work with recent e17
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
NO_BUILD= yes
diff --git a/x11-themes/e17-theme-cthulhain/Makefile b/x11-themes/e17-theme-cthulhain/Makefile
index 5f5d46c03de0..b6690dbbb895 100644
--- a/x11-themes/e17-theme-cthulhain/Makefile
+++ b/x11-themes/e17-theme-cthulhain/Makefile
@@ -6,12 +6,11 @@
#
PORTNAME= cthulhain
-PORTVERSION= 0.4.1
+PORTVERSION= 0.4.5
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= x11-themes
-MASTER_SITES= ${MASTER_SITE_GET_E} \
- ftp://ftp.springdaemons.com/pub/snapshots/e17/
+MASTER_SITES= GOOGLE_CODE
MASTER_SITE_SUBDIR= Themes/E17
PKGNAMEPREFIX= e17-theme-
EXTRACT_SUFX= .edj
@@ -19,7 +18,7 @@ EXTRACT_SUFX= .edj
MAINTAINER= stas@FreeBSD.org
COMMENT= Cthulhain theme for use with e17 window manager
-RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/x11-themes/e17-theme-cthulhain/distinfo b/x11-themes/e17-theme-cthulhain/distinfo
index 17306384bb18..6bdda60bb2c0 100644
--- a/x11-themes/e17-theme-cthulhain/distinfo
+++ b/x11-themes/e17-theme-cthulhain/distinfo
@@ -1,3 +1,2 @@
-MD5 (cthulhain-0.4.1.edj) = c371dae5a58ee089afbf545b36da4e7c
-SHA256 (cthulhain-0.4.1.edj) = 8a7f55bf0ae8e3de83b9e7aa8efcacc2e6378f77f8492d40a108a9dbc2e705fc
-SIZE (cthulhain-0.4.1.edj) = 2329966
+SHA256 (cthulhain-0.4.5.edj) = b97f5bf68237f6082be9283dec3d2903345158d03b0d017ae0cbfb6417077fa3
+SIZE (cthulhain-0.4.5.edj) = 3144711
diff --git a/x11-themes/e17-theme-cthulhain/pkg-descr b/x11-themes/e17-theme-cthulhain/pkg-descr
index 8b156a9eceb1..3474e2bbaff5 100644
--- a/x11-themes/e17-theme-cthulhain/pkg-descr
+++ b/x11-themes/e17-theme-cthulhain/pkg-descr
@@ -1,4 +1,4 @@
Nice theme for use with e17 window manager. Theme that's based on the fluxbox
theme Cthulhain.
-WWW: http://www.get-e.org/Themes/E17/
+WWW: http://code.google.com/p/cthulhain/
diff --git a/x11-themes/e17-theme-dali/Makefile b/x11-themes/e17-theme-dali/Makefile
index 17f1cb1fe5d2..865ba0a5f5d9 100644
--- a/x11-themes/e17-theme-dali/Makefile
+++ b/x11-themes/e17-theme-dali/Makefile
@@ -19,6 +19,10 @@ EXTRACT_SUFX= .edj
MAINTAINER= stas@FreeBSD.org
COMMENT= Dali theme for use with e17 window manager
+BROKEN= does not work with recent e17
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
NO_BUILD= yes
diff --git a/x11-themes/e17-theme-darkness/Makefile b/x11-themes/e17-theme-darkness/Makefile
index 12bd505e6bb4..fbc05ca9388f 100644
--- a/x11-themes/e17-theme-darkness/Makefile
+++ b/x11-themes/e17-theme-darkness/Makefile
@@ -6,20 +6,18 @@
#
PORTNAME= darkness
-PORTVERSION= 0.99.037.4
-PORTREVISION= 3
+PORTVERSION= 0.99.042
+PORTREVISION= 0
CATEGORIES= x11-themes
-MASTER_SITES= ${MASTER_SITE_GET_E} \
- ftp://ftp.springdaemons.com/pub/snapshots/e17/
-MASTER_SITE_SUBDIR= Themes/E17
+MASTER_SITES= http://fc09.deviantart.net/fs28/f/2008/055/f/a/
PKGNAMEPREFIX= e17-theme-
-DISTNAME= ${PORTNAME}_by_saturn_vk
+DISTNAME= Darkness_by_saturn_vk
EXTRACT_SUFX= .edj
MAINTAINER= stas@FreeBSD.org
COMMENT= Darkness theme for use with e17 window manager
-RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/x11-themes/e17-theme-darkness/distinfo b/x11-themes/e17-theme-darkness/distinfo
index 1a07673341a3..9be1b7539d33 100644
--- a/x11-themes/e17-theme-darkness/distinfo
+++ b/x11-themes/e17-theme-darkness/distinfo
@@ -1,3 +1,2 @@
-MD5 (darkness_by_saturn_vk.edj) = 84f9376108e04cf3bddcfaa160a5edd7
-SHA256 (darkness_by_saturn_vk.edj) = 7c0ae93268abd6212165a8f270cb557ee864bb62f46162ac853edb27f2733099
-SIZE (darkness_by_saturn_vk.edj) = 5401434
+SHA256 (Darkness_by_saturn_vk.edj) = ec1378876a79ba5688274be5d7b314624610c7584c9c5a2d84d14c02cfa3a340
+SIZE (Darkness_by_saturn_vk.edj) = 5408247
diff --git a/x11-themes/e17-theme-gant/Makefile b/x11-themes/e17-theme-gant/Makefile
index 0595376d90c5..8d36f329ae5d 100644
--- a/x11-themes/e17-theme-gant/Makefile
+++ b/x11-themes/e17-theme-gant/Makefile
@@ -20,6 +20,10 @@ EXTRACT_SUFX= .edj
MAINTAINER= stas@FreeBSD.org
COMMENT= GANT theme for use with e17 window manager
+BROKEN= does not work with recent e17
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
NO_BUILD= yes
diff --git a/x11-themes/e17-theme-japan2007/Makefile b/x11-themes/e17-theme-japan2007/Makefile
index 30b425af7d67..e1ed6d16c760 100644
--- a/x11-themes/e17-theme-japan2007/Makefile
+++ b/x11-themes/e17-theme-japan2007/Makefile
@@ -19,6 +19,10 @@ EXTRACT_SUFX= .edj
MAINTAINER= stas@FreeBSD.org
COMMENT= Japan2007 theme for use with e17 window manager
+BROKEN= does not work with recent e17
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
NO_BUILD= yes
diff --git a/x11-themes/e17-theme-kor/Makefile b/x11-themes/e17-theme-kor/Makefile
index 7a9f041b9b7a..e4dd30144b50 100644
--- a/x11-themes/e17-theme-kor/Makefile
+++ b/x11-themes/e17-theme-kor/Makefile
@@ -19,6 +19,10 @@ EXTRACT_SUFX= .edj
MAINTAINER= stas@FreeBSD.org
COMMENT= A fresh sunny theme for use with e17 window manager
+BROKEN= does not work with recent e17
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
NO_BUILD= yes
diff --git a/x11-themes/e17-theme-milky/Makefile b/x11-themes/e17-theme-milky/Makefile
index f3d363dfb525..d1d38c13e605 100644
--- a/x11-themes/e17-theme-milky/Makefile
+++ b/x11-themes/e17-theme-milky/Makefile
@@ -19,6 +19,10 @@ EXTRACT_SUFX= .edj
MAINTAINER= stas@FreeBSD.org
COMMENT= Milky's theme for use with e17 window manager
+BROKEN= does not work with recent e17
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
NO_BUILD= yes
diff --git a/x11-themes/e17-theme-night_bling/Makefile b/x11-themes/e17-theme-night_bling/Makefile
index c06964c3f508..c218e7591f3a 100644
--- a/x11-themes/e17-theme-night_bling/Makefile
+++ b/x11-themes/e17-theme-night_bling/Makefile
@@ -19,6 +19,10 @@ EXTRACT_SUFX= .edj
MAINTAINER= stas@FreeBSD.org
COMMENT= Night Bling theme for use with e17 window manager
+BROKEN= does not work with recent e17
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
NO_BUILD= yes
diff --git a/x11-themes/e17-theme-simply_white/Makefile b/x11-themes/e17-theme-simply_white/Makefile
index 669b00b9fb02..0b3bd4b3c35c 100644
--- a/x11-themes/e17-theme-simply_white/Makefile
+++ b/x11-themes/e17-theme-simply_white/Makefile
@@ -19,6 +19,10 @@ EXTRACT_SUFX= .edj
MAINTAINER= stas@FreeBSD.org
COMMENT= Simply White theme for use with e17 window manager
+BROKEN= does not work with recent e17
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
NO_BUILD= yes
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 5dbdee8d212a..8a2e957ad7f5 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -14,6 +14,7 @@
SUBDIR += easygtk
SUBDIR += eel
SUBDIR += efltk
+ SUBDIR += elementary
SUBDIR += enhance
SUBDIR += etk
SUBDIR += ewl
diff --git a/x11-toolkits/elementary/Makefile b/x11-toolkits/elementary/Makefile
new file mode 100644
index 000000000000..c601d30b9647
--- /dev/null
+++ b/x11-toolkits/elementary/Makefile
@@ -0,0 +1,33 @@
+# New ports collection makefile for: elementary
+# Date created: 07 January 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= elementary
+PORTVERSION= 0.7.0.52995
+CATEGORIES= x11-toolkits enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/base/
+
+MAINTAINER= magik@roorback.net
+COMMENT= Simple widget toolkit using EFL
+
+LIB_DEPENDS= lua-5.1:${PORTSDIR}/lang/lua
+
+LICENSE= LGPL21
+DIST_SUBDIR= e17
+USE_BZIP2= yes
+GNU_CONFIGURE= yes
+USE_EFL= ecore embryo edje libtool_hack librt_hack modarch_hack
+USE_GNOME= gnomehack pkgconfig gnometarget
+USE_LDCONFIG= yes
+INSTALLS_ICONS= yes
+
+post-patch:
+ ${LN} -s profile.src ${WRKSRC}/config/profile.cfg
+ ${LN} -s base.src ${WRKSRC}/config/default/base.cfg
+ ${LN} -s base.src ${WRKSRC}/config/illume/base.cfg
+ ${LN} -s base.src ${WRKSRC}/config/standard/base.cfg
+
+.include <bsd.port.mk>
diff --git a/x11-toolkits/elementary/distinfo b/x11-toolkits/elementary/distinfo
new file mode 100644
index 000000000000..e2bd9452e5c1
--- /dev/null
+++ b/x11-toolkits/elementary/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/elementary-0.7.0.52995.tar.bz2) = dacb8a55ff8c7dc77cf177258ea2e4c12918e04222f0fd887bf3fd9f20c562f2
+SIZE (e17/elementary-0.7.0.52995.tar.bz2) = 3510109
diff --git a/x11-toolkits/elementary/files/patch-configure b/x11-toolkits/elementary/files/patch-configure
new file mode 100644
index 000000000000..cd710ddc4f3c
--- /dev/null
+++ b/x11-toolkits/elementary/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig 2010-12-06 00:17:02.000000000 -0800
++++ configure 2010-12-06 00:17:45.000000000 -0800
+@@ -13066,7 +13066,7 @@
+ _ACEOF
+
+ version_info="7:0:7"
+-release_info="-release ver-pre-svn-07"
++release_info=""
+
+
+ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
diff --git a/x11-toolkits/elementary/pkg-descr b/x11-toolkits/elementary/pkg-descr
new file mode 100644
index 000000000000..bd0f28132f90
--- /dev/null
+++ b/x11-toolkits/elementary/pkg-descr
@@ -0,0 +1,5 @@
+This is a VERY SIMPLE toolkit.
+It is not meant for writing extensive desktop applications (yet).
+Small simple ones with simple needs.
+
+WWW: http://docs.enlightenment.org/auto/elementary/
diff --git a/x11-toolkits/elementary/pkg-plist b/x11-toolkits/elementary/pkg-plist
new file mode 100644
index 000000000000..9e6481a0b7d9
--- /dev/null
+++ b/x11-toolkits/elementary/pkg-plist
@@ -0,0 +1,91 @@
+bin/elementary_config
+bin/elementary_quicklaunch
+bin/elementary_run
+bin/elementary_test
+bin/elementary_testql
+include/elementary-0/Elementary.h
+include/elementary-0/Elementary_Cursor.h
+include/elementary-0/elm_widget.h
+lib/libelementary.so
+lib/libelementary.so.7
+lib/edje/modules/elm/%%E17_ARCH%%/module.so
+lib/elementary_testql.so
+lib/elementary/modules/test_entry/%%E17_ARCH%%/module.so
+libdata/pkgconfig/elementary.pc
+share/applications/elementary_config.desktop
+share/applications/elementary_test.desktop
+share/icons/elementary.png
+%%DATADIR%%/config/default/base.cfg
+%%DATADIR%%/config/default/icon.png
+%%DATADIR%%/config/default/profile.desktop
+%%DATADIR%%/config/illume/base.cfg
+%%DATADIR%%/config/illume/icon.png
+%%DATADIR%%/config/illume/profile.desktop
+%%DATADIR%%/config/profile.cfg
+%%DATADIR%%/config/standard/base.cfg
+%%DATADIR%%/config/standard/icon.png
+%%DATADIR%%/config/standard/profile.desktop
+%%DATADIR%%/edje_externals/icons.edj
+%%DATADIR%%/images/bubble.png
+%%DATADIR%%/images/bubble_sh.png
+%%DATADIR%%/images/icon_00.png
+%%DATADIR%%/images/icon_01.png
+%%DATADIR%%/images/icon_02.png
+%%DATADIR%%/images/icon_03.png
+%%DATADIR%%/images/icon_04.png
+%%DATADIR%%/images/icon_05.png
+%%DATADIR%%/images/icon_06.png
+%%DATADIR%%/images/icon_07.png
+%%DATADIR%%/images/icon_08.png
+%%DATADIR%%/images/icon_09.png
+%%DATADIR%%/images/icon_10.png
+%%DATADIR%%/images/icon_11.png
+%%DATADIR%%/images/icon_12.png
+%%DATADIR%%/images/icon_13.png
+%%DATADIR%%/images/icon_14.png
+%%DATADIR%%/images/icon_15.png
+%%DATADIR%%/images/icon_16.png
+%%DATADIR%%/images/icon_17.png
+%%DATADIR%%/images/icon_18.png
+%%DATADIR%%/images/icon_19.png
+%%DATADIR%%/images/icon_20.png
+%%DATADIR%%/images/icon_21.png
+%%DATADIR%%/images/icon_22.png
+%%DATADIR%%/images/icon_23.png
+%%DATADIR%%/images/logo.png
+%%DATADIR%%/images/logo_small.png
+%%DATADIR%%/images/mystrale.jpg
+%%DATADIR%%/images/mystrale_2.jpg
+%%DATADIR%%/images/panel_01.jpg
+%%DATADIR%%/images/parking.png
+%%DATADIR%%/images/plant_01.jpg
+%%DATADIR%%/images/rock_01.jpg
+%%DATADIR%%/images/rock_02.jpg
+%%DATADIR%%/images/sky_01.jpg
+%%DATADIR%%/images/sky_02.jpg
+%%DATADIR%%/images/sky_03.jpg
+%%DATADIR%%/images/sky_04.jpg
+%%DATADIR%%/images/wood_01.jpg
+%%DATADIR%%/objects/multip.edj
+%%DATADIR%%/objects/test.edj
+%%DATADIR%%/themes/default.edj
+@dirrm include/elementary-0
+@dirrm lib/edje/modules/elm/%%E17_ARCH%%
+@dirrm lib/edje/modules/elm
+@dirrmtry lib/edje/modules
+@dirrmtry lib/edje
+@dirrm lib/elementary/modules/test_entry/%%E17_ARCH%%
+@dirrm lib/elementary/modules/test_entry
+@dirrm lib/elementary/modules
+@dirrm lib/elementary
+@dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%/objects
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%/edje_externals
+@dirrm %%DATADIR%%/config/standard
+@dirrm %%DATADIR%%/config/illume
+@dirrm %%DATADIR%%/config/default
+@dirrm %%DATADIR%%/config
+@dirrm %%DATADIR%%
+@dirrmtry share/applications
+@dirrmtry share/icons
diff --git a/x11-toolkits/enhance/Makefile b/x11-toolkits/enhance/Makefile
index d18958e0f8ef..e018eb74e291 100644
--- a/x11-toolkits/enhance/Makefile
+++ b/x11-toolkits/enhance/Makefile
@@ -22,4 +22,8 @@ USE_LDCONFIG= yes
USE_EFL= ecore etk exml
GNU_CONFIGURE= yes
+BROKEN= does not compile
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
.include <bsd.port.mk>
diff --git a/x11-toolkits/etk/Makefile b/x11-toolkits/etk/Makefile
index 4f31f19921bc..185e320b3c42 100644
--- a/x11-toolkits/etk/Makefile
+++ b/x11-toolkits/etk/Makefile
@@ -26,6 +26,10 @@ USE_EFL_ECORE= file x11 imf imf_evas
USE_EFL_EVAS_LOADERS= png jpeg
USE_LDCONFIG= yes
+BROKEN= does not compile
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
# NLS is mandatory
USE_GETTEXT= yes
LDFLAGS= "-lintl"
diff --git a/x11-toolkits/ewl/Makefile b/x11-toolkits/ewl/Makefile
index 4f6979f36662..68a90c5e36ac 100644
--- a/x11-toolkits/ewl/Makefile
+++ b/x11-toolkits/ewl/Makefile
@@ -25,6 +25,10 @@ USE_EFL_ECORE= txt file
WANT_EFL= yes
USE_LDCONFIG= yes
+BROKEN= does not compile
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
CONFIGURE_ARGS= --disable-tests
OPTIONS= EPSILON "Enable Epsilon Support for Ewl_Image" on \
diff --git a/x11-wm/Makefile b/x11-wm/Makefile
index 7b9670a71ba0..0ff892d0fa83 100644
--- a/x11-wm/Makefile
+++ b/x11-wm/Makefile
@@ -34,23 +34,51 @@
SUBDIR += dwm
SUBDIR += e16
SUBDIR += e16utils
+ SUBDIR += e17-module-alarm
SUBDIR += e17-module-bling
SUBDIR += e17-module-calendar
SUBDIR += e17-module-cpu
SUBDIR += e17-module-deskshow
+ SUBDIR += e17-module-diskio
+ SUBDIR += e17-module-drawer
+ SUBDIR += e17-module-efm_nav
+ SUBDIR += e17-module-efm_path
+ SUBDIR += e17-module-efm_pathbar
+ SUBDIR += e17-module-everything-mpris
+ SUBDIR += e17-module-everything-pidgin
+ SUBDIR += e17-module-everything-places
+ SUBDIR += e17-module-everything-wallpaper
+ SUBDIR += e17-module-everything-websearch
+ SUBDIR += e17-module-exebuf
+ SUBDIR += e17-module-execwatch
SUBDIR += e17-module-flame
+ SUBDIR += e17-module-forecasts
+ SUBDIR += e17-module-iiirk
+ SUBDIR += e17-module-itask-ng
SUBDIR += e17-module-language
SUBDIR += e17-module-mail
SUBDIR += e17-module-mem
SUBDIR += e17-module-mixer
SUBDIR += e17-module-moon
+ SUBDIR += e17-module-mpdule
+ SUBDIR += e17-module-net
+ SUBDIR += e17-module-notification
+ SUBDIR += e17-module-penguins
+ SUBDIR += e17-module-photo
+ SUBDIR += e17-module-places
+ SUBDIR += e17-module-quickaccess
SUBDIR += e17-module-rain
SUBDIR += e17-module-screenshot
SUBDIR += e17-module-slideshow
SUBDIR += e17-module-snow
+ SUBDIR += e17-module-taskbar
+ SUBDIR += e17-module-tclock
+ SUBDIR += e17-module-tiling
SUBDIR += e17-module-uptime
SUBDIR += e17-module-weather
SUBDIR += e17-module-winselector
+ SUBDIR += e17-module-wlan
+ SUBDIR += e17-modules
SUBDIR += e17-utils
SUBDIR += echinus
SUBDIR += ede
diff --git a/x11-wm/e17-module-alarm/Makefile b/x11-wm/e17-module-alarm/Makefile
new file mode 100644
index 000000000000..9b8a93d4bddc
--- /dev/null
+++ b/x11-wm/e17-module-alarm/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: e17-module-alarm
+# Date created: 07 January 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= alarm
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
+PKGNAMEPREFIX= e17-module-
+DISTNAME= ${PORTNAME}-${PORTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= A module to set Alarms in Enlightenment 17
+
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+
+DIST_SUBDIR= e17
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget pkgconfig
+USE_EFL= edje libtool_hack modarch_hack
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-alarm/distinfo b/x11-wm/e17-module-alarm/distinfo
new file mode 100644
index 000000000000..f1859028d4b9
--- /dev/null
+++ b/x11-wm/e17-module-alarm/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/alarm-20101003.tar.bz2) = ed3691b4b9dca4601148228834caad8ab1168a661c282ba27585d45f3d587701
+SIZE (e17/alarm-20101003.tar.bz2) = 576450
diff --git a/x11-wm/e17-module-alarm/pkg-descr b/x11-wm/e17-module-alarm/pkg-descr
new file mode 100644
index 000000000000..ac264c0c4558
--- /dev/null
+++ b/x11-wm/e17-module-alarm/pkg-descr
@@ -0,0 +1,3 @@
+A module to set Alarms in Enlightenment 17.
+
+WWW: http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-alarm/pkg-plist b/x11-wm/e17-module-alarm/pkg-plist
new file mode 100644
index 000000000000..82530393b2c0
--- /dev/null
+++ b/x11-wm/e17-module-alarm/pkg-plist
@@ -0,0 +1,96 @@
+lib/enlightenment/modules/alarm/module.desktop
+lib/enlightenment/modules/alarm/e-module-alarm.edj
+lib/enlightenment/modules/alarm/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/alarm/alarm.edj
+%%NLS%%lib/enlightenment/modules/alarm/locale/ca/LC_MESSAGES/alarm.mo
+%%NLS%%lib/enlightenment/modules/alarm/locale/it/LC_MESSAGES/alarm.mo
+%%NLS%%lib/enlightenment/modules/alarm/locale/eo/LC_MESSAGES/alarm.mo
+%%NLS%%lib/enlightenment/modules/alarm/locale/sk/LC_MESSAGES/alarm.mo
+%%NLS%%lib/enlightenment/modules/alarm/locale/tr/LC_MESSAGES/alarm.mo
+%%NLS%%lib/enlightenment/modules/alarm/locale/vi/LC_MESSAGES/alarm.mo
+%%NLS%%lib/enlightenment/modules/alarm/locale/de/LC_MESSAGES/alarm.mo
+%%NLS%%lib/enlightenment/modules/alarm/locale/ja/LC_MESSAGES/alarm.mo
+%%NLS%%lib/enlightenment/modules/alarm/locale/uk/LC_MESSAGES/alarm.mo
+%%NLS%%lib/enlightenment/modules/alarm/locale/el/LC_MESSAGES/alarm.mo
+%%NLS%%lib/enlightenment/modules/alarm/locale/fi/LC_MESSAGES/alarm.mo
+%%NLS%%lib/enlightenment/modules/alarm/locale/sv/LC_MESSAGES/alarm.mo
+%%NLS%%lib/enlightenment/modules/alarm/locale/pt/LC_MESSAGES/alarm.mo
+%%NLS%%lib/enlightenment/modules/alarm/locale/ko/LC_MESSAGES/alarm.mo
+%%NLS%%lib/enlightenment/modules/alarm/locale/ru/LC_MESSAGES/alarm.mo
+%%NLS%%lib/enlightenment/modules/alarm/locale/zh_CN/LC_MESSAGES/alarm.mo
+%%NLS%%lib/enlightenment/modules/alarm/locale/cs/LC_MESSAGES/alarm.mo
+%%NLS%%lib/enlightenment/modules/alarm/locale/ar/LC_MESSAGES/alarm.mo
+%%NLS%%lib/enlightenment/modules/alarm/locale/he/LC_MESSAGES/alarm.mo
+%%NLS%%lib/enlightenment/modules/alarm/locale/lt/LC_MESSAGES/alarm.mo
+%%NLS%%lib/enlightenment/modules/alarm/locale/fr/LC_MESSAGES/alarm.mo
+%%NLS%%lib/enlightenment/modules/alarm/locale/nl/LC_MESSAGES/alarm.mo
+%%NLS%%lib/enlightenment/modules/alarm/locale/nb/LC_MESSAGES/alarm.mo
+%%NLS%%lib/enlightenment/modules/alarm/locale/hr/LC_MESSAGES/alarm.mo
+%%NLS%%lib/enlightenment/modules/alarm/locale/et/LC_MESSAGES/alarm.mo
+%%NLS%%lib/enlightenment/modules/alarm/locale/pt_BR/LC_MESSAGES/alarm.mo
+%%NLS%%lib/enlightenment/modules/alarm/locale/pl/LC_MESSAGES/alarm.mo
+%%NLS%%lib/enlightenment/modules/alarm/locale/es/LC_MESSAGES/alarm.mo
+%%NLS%%lib/enlightenment/modules/alarm/locale/hu/LC_MESSAGES/alarm.mo
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/hu
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/pl
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/pt_BR
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/et/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/et
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/hr
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/nb/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/nb
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/nl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/nl
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/he/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/he
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/ar
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/zh_CN
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/ru
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/ko/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/ko
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/pt
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/uk
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/de
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/vi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/vi
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/tr
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/sk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/sk
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/ca/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale/ca
+%%NLS%%@dirrm lib/enlightenment/modules/alarm/locale
+@dirrm lib/enlightenment/modules/alarm/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/alarm
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-bling/Makefile b/x11-wm/e17-module-bling/Makefile
index 7d7eb4d0c3c6..feef9cf1a7ec 100644
--- a/x11-wm/e17-module-bling/Makefile
+++ b/x11-wm/e17-module-bling/Makefile
@@ -23,7 +23,11 @@ GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnometarget pkgconfig
-USE_EFL= edje
+USE_EFL= edje libtool_hack modarch_hack
USE_XORG= xcomposite xext xrender xdamage xfixes
+BROKEN= does not compile
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-bling/distinfo b/x11-wm/e17-module-bling/distinfo
index 57fe5a107132..38eb33d53a90 100644
--- a/x11-wm/e17-module-bling/distinfo
+++ b/x11-wm/e17-module-bling/distinfo
@@ -1,3 +1,2 @@
-MD5 (bling-20080413.tar.bz2) = cade4456c839c37cc3f1d46d31aa7644
SHA256 (bling-20080413.tar.bz2) = 01636e59be75f2dc15ed1908192d2d2f7e64e94f26371fadf2f188a40a126868
SIZE (bling-20080413.tar.bz2) = 280356
diff --git a/x11-wm/e17-module-bling/pkg-plist b/x11-wm/e17-module-bling/pkg-plist
index 4a35480e6312..7f04063d1674 100644
--- a/x11-wm/e17-module-bling/pkg-plist
+++ b/x11-wm/e17-module-bling/pkg-plist
@@ -1,6 +1,4 @@
lib/enlightenment/modules/bling/e-module-bling.edj
-lib/enlightenment/modules/bling/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/bling/%%E17_ARCH%%/module.la
lib/enlightenment/modules/bling/%%E17_ARCH%%/module.so
lib/enlightenment/modules/bling/module.desktop
@dirrm lib/enlightenment/modules/bling/%%E17_ARCH%%
diff --git a/x11-wm/e17-module-calendar/Makefile b/x11-wm/e17-module-calendar/Makefile
index 8c35a9c96120..ca8645b3c319 100644
--- a/x11-wm/e17-module-calendar/Makefile
+++ b/x11-wm/e17-module-calendar/Makefile
@@ -6,26 +6,25 @@
#
PORTNAME= calendar
-PORTVERSION= 20080223
-PORTREVISION= 5
+PORTVERSION= 20101003
PORTEPOCH= 1
-CATEGORIES= x11-wm
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= Nice calendar module for e17
-BUILD_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
-RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+DIST_SUBDIR= e17
+GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnometarget pkgconfig
-USE_EFL= ecore evas edje eet
-USE_EFL_ESMART= trans_x11
-GNU_CONFIGURE= yes
+USE_EFL= ecore evas edje eet libtool_hack modarch_hack
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff --git a/x11-wm/e17-module-calendar/distinfo b/x11-wm/e17-module-calendar/distinfo
index c78a68a819af..13275056ac1c 100644
--- a/x11-wm/e17-module-calendar/distinfo
+++ b/x11-wm/e17-module-calendar/distinfo
@@ -1,3 +1,2 @@
-MD5 (calendar-20080223.tar.bz2) = 71d12bd35f1bf10e6b9d7ffdfa7795cd
-SHA256 (calendar-20080223.tar.bz2) = 05a6557c4dbbada9665d340084476b015442daebdf03708ba72fe69dc9ed0b5d
-SIZE (calendar-20080223.tar.bz2) = 305824
+SHA256 (e17/calendar-20101003.tar.bz2) = 1d0ed93c4a55811d00bea3c4f1418e165f3293ee273f4e592dc29dae6dc2c96e
+SIZE (e17/calendar-20101003.tar.bz2) = 509601
diff --git a/x11-wm/e17-module-calendar/pkg-plist b/x11-wm/e17-module-calendar/pkg-plist
index ccaf607ad5bd..52f5fae90244 100644
--- a/x11-wm/e17-module-calendar/pkg-plist
+++ b/x11-wm/e17-module-calendar/pkg-plist
@@ -1,15 +1,111 @@
lib/enlightenment/modules/calendar/calendar.edj
lib/enlightenment/modules/calendar/e-module-calendar.edj
lib/enlightenment/modules/calendar/module.desktop
-lib/enlightenment/modules/calendar/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/calendar/%%E17_ARCH%%/module.la
lib/enlightenment/modules/calendar/%%E17_ARCH%%/module.so
-%%NLS%%lib/enlightenment/modules/calendar/locale/fi/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/da/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/tr/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/sk/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/eo/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/hi/LC_MESSAGES/calendar.mo
%%NLS%%lib/enlightenment/modules/calendar/locale/it/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/ru/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/fi/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/sv/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/ko/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/pt/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/el/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/zh_CN/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/th/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/de/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/ja/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/uk/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/nl/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/en_GB/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/fr/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/he/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/ar/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/km/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/lt/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/cs/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/pl/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/es/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/hu/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/hr/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/bs/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/et/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/bg/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/pt_BR/LC_MESSAGES/calendar.mo
+%%NLS%%lib/enlightenment/modules/calendar/locale/nb/LC_MESSAGES/calendar.mo
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/nb/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/nb
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/pt_BR
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/et/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/et
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/bs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/bs
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/hr
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/hu
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/pl
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/km/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/km
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/ar
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/he/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/he
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/en_GB/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/en_GB
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/nl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/nl
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/uk
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/de
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/th/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/th
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/zh_CN
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/pt
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/ko/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/ko
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/sv
%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/fi/LC_MESSAGES
%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/ru
%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/it/LC_MESSAGES
%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/hi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/hi
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/sk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/sk
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/tr
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/da/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale/da
%%NLS%%@dirrm lib/enlightenment/modules/calendar/locale
@dirrm lib/enlightenment/modules/calendar/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/calendar
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-cpu/Makefile b/x11-wm/e17-module-cpu/Makefile
index 6ae9e5e58463..3284bc4a7561 100644
--- a/x11-wm/e17-module-cpu/Makefile
+++ b/x11-wm/e17-module-cpu/Makefile
@@ -6,24 +6,24 @@
#
PORTNAME= cpu
-PORTVERSION= 20080223
-PORTREVISION= 5
-CATEGORIES= x11-wm
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= An e17 module which allows users to monitor cpu load
-BUILD_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
-RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+DIST_SUBDIR= e17
+GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnometarget pkgconfig
-USE_EFL= edje
-GNU_CONFIGURE= yes
+USE_EFL= edje libtool_hack modarch_hack
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff --git a/x11-wm/e17-module-cpu/distinfo b/x11-wm/e17-module-cpu/distinfo
index 70530f65d7a2..3c6cdcb3b26e 100644
--- a/x11-wm/e17-module-cpu/distinfo
+++ b/x11-wm/e17-module-cpu/distinfo
@@ -1,3 +1,2 @@
-MD5 (cpu-20080223.tar.bz2) = 3b05b752b4580e74bcdfa81182b0a942
-SHA256 (cpu-20080223.tar.bz2) = a91b07fa671037b4add7af40e811730b1c7f09584b1965509a801d7306701950
-SIZE (cpu-20080223.tar.bz2) = 271713
+SHA256 (e17/cpu-20101003.tar.bz2) = 2b57fca0d621767f720eb652ffea60911c9d73ce1f6fca66c97b5e34323adc19
+SIZE (e17/cpu-20101003.tar.bz2) = 492973
diff --git a/x11-wm/e17-module-cpu/pkg-plist b/x11-wm/e17-module-cpu/pkg-plist
index 79b81ddb6f3a..3460d66b78cb 100644
--- a/x11-wm/e17-module-cpu/pkg-plist
+++ b/x11-wm/e17-module-cpu/pkg-plist
@@ -1,30 +1,91 @@
lib/enlightenment/modules/cpu/cpu.edj
-lib/enlightenment/modules/cpu/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/cpu/%%E17_ARCH%%/module.la
-lib/enlightenment/modules/cpu/%%E17_ARCH%%/module.so
lib/enlightenment/modules/cpu/module.desktop
lib/enlightenment/modules/cpu/e-module-cpu.edj
-%%NLS%%lib/enlightenment/modules/cpu/locale/eo/LC_MESSAGES/cpu.mo
+lib/enlightenment/modules/cpu/%%E17_ARCH%%/module.so
+%%NLS%%lib/enlightenment/modules/cpu/locale/hr/LC_MESSAGES/cpu.mo
%%NLS%%lib/enlightenment/modules/cpu/locale/bg/LC_MESSAGES/cpu.mo
-%%NLS%%lib/enlightenment/modules/cpu/locale/fi/LC_MESSAGES/cpu.mo
-%%NLS%%lib/enlightenment/modules/cpu/locale/it/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/nb/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/pl/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/es/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/fo/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/hu/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/he/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/ar/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/lt/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/cs/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/nl/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/zh_CN/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/fr/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/el/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/de/LC_MESSAGES/cpu.mo
%%NLS%%lib/enlightenment/modules/cpu/locale/ja/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/uk/LC_MESSAGES/cpu.mo
%%NLS%%lib/enlightenment/modules/cpu/locale/ru/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/fi/LC_MESSAGES/cpu.mo
%%NLS%%lib/enlightenment/modules/cpu/locale/sv/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/pt/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/eo/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/it/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/da/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/tr/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/pt_BR/LC_MESSAGES/cpu.mo
+%%NLS%%lib/enlightenment/modules/cpu/locale/sk/LC_MESSAGES/cpu.mo
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/sk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/sk
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/pt_BR
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/tr
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/da/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/da
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/it
%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/eo/LC_MESSAGES
%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/eo
-%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/bg/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/pt
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/sv
%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/fi/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/fi
-%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/it/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/it
-%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/ja/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/fi
%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/ru/LC_MESSAGES
%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/ru
-%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/sv/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/uk
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/de
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/zh_CN
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/nl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/nl
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/ar
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/he/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/he
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/hu
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/fo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/fo
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/pl
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/nb/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/nb
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale/hr
%%NLS%%@dirrm lib/enlightenment/modules/cpu/locale
@dirrm lib/enlightenment/modules/cpu/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/cpu
diff --git a/x11-wm/e17-module-deskshow/Makefile b/x11-wm/e17-module-deskshow/Makefile
index b6811a5334e4..262486184ca8 100644
--- a/x11-wm/e17-module-deskshow/Makefile
+++ b/x11-wm/e17-module-deskshow/Makefile
@@ -6,23 +6,23 @@
#
PORTNAME= deskshow
-PORTVERSION= 20080223
-PORTREVISION= 4
-CATEGORIES= x11-wm
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= E17 module that minimizes all windows to show the desktop
-BUILD_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
-RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+DIST_SUBDIR= e17
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnometarget pkgconfig
-USE_EFL= edje
+USE_EFL= edje libtool_hack modarch_hack
.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-deskshow/distinfo b/x11-wm/e17-module-deskshow/distinfo
index 733891cfa3a2..e15dacafa074 100644
--- a/x11-wm/e17-module-deskshow/distinfo
+++ b/x11-wm/e17-module-deskshow/distinfo
@@ -1,3 +1,2 @@
-MD5 (deskshow-20080223.tar.bz2) = d7d969b736b436930d35e56a9406ed0c
-SHA256 (deskshow-20080223.tar.bz2) = dcf5e551c191e485a1beece04f986babdfc3bf45f70a0d2915e9a18c71c7d972
-SIZE (deskshow-20080223.tar.bz2) = 252520
+SHA256 (e17/deskshow-20101003.tar.bz2) = 99e9b29b3442e61485d4f053f07bfb6aaf709c5398e663b31521107c0df4c92a
+SIZE (e17/deskshow-20101003.tar.bz2) = 377181
diff --git a/x11-wm/e17-module-deskshow/pkg-plist b/x11-wm/e17-module-deskshow/pkg-plist
index b63bdae99989..5afe4a3b63a0 100644
--- a/x11-wm/e17-module-deskshow/pkg-plist
+++ b/x11-wm/e17-module-deskshow/pkg-plist
@@ -1,6 +1,3 @@
-lib/enlightenment/modules/deskshow/deskshow.edj
-lib/enlightenment/modules/deskshow/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/deskshow/%%E17_ARCH%%/module.la
lib/enlightenment/modules/deskshow/%%E17_ARCH%%/module.so
lib/enlightenment/modules/deskshow/module.desktop
lib/enlightenment/modules/deskshow/e-module-deskshow.edj
diff --git a/x11-wm/e17-module-diskio/Makefile b/x11-wm/e17-module-diskio/Makefile
new file mode 100644
index 000000000000..d0f591f6477f
--- /dev/null
+++ b/x11-wm/e17-module-diskio/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: e17-module-diskio
+# Date created: 07 January 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= diskio
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
+PKGNAMEPREFIX= e17-module-
+DISTNAME= ${PORTNAME}-${PORTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= Disk I/O visualization module for E17
+
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+
+DIST_SUBDIR= e17
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget pkgconfig
+USE_EFL= edje libtool_hack modarch_hack
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-diskio/distinfo b/x11-wm/e17-module-diskio/distinfo
new file mode 100644
index 000000000000..e63253781e31
--- /dev/null
+++ b/x11-wm/e17-module-diskio/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/diskio-20101003.tar.bz2) = 9a353d2c470303a463944e90570a3a5278aefbda3e210e4eb2e47558ff74f2d4
+SIZE (e17/diskio-20101003.tar.bz2) = 433788
diff --git a/x11-wm/e17-module-diskio/pkg-descr b/x11-wm/e17-module-diskio/pkg-descr
new file mode 100644
index 000000000000..d3087cdcd760
--- /dev/null
+++ b/x11-wm/e17-module-diskio/pkg-descr
@@ -0,0 +1,3 @@
+Disk I/O visualization module for e17.
+
+WWW: http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-diskio/pkg-plist b/x11-wm/e17-module-diskio/pkg-plist
new file mode 100644
index 000000000000..23ab446da9fb
--- /dev/null
+++ b/x11-wm/e17-module-diskio/pkg-plist
@@ -0,0 +1,7 @@
+lib/enlightenment/modules/diskio/e-module-diskio.edj
+lib/enlightenment/modules/diskio/module.desktop
+lib/enlightenment/modules/diskio/%%E17_ARCH%%/module.so
+@dirrm lib/enlightenment/modules/diskio/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/diskio
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-drawer/Makefile b/x11-wm/e17-module-drawer/Makefile
new file mode 100644
index 000000000000..73fb4dcf36d9
--- /dev/null
+++ b/x11-wm/e17-module-drawer/Makefile
@@ -0,0 +1,39 @@
+# New ports collection makefile for: e17-module-drawer
+# Date created: 29 August 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= drawer
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
+PKGNAMEPREFIX= e17-module-
+DISTNAME= ${PORTNAME}-${PORTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= An e17 module to display/organize different types of information
+
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment \
+ ethumb:${PORTSDIR}/graphics/ethumb
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment \
+ ethumb:${PORTSDIR}/graphics/ethumb
+
+DIST_SUBDIR= e17
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnomehack gnometarget pkgconfig
+USE_EFL= edje libtool_hack modarch_hack
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-drawer/distinfo b/x11-wm/e17-module-drawer/distinfo
new file mode 100644
index 000000000000..00efa63a624c
--- /dev/null
+++ b/x11-wm/e17-module-drawer/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/drawer-20101003.tar.bz2) = 9df0bae8a2ece92e835ce8ef35510c0b1422428e38f37328aed2a5f9a974f156
+SIZE (e17/drawer-20101003.tar.bz2) = 625350
diff --git a/x11-wm/e17-module-drawer/pkg-descr b/x11-wm/e17-module-drawer/pkg-descr
new file mode 100644
index 000000000000..e800e9c1d1be
--- /dev/null
+++ b/x11-wm/e17-module-drawer/pkg-descr
@@ -0,0 +1,3 @@
+A module to display/organize different types of information.
+
+WWW: http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-drawer/pkg-plist b/x11-wm/e17-module-drawer/pkg-plist
new file mode 100644
index 000000000000..e6938d7299b9
--- /dev/null
+++ b/x11-wm/e17-module-drawer/pkg-plist
@@ -0,0 +1,68 @@
+include/drawer/Drawer.h
+libdata/pkgconfig/drawer.pc
+lib/enlightenment/modules/drawer/%%E17_ARCH%%/plugins/views/grid.so
+lib/enlightenment/modules/drawer/%%E17_ARCH%%/plugins/views/list.so
+lib/enlightenment/modules/drawer/%%E17_ARCH%%/plugins/views/grid.desktop
+lib/enlightenment/modules/drawer/%%E17_ARCH%%/plugins/views/list.desktop
+lib/enlightenment/modules/drawer/%%E17_ARCH%%/plugins/sources/directory_watcher.desktop
+lib/enlightenment/modules/drawer/%%E17_ARCH%%/plugins/sources/launcher.so
+lib/enlightenment/modules/drawer/%%E17_ARCH%%/plugins/sources/history.desktop
+lib/enlightenment/modules/drawer/%%E17_ARCH%%/plugins/sources/directory_watcher.so
+lib/enlightenment/modules/drawer/%%E17_ARCH%%/plugins/sources/history.so
+lib/enlightenment/modules/drawer/%%E17_ARCH%%/plugins/sources/winlist.desktop
+lib/enlightenment/modules/drawer/%%E17_ARCH%%/plugins/sources/winlist.so
+lib/enlightenment/modules/drawer/%%E17_ARCH%%/plugins/sources/launcher.desktop
+lib/enlightenment/modules/drawer/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/drawer/e-module-drawer.edj
+lib/enlightenment/modules/drawer/module.desktop
+%%NLS%%lib/enlightenment/modules/drawer/locale/tr/LC_MESSAGES/drawer.mo
+%%NLS%%lib/enlightenment/modules/drawer/locale/eo/LC_MESSAGES/drawer.mo
+%%NLS%%lib/enlightenment/modules/drawer/locale/it/LC_MESSAGES/drawer.mo
+%%NLS%%lib/enlightenment/modules/drawer/locale/pt_BR/LC_MESSAGES/drawer.mo
+%%NLS%%lib/enlightenment/modules/drawer/locale/pt/LC_MESSAGES/drawer.mo
+%%NLS%%lib/enlightenment/modules/drawer/locale/fi/LC_MESSAGES/drawer.mo
+%%NLS%%lib/enlightenment/modules/drawer/locale/el/LC_MESSAGES/drawer.mo
+%%NLS%%lib/enlightenment/modules/drawer/locale/uk/LC_MESSAGES/drawer.mo
+%%NLS%%lib/enlightenment/modules/drawer/locale/fr/LC_MESSAGES/drawer.mo
+%%NLS%%lib/enlightenment/modules/drawer/locale/lt/LC_MESSAGES/drawer.mo
+%%NLS%%lib/enlightenment/modules/drawer/locale/cs/LC_MESSAGES/drawer.mo
+%%NLS%%lib/enlightenment/modules/drawer/locale/zh_CN/LC_MESSAGES/drawer.mo
+%%NLS%%lib/enlightenment/modules/drawer/locale/es/LC_MESSAGES/drawer.mo
+%%NLS%%lib/enlightenment/modules/drawer/locale/hr/LC_MESSAGES/drawer.mo
+%%NLS%%@dirrm lib/enlightenment/modules/drawer/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/drawer/locale/hr
+%%NLS%%@dirrm lib/enlightenment/modules/drawer/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/drawer/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/drawer/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/drawer/locale/zh_CN
+%%NLS%%@dirrm lib/enlightenment/modules/drawer/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/drawer/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/drawer/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/drawer/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/drawer/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/drawer/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/drawer/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/drawer/locale/uk
+%%NLS%%@dirrm lib/enlightenment/modules/drawer/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/drawer/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/drawer/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/drawer/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/drawer/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/drawer/locale/pt
+%%NLS%%@dirrm lib/enlightenment/modules/drawer/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/drawer/locale/pt_BR
+%%NLS%%@dirrm lib/enlightenment/modules/drawer/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/drawer/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/drawer/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/drawer/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/drawer/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/drawer/locale/tr
+%%NLS%%@dirrm lib/enlightenment/modules/drawer/locale
+@dirrm include/drawer
+@dirrm lib/enlightenment/modules/drawer/%%E17_ARCH%%/plugins/sources
+@dirrm lib/enlightenment/modules/drawer/%%E17_ARCH%%/plugins/views
+@dirrm lib/enlightenment/modules/drawer/%%E17_ARCH%%/plugins
+@dirrm lib/enlightenment/modules/drawer/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/drawer
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-efm_nav/Makefile b/x11-wm/e17-module-efm_nav/Makefile
new file mode 100644
index 000000000000..d6a8399b7ef1
--- /dev/null
+++ b/x11-wm/e17-module-efm_nav/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: e17-module-efm_nav
+# Date created: 07 January 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= efm_nav
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
+PKGNAMEPREFIX= e17-module-
+DISTNAME= ${PORTNAME}-${PORTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= An e17 module that allows a user to navigate through the filesystem
+
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+
+DIST_SUBDIR= e17
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget pkgconfig
+USE_EFL= edje libtool_hack modarch_hack
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-efm_nav/distinfo b/x11-wm/e17-module-efm_nav/distinfo
new file mode 100644
index 000000000000..2395c83ee960
--- /dev/null
+++ b/x11-wm/e17-module-efm_nav/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/efm_nav-20101003.tar.bz2) = 91092f29e6607143c37db6e32e11b2d5289ea919e27216f3a6fb53638d26e881
+SIZE (e17/efm_nav-20101003.tar.bz2) = 495483
diff --git a/x11-wm/e17-module-efm_nav/pkg-descr b/x11-wm/e17-module-efm_nav/pkg-descr
new file mode 100644
index 000000000000..4a8025022ef1
--- /dev/null
+++ b/x11-wm/e17-module-efm_nav/pkg-descr
@@ -0,0 +1,3 @@
+A module that allows a user to navigate through the filesystem.
+
+WWW: http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-efm_nav/pkg-plist b/x11-wm/e17-module-efm_nav/pkg-plist
new file mode 100644
index 000000000000..17a8f279d8d8
--- /dev/null
+++ b/x11-wm/e17-module-efm_nav/pkg-plist
@@ -0,0 +1,89 @@
+lib/enlightenment/modules/efm_nav/module.desktop
+lib/enlightenment/modules/efm_nav/e-module-efm_nav.edj
+lib/enlightenment/modules/efm_nav/%%E17_ARCH%%/module.so
+%%NLS%%lib/enlightenment/modules/efm_nav/locale/fr/LC_MESSAGES/efm_nav.mo
+%%NLS%%lib/enlightenment/modules/efm_nav/locale/nl/LC_MESSAGES/efm_nav.mo
+%%NLS%%lib/enlightenment/modules/efm_nav/locale/cs/LC_MESSAGES/efm_nav.mo
+%%NLS%%lib/enlightenment/modules/efm_nav/locale/ar/LC_MESSAGES/efm_nav.mo
+%%NLS%%lib/enlightenment/modules/efm_nav/locale/he/LC_MESSAGES/efm_nav.mo
+%%NLS%%lib/enlightenment/modules/efm_nav/locale/lt/LC_MESSAGES/efm_nav.mo
+%%NLS%%lib/enlightenment/modules/efm_nav/locale/es/LC_MESSAGES/efm_nav.mo
+%%NLS%%lib/enlightenment/modules/efm_nav/locale/pl/LC_MESSAGES/efm_nav.mo
+%%NLS%%lib/enlightenment/modules/efm_nav/locale/hu/LC_MESSAGES/efm_nav.mo
+%%NLS%%lib/enlightenment/modules/efm_nav/locale/nb/LC_MESSAGES/efm_nav.mo
+%%NLS%%lib/enlightenment/modules/efm_nav/locale/hr/LC_MESSAGES/efm_nav.mo
+%%NLS%%lib/enlightenment/modules/efm_nav/locale/bg/LC_MESSAGES/efm_nav.mo
+%%NLS%%lib/enlightenment/modules/efm_nav/locale/zh_CN/LC_MESSAGES/efm_nav.mo
+%%NLS%%lib/enlightenment/modules/efm_nav/locale/sk/LC_MESSAGES/efm_nav.mo
+%%NLS%%lib/enlightenment/modules/efm_nav/locale/tr/LC_MESSAGES/efm_nav.mo
+%%NLS%%lib/enlightenment/modules/efm_nav/locale/da/LC_MESSAGES/efm_nav.mo
+%%NLS%%lib/enlightenment/modules/efm_nav/locale/it/LC_MESSAGES/efm_nav.mo
+%%NLS%%lib/enlightenment/modules/efm_nav/locale/eo/LC_MESSAGES/efm_nav.mo
+%%NLS%%lib/enlightenment/modules/efm_nav/locale/sv/LC_MESSAGES/efm_nav.mo
+%%NLS%%lib/enlightenment/modules/efm_nav/locale/fi/LC_MESSAGES/efm_nav.mo
+%%NLS%%lib/enlightenment/modules/efm_nav/locale/ko/LC_MESSAGES/efm_nav.mo
+%%NLS%%lib/enlightenment/modules/efm_nav/locale/ru/LC_MESSAGES/efm_nav.mo
+%%NLS%%lib/enlightenment/modules/efm_nav/locale/pt_BR/LC_MESSAGES/efm_nav.mo
+%%NLS%%lib/enlightenment/modules/efm_nav/locale/ja/LC_MESSAGES/efm_nav.mo
+%%NLS%%lib/enlightenment/modules/efm_nav/locale/de/LC_MESSAGES/efm_nav.mo
+%%NLS%%lib/enlightenment/modules/efm_nav/locale/uk/LC_MESSAGES/efm_nav.mo
+%%NLS%%lib/enlightenment/modules/efm_nav/locale/el/LC_MESSAGES/efm_nav.mo
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/uk
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/de
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/pt_BR
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/ru
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/ko/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/ko
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/da/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/da
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/tr
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/sk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/sk
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/zh_CN
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/hr
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/nb/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/nb
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/hu
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/pl
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/he/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/he
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/ar
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/nl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/nl
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/efm_nav/locale
+@dirrm lib/enlightenment/modules/efm_nav/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/efm_nav
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-efm_path/Makefile b/x11-wm/e17-module-efm_path/Makefile
new file mode 100644
index 000000000000..c629e32483ed
--- /dev/null
+++ b/x11-wm/e17-module-efm_path/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: e17-module-efm_path
+# Date created: 07 January 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= efm_path
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
+PKGNAMEPREFIX= e17-module-
+DISTNAME= ${PORTNAME}-${PORTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= An e17 module that allows a user to type a location into the filemanager
+
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+
+DIST_SUBDIR= e17
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget pkgconfig
+USE_EFL= edje libtool_hack modarch_hack
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-efm_path/distinfo b/x11-wm/e17-module-efm_path/distinfo
new file mode 100644
index 000000000000..f2b2c8af3ec5
--- /dev/null
+++ b/x11-wm/e17-module-efm_path/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/efm_path-20101003.tar.bz2) = cdf0b41b2bba9ca8853825bdc89a61b29b0f934ddee7039454af9e5779d1f892
+SIZE (e17/efm_path-20101003.tar.bz2) = 471529
diff --git a/x11-wm/e17-module-efm_path/pkg-descr b/x11-wm/e17-module-efm_path/pkg-descr
new file mode 100644
index 000000000000..f28d7f0aeb92
--- /dev/null
+++ b/x11-wm/e17-module-efm_path/pkg-descr
@@ -0,0 +1,3 @@
+A module that allows a user to type a location into the filemanager.
+
+WWW: http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-efm_path/pkg-plist b/x11-wm/e17-module-efm_path/pkg-plist
new file mode 100644
index 000000000000..19a7b681c1f0
--- /dev/null
+++ b/x11-wm/e17-module-efm_path/pkg-plist
@@ -0,0 +1,86 @@
+lib/enlightenment/modules/efm_path/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/efm_path/e-module-efm_path.edj
+lib/enlightenment/modules/efm_path/module.desktop
+%%NLS%%lib/enlightenment/modules/efm_path/locale/fr/LC_MESSAGES/efm_path.mo
+%%NLS%%lib/enlightenment/modules/efm_path/locale/nl/LC_MESSAGES/efm_path.mo
+%%NLS%%lib/enlightenment/modules/efm_path/locale/cs/LC_MESSAGES/efm_path.mo
+%%NLS%%lib/enlightenment/modules/efm_path/locale/pt/LC_MESSAGES/efm_path.mo
+%%NLS%%lib/enlightenment/modules/efm_path/locale/pt_BR/LC_MESSAGES/efm_path.mo
+%%NLS%%lib/enlightenment/modules/efm_path/locale/lt/LC_MESSAGES/efm_path.mo
+%%NLS%%lib/enlightenment/modules/efm_path/locale/he/LC_MESSAGES/efm_path.mo
+%%NLS%%lib/enlightenment/modules/efm_path/locale/ar/LC_MESSAGES/efm_path.mo
+%%NLS%%lib/enlightenment/modules/efm_path/locale/hu/LC_MESSAGES/efm_path.mo
+%%NLS%%lib/enlightenment/modules/efm_path/locale/pl/LC_MESSAGES/efm_path.mo
+%%NLS%%lib/enlightenment/modules/efm_path/locale/es/LC_MESSAGES/efm_path.mo
+%%NLS%%lib/enlightenment/modules/efm_path/locale/bg/LC_MESSAGES/efm_path.mo
+%%NLS%%lib/enlightenment/modules/efm_path/locale/hr/LC_MESSAGES/efm_path.mo
+%%NLS%%lib/enlightenment/modules/efm_path/locale/tr/LC_MESSAGES/efm_path.mo
+%%NLS%%lib/enlightenment/modules/efm_path/locale/sk/LC_MESSAGES/efm_path.mo
+%%NLS%%lib/enlightenment/modules/efm_path/locale/da/LC_MESSAGES/efm_path.mo
+%%NLS%%lib/enlightenment/modules/efm_path/locale/it/LC_MESSAGES/efm_path.mo
+%%NLS%%lib/enlightenment/modules/efm_path/locale/zh_CN/LC_MESSAGES/efm_path.mo
+%%NLS%%lib/enlightenment/modules/efm_path/locale/eo/LC_MESSAGES/efm_path.mo
+%%NLS%%lib/enlightenment/modules/efm_path/locale/fi/LC_MESSAGES/efm_path.mo
+%%NLS%%lib/enlightenment/modules/efm_path/locale/sv/LC_MESSAGES/efm_path.mo
+%%NLS%%lib/enlightenment/modules/efm_path/locale/ru/LC_MESSAGES/efm_path.mo
+%%NLS%%lib/enlightenment/modules/efm_path/locale/uk/LC_MESSAGES/efm_path.mo
+%%NLS%%lib/enlightenment/modules/efm_path/locale/de/LC_MESSAGES/efm_path.mo
+%%NLS%%lib/enlightenment/modules/efm_path/locale/ja/LC_MESSAGES/efm_path.mo
+%%NLS%%lib/enlightenment/modules/efm_path/locale/el/LC_MESSAGES/efm_path.mo
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/de
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/uk
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/ru
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/zh_CN
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/da/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/da
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/sk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/sk
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/tr
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/hr
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/pl
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/hu
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/ar
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/he/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/he
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/pt
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/pt_BR
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/nl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/nl
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/efm_path/locale
+@dirrm lib/enlightenment/modules/efm_path/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/efm_path
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-efm_pathbar/Makefile b/x11-wm/e17-module-efm_pathbar/Makefile
new file mode 100644
index 000000000000..06e257595a87
--- /dev/null
+++ b/x11-wm/e17-module-efm_pathbar/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: e17-module-efm_pathbar
+# Date created: 07 January 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= efm_pathbar
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
+PKGNAMEPREFIX= e17-module-
+DISTNAME= ${PORTNAME}-${PORTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= An e17 module that provides a pathbar gadget
+
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+
+DIST_SUBDIR= e17
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget pkgconfig
+USE_EFL= edje libtool_hack modarch_hack
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-efm_pathbar/distinfo b/x11-wm/e17-module-efm_pathbar/distinfo
new file mode 100644
index 000000000000..1212fa7f47c1
--- /dev/null
+++ b/x11-wm/e17-module-efm_pathbar/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/efm_pathbar-20101003.tar.bz2) = ac80883985c4c7b40b430e537eac7ef09b30ca6a66078ab1879b52b56fb78c5a
+SIZE (e17/efm_pathbar-20101003.tar.bz2) = 472889
diff --git a/x11-wm/e17-module-efm_pathbar/pkg-descr b/x11-wm/e17-module-efm_pathbar/pkg-descr
new file mode 100644
index 000000000000..dc067d8c1638
--- /dev/null
+++ b/x11-wm/e17-module-efm_pathbar/pkg-descr
@@ -0,0 +1,3 @@
+A module that provide a pathbar gadget to navigate through the filesystem.
+
+WWW: http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-efm_pathbar/pkg-plist b/x11-wm/e17-module-efm_pathbar/pkg-plist
new file mode 100644
index 000000000000..d8d8116d2010
--- /dev/null
+++ b/x11-wm/e17-module-efm_pathbar/pkg-plist
@@ -0,0 +1,74 @@
+lib/enlightenment/modules/efm_pathbar/e-module-efm_pathbar.edj
+lib/enlightenment/modules/efm_pathbar/module.desktop
+lib/enlightenment/modules/efm_pathbar/%%E17_ARCH%%/module.so
+%%NLS%%lib/enlightenment/modules/efm_pathbar/locale/pt_BR/LC_MESSAGES/efm_pathbar.mo
+%%NLS%%lib/enlightenment/modules/efm_pathbar/locale/lt/LC_MESSAGES/efm_pathbar.mo
+%%NLS%%lib/enlightenment/modules/efm_pathbar/locale/he/LC_MESSAGES/efm_pathbar.mo
+%%NLS%%lib/enlightenment/modules/efm_pathbar/locale/ar/LC_MESSAGES/efm_pathbar.mo
+%%NLS%%lib/enlightenment/modules/efm_pathbar/locale/cs/LC_MESSAGES/efm_pathbar.mo
+%%NLS%%lib/enlightenment/modules/efm_pathbar/locale/nl/LC_MESSAGES/efm_pathbar.mo
+%%NLS%%lib/enlightenment/modules/efm_pathbar/locale/fr/LC_MESSAGES/efm_pathbar.mo
+%%NLS%%lib/enlightenment/modules/efm_pathbar/locale/bg/LC_MESSAGES/efm_pathbar.mo
+%%NLS%%lib/enlightenment/modules/efm_pathbar/locale/hr/LC_MESSAGES/efm_pathbar.mo
+%%NLS%%lib/enlightenment/modules/efm_pathbar/locale/hu/LC_MESSAGES/efm_pathbar.mo
+%%NLS%%lib/enlightenment/modules/efm_pathbar/locale/pl/LC_MESSAGES/efm_pathbar.mo
+%%NLS%%lib/enlightenment/modules/efm_pathbar/locale/pt/LC_MESSAGES/efm_pathbar.mo
+%%NLS%%lib/enlightenment/modules/efm_pathbar/locale/es/LC_MESSAGES/efm_pathbar.mo
+%%NLS%%lib/enlightenment/modules/efm_pathbar/locale/eo/LC_MESSAGES/efm_pathbar.mo
+%%NLS%%lib/enlightenment/modules/efm_pathbar/locale/it/LC_MESSAGES/efm_pathbar.mo
+%%NLS%%lib/enlightenment/modules/efm_pathbar/locale/zh_CN/LC_MESSAGES/efm_pathbar.mo
+%%NLS%%lib/enlightenment/modules/efm_pathbar/locale/da/LC_MESSAGES/efm_pathbar.mo
+%%NLS%%lib/enlightenment/modules/efm_pathbar/locale/tr/LC_MESSAGES/efm_pathbar.mo
+%%NLS%%lib/enlightenment/modules/efm_pathbar/locale/sk/LC_MESSAGES/efm_pathbar.mo
+%%NLS%%lib/enlightenment/modules/efm_pathbar/locale/el/LC_MESSAGES/efm_pathbar.mo
+%%NLS%%lib/enlightenment/modules/efm_pathbar/locale/uk/LC_MESSAGES/efm_pathbar.mo
+%%NLS%%lib/enlightenment/modules/efm_pathbar/locale/ru/LC_MESSAGES/efm_pathbar.mo
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/ru
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/uk
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/sk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/sk
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/tr
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/da/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/da
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/zh_CN
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/pl
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/pt
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/hu
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/hr
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/nl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/nl
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/ar
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/he/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/he
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale/pt_BR
+%%NLS%%@dirrm lib/enlightenment/modules/efm_pathbar/locale
+@dirrm lib/enlightenment/modules/efm_pathbar/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/efm_pathbar
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-engage/Makefile b/x11-wm/e17-module-engage/Makefile
new file mode 100644
index 000000000000..56352536d82b
--- /dev/null
+++ b/x11-wm/e17-module-engage/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: e17-module-itask-ng
+# Date created: 19 June 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= itask-ng
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
+PKGNAMEPREFIX= e17-module-
+DISTNAME= ${PORTNAME}-${PORTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= A fast applications switching module for e17
+
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+
+DIST_SUBDIR= e17
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget pkgconfig
+USE_EFL= edje libtool_hack modarch_hack
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-engage/distinfo b/x11-wm/e17-module-engage/distinfo
new file mode 100644
index 000000000000..dda82d3f5f20
--- /dev/null
+++ b/x11-wm/e17-module-engage/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/itask-ng-20101003.tar.bz2) = 21aa7efaa096f2f29b9e46a0eb95f3b9c5a6e94800d0ef75c1f33a7505ff9fa4
+SIZE (e17/itask-ng-20101003.tar.bz2) = 557309
diff --git a/x11-wm/e17-module-engage/pkg-descr b/x11-wm/e17-module-engage/pkg-descr
new file mode 100644
index 000000000000..4d79d0534227
--- /dev/null
+++ b/x11-wm/e17-module-engage/pkg-descr
@@ -0,0 +1,12 @@
+This is the ITask Application module for Enlightenment.
+
+It will hold all of your open applications for fast switching.
+
+There are three basic functionalities that you don't want to miss:
+1. If you click on an icon it will be shown and raised to the top
+ and if its on another desk, then you will be switched to it.
+2. If you drag an icon out of ITask the App will be shown on the
+ current desktop.
+3. Drag an icon to a pagers desk to send it.
+
+WWW: http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-engage/pkg-plist b/x11-wm/e17-module-engage/pkg-plist
new file mode 100644
index 000000000000..8afe09c88d12
--- /dev/null
+++ b/x11-wm/e17-module-engage/pkg-plist
@@ -0,0 +1,19 @@
+lib/enlightenment/modules/itask-ng/itask-ng.edj
+lib/enlightenment/modules/itask-ng/module_icon.png
+lib/enlightenment/modules/itask-ng/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/itask-ng/module.desktop
+lib/enlightenment/modules/itask-ng/e-module-ng.edj
+%%NLS%%lib/enlightenment/modules/itask-ng/locale/fr/LC_MESSAGES/itask-ng.mo
+%%NLS%%lib/enlightenment/modules/itask-ng/locale/de/LC_MESSAGES/itask-ng.mo
+%%NLS%%lib/enlightenment/modules/itask-ng/locale/it/LC_MESSAGES/itask-ng.mo
+%%NLS%%@dirrm lib/enlightenment/modules/itask-ng/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/itask-ng/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/itask-ng/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/itask-ng/locale/de
+%%NLS%%@dirrm lib/enlightenment/modules/itask-ng/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/itask-ng/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/itask-ng/locale
+@dirrm lib/enlightenment/modules/itask-ng/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/itask-ng
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-everything-mpris/Makefile b/x11-wm/e17-module-everything-mpris/Makefile
new file mode 100644
index 000000000000..34425c2a0408
--- /dev/null
+++ b/x11-wm/e17-module-everything-mpris/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: e17-module-everything-mpris
+# Date created: 19 June 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= everything-mpris
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
+PKGNAMEPREFIX= e17-module-
+DISTNAME= ${PORTNAME}-${PORTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= An e17 frontend module for mediaplayers that support mpris
+
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+
+DIST_SUBDIR= e17
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget pkgconfig
+USE_EFL= edje libtool_hack modarch_hack
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-everything-mpris/distinfo b/x11-wm/e17-module-everything-mpris/distinfo
new file mode 100644
index 000000000000..18ca09c135ab
--- /dev/null
+++ b/x11-wm/e17-module-everything-mpris/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/everything-mpris-20101003.tar.bz2) = adf1f162acd7b4bc478794f945a45058c948cb450d987e7911ae5c5e39cf2a85
+SIZE (e17/everything-mpris-20101003.tar.bz2) = 583806
diff --git a/x11-wm/e17-module-everything-mpris/pkg-descr b/x11-wm/e17-module-everything-mpris/pkg-descr
new file mode 100644
index 000000000000..b1ab04024b83
--- /dev/null
+++ b/x11-wm/e17-module-everything-mpris/pkg-descr
@@ -0,0 +1,8 @@
+Everything-mpris plugin is a frontend for mediaplayers that support mpris.
+
+Supported players/daemons:
+ - Amarok, Audacious, Exaile, Totem...
+ - corn, simple sound server: http://incise.org/corn.html.
+ - xmms2, via xmms2-mpris-bridge.
+
+WWW: http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-everything-mpris/pkg-plist b/x11-wm/e17-module-everything-mpris/pkg-plist
new file mode 100644
index 000000000000..03ce3a17b64e
--- /dev/null
+++ b/x11-wm/e17-module-everything-mpris/pkg-plist
@@ -0,0 +1,17 @@
+lib/enlightenment/modules/evry-mpris/e-module.edj
+lib/enlightenment/modules/evry-mpris/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/evry-mpris/module.desktop
+%%NLS%%lib/enlightenment/modules/evry-mpris/locale/fr/LC_MESSAGES/evry-mpris.mo
+%%NLS%%lib/enlightenment/modules/evry-mpris/locale/it/LC_MESSAGES/evry-mpris.mo
+%%NLS%%lib/enlightenment/modules/evry-mpris/locale/el/LC_MESSAGES/evry-mpris.mo
+%%NLS%%@dirrm lib/enlightenment/modules/evry-mpris/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/evry-mpris/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/evry-mpris/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/evry-mpris/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/evry-mpris/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/evry-mpris/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/evry-mpris/locale
+@dirrm lib/enlightenment/modules/evry-mpris/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/evry-mpris
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-everything-pidgin/Makefile b/x11-wm/e17-module-everything-pidgin/Makefile
new file mode 100644
index 000000000000..97bb0830aaa0
--- /dev/null
+++ b/x11-wm/e17-module-everything-pidgin/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: e17-module-everything-pidgin
+# Date created: 19 June 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= everything-pidgin
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
+PKGNAMEPREFIX= e17-module-
+DISTNAME= ${PORTNAME}-${PORTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= An e17 pidgin plugin for the "everything" module
+
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+
+DIST_SUBDIR= e17
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget pkgconfig
+USE_EFL= edje libtool_hack modarch_hack
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-everything-pidgin/distinfo b/x11-wm/e17-module-everything-pidgin/distinfo
new file mode 100644
index 000000000000..2436bf674770
--- /dev/null
+++ b/x11-wm/e17-module-everything-pidgin/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/everything-pidgin-20101003.tar.bz2) = 144b397f24bccd346f98e8dfb5616c41ab4c022324bde67c722913de70ea3583
+SIZE (e17/everything-pidgin-20101003.tar.bz2) = 478158
diff --git a/x11-wm/e17-module-everything-pidgin/pkg-descr b/x11-wm/e17-module-everything-pidgin/pkg-descr
new file mode 100644
index 000000000000..b7dbc1b5c496
--- /dev/null
+++ b/x11-wm/e17-module-everything-pidgin/pkg-descr
@@ -0,0 +1,4 @@
+An e17 module that allows to open chat windows and send
+files to buddies in Pidgin.
+
+WWW: http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-everything-pidgin/pkg-plist b/x11-wm/e17-module-everything-pidgin/pkg-plist
new file mode 100644
index 000000000000..c1aa17d13ea5
--- /dev/null
+++ b/x11-wm/e17-module-everything-pidgin/pkg-plist
@@ -0,0 +1,17 @@
+lib/enlightenment/modules/evry-pidgin/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/evry-pidgin/e-module.edj
+lib/enlightenment/modules/evry-pidgin/module.desktop
+%%NLS%%lib/enlightenment/modules/evry-pidgin/locale/it/LC_MESSAGES/evry-pidgin.mo
+%%NLS%%lib/enlightenment/modules/evry-pidgin/locale/el/LC_MESSAGES/evry-pidgin.mo
+%%NLS%%lib/enlightenment/modules/evry-pidgin/locale/fr/LC_MESSAGES/evry-pidgin.mo
+%%NLS%%@dirrm lib/enlightenment/modules/evry-pidgin/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/evry-pidgin/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/evry-pidgin/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/evry-pidgin/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/evry-pidgin/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/evry-pidgin/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/evry-pidgin/locale
+@dirrm lib/enlightenment/modules/evry-pidgin/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/evry-pidgin
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-everything-places/Makefile b/x11-wm/e17-module-everything-places/Makefile
new file mode 100644
index 000000000000..271ba971e52e
--- /dev/null
+++ b/x11-wm/e17-module-everything-places/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: e17-module-everything-places
+# Date created: 19 June 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= everything-places
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
+PKGNAMEPREFIX= e17-module-
+DISTNAME= ${PORTNAME}-${PORTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= An e17 places plugin for the "everything" module
+
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+
+DIST_SUBDIR= e17
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget pkgconfig
+USE_EFL= edje libtool_hack modarch_hack
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-everything-places/distinfo b/x11-wm/e17-module-everything-places/distinfo
new file mode 100644
index 000000000000..18f1e1c2a5b7
--- /dev/null
+++ b/x11-wm/e17-module-everything-places/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/everything-places-20101003.tar.bz2) = 28a9b897691867ca4b72574b3a6c75857afc77acb033c1da1330e747f6b89cab
+SIZE (e17/everything-places-20101003.tar.bz2) = 474453
diff --git a/x11-wm/e17-module-everything-places/pkg-descr b/x11-wm/e17-module-everything-places/pkg-descr
new file mode 100644
index 000000000000..33a3745d2888
--- /dev/null
+++ b/x11-wm/e17-module-everything-places/pkg-descr
@@ -0,0 +1,3 @@
+An e17 places plugin for the "everything" module.
+
+WWW: http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-everything-places/pkg-plist b/x11-wm/e17-module-everything-places/pkg-plist
new file mode 100644
index 000000000000..044ad7a18775
--- /dev/null
+++ b/x11-wm/e17-module-everything-places/pkg-plist
@@ -0,0 +1,14 @@
+lib/enlightenment/modules/everything-places/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/everything-places/module.desktop
+lib/enlightenment/modules/everything-places/e-module.edj
+%%NLS%%lib/enlightenment/modules/everything-places/locale/it/LC_MESSAGES/everything-places.mo
+%%NLS%%lib/enlightenment/modules/everything-places/locale/fr/LC_MESSAGES/everything-places.mo
+%%NLS%%@dirrm lib/enlightenment/modules/everything-places/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/everything-places/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/everything-places/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/everything-places/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/everything-places/locale
+@dirrm lib/enlightenment/modules/everything-places/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/everything-places
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-everything-wallpaper/Makefile b/x11-wm/e17-module-everything-wallpaper/Makefile
new file mode 100644
index 000000000000..053939a569e1
--- /dev/null
+++ b/x11-wm/e17-module-everything-wallpaper/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: e17-module-everything-wallpaper
+# Date created: 19 June 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= everything-wallpaper
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
+PKGNAMEPREFIX= e17-module-
+DISTNAME= ${PORTNAME}-${PORTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= An e17 wallpaper plugin for the "everything" module
+
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+
+DIST_SUBDIR= e17
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget pkgconfig
+USE_EFL= edje libtool_hack modarch_hack
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-everything-wallpaper/distinfo b/x11-wm/e17-module-everything-wallpaper/distinfo
new file mode 100644
index 000000000000..931b6b7a1a34
--- /dev/null
+++ b/x11-wm/e17-module-everything-wallpaper/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/everything-wallpaper-20101003.tar.bz2) = 0b94a48b36be0a9ff8e06dc6ce8962b0e519abc3338d48e87b4b83d557ff04c1
+SIZE (e17/everything-wallpaper-20101003.tar.bz2) = 493251
diff --git a/x11-wm/e17-module-everything-wallpaper/pkg-descr b/x11-wm/e17-module-everything-wallpaper/pkg-descr
new file mode 100644
index 000000000000..a707a193f41a
--- /dev/null
+++ b/x11-wm/e17-module-everything-wallpaper/pkg-descr
@@ -0,0 +1,3 @@
+An e17 wallpaper plugin for the "everything" module.
+
+WWW: http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-everything-wallpaper/pkg-plist b/x11-wm/e17-module-everything-wallpaper/pkg-plist
new file mode 100644
index 000000000000..4d2ded4aef3e
--- /dev/null
+++ b/x11-wm/e17-module-everything-wallpaper/pkg-plist
@@ -0,0 +1,7 @@
+lib/enlightenment/modules/everything-wallpaper/module.desktop
+lib/enlightenment/modules/everything-wallpaper/e-module.edj
+lib/enlightenment/modules/everything-wallpaper/%%E17_ARCH%%/module.so
+@dirrm lib/enlightenment/modules/everything-wallpaper/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/everything-wallpaper
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-everything-websearch/Makefile b/x11-wm/e17-module-everything-websearch/Makefile
new file mode 100644
index 000000000000..8c3711a9ee82
--- /dev/null
+++ b/x11-wm/e17-module-everything-websearch/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: e17-module-everything-websearch
+# Date created: 19 June 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= everything-websearch
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
+PKGNAMEPREFIX= e17-module-
+DISTNAME= ${PORTNAME}-${PORTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= An e17 websearch plugin for the "everything" module
+
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+
+DIST_SUBDIR= e17
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget pkgconfig
+USE_EFL= edje libtool_hack modarch_hack
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-everything-websearch/distinfo b/x11-wm/e17-module-everything-websearch/distinfo
new file mode 100644
index 000000000000..30e4b8631099
--- /dev/null
+++ b/x11-wm/e17-module-everything-websearch/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/everything-websearch-20101003.tar.bz2) = 6ca74aaea14c1f6d718903cd287d19ec003892ff5e9523875fbf848fd70e1b6a
+SIZE (e17/everything-websearch-20101003.tar.bz2) = 576160
diff --git a/x11-wm/e17-module-everything-websearch/pkg-descr b/x11-wm/e17-module-everything-websearch/pkg-descr
new file mode 100644
index 000000000000..da178a460eda
--- /dev/null
+++ b/x11-wm/e17-module-everything-websearch/pkg-descr
@@ -0,0 +1,5 @@
+Helps to find stuff on Wikipedia, use Google suggestions
+and 'Google for it'(tm) action.
+Triggers can be configured, defaults are 'g ' and 'w '.
+
+WWW: http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-everything-websearch/pkg-plist b/x11-wm/e17-module-everything-websearch/pkg-plist
new file mode 100644
index 000000000000..8609665cecb5
--- /dev/null
+++ b/x11-wm/e17-module-everything-websearch/pkg-plist
@@ -0,0 +1,17 @@
+lib/enlightenment/modules/evry-websearch/module.desktop
+lib/enlightenment/modules/evry-websearch/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/evry-websearch/e-module.edj
+%%NLS%%lib/enlightenment/modules/evry-websearch/locale/fr/LC_MESSAGES/evry-websearch.mo
+%%NLS%%lib/enlightenment/modules/evry-websearch/locale/it/LC_MESSAGES/evry-websearch.mo
+%%NLS%%lib/enlightenment/modules/evry-websearch/locale/el/LC_MESSAGES/evry-websearch.mo
+%%NLS%%@dirrm lib/enlightenment/modules/evry-websearch/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/evry-websearch/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/evry-websearch/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/evry-websearch/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/evry-websearch/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/evry-websearch/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/evry-websearch/locale
+@dirrm lib/enlightenment/modules/evry-websearch/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/evry-websearch
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-exebuf/Makefile b/x11-wm/e17-module-exebuf/Makefile
new file mode 100644
index 000000000000..ca0af2a1e707
--- /dev/null
+++ b/x11-wm/e17-module-exebuf/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: e17-module-exebuf
+# Date created: 19 June 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= exebuf
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
+PKGNAMEPREFIX= e17-module-
+DISTNAME= ${PORTNAME}-${PORTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= Exebuf program launcher module for e17
+
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+
+DIST_SUBDIR= e17
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget pkgconfig
+USE_EFL= edje libtool_hack modarch_hack
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-exebuf/distinfo b/x11-wm/e17-module-exebuf/distinfo
new file mode 100644
index 000000000000..8b3b80f7f80a
--- /dev/null
+++ b/x11-wm/e17-module-exebuf/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/exebuf-20101003.tar.bz2) = bc096e384c2f45b96a592e845929993f0116109fc4b328345288547362b91d5e
+SIZE (e17/exebuf-20101003.tar.bz2) = 519271
diff --git a/x11-wm/e17-module-exebuf/pkg-descr b/x11-wm/e17-module-exebuf/pkg-descr
new file mode 100644
index 000000000000..7ad2fb208d7a
--- /dev/null
+++ b/x11-wm/e17-module-exebuf/pkg-descr
@@ -0,0 +1,3 @@
+Exebuf program launcher module for e17.
+
+WWW: http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-exebuf/pkg-plist b/x11-wm/e17-module-exebuf/pkg-plist
new file mode 100644
index 000000000000..6f5a4b6f6192
--- /dev/null
+++ b/x11-wm/e17-module-exebuf/pkg-plist
@@ -0,0 +1,7 @@
+lib/enlightenment/modules/exebuf/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/exebuf/module.desktop
+lib/enlightenment/modules/exebuf/e-module-exebuf.edj
+@dirrm lib/enlightenment/modules/exebuf/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/exebuf
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-execwatch/Makefile b/x11-wm/e17-module-execwatch/Makefile
new file mode 100644
index 000000000000..21f6fc2085fb
--- /dev/null
+++ b/x11-wm/e17-module-execwatch/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: e17-module-execwatch
+# Date created: 07 January 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= execwatch
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
+PKGNAMEPREFIX= e17-module-
+DISTNAME= ${PORTNAME}-${PORTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= An e17 module to show the last state of a periodically executed command
+
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+
+DIST_SUBDIR= e17
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget pkgconfig
+USE_EFL= edje libtool_hack modarch_hack
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-execwatch/distinfo b/x11-wm/e17-module-execwatch/distinfo
new file mode 100644
index 000000000000..1845af7c9ea3
--- /dev/null
+++ b/x11-wm/e17-module-execwatch/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/execwatch-20101003.tar.bz2) = 11fb7cd6bfc1b9b42aeda0bd1afe9e8139a6c0d2ce059dee0b4fb0c0b8297f19
+SIZE (e17/execwatch-20101003.tar.bz2) = 483336
diff --git a/x11-wm/e17-module-execwatch/pkg-descr b/x11-wm/e17-module-execwatch/pkg-descr
new file mode 100644
index 000000000000..b310c7b681f2
--- /dev/null
+++ b/x11-wm/e17-module-execwatch/pkg-descr
@@ -0,0 +1,5 @@
+Shows the last state of a periodically executed command.
+Useful as an update checker or for checking if a remote host
+is available (through ping).
+
+WWW: http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-execwatch/pkg-plist b/x11-wm/e17-module-execwatch/pkg-plist
new file mode 100644
index 000000000000..291c0e8d2f21
--- /dev/null
+++ b/x11-wm/e17-module-execwatch/pkg-plist
@@ -0,0 +1,8 @@
+lib/enlightenment/modules/execwatch/e-module-execwatch.edj
+lib/enlightenment/modules/execwatch/execwatch.edj
+lib/enlightenment/modules/execwatch/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/execwatch/module.desktop
+@dirrm lib/enlightenment/modules/execwatch/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/execwatch
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-flame/Makefile b/x11-wm/e17-module-flame/Makefile
index 8e2c05f7cc1b..6d3c12e1a858 100644
--- a/x11-wm/e17-module-flame/Makefile
+++ b/x11-wm/e17-module-flame/Makefile
@@ -6,24 +6,24 @@
#
PORTNAME= flame
-PORTVERSION= 20080223
-PORTREVISION= 5
-CATEGORIES= x11-wm
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= An e17 module which draws flames on your desktop
-BUILD_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
-RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+DIST_SUBDIR= e17
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnometarget pkgconfig
-USE_EFL= edje
+USE_EFL= edje libtool_hack modarch_hack
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff --git a/x11-wm/e17-module-flame/distinfo b/x11-wm/e17-module-flame/distinfo
index 69ba773e3ed1..34905e98f019 100644
--- a/x11-wm/e17-module-flame/distinfo
+++ b/x11-wm/e17-module-flame/distinfo
@@ -1,3 +1,2 @@
-MD5 (flame-20080223.tar.bz2) = a6bc14b59ea1c7d40d0994aaf7545fff
-SHA256 (flame-20080223.tar.bz2) = 242a5e4be9cc8863ef4b95fb71b9e305a6eaa08baa9c7ef85ab6c5d4faad38e9
-SIZE (flame-20080223.tar.bz2) = 229806
+SHA256 (e17/flame-20101003.tar.bz2) = 02574716213c1af9dd6c27e683217ad2028740f1d5b4296cbef7b15dba17ddf7
+SIZE (e17/flame-20101003.tar.bz2) = 468763
diff --git a/x11-wm/e17-module-flame/pkg-plist b/x11-wm/e17-module-flame/pkg-plist
index 76d917dd30f9..b4f75756803a 100644
--- a/x11-wm/e17-module-flame/pkg-plist
+++ b/x11-wm/e17-module-flame/pkg-plist
@@ -1,20 +1,87 @@
-lib/enlightenment/modules/flame/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/flame/%%E17_ARCH%%/module.la
-lib/enlightenment/modules/flame/%%E17_ARCH%%/module.so
lib/enlightenment/modules/flame/module.desktop
lib/enlightenment/modules/flame/e-module-flame.edj
-%%NLS%%lib/enlightenment/modules/flame/locale/eo/LC_MESSAGES/flame.mo
+lib/enlightenment/modules/flame/%%E17_ARCH%%/module.so
%%NLS%%lib/enlightenment/modules/flame/locale/fi/LC_MESSAGES/flame.mo
-%%NLS%%lib/enlightenment/modules/flame/locale/it/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/sv/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/ru/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/uk/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/de/LC_MESSAGES/flame.mo
%%NLS%%lib/enlightenment/modules/flame/locale/ja/LC_MESSAGES/flame.mo
-%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/eo/LC_MESSAGES
+%%NLS%%lib/enlightenment/modules/flame/locale/el/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/zh_CN/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/sk/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/tr/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/it/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/hi/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/eo/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/hu/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/pl/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/es/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/pt/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/pt_BR/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/nb/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/bg/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/hr/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/fr/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/nl/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/cs/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/lt/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/ar/LC_MESSAGES/flame.mo
+%%NLS%%lib/enlightenment/modules/flame/locale/he/LC_MESSAGES/flame.mo
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/he/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/he
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/ar
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/nl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/nl
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/hr
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/nb/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/nb
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/pt_BR
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/pt
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/pl
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/hu
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/eo/LC_MESSAGES
%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/eo
-%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/fi/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/hi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/hi
%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/it/LC_MESSAGES
%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/tr
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/sk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/sk
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/zh_CN
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/el
%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/ja/LC_MESSAGES
%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/de
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/uk
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/ru
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/flame/locale/fi
%%NLS%%@dirrm lib/enlightenment/modules/flame/locale
@dirrm lib/enlightenment/modules/flame/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/flame
diff --git a/x11-wm/e17-module-forecasts/Makefile b/x11-wm/e17-module-forecasts/Makefile
new file mode 100644
index 000000000000..590fbd89208b
--- /dev/null
+++ b/x11-wm/e17-module-forecasts/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: e17-module-forecasts
+# Date created: 07 January 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= forecasts
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
+PKGNAMEPREFIX= e17-module-
+DISTNAME= ${PORTNAME}-${PORTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= An e17 weather forecast display module
+
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+
+DIST_SUBDIR= e17
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget pkgconfig
+USE_EFL= edje libtool_hack modarch_hack
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-forecasts/distinfo b/x11-wm/e17-module-forecasts/distinfo
new file mode 100644
index 000000000000..57a47106a1b8
--- /dev/null
+++ b/x11-wm/e17-module-forecasts/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/forecasts-20101003.tar.bz2) = c8b8063605c8c72c759f22abe35a4e62f49d0811ef1c208aa3c70f4312cf9612
+SIZE (e17/forecasts-20101003.tar.bz2) = 1059714
diff --git a/x11-wm/e17-module-forecasts/pkg-descr b/x11-wm/e17-module-forecasts/pkg-descr
new file mode 100644
index 000000000000..f26fc1ed51a7
--- /dev/null
+++ b/x11-wm/e17-module-forecasts/pkg-descr
@@ -0,0 +1,4 @@
+The forecasts gadget will display the current weather conditions
+and a few days forecast.
+
+WWW: http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-forecasts/pkg-plist b/x11-wm/e17-module-forecasts/pkg-plist
new file mode 100644
index 000000000000..8528b2dd6a77
--- /dev/null
+++ b/x11-wm/e17-module-forecasts/pkg-plist
@@ -0,0 +1,90 @@
+lib/enlightenment/modules/forecasts/forecasts.edj
+lib/enlightenment/modules/forecasts/module.desktop
+lib/enlightenment/modules/forecasts/e-module-forecasts.edj
+lib/enlightenment/modules/forecasts/%%E17_ARCH%%/module.so
+%%NLS%%lib/enlightenment/modules/forecasts/locale/hu/LC_MESSAGES/forecasts.mo
+%%NLS%%lib/enlightenment/modules/forecasts/locale/es/LC_MESSAGES/forecasts.mo
+%%NLS%%lib/enlightenment/modules/forecasts/locale/pl/LC_MESSAGES/forecasts.mo
+%%NLS%%lib/enlightenment/modules/forecasts/locale/bg/LC_MESSAGES/forecasts.mo
+%%NLS%%lib/enlightenment/modules/forecasts/locale/hr/LC_MESSAGES/forecasts.mo
+%%NLS%%lib/enlightenment/modules/forecasts/locale/nb/LC_MESSAGES/forecasts.mo
+%%NLS%%lib/enlightenment/modules/forecasts/locale/nl/LC_MESSAGES/forecasts.mo
+%%NLS%%lib/enlightenment/modules/forecasts/locale/fr/LC_MESSAGES/forecasts.mo
+%%NLS%%lib/enlightenment/modules/forecasts/locale/lt/LC_MESSAGES/forecasts.mo
+%%NLS%%lib/enlightenment/modules/forecasts/locale/he/LC_MESSAGES/forecasts.mo
+%%NLS%%lib/enlightenment/modules/forecasts/locale/ar/LC_MESSAGES/forecasts.mo
+%%NLS%%lib/enlightenment/modules/forecasts/locale/cs/LC_MESSAGES/forecasts.mo
+%%NLS%%lib/enlightenment/modules/forecasts/locale/zh_CN/LC_MESSAGES/forecasts.mo
+%%NLS%%lib/enlightenment/modules/forecasts/locale/ru/LC_MESSAGES/forecasts.mo
+%%NLS%%lib/enlightenment/modules/forecasts/locale/pt/LC_MESSAGES/forecasts.mo
+%%NLS%%lib/enlightenment/modules/forecasts/locale/ko/LC_MESSAGES/forecasts.mo
+%%NLS%%lib/enlightenment/modules/forecasts/locale/sv/LC_MESSAGES/forecasts.mo
+%%NLS%%lib/enlightenment/modules/forecasts/locale/fi/LC_MESSAGES/forecasts.mo
+%%NLS%%lib/enlightenment/modules/forecasts/locale/el/LC_MESSAGES/forecasts.mo
+%%NLS%%lib/enlightenment/modules/forecasts/locale/uk/LC_MESSAGES/forecasts.mo
+%%NLS%%lib/enlightenment/modules/forecasts/locale/ja/LC_MESSAGES/forecasts.mo
+%%NLS%%lib/enlightenment/modules/forecasts/locale/de/LC_MESSAGES/forecasts.mo
+%%NLS%%lib/enlightenment/modules/forecasts/locale/tr/LC_MESSAGES/forecasts.mo
+%%NLS%%lib/enlightenment/modules/forecasts/locale/sk/LC_MESSAGES/forecasts.mo
+%%NLS%%lib/enlightenment/modules/forecasts/locale/pt_BR/LC_MESSAGES/forecasts.mo
+%%NLS%%lib/enlightenment/modules/forecasts/locale/eo/LC_MESSAGES/forecasts.mo
+%%NLS%%lib/enlightenment/modules/forecasts/locale/it/LC_MESSAGES/forecasts.mo
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/pt_BR
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/sk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/sk
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/tr
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/de
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/uk
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/ko/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/ko
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/pt
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/ru
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/zh_CN
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/ar
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/he/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/he
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/nl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/nl
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/nb/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/nb
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/hr
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/pl
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale/hu
+%%NLS%%@dirrm lib/enlightenment/modules/forecasts/locale
+@dirrm lib/enlightenment/modules/forecasts/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/forecasts
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-iiirk/Makefile b/x11-wm/e17-module-iiirk/Makefile
new file mode 100644
index 000000000000..d942e1d7e80f
--- /dev/null
+++ b/x11-wm/e17-module-iiirk/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: e17-module-iiirk
+# Date created: 07 January 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= iiirk
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
+PKGNAMEPREFIX= e17-module-
+DISTNAME= ${PORTNAME}-${PORTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= A taskbar-like module for e17
+
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+
+DIST_SUBDIR= e17
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget pkgconfig
+USE_EFL= edje libtool_hack modarch_hack
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-iiirk/distinfo b/x11-wm/e17-module-iiirk/distinfo
new file mode 100644
index 000000000000..a5f60ebf5f6f
--- /dev/null
+++ b/x11-wm/e17-module-iiirk/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/iiirk-20101003.tar.bz2) = 0df0d593df04f74165cbcdce9322dbd13ffb4359a1232d7dca4cfedf4e19b611
+SIZE (e17/iiirk-20101003.tar.bz2) = 480170
diff --git a/x11-wm/e17-module-iiirk/pkg-descr b/x11-wm/e17-module-iiirk/pkg-descr
new file mode 100644
index 000000000000..1e3bcbc2de76
--- /dev/null
+++ b/x11-wm/e17-module-iiirk/pkg-descr
@@ -0,0 +1,22 @@
+This module act like a taskbar for selected applications only. The purpose of
+this, is having a module behaving like a tray would dock some icons. Due to the
+status of the system tray specification this module don't rely on it, but on
+.desktop and netwm icons only instead.
+
+It's highly recommended to make sure a .desktop match the border you want to
+dock in this module. See http://wiki.enlightenment.org/index.php/E17_and_Efreet#Border_Icons
+for further explanation on how do this matching.
+
+In order to add an icon to the module you have two ways. You can either drag and
+drop the border icon on it, or configure the "Iiirk source". Which is a list of
+.desktop to match automatically.
+
+Once the icon is in the module, a click on it will toggle show/hide on the
+corresponding window. Don't close your windows, what does the window when
+closed is up to the application, not to the module. Use the minimize instead.
+If the option "Hide window from any list when iconified" is enabled, minimize it
+even by using the border button will active the skip window list on it.
+
+Drop an icon outside the box will remove the match on the corresponding .desktop.
+
+WWW: http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-iiirk/pkg-plist b/x11-wm/e17-module-iiirk/pkg-plist
new file mode 100644
index 000000000000..b83fa07779e3
--- /dev/null
+++ b/x11-wm/e17-module-iiirk/pkg-plist
@@ -0,0 +1,56 @@
+lib/enlightenment/modules/iiirk/e-module-iiirk.edj
+lib/enlightenment/modules/iiirk/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/iiirk/module.desktop
+%%NLS%%lib/enlightenment/modules/iiirk/locale/nl/LC_MESSAGES/iiirk.mo
+%%NLS%%lib/enlightenment/modules/iiirk/locale/fr/LC_MESSAGES/iiirk.mo
+%%NLS%%lib/enlightenment/modules/iiirk/locale/lt/LC_MESSAGES/iiirk.mo
+%%NLS%%lib/enlightenment/modules/iiirk/locale/he/LC_MESSAGES/iiirk.mo
+%%NLS%%lib/enlightenment/modules/iiirk/locale/cs/LC_MESSAGES/iiirk.mo
+%%NLS%%lib/enlightenment/modules/iiirk/locale/hu/LC_MESSAGES/iiirk.mo
+%%NLS%%lib/enlightenment/modules/iiirk/locale/pl/LC_MESSAGES/iiirk.mo
+%%NLS%%lib/enlightenment/modules/iiirk/locale/es/LC_MESSAGES/iiirk.mo
+%%NLS%%lib/enlightenment/modules/iiirk/locale/hr/LC_MESSAGES/iiirk.mo
+%%NLS%%lib/enlightenment/modules/iiirk/locale/tr/LC_MESSAGES/iiirk.mo
+%%NLS%%lib/enlightenment/modules/iiirk/locale/eo/LC_MESSAGES/iiirk.mo
+%%NLS%%lib/enlightenment/modules/iiirk/locale/it/LC_MESSAGES/iiirk.mo
+%%NLS%%lib/enlightenment/modules/iiirk/locale/el/LC_MESSAGES/iiirk.mo
+%%NLS%%lib/enlightenment/modules/iiirk/locale/pt/LC_MESSAGES/iiirk.mo
+%%NLS%%lib/enlightenment/modules/iiirk/locale/uk/LC_MESSAGES/iiirk.mo
+%%NLS%%lib/enlightenment/modules/iiirk/locale/zh_CN/LC_MESSAGES/iiirk.mo
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/zh_CN
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/uk
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/pt
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/tr
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/hr
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/pl
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/hu
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/he/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/he
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/nl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale/nl
+%%NLS%%@dirrm lib/enlightenment/modules/iiirk/locale
+@dirrm lib/enlightenment/modules/iiirk/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/iiirk
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-itask-ng/Makefile b/x11-wm/e17-module-itask-ng/Makefile
new file mode 100644
index 000000000000..56352536d82b
--- /dev/null
+++ b/x11-wm/e17-module-itask-ng/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: e17-module-itask-ng
+# Date created: 19 June 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= itask-ng
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
+PKGNAMEPREFIX= e17-module-
+DISTNAME= ${PORTNAME}-${PORTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= A fast applications switching module for e17
+
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+
+DIST_SUBDIR= e17
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget pkgconfig
+USE_EFL= edje libtool_hack modarch_hack
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-itask-ng/distinfo b/x11-wm/e17-module-itask-ng/distinfo
new file mode 100644
index 000000000000..dda82d3f5f20
--- /dev/null
+++ b/x11-wm/e17-module-itask-ng/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/itask-ng-20101003.tar.bz2) = 21aa7efaa096f2f29b9e46a0eb95f3b9c5a6e94800d0ef75c1f33a7505ff9fa4
+SIZE (e17/itask-ng-20101003.tar.bz2) = 557309
diff --git a/x11-wm/e17-module-itask-ng/pkg-descr b/x11-wm/e17-module-itask-ng/pkg-descr
new file mode 100644
index 000000000000..4d79d0534227
--- /dev/null
+++ b/x11-wm/e17-module-itask-ng/pkg-descr
@@ -0,0 +1,12 @@
+This is the ITask Application module for Enlightenment.
+
+It will hold all of your open applications for fast switching.
+
+There are three basic functionalities that you don't want to miss:
+1. If you click on an icon it will be shown and raised to the top
+ and if its on another desk, then you will be switched to it.
+2. If you drag an icon out of ITask the App will be shown on the
+ current desktop.
+3. Drag an icon to a pagers desk to send it.
+
+WWW: http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-itask-ng/pkg-plist b/x11-wm/e17-module-itask-ng/pkg-plist
new file mode 100644
index 000000000000..8afe09c88d12
--- /dev/null
+++ b/x11-wm/e17-module-itask-ng/pkg-plist
@@ -0,0 +1,19 @@
+lib/enlightenment/modules/itask-ng/itask-ng.edj
+lib/enlightenment/modules/itask-ng/module_icon.png
+lib/enlightenment/modules/itask-ng/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/itask-ng/module.desktop
+lib/enlightenment/modules/itask-ng/e-module-ng.edj
+%%NLS%%lib/enlightenment/modules/itask-ng/locale/fr/LC_MESSAGES/itask-ng.mo
+%%NLS%%lib/enlightenment/modules/itask-ng/locale/de/LC_MESSAGES/itask-ng.mo
+%%NLS%%lib/enlightenment/modules/itask-ng/locale/it/LC_MESSAGES/itask-ng.mo
+%%NLS%%@dirrm lib/enlightenment/modules/itask-ng/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/itask-ng/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/itask-ng/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/itask-ng/locale/de
+%%NLS%%@dirrm lib/enlightenment/modules/itask-ng/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/itask-ng/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/itask-ng/locale
+@dirrm lib/enlightenment/modules/itask-ng/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/itask-ng
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-language/Makefile b/x11-wm/e17-module-language/Makefile
index 4b273518d1e7..1e0779d0c955 100644
--- a/x11-wm/e17-module-language/Makefile
+++ b/x11-wm/e17-module-language/Makefile
@@ -1,31 +1,31 @@
# New ports collection makefile for: e17-module-language
-# Date created: 23 June 2006
-# Whom: Stanislav Sedov <ssedov@mbsd.msk.ru>
+# Date created: 21 August 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
#
# $FreeBSD$
#
PORTNAME= language
-PORTVERSION= 20080223
-PORTREVISION= 5
-CATEGORIES= x11-wm
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
-MAINTAINER= stas@FreeBSD.org
-COMMENT= An e17 module to switch XKB input language
+MAINTAINER= magik@roorback.net
+COMMENT= An e17 XKB language/layout control module
-BUILD_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
-RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+DIST_SUBDIR= e17
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnometarget pkgconfig
-USE_EFL= edje exml
-USE_XORG= x11 xkbfile
+USE_XORG= xkbfile
+USE_EFL= edje libtool_hack modarch_hack
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff --git a/x11-wm/e17-module-language/distinfo b/x11-wm/e17-module-language/distinfo
index 1a265df3bc05..2f0514fa2183 100644
--- a/x11-wm/e17-module-language/distinfo
+++ b/x11-wm/e17-module-language/distinfo
@@ -1,3 +1,2 @@
-MD5 (language-20080223.tar.bz2) = 9a2fb69f4f2681d32215ae85b03667f4
-SHA256 (language-20080223.tar.bz2) = 073208e8874627682101f9a373188a481baa24261f3c1b820bcf2197d0837ec9
-SIZE (language-20080223.tar.bz2) = 405615
+SHA256 (e17/language-20101003.tar.bz2) = 051e4807cb4bcdb7fdd78edc127248fe31379b2e4f23e186ae99831906214e34
+SIZE (e17/language-20101003.tar.bz2) = 644953
diff --git a/x11-wm/e17-module-language/files/patch-configure b/x11-wm/e17-module-language/files/patch-configure
deleted file mode 100644
index 16091f080088..000000000000
--- a/x11-wm/e17-module-language/files/patch-configure
+++ /dev/null
@@ -1,26 +0,0 @@
---- configure.orig Sun Jul 9 23:28:34 2006
-+++ configure Sun Jul 9 23:29:18 2006
-@@ -22091,6 +22091,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+#include <X11/Xlib.h>
-+#include <X11/Xos.h>
-+#include <X11/XKBlib.h>
-+#include <X11/extensions/XKBfile.h>
-+#include <X11/extensions/XKBconfig.h>
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
-@@ -22135,6 +22140,11 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+#include <X11/Xlib.h>
-+#include <X11/Xos.h>
-+#include <X11/XKBlib.h>
-+#include <X11/extensions/XKBfile.h>
-+#include <X11/extensions/XKBconfig.h>
- #include <$ac_header>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
diff --git a/x11-wm/e17-module-language/pkg-descr b/x11-wm/e17-module-language/pkg-descr
index 12881f1fd52e..aa8e714b8569 100644
--- a/x11-wm/e17-module-language/pkg-descr
+++ b/x11-wm/e17-module-language/pkg-descr
@@ -1,4 +1,3 @@
-This e17 module allows users to switch current XKB language in efficient way.
+AN e17 gadget to control active keyboard, keyboard layout, and layout variant.
-Author: Aleksej 'sndev' Struk <astruk@gmail.com>
WWW: http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-language/pkg-plist b/x11-wm/e17-module-language/pkg-plist
index 86b38fe3bd9b..a53ba8ac941b 100644
--- a/x11-wm/e17-module-language/pkg-plist
+++ b/x11-wm/e17-module-language/pkg-plist
@@ -1,98 +1,159 @@
-lib/enlightenment/modules/language/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/language/%%E17_ARCH%%/module.la
-lib/enlightenment/modules/language/%%E17_ARCH%%/module.so
-lib/enlightenment/modules/language/images/AFG_flag.png
-lib/enlightenment/modules/language/images/ALB_flag.png
+lib/enlightenment/modules/language/e-module-language.edj
+lib/enlightenment/modules/language/language.edj
+lib/enlightenment/modules/language/images/MMR_flag.png
+lib/enlightenment/modules/language/images/HUN_flag.png
+lib/enlightenment/modules/language/images/MKD_flag.png
lib/enlightenment/modules/language/images/AND_flag.png
-lib/enlightenment/modules/language/images/ARA_flag.png
-lib/enlightenment/modules/language/images/ARM_flag.png
-lib/enlightenment/modules/language/images/AZE_flag.png
-lib/enlightenment/modules/language/images/BAN_flag.png
-lib/enlightenment/modules/language/images/BEL_flag.png
-lib/enlightenment/modules/language/images/BGR_flag.png
-lib/enlightenment/modules/language/images/BHU_flag.png
-lib/enlightenment/modules/language/images/BIH_flag.png
-lib/enlightenment/modules/language/images/BLR_flag.png
-lib/enlightenment/modules/language/images/BRA_flag.png
-lib/enlightenment/modules/language/images/CAN_flag.png
+lib/enlightenment/modules/language/images/USA_flag.png
+lib/enlightenment/modules/language/images/LTU_flag.png
+lib/enlightenment/modules/language/images/SCG_flag.png
+lib/enlightenment/modules/language/images/EST_flag.png
+lib/enlightenment/modules/language/images/unknown_flag.png
+lib/enlightenment/modules/language/images/POL_flag.png
lib/enlightenment/modules/language/images/CHE_flag.png
-lib/enlightenment/modules/language/images/CZE_flag.png
lib/enlightenment/modules/language/images/DEU_flag.png
-lib/enlightenment/modules/language/images/DNK_flag.png
-lib/enlightenment/modules/language/images/EPO_flag.png
-lib/enlightenment/modules/language/images/ESP_flag.png
-lib/enlightenment/modules/language/images/EST_flag.png
-lib/enlightenment/modules/language/images/FAO_flag.png
-lib/enlightenment/modules/language/images/FIN_flag.png
-lib/enlightenment/modules/language/images/FRA_flag.png
-lib/enlightenment/modules/language/images/GBR_flag.png
+lib/enlightenment/modules/language/images/THA_flag.png
+lib/enlightenment/modules/language/images/SYR_flag.png
+lib/enlightenment/modules/language/images/SWE_flag.png
+lib/enlightenment/modules/language/images/BAN_flag.png
+lib/enlightenment/modules/language/images/HRV_flag.png
lib/enlightenment/modules/language/images/GEO_flag.png
-lib/enlightenment/modules/language/images/GHA_flag.png
+lib/enlightenment/modules/language/images/ROU_flag.png
+lib/enlightenment/modules/language/images/FRA_flag.png
+lib/enlightenment/modules/language/images/DNK_flag.png
+lib/enlightenment/modules/language/images/KYR_flag.png
+lib/enlightenment/modules/language/images/SVK_flag.png
+lib/enlightenment/modules/language/images/PAK_flag.png
+lib/enlightenment/modules/language/images/ARA_flag.png
+lib/enlightenment/modules/language/images/TUR_flag.png
lib/enlightenment/modules/language/images/GRE_flag.png
-lib/enlightenment/modules/language/images/HRV_flag.png
-lib/enlightenment/modules/language/images/HUN_flag.png
-lib/enlightenment/modules/language/images/IND_flag.png
-lib/enlightenment/modules/language/images/IRL_flag.png
-lib/enlightenment/modules/language/images/IRN_flag.png
-lib/enlightenment/modules/language/images/ISL_flag.png
-lib/enlightenment/modules/language/images/ISR_flag.png
-lib/enlightenment/modules/language/images/ITA_flag.png
+lib/enlightenment/modules/language/images/UKR_flag.png
lib/enlightenment/modules/language/images/JPN_flag.png
-lib/enlightenment/modules/language/images/KAZ_flag.png
-lib/enlightenment/modules/language/images/KHM_flag.png
-lib/enlightenment/modules/language/images/KYR_flag.png
-lib/enlightenment/modules/language/images/LAO_flag.png
-lib/enlightenment/modules/language/images/LTU_flag.png
-lib/enlightenment/modules/language/images/LVA_flag.png
+lib/enlightenment/modules/language/images/SRL_flag.png
lib/enlightenment/modules/language/images/MAL_flag.png
-lib/enlightenment/modules/language/images/MAO_flag.png
-lib/enlightenment/modules/language/images/MKD_flag.png
+lib/enlightenment/modules/language/images/ISR_flag.png
+lib/enlightenment/modules/language/images/ISL_flag.png
+lib/enlightenment/modules/language/images/ALB_flag.png
lib/enlightenment/modules/language/images/MLT_flag.png
-lib/enlightenment/modules/language/images/MMR_flag.png
-lib/enlightenment/modules/language/images/MNG_flag.png
+lib/enlightenment/modules/language/images/BIH_flag.png
+lib/enlightenment/modules/language/images/LAO_flag.png
+lib/enlightenment/modules/language/images/IRL_flag.png
+lib/enlightenment/modules/language/images/GHA_flag.png
+lib/enlightenment/modules/language/images/LVA_flag.png
lib/enlightenment/modules/language/images/NLD_flag.png
-lib/enlightenment/modules/language/images/NOR_flag.png
-lib/enlightenment/modules/language/images/PAK_flag.png
-lib/enlightenment/modules/language/images/POL_flag.png
-lib/enlightenment/modules/language/images/PRT_flag.png
-lib/enlightenment/modules/language/images/ROU_flag.png
-lib/enlightenment/modules/language/images/RUS_flag.png
-lib/enlightenment/modules/language/images/SCG_flag.png
-lib/enlightenment/modules/language/images/SRL_flag.png
-lib/enlightenment/modules/language/images/SVK_flag.png
-lib/enlightenment/modules/language/images/SVN_flag.png
-lib/enlightenment/modules/language/images/SWE_flag.png
-lib/enlightenment/modules/language/images/SYR_flag.png
-lib/enlightenment/modules/language/images/THA_flag.png
+lib/enlightenment/modules/language/images/GBR_flag.png
+lib/enlightenment/modules/language/images/FAO_flag.png
+lib/enlightenment/modules/language/images/BLR_flag.png
+lib/enlightenment/modules/language/images/BHU_flag.png
+lib/enlightenment/modules/language/images/ARM_flag.png
+lib/enlightenment/modules/language/images/MAO_flag.png
+lib/enlightenment/modules/language/images/FIN_flag.png
+lib/enlightenment/modules/language/images/KAZ_flag.png
+lib/enlightenment/modules/language/images/IND_flag.png
+lib/enlightenment/modules/language/images/AFG_flag.png
lib/enlightenment/modules/language/images/TJK_flag.png
-lib/enlightenment/modules/language/images/TUR_flag.png
-lib/enlightenment/modules/language/images/UKR_flag.png
-lib/enlightenment/modules/language/images/USA_flag.png
+lib/enlightenment/modules/language/images/KHM_flag.png
lib/enlightenment/modules/language/images/UZB_flag.png
+lib/enlightenment/modules/language/images/CAN_flag.png
lib/enlightenment/modules/language/images/VNM_flag.png
+lib/enlightenment/modules/language/images/EPO_flag.png
+lib/enlightenment/modules/language/images/NOR_flag.png
+lib/enlightenment/modules/language/images/PRT_flag.png
lib/enlightenment/modules/language/images/ZAR_flag.png
-lib/enlightenment/modules/language/images/unknown_flag.png
-lib/enlightenment/modules/language/language.edj
-lib/enlightenment/modules/language/e-module-language.edj
+lib/enlightenment/modules/language/images/CZE_flag.png
+lib/enlightenment/modules/language/images/BRA_flag.png
+lib/enlightenment/modules/language/images/BEL_flag.png
+lib/enlightenment/modules/language/images/MNG_flag.png
+lib/enlightenment/modules/language/images/BGR_flag.png
+lib/enlightenment/modules/language/images/IRN_flag.png
+lib/enlightenment/modules/language/images/ITA_flag.png
+lib/enlightenment/modules/language/images/SVN_flag.png
+lib/enlightenment/modules/language/images/RUS_flag.png
+lib/enlightenment/modules/language/images/AZE_flag.png
+lib/enlightenment/modules/language/images/ESP_flag.png
+lib/enlightenment/modules/language/%%E17_ARCH%%/module.so
lib/enlightenment/modules/language/module.desktop
-%%NLS%%lib/enlightenment/modules/language/locale/eo/LC_MESSAGES/language.mo
-%%NLS%%lib/enlightenment/modules/language/locale/fi/LC_MESSAGES/language.mo
%%NLS%%lib/enlightenment/modules/language/locale/fr/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/nl/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/cs/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/ar/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/lt/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/es/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/pl/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/hu/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/fo/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/nb/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/hr/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/bg/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/pt_BR/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/sk/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/tr/LC_MESSAGES/language.mo
%%NLS%%lib/enlightenment/modules/language/locale/it/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/eo/LC_MESSAGES/language.mo
%%NLS%%lib/enlightenment/modules/language/locale/sv/LC_MESSAGES/language.mo
-%%NLS%%@dirrm lib/enlightenment/modules/language/locale/eo/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/language/locale/eo
+%%NLS%%lib/enlightenment/modules/language/locale/fi/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/pt/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/ru/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/zh_CN/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/ja/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/de/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/uk/LC_MESSAGES/language.mo
+%%NLS%%lib/enlightenment/modules/language/locale/el/LC_MESSAGES/language.mo
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/uk
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/de
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/zh_CN
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/ru
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/pt
%%NLS%%@dirrm lib/enlightenment/modules/language/locale/fi/LC_MESSAGES
%%NLS%%@dirrm lib/enlightenment/modules/language/locale/fi
-%%NLS%%@dirrm lib/enlightenment/modules/language/locale/fr/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/language/locale/fr
-%%NLS%%@dirrm lib/enlightenment/modules/language/locale/it/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/language/locale/it
%%NLS%%@dirrm lib/enlightenment/modules/language/locale/sv/LC_MESSAGES
%%NLS%%@dirrm lib/enlightenment/modules/language/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/tr
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/sk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/sk
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/pt_BR
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/hr
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/nb/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/nb
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/fo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/fo
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/hu
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/pl
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/ar
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/nl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/nl
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/language/locale/fr
%%NLS%%@dirrm lib/enlightenment/modules/language/locale
-@dirrm lib/enlightenment/modules/language/images
@dirrm lib/enlightenment/modules/language/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/language/images
@dirrm lib/enlightenment/modules/language
@dirrmtry lib/enlightenment/modules
@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-mail/Makefile b/x11-wm/e17-module-mail/Makefile
index 8ab08f97bfea..dd84ea697959 100644
--- a/x11-wm/e17-module-mail/Makefile
+++ b/x11-wm/e17-module-mail/Makefile
@@ -6,25 +6,25 @@
#
PORTNAME= mail
-PORTVERSION= 20080223
-PORTREVISION= 5
-CATEGORIES= x11-wm
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= An e17 module to check your mailboxes (like xbiff does)
-BUILD_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
-RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+DIST_SUBDIR= e17
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnometarget pkgconfig
-USE_EFL= edje
+USE_EFL= edje libtool_hack modarch_hack
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff --git a/x11-wm/e17-module-mail/distinfo b/x11-wm/e17-module-mail/distinfo
index 8c332f9f87e6..9751e880e0b7 100644
--- a/x11-wm/e17-module-mail/distinfo
+++ b/x11-wm/e17-module-mail/distinfo
@@ -1,3 +1,2 @@
-MD5 (mail-20080223.tar.bz2) = b98d34ad295095779e5c8a2286e77f62
-SHA256 (mail-20080223.tar.bz2) = 0bc096b188c0dae6347cd8acb7e7b806fb21b7263181b6e1e1e53c10977c7581
-SIZE (mail-20080223.tar.bz2) = 304423
+SHA256 (e17/mail-20101003.tar.bz2) = 1a3d82b12c772fe9bc042396cad86525a5ea1fdf8397bc974e72b9c418754276
+SIZE (e17/mail-20101003.tar.bz2) = 518882
diff --git a/x11-wm/e17-module-mail/pkg-plist b/x11-wm/e17-module-mail/pkg-plist
index 5fe294a96b64..d5b898619773 100644
--- a/x11-wm/e17-module-mail/pkg-plist
+++ b/x11-wm/e17-module-mail/pkg-plist
@@ -1,13 +1,83 @@
-lib/enlightenment/modules/mail/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/mail/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/mail/module.desktop
+lib/enlightenment/modules/mail/e-module-mail.edj
lib/enlightenment/modules/mail/%%E17_ARCH%%/module.so
lib/enlightenment/modules/mail/mail.edj
-lib/enlightenment/modules/mail/e-module-mail.edj
-lib/enlightenment/modules/mail/module.desktop
-%%NLS%%lib/enlightenment/modules/mail/locale/fi/LC_MESSAGES/mail.mo
%%NLS%%lib/enlightenment/modules/mail/locale/it/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/eo/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/tr/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/sk/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/de/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/ja/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/uk/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/el/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/th/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/zh_CN/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/fi/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/sv/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/pt/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/ru/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/cs/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/he/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/ar/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/lt/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/fr/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/nl/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/hr/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/bg/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/pl/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/es/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/hu/LC_MESSAGES/mail.mo
+%%NLS%%lib/enlightenment/modules/mail/locale/pt_BR/LC_MESSAGES/mail.mo
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/pt_BR
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/hu
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/pl
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/hr
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/nl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/nl
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/ar
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/he/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/he
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/ru
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/pt
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/sv
%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/fi/LC_MESSAGES
%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/zh_CN
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/th/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/th
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/uk
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/de
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/sk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/sk
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/tr
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/eo
%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/it/LC_MESSAGES
%%NLS%%@dirrm lib/enlightenment/modules/mail/locale/it
%%NLS%%@dirrm lib/enlightenment/modules/mail/locale
diff --git a/x11-wm/e17-module-mem/Makefile b/x11-wm/e17-module-mem/Makefile
index a53918749f2a..93ee5e2df1b4 100644
--- a/x11-wm/e17-module-mem/Makefile
+++ b/x11-wm/e17-module-mem/Makefile
@@ -6,25 +6,25 @@
#
PORTNAME= mem
-PORTVERSION= 20080223
-PORTREVISION= 5
+PORTVERSION= 20101003
PORTEPOCH= 1
-CATEGORIES= x11-wm
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= An e17 memory monitoring module
-BUILD_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
-RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+DIST_SUBDIR= e17
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnometarget pkgconfig
-USE_EFL= edje
+USE_EFL= edje libtool_hack modarch_hack
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff --git a/x11-wm/e17-module-mem/distinfo b/x11-wm/e17-module-mem/distinfo
index 185749c2a842..3c0787729a1f 100644
--- a/x11-wm/e17-module-mem/distinfo
+++ b/x11-wm/e17-module-mem/distinfo
@@ -1,3 +1,2 @@
-MD5 (mem-20080223.tar.bz2) = 835c499960837db2d2db98f6f3dfef37
-SHA256 (mem-20080223.tar.bz2) = c959441f8749f084e9b1967640566e94ba1c13e27a8dceab198fe8aa0726dadf
-SIZE (mem-20080223.tar.bz2) = 383825
+SHA256 (e17/mem-20101003.tar.bz2) = 6ccb5790130331065c7f0855ddc0c20a1a5da85f997f59cebf4dcaac924a296f
+SIZE (e17/mem-20101003.tar.bz2) = 532616
diff --git a/x11-wm/e17-module-mem/pkg-plist b/x11-wm/e17-module-mem/pkg-plist
index 592205b8e34d..860941b77184 100644
--- a/x11-wm/e17-module-mem/pkg-plist
+++ b/x11-wm/e17-module-mem/pkg-plist
@@ -1,27 +1,85 @@
-lib/enlightenment/modules/mem/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/mem/%%E17_ARCH%%/module.la
-lib/enlightenment/modules/mem/%%E17_ARCH%%/module.so
-lib/enlightenment/modules/mem/mem.edj
lib/enlightenment/modules/mem/e-module-mem.edj
lib/enlightenment/modules/mem/module.desktop
+lib/enlightenment/modules/mem/mem.edj
+lib/enlightenment/modules/mem/%%E17_ARCH%%/module.so
+%%NLS%%lib/enlightenment/modules/mem/locale/sk/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/tr/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/it/LC_MESSAGES/mem.mo
%%NLS%%lib/enlightenment/modules/mem/locale/eo/LC_MESSAGES/mem.mo
%%NLS%%lib/enlightenment/modules/mem/locale/fi/LC_MESSAGES/mem.mo
-%%NLS%%lib/enlightenment/modules/mem/locale/it/LC_MESSAGES/mem.mo
-%%NLS%%lib/enlightenment/modules/mem/locale/ja/LC_MESSAGES/mem.mo
-%%NLS%%lib/enlightenment/modules/mem/locale/ru/LC_MESSAGES/mem.mo
%%NLS%%lib/enlightenment/modules/mem/locale/sv/LC_MESSAGES/mem.mo
-%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/eo/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/eo
-%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/fi/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/fi
-%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/it/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/it
+%%NLS%%lib/enlightenment/modules/mem/locale/zh_CN/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/ru/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/de/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/ja/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/uk/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/el/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/fr/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/nl/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/cs/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/ar/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/he/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/lt/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/pl/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/es/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/hu/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/pt/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/pt_BR/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/nb/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/hr/LC_MESSAGES/mem.mo
+%%NLS%%lib/enlightenment/modules/mem/locale/bg/LC_MESSAGES/mem.mo
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/hr
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/nb/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/nb
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/pt_BR
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/pt
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/hu
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/pl
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/he/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/he
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/ar
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/nl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/nl
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/uk
%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/ja/LC_MESSAGES
%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/de
%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/ru/LC_MESSAGES
%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/ru
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/zh_CN
%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/sv/LC_MESSAGES
%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/tr
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/sk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/mem/locale/sk
%%NLS%%@dirrm lib/enlightenment/modules/mem/locale
@dirrm lib/enlightenment/modules/mem/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/mem
diff --git a/x11-wm/e17-module-mixer/Makefile b/x11-wm/e17-module-mixer/Makefile
index 7dafe975ccd5..a67912a280f2 100644
--- a/x11-wm/e17-module-mixer/Makefile
+++ b/x11-wm/e17-module-mixer/Makefile
@@ -22,9 +22,13 @@ RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnometarget pkgconfig
-USE_EFL= edje
+USE_EFL= edje libtool_hack modarch_hack
GNU_CONFIGURE= yes
+BROKEN= does not compile
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
PLIST_SUB+= NLS=""
diff --git a/x11-wm/e17-module-mixer/distinfo b/x11-wm/e17-module-mixer/distinfo
index 73b0c692169a..69f4bc7c9ee9 100644
--- a/x11-wm/e17-module-mixer/distinfo
+++ b/x11-wm/e17-module-mixer/distinfo
@@ -1,3 +1,2 @@
-MD5 (mixer-20080223.tar.bz2) = 578efbd7f92e64532cd1511d0158e8dd
SHA256 (mixer-20080223.tar.bz2) = 7a6b814bae322e8ac5988f532410ea092967d16f7b3742bd5f2cc01bd672d7ff
SIZE (mixer-20080223.tar.bz2) = 289275
diff --git a/x11-wm/e17-module-mixer/pkg-plist b/x11-wm/e17-module-mixer/pkg-plist
index 23d0ae78ed2d..a942f2a6dc7b 100644
--- a/x11-wm/e17-module-mixer/pkg-plist
+++ b/x11-wm/e17-module-mixer/pkg-plist
@@ -1,5 +1,3 @@
-lib/enlightenment/modules/mixer/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/mixer/%%E17_ARCH%%/module.la
lib/enlightenment/modules/mixer/%%E17_ARCH%%/module.so
lib/enlightenment/modules/mixer/mixer.edj
lib/enlightenment/modules/mixer/e-module-mixer.edj
diff --git a/x11-wm/e17-module-moon/Makefile b/x11-wm/e17-module-moon/Makefile
index 56b9e6e0a789..d97a50140342 100644
--- a/x11-wm/e17-module-moon/Makefile
+++ b/x11-wm/e17-module-moon/Makefile
@@ -6,25 +6,25 @@
#
PORTNAME= moon
-PORTVERSION= 20080223
-PORTREVISION= 5
+PORTVERSION= 20101003
PORTEPOCH= 1
-CATEGORIES= x11-wm
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= An e17 Moon Clock module
-BUILD_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
-RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+DIST_SUBDIR= e17
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnometarget pkgconfig
-USE_EFL= edje
+USE_EFL= edje libtool_hack modarch_hack
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff --git a/x11-wm/e17-module-moon/distinfo b/x11-wm/e17-module-moon/distinfo
index 985c259b8383..cb08da518d0c 100644
--- a/x11-wm/e17-module-moon/distinfo
+++ b/x11-wm/e17-module-moon/distinfo
@@ -1,3 +1,2 @@
-MD5 (moon-20080223.tar.bz2) = 77f4e625f597799c5bf160cbabfc1601
-SHA256 (moon-20080223.tar.bz2) = 0b8bd6bfe7147bbadddd642b35cb1d89a11d2bb5f1ad6f448185ebf948e85e62
-SIZE (moon-20080223.tar.bz2) = 648718
+SHA256 (e17/moon-20101003.tar.bz2) = 0eb8237564f3b819f898cb7f46e50917940ac8a6505af8dc6b4179d860426d94
+SIZE (e17/moon-20101003.tar.bz2) = 916374
diff --git a/x11-wm/e17-module-moon/pkg-plist b/x11-wm/e17-module-moon/pkg-plist
index fb85cb2abbce..e09dc5ffdf25 100644
--- a/x11-wm/e17-module-moon/pkg-plist
+++ b/x11-wm/e17-module-moon/pkg-plist
@@ -1,24 +1,88 @@
-lib/enlightenment/modules/moon/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/moon/%%E17_ARCH%%/module.la
-lib/enlightenment/modules/moon/%%E17_ARCH%%/module.so
-lib/enlightenment/modules/moon/module.desktop
lib/enlightenment/modules/moon/e-module-moon.edj
lib/enlightenment/modules/moon/moon.edj
-%%NLS%%lib/enlightenment/modules/moon/locale/eo/LC_MESSAGES/moon.mo
-%%NLS%%lib/enlightenment/modules/moon/locale/fi/LC_MESSAGES/moon.mo
+lib/enlightenment/modules/moon/module.desktop
+lib/enlightenment/modules/moon/%%E17_ARCH%%/module.so
%%NLS%%lib/enlightenment/modules/moon/locale/it/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/eo/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/tr/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/sk/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/pt_BR/LC_MESSAGES/moon.mo
%%NLS%%lib/enlightenment/modules/moon/locale/ja/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/de/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/uk/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/el/LC_MESSAGES/moon.mo
%%NLS%%lib/enlightenment/modules/moon/locale/sv/LC_MESSAGES/moon.mo
-%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/eo/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/eo
+%%NLS%%lib/enlightenment/modules/moon/locale/fi/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/pt/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/ru/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/cs/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/he/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/ar/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/km/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/lt/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/fr/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/zh_CN/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/nl/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/nb/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/hr/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/bg/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/es/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/pl/LC_MESSAGES/moon.mo
+%%NLS%%lib/enlightenment/modules/moon/locale/hu/LC_MESSAGES/moon.mo
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/hu
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/pl
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/hr
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/nb/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/nb
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/nl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/nl
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/zh_CN
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/km/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/km
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/ar
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/he/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/he
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/ru
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/pt
%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/fi/LC_MESSAGES
%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/fi
-%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/it/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/it
-%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/ja/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/ja
%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/sv/LC_MESSAGES
%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/uk
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/de
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/pt_BR
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/sk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/sk
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/tr
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/moon/locale/it
%%NLS%%@dirrm lib/enlightenment/modules/moon/locale
@dirrm lib/enlightenment/modules/moon/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/moon
diff --git a/x11-wm/e17-module-mpdule/Makefile b/x11-wm/e17-module-mpdule/Makefile
new file mode 100644
index 000000000000..8c6b9bf24839
--- /dev/null
+++ b/x11-wm/e17-module-mpdule/Makefile
@@ -0,0 +1,38 @@
+# New ports collection makefile for: e17-module-mpdule
+# Date created: 07 January 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= mpdule
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
+PKGNAMEPREFIX= e17-module-
+DISTNAME= ${PORTNAME}-${PORTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= An MPD module for e17
+
+LIB_DEPENDS= mpd.2:${PORTSDIR}/audio/libmpd
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+
+DIST_SUBDIR= e17
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget pkgconfig
+USE_EFL= edje libtool_hack modarch_hack
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-mpdule/distinfo b/x11-wm/e17-module-mpdule/distinfo
new file mode 100644
index 000000000000..10e837207dd5
--- /dev/null
+++ b/x11-wm/e17-module-mpdule/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/mpdule-20101003.tar.bz2) = 7a12f6638886eef4a934a33f6c308e7cc3c3569ded0c90859605166a5a65ea9e
+SIZE (e17/mpdule-20101003.tar.bz2) = 408216
diff --git a/x11-wm/e17-module-mpdule/pkg-descr b/x11-wm/e17-module-mpdule/pkg-descr
new file mode 100644
index 000000000000..3703b5802da0
--- /dev/null
+++ b/x11-wm/e17-module-mpdule/pkg-descr
@@ -0,0 +1,8 @@
+Simple MPD module.
+Load it into your shelf. Set it to "Able to be Resized", and
+resize to a good size for best experience.
+
+To see more than just the artist and title, edit the theme
+(see comments in the theme for more info).
+
+WWW: http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-mpdule/pkg-plist b/x11-wm/e17-module-mpdule/pkg-plist
new file mode 100644
index 000000000000..5fc7b5481ece
--- /dev/null
+++ b/x11-wm/e17-module-mpdule/pkg-plist
@@ -0,0 +1,8 @@
+lib/enlightenment/modules/mpdule/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/mpdule/mpdule.edj
+lib/enlightenment/modules/mpdule/module.desktop
+lib/enlightenment/modules/mpdule/e-module-mpdule.edj
+@dirrm lib/enlightenment/modules/mpdule/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/mpdule
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-net/Makefile b/x11-wm/e17-module-net/Makefile
new file mode 100644
index 000000000000..0715cfebf748
--- /dev/null
+++ b/x11-wm/e17-module-net/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: e17-module-net
+# Date created: 07 January 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= net
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
+PKGNAMEPREFIX= e17-module-
+DISTNAME= ${PORTNAME}-${PORTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= An e17 NIC monitoring module
+
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+
+DIST_SUBDIR= e17
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget pkgconfig
+USE_EFL= edje libtool_hack modarch_hack
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-net/distinfo b/x11-wm/e17-module-net/distinfo
new file mode 100644
index 000000000000..910f1b2a9066
--- /dev/null
+++ b/x11-wm/e17-module-net/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/net-20101003.tar.bz2) = e7525cd5fb73a2429ccd03f4a456a82d6619982305f2c2a4dcf1c1fd3b99a892
+SIZE (e17/net-20101003.tar.bz2) = 507031
diff --git a/x11-wm/e17-module-net/pkg-descr b/x11-wm/e17-module-net/pkg-descr
new file mode 100644
index 000000000000..79519445fb49
--- /dev/null
+++ b/x11-wm/e17-module-net/pkg-descr
@@ -0,0 +1,3 @@
+An e17 NIC montoring module.
+
+WWW: http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-net/pkg-plist b/x11-wm/e17-module-net/pkg-plist
new file mode 100644
index 000000000000..c590418eea87
--- /dev/null
+++ b/x11-wm/e17-module-net/pkg-plist
@@ -0,0 +1,90 @@
+lib/enlightenment/modules/net/module.desktop
+lib/enlightenment/modules/net/net.edj
+lib/enlightenment/modules/net/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/net/e-module-net.edj
+%%NLS%%lib/enlightenment/modules/net/locale/cs/LC_MESSAGES/net.mo
+%%NLS%%lib/enlightenment/modules/net/locale/lt/LC_MESSAGES/net.mo
+%%NLS%%lib/enlightenment/modules/net/locale/he/LC_MESSAGES/net.mo
+%%NLS%%lib/enlightenment/modules/net/locale/zh_CN/LC_MESSAGES/net.mo
+%%NLS%%lib/enlightenment/modules/net/locale/ar/LC_MESSAGES/net.mo
+%%NLS%%lib/enlightenment/modules/net/locale/fr/LC_MESSAGES/net.mo
+%%NLS%%lib/enlightenment/modules/net/locale/nl/LC_MESSAGES/net.mo
+%%NLS%%lib/enlightenment/modules/net/locale/nb/LC_MESSAGES/net.mo
+%%NLS%%lib/enlightenment/modules/net/locale/bg/LC_MESSAGES/net.mo
+%%NLS%%lib/enlightenment/modules/net/locale/hr/LC_MESSAGES/net.mo
+%%NLS%%lib/enlightenment/modules/net/locale/fo/LC_MESSAGES/net.mo
+%%NLS%%lib/enlightenment/modules/net/locale/hu/LC_MESSAGES/net.mo
+%%NLS%%lib/enlightenment/modules/net/locale/pl/LC_MESSAGES/net.mo
+%%NLS%%lib/enlightenment/modules/net/locale/es/LC_MESSAGES/net.mo
+%%NLS%%lib/enlightenment/modules/net/locale/it/LC_MESSAGES/net.mo
+%%NLS%%lib/enlightenment/modules/net/locale/pt/LC_MESSAGES/net.mo
+%%NLS%%lib/enlightenment/modules/net/locale/pt_BR/LC_MESSAGES/net.mo
+%%NLS%%lib/enlightenment/modules/net/locale/eo/LC_MESSAGES/net.mo
+%%NLS%%lib/enlightenment/modules/net/locale/tr/LC_MESSAGES/net.mo
+%%NLS%%lib/enlightenment/modules/net/locale/sk/LC_MESSAGES/net.mo
+%%NLS%%lib/enlightenment/modules/net/locale/uk/LC_MESSAGES/net.mo
+%%NLS%%lib/enlightenment/modules/net/locale/de/LC_MESSAGES/net.mo
+%%NLS%%lib/enlightenment/modules/net/locale/ja/LC_MESSAGES/net.mo
+%%NLS%%lib/enlightenment/modules/net/locale/el/LC_MESSAGES/net.mo
+%%NLS%%lib/enlightenment/modules/net/locale/fi/LC_MESSAGES/net.mo
+%%NLS%%lib/enlightenment/modules/net/locale/sv/LC_MESSAGES/net.mo
+%%NLS%%lib/enlightenment/modules/net/locale/ru/LC_MESSAGES/net.mo
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/ru
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/de
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/uk
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/sk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/sk
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/tr
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/pt_BR
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/pt
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/pl
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/hu
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/fo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/fo
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/hr
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/nb/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/nb
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/nl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/nl
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/ar
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/zh_CN
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/he/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/he
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/net/locale
+@dirrm lib/enlightenment/modules/net/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/net
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-notification/Makefile b/x11-wm/e17-module-notification/Makefile
new file mode 100644
index 000000000000..613eba76fc42
--- /dev/null
+++ b/x11-wm/e17-module-notification/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: e17-module-notification
+# Date created: 07 January 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= notification
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
+PKGNAMEPREFIX= e17-module-
+DISTNAME= ${PORTNAME}-${PORTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= An e17 notification daemon module
+
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+
+DIST_SUBDIR= e17
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget pkgconfig
+USE_EFL= edje libtool_hack modarch_hack
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-notification/distinfo b/x11-wm/e17-module-notification/distinfo
new file mode 100644
index 000000000000..9727edccf0d6
--- /dev/null
+++ b/x11-wm/e17-module-notification/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/notification-20101003.tar.bz2) = 718e22177fa02fd4205d9fe86566461c05abb89a91107f42bd340c4b369e4969
+SIZE (e17/notification-20101003.tar.bz2) = 558771
diff --git a/x11-wm/e17-module-notification/pkg-descr b/x11-wm/e17-module-notification/pkg-descr
new file mode 100644
index 000000000000..37cbf7bd4980
--- /dev/null
+++ b/x11-wm/e17-module-notification/pkg-descr
@@ -0,0 +1,3 @@
+This module provides a notification daemon for E17.
+
+WWW: http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-notification/pkg-plist b/x11-wm/e17-module-notification/pkg-plist
new file mode 100644
index 000000000000..5f603aca8f5a
--- /dev/null
+++ b/x11-wm/e17-module-notification/pkg-plist
@@ -0,0 +1,89 @@
+lib/enlightenment/modules/notification/module.desktop
+lib/enlightenment/modules/notification/e-module-notification.edj
+lib/enlightenment/modules/notification/%%E17_ARCH%%/module.so
+%%NLS%%lib/enlightenment/modules/notification/locale/it/LC_MESSAGES/notification.mo
+%%NLS%%lib/enlightenment/modules/notification/locale/en_GB/LC_MESSAGES/notification.mo
+%%NLS%%lib/enlightenment/modules/notification/locale/eo/LC_MESSAGES/notification.mo
+%%NLS%%lib/enlightenment/modules/notification/locale/tr/LC_MESSAGES/notification.mo
+%%NLS%%lib/enlightenment/modules/notification/locale/sk/LC_MESSAGES/notification.mo
+%%NLS%%lib/enlightenment/modules/notification/locale/ja/LC_MESSAGES/notification.mo
+%%NLS%%lib/enlightenment/modules/notification/locale/de/LC_MESSAGES/notification.mo
+%%NLS%%lib/enlightenment/modules/notification/locale/uk/LC_MESSAGES/notification.mo
+%%NLS%%lib/enlightenment/modules/notification/locale/el/LC_MESSAGES/notification.mo
+%%NLS%%lib/enlightenment/modules/notification/locale/sv/LC_MESSAGES/notification.mo
+%%NLS%%lib/enlightenment/modules/notification/locale/fi/LC_MESSAGES/notification.mo
+%%NLS%%lib/enlightenment/modules/notification/locale/pt/LC_MESSAGES/notification.mo
+%%NLS%%lib/enlightenment/modules/notification/locale/pt_BR/LC_MESSAGES/notification.mo
+%%NLS%%lib/enlightenment/modules/notification/locale/ru/LC_MESSAGES/notification.mo
+%%NLS%%lib/enlightenment/modules/notification/locale/cs/LC_MESSAGES/notification.mo
+%%NLS%%lib/enlightenment/modules/notification/locale/he/LC_MESSAGES/notification.mo
+%%NLS%%lib/enlightenment/modules/notification/locale/ar/LC_MESSAGES/notification.mo
+%%NLS%%lib/enlightenment/modules/notification/locale/lt/LC_MESSAGES/notification.mo
+%%NLS%%lib/enlightenment/modules/notification/locale/fr/LC_MESSAGES/notification.mo
+%%NLS%%lib/enlightenment/modules/notification/locale/nl/LC_MESSAGES/notification.mo
+%%NLS%%lib/enlightenment/modules/notification/locale/hr/LC_MESSAGES/notification.mo
+%%NLS%%lib/enlightenment/modules/notification/locale/bg/LC_MESSAGES/notification.mo
+%%NLS%%lib/enlightenment/modules/notification/locale/es/LC_MESSAGES/notification.mo
+%%NLS%%lib/enlightenment/modules/notification/locale/pl/LC_MESSAGES/notification.mo
+%%NLS%%lib/enlightenment/modules/notification/locale/fo/LC_MESSAGES/notification.mo
+%%NLS%%lib/enlightenment/modules/notification/locale/hu/LC_MESSAGES/notification.mo
+%%NLS%%lib/enlightenment/modules/notification/locale/zh_CN/LC_MESSAGES/notification.mo
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/zh_CN
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/hu
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/fo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/fo
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/pl
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/hr
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/nl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/nl
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/ar
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/he/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/he
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/ru
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/pt_BR
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/pt
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/uk
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/de
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/sk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/sk
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/tr
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/en_GB/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/en_GB
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/notification/locale
+@dirrm lib/enlightenment/modules/notification/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/notification
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-penguins/Makefile b/x11-wm/e17-module-penguins/Makefile
new file mode 100644
index 000000000000..7b934aa0b7db
--- /dev/null
+++ b/x11-wm/e17-module-penguins/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: e17-module-penguins
+# Date created: 07 January 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= penguins
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
+PKGNAMEPREFIX= e17-module-
+DISTNAME= ${PORTNAME}-${PORTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= An e17 module that displays fancy penguins walking around your desktop
+
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+
+DIST_SUBDIR= e17
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget pkgconfig
+USE_EFL= edje libtool_hack modarch_hack
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-penguins/distinfo b/x11-wm/e17-module-penguins/distinfo
new file mode 100644
index 000000000000..c831b42c73d6
--- /dev/null
+++ b/x11-wm/e17-module-penguins/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/penguins-20101003.tar.bz2) = ff306a12d0b4ba0b0a858adfcf69e3c77e2a3f0696df435e6ba596eabab004a2
+SIZE (e17/penguins-20101003.tar.bz2) = 741520
diff --git a/x11-wm/e17-module-penguins/pkg-descr b/x11-wm/e17-module-penguins/pkg-descr
new file mode 100644
index 000000000000..ba3d6cc4c958
--- /dev/null
+++ b/x11-wm/e17-module-penguins/pkg-descr
@@ -0,0 +1,3 @@
+An e17 module to display fancy penguins walking around your desktop.
+
+WWW: http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-penguins/pkg-plist b/x11-wm/e17-module-penguins/pkg-plist
new file mode 100644
index 000000000000..16192099a52f
--- /dev/null
+++ b/x11-wm/e17-module-penguins/pkg-plist
@@ -0,0 +1,86 @@
+lib/enlightenment/modules/penguins/themes/lemmings.edj
+lib/enlightenment/modules/penguins/themes/default.edj
+lib/enlightenment/modules/penguins/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/penguins/module.desktop
+lib/enlightenment/modules/penguins/e-module-penguins.edj
+%%NLS%%lib/enlightenment/modules/penguins/locale/hr/LC_MESSAGES/penguins.mo
+%%NLS%%lib/enlightenment/modules/penguins/locale/bg/LC_MESSAGES/penguins.mo
+%%NLS%%lib/enlightenment/modules/penguins/locale/pl/LC_MESSAGES/penguins.mo
+%%NLS%%lib/enlightenment/modules/penguins/locale/es/LC_MESSAGES/penguins.mo
+%%NLS%%lib/enlightenment/modules/penguins/locale/hu/LC_MESSAGES/penguins.mo
+%%NLS%%lib/enlightenment/modules/penguins/locale/zh_CN/LC_MESSAGES/penguins.mo
+%%NLS%%lib/enlightenment/modules/penguins/locale/ar/LC_MESSAGES/penguins.mo
+%%NLS%%lib/enlightenment/modules/penguins/locale/he/LC_MESSAGES/penguins.mo
+%%NLS%%lib/enlightenment/modules/penguins/locale/lt/LC_MESSAGES/penguins.mo
+%%NLS%%lib/enlightenment/modules/penguins/locale/cs/LC_MESSAGES/penguins.mo
+%%NLS%%lib/enlightenment/modules/penguins/locale/nl/LC_MESSAGES/penguins.mo
+%%NLS%%lib/enlightenment/modules/penguins/locale/fr/LC_MESSAGES/penguins.mo
+%%NLS%%lib/enlightenment/modules/penguins/locale/el/LC_MESSAGES/penguins.mo
+%%NLS%%lib/enlightenment/modules/penguins/locale/de/LC_MESSAGES/penguins.mo
+%%NLS%%lib/enlightenment/modules/penguins/locale/ja/LC_MESSAGES/penguins.mo
+%%NLS%%lib/enlightenment/modules/penguins/locale/uk/LC_MESSAGES/penguins.mo
+%%NLS%%lib/enlightenment/modules/penguins/locale/ru/LC_MESSAGES/penguins.mo
+%%NLS%%lib/enlightenment/modules/penguins/locale/pt_BR/LC_MESSAGES/penguins.mo
+%%NLS%%lib/enlightenment/modules/penguins/locale/fi/LC_MESSAGES/penguins.mo
+%%NLS%%lib/enlightenment/modules/penguins/locale/sv/LC_MESSAGES/penguins.mo
+%%NLS%%lib/enlightenment/modules/penguins/locale/pt/LC_MESSAGES/penguins.mo
+%%NLS%%lib/enlightenment/modules/penguins/locale/eo/LC_MESSAGES/penguins.mo
+%%NLS%%lib/enlightenment/modules/penguins/locale/it/LC_MESSAGES/penguins.mo
+%%NLS%%lib/enlightenment/modules/penguins/locale/sk/LC_MESSAGES/penguins.mo
+%%NLS%%lib/enlightenment/modules/penguins/locale/tr/LC_MESSAGES/penguins.mo
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/tr
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/sk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/sk
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/pt
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/pt_BR
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/ru
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/uk
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/de
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/nl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/nl
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/he/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/he
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/ar
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/zh_CN
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/hu
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/pl
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale/hr
+%%NLS%%@dirrm lib/enlightenment/modules/penguins/locale
+@dirrm lib/enlightenment/modules/penguins/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/penguins/themes
+@dirrm lib/enlightenment/modules/penguins
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-photo/Makefile b/x11-wm/e17-module-photo/Makefile
new file mode 100644
index 000000000000..d51d43709225
--- /dev/null
+++ b/x11-wm/e17-module-photo/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: e17-module-photo
+# Date created: 07 January 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= photo
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
+PKGNAMEPREFIX= e17-module-
+DISTNAME= ${PORTNAME}-${PORTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= An e17 photo slideshow module
+
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+
+DIST_SUBDIR= e17
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget pkgconfig
+USE_EFL= edje libtool_hack modarch_hack
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-photo/distinfo b/x11-wm/e17-module-photo/distinfo
new file mode 100644
index 000000000000..119362f74ae7
--- /dev/null
+++ b/x11-wm/e17-module-photo/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/photo-20101003.tar.bz2) = 808faee8de7999c0ce7c1e253ef7231b119128e7aacbb6767cebb927132a576e
+SIZE (e17/photo-20101003.tar.bz2) = 661298
diff --git a/x11-wm/e17-module-photo/pkg-descr b/x11-wm/e17-module-photo/pkg-descr
new file mode 100644
index 000000000000..80ebf0031dfc
--- /dev/null
+++ b/x11-wm/e17-module-photo/pkg-descr
@@ -0,0 +1,3 @@
+An e17 module to view photos or a mini slideshow within the gadget.
+
+WWW: http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-photo/pkg-plist b/x11-wm/e17-module-photo/pkg-plist
new file mode 100644
index 000000000000..76a27cbfbf63
--- /dev/null
+++ b/x11-wm/e17-module-photo/pkg-plist
@@ -0,0 +1,68 @@
+lib/enlightenment/modules/photo/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/photo/photo.edj
+lib/enlightenment/modules/photo/module.desktop
+lib/enlightenment/modules/photo/e-module-photo.edj
+lib/enlightenment/modules/photo/images/photo_logo.png
+%%NLS%%lib/enlightenment/modules/photo/locale/hu/LC_MESSAGES/photo.mo
+%%NLS%%lib/enlightenment/modules/photo/locale/es/LC_MESSAGES/photo.mo
+%%NLS%%lib/enlightenment/modules/photo/locale/pl/LC_MESSAGES/photo.mo
+%%NLS%%lib/enlightenment/modules/photo/locale/bg/LC_MESSAGES/photo.mo
+%%NLS%%lib/enlightenment/modules/photo/locale/hr/LC_MESSAGES/photo.mo
+%%NLS%%lib/enlightenment/modules/photo/locale/fr/LC_MESSAGES/photo.mo
+%%NLS%%lib/enlightenment/modules/photo/locale/lt/LC_MESSAGES/photo.mo
+%%NLS%%lib/enlightenment/modules/photo/locale/he/LC_MESSAGES/photo.mo
+%%NLS%%lib/enlightenment/modules/photo/locale/cs/LC_MESSAGES/photo.mo
+%%NLS%%lib/enlightenment/modules/photo/locale/pt/LC_MESSAGES/photo.mo
+%%NLS%%lib/enlightenment/modules/photo/locale/sv/LC_MESSAGES/photo.mo
+%%NLS%%lib/enlightenment/modules/photo/locale/fi/LC_MESSAGES/photo.mo
+%%NLS%%lib/enlightenment/modules/photo/locale/el/LC_MESSAGES/photo.mo
+%%NLS%%lib/enlightenment/modules/photo/locale/uk/LC_MESSAGES/photo.mo
+%%NLS%%lib/enlightenment/modules/photo/locale/de/LC_MESSAGES/photo.mo
+%%NLS%%lib/enlightenment/modules/photo/locale/tr/LC_MESSAGES/photo.mo
+%%NLS%%lib/enlightenment/modules/photo/locale/eo/LC_MESSAGES/photo.mo
+%%NLS%%lib/enlightenment/modules/photo/locale/it/LC_MESSAGES/photo.mo
+%%NLS%%lib/enlightenment/modules/photo/locale/zh_CN/LC_MESSAGES/photo.mo
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/zh_CN
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/tr
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/de
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/uk
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/pt
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/he/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/he
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/hr
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/pl
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale/hu
+%%NLS%%@dirrm lib/enlightenment/modules/photo/locale
+@dirrm lib/enlightenment/modules/photo/images
+@dirrm lib/enlightenment/modules/photo/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/photo
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-places/Makefile b/x11-wm/e17-module-places/Makefile
new file mode 100644
index 000000000000..98c2249c4b30
--- /dev/null
+++ b/x11-wm/e17-module-places/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: e17-module-places
+# Date created: 19 June 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= places
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
+PKGNAMEPREFIX= e17-module-
+DISTNAME= ${PORTNAME}-${PORTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= An e17 module to manage disk volumes
+
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+
+DIST_SUBDIR= e17
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget pkgconfig
+USE_EFL= edje libtool_hack modarch_hack
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-places/distinfo b/x11-wm/e17-module-places/distinfo
new file mode 100644
index 000000000000..b31943f63c21
--- /dev/null
+++ b/x11-wm/e17-module-places/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/places-20101003.tar.bz2) = 0d15e2c71f7610bced86496702c3936b11a8912afc3dc4b3ca64c5dd5854e673
+SIZE (e17/places-20101003.tar.bz2) = 532363
diff --git a/x11-wm/e17-module-places/pkg-descr b/x11-wm/e17-module-places/pkg-descr
new file mode 100644
index 000000000000..6da6ab3c1ea7
--- /dev/null
+++ b/x11-wm/e17-module-places/pkg-descr
@@ -0,0 +1,3 @@
+This module manages the volumes devices attached to the system.
+
+WWW: http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-places/pkg-plist b/x11-wm/e17-module-places/pkg-plist
new file mode 100644
index 000000000000..8b983db2bf28
--- /dev/null
+++ b/x11-wm/e17-module-places/pkg-plist
@@ -0,0 +1,62 @@
+lib/enlightenment/modules/places/module.desktop
+lib/enlightenment/modules/places/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/places/e-module-places.edj
+%%NLS%%lib/enlightenment/modules/places/locale/zh_CN/LC_MESSAGES/places.mo
+%%NLS%%lib/enlightenment/modules/places/locale/ru/LC_MESSAGES/places.mo
+%%NLS%%lib/enlightenment/modules/places/locale/el/LC_MESSAGES/places.mo
+%%NLS%%lib/enlightenment/modules/places/locale/uk/LC_MESSAGES/places.mo
+%%NLS%%lib/enlightenment/modules/places/locale/de/LC_MESSAGES/places.mo
+%%NLS%%lib/enlightenment/modules/places/locale/tr/LC_MESSAGES/places.mo
+%%NLS%%lib/enlightenment/modules/places/locale/eo/LC_MESSAGES/places.mo
+%%NLS%%lib/enlightenment/modules/places/locale/it/LC_MESSAGES/places.mo
+%%NLS%%lib/enlightenment/modules/places/locale/ca/LC_MESSAGES/places.mo
+%%NLS%%lib/enlightenment/modules/places/locale/hu/LC_MESSAGES/places.mo
+%%NLS%%lib/enlightenment/modules/places/locale/pl/LC_MESSAGES/places.mo
+%%NLS%%lib/enlightenment/modules/places/locale/pt/LC_MESSAGES/places.mo
+%%NLS%%lib/enlightenment/modules/places/locale/pt_BR/LC_MESSAGES/places.mo
+%%NLS%%lib/enlightenment/modules/places/locale/es/LC_MESSAGES/places.mo
+%%NLS%%lib/enlightenment/modules/places/locale/hr/LC_MESSAGES/places.mo
+%%NLS%%lib/enlightenment/modules/places/locale/fr/LC_MESSAGES/places.mo
+%%NLS%%lib/enlightenment/modules/places/locale/lt/LC_MESSAGES/places.mo
+%%NLS%%lib/enlightenment/modules/places/locale/cs/LC_MESSAGES/places.mo
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/hr
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/pt
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/pt_BR
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/pl
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/hu
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/ca/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/ca
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/tr
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/de
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/uk
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/ru
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale/zh_CN
+%%NLS%%@dirrm lib/enlightenment/modules/places/locale
+@dirrm lib/enlightenment/modules/places/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/places
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-quickaccess/Makefile b/x11-wm/e17-module-quickaccess/Makefile
new file mode 100644
index 000000000000..70ec0068cd21
--- /dev/null
+++ b/x11-wm/e17-module-quickaccess/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: e17-module-quickaccess
+# Date created: 19 June 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= quickaccess
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
+PKGNAMEPREFIX= e17-module-
+DISTNAME= ${PORTNAME}-${PORTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= An e17 module to provide quick access to applications
+
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+
+DIST_SUBDIR= e17
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget pkgconfig
+USE_EFL= edje libtool_hack modarch_hack
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-quickaccess/distinfo b/x11-wm/e17-module-quickaccess/distinfo
new file mode 100644
index 000000000000..40c31d5b3b78
--- /dev/null
+++ b/x11-wm/e17-module-quickaccess/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/quickaccess-20101003.tar.bz2) = 812ec7e1453695e87fa190b1f1902de227cce9972ca2f8c68174ccc1f1bff4be
+SIZE (e17/quickaccess-20101003.tar.bz2) = 542700
diff --git a/x11-wm/e17-module-quickaccess/pkg-descr b/x11-wm/e17-module-quickaccess/pkg-descr
new file mode 100644
index 000000000000..e9c761eab786
--- /dev/null
+++ b/x11-wm/e17-module-quickaccess/pkg-descr
@@ -0,0 +1,12 @@
+This module aims to provide quick access to some applications given
+its name/class pair.
+
+It is based on the widely known "yakuake" (http://yakuake.uv.ro/),
+that drops konsole (kde's terminal emulator) instances from top just
+like Quake did.
+
+Unlike yakuake, this module should be extensible and fit any
+application, like urxvt to provide same functionality, but could also
+fit emacs/gvim, firefox or similar.
+
+WWW: http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-quickaccess/pkg-plist b/x11-wm/e17-module-quickaccess/pkg-plist
new file mode 100644
index 000000000000..8200d2dc0330
--- /dev/null
+++ b/x11-wm/e17-module-quickaccess/pkg-plist
@@ -0,0 +1,7 @@
+lib/enlightenment/modules/quickaccess/module.desktop
+lib/enlightenment/modules/quickaccess/e-module-quickaccess.edj
+lib/enlightenment/modules/quickaccess/%%E17_ARCH%%/module.so
+@dirrm lib/enlightenment/modules/quickaccess/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/quickaccess
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-rain/Makefile b/x11-wm/e17-module-rain/Makefile
index 0a2f0566223b..5999a1afecc2 100644
--- a/x11-wm/e17-module-rain/Makefile
+++ b/x11-wm/e17-module-rain/Makefile
@@ -6,24 +6,24 @@
#
PORTNAME= rain
-PORTVERSION= 20080223
-PORTREVISION= 5
-CATEGORIES= x11-wm
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= An e17 module which draws raindrops on your screen
-BUILD_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
-RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+DIST_SUBDIR= e17
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnometarget pkgconfig
-USE_EFL= edje
+USE_EFL= edje libtool_hack modarch_hack
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff --git a/x11-wm/e17-module-rain/distinfo b/x11-wm/e17-module-rain/distinfo
index 56101a06a01f..fa073dd5e766 100644
--- a/x11-wm/e17-module-rain/distinfo
+++ b/x11-wm/e17-module-rain/distinfo
@@ -1,3 +1,2 @@
-MD5 (rain-20080223.tar.bz2) = 639e63c2b425d83b11ba0bc4860a954f
-SHA256 (rain-20080223.tar.bz2) = 8723b2b56fce6c24db8d4586ad4d00104db26690a40addec2a518855576264b7
-SIZE (rain-20080223.tar.bz2) = 302065
+SHA256 (e17/rain-20101003.tar.bz2) = b99e7f40836cabee425c146b4657c458e3b27f792ce99adb97d7fc1aeea60f91
+SIZE (e17/rain-20101003.tar.bz2) = 551395
diff --git a/x11-wm/e17-module-rain/pkg-plist b/x11-wm/e17-module-rain/pkg-plist
index cd9fcbdd71fd..a4e0e3c45967 100644
--- a/x11-wm/e17-module-rain/pkg-plist
+++ b/x11-wm/e17-module-rain/pkg-plist
@@ -1,30 +1,82 @@
lib/enlightenment/modules/rain/cloud.png
-lib/enlightenment/modules/rain/drop-l.png
-lib/enlightenment/modules/rain/drop-m.png
lib/enlightenment/modules/rain/drop-s.png
-lib/enlightenment/modules/rain/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/rain/%%E17_ARCH%%/module.la
-lib/enlightenment/modules/rain/%%E17_ARCH%%/module.so
lib/enlightenment/modules/rain/module.desktop
+lib/enlightenment/modules/rain/drop-l.png
+lib/enlightenment/modules/rain/%%E17_ARCH%%/module.so
lib/enlightenment/modules/rain/e-module-rain.edj
-%%NLS%%lib/enlightenment/modules/rain/locale/eo/LC_MESSAGES/rain.mo
-%%NLS%%lib/enlightenment/modules/rain/locale/fi/LC_MESSAGES/rain.mo
+lib/enlightenment/modules/rain/drop-m.png
+%%NLS%%lib/enlightenment/modules/rain/locale/hr/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/bg/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/pl/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/pt/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/es/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/hu/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/cs/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/ar/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/he/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/lt/LC_MESSAGES/rain.mo
%%NLS%%lib/enlightenment/modules/rain/locale/fr/LC_MESSAGES/rain.mo
-%%NLS%%lib/enlightenment/modules/rain/locale/it/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/nl/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/de/LC_MESSAGES/rain.mo
%%NLS%%lib/enlightenment/modules/rain/locale/ja/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/uk/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/el/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/fi/LC_MESSAGES/rain.mo
%%NLS%%lib/enlightenment/modules/rain/locale/sv/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/ru/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/it/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/eo/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/sk/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/zh_CN/LC_MESSAGES/rain.mo
+%%NLS%%lib/enlightenment/modules/rain/locale/tr/LC_MESSAGES/rain.mo
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/tr
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/zh_CN
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/sk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/sk
%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/eo/LC_MESSAGES
%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/eo
-%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/fi/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/fi
-%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/fr/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/fr
%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/it/LC_MESSAGES
%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/it
-%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/ja/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/ru
%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/sv/LC_MESSAGES
%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/uk
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/de
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/nl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/nl
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/he/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/he
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/ar
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/hu
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/pl
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/pt
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/rain/locale/hr
%%NLS%%@dirrm lib/enlightenment/modules/rain/locale
@dirrm lib/enlightenment/modules/rain/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/rain
diff --git a/x11-wm/e17-module-screenshot/Makefile b/x11-wm/e17-module-screenshot/Makefile
index 2acf966e96f1..66c264967690 100644
--- a/x11-wm/e17-module-screenshot/Makefile
+++ b/x11-wm/e17-module-screenshot/Makefile
@@ -6,25 +6,33 @@
#
PORTNAME= screenshot
-PORTVERSION= 20080223
-PORTREVISION= 4
-CATEGORIES= x11-wm
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= An e17 module which allows users to take screenshots
-BUILD_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment \
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment \
emprint:${PORTSDIR}/x11/emprint
-RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment \
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment \
emprint:${PORTSDIR}/x11/emprint
+DIST_SUBDIR= e17
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnometarget pkgconfig
-USE_EFL= edje
+USE_EFL= edje libtool_hack modarch_hack
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-screenshot/distinfo b/x11-wm/e17-module-screenshot/distinfo
index 458f212e6f78..54987e52c1db 100644
--- a/x11-wm/e17-module-screenshot/distinfo
+++ b/x11-wm/e17-module-screenshot/distinfo
@@ -1,3 +1,2 @@
-MD5 (screenshot-20080223.tar.bz2) = 21cc85f9743230fe807e634f493697c9
-SHA256 (screenshot-20080223.tar.bz2) = eb1cc3372fe9548bd438f5cc4e4863b84849481c49e4a6186e9df56aae2bddc9
-SIZE (screenshot-20080223.tar.bz2) = 247699
+SHA256 (e17/screenshot-20101003.tar.bz2) = 3796378c166a705289ee4d9977cff7d3572cdd2629f871c6ef57541bb3ed9daf
+SIZE (e17/screenshot-20101003.tar.bz2) = 502021
diff --git a/x11-wm/e17-module-screenshot/pkg-plist b/x11-wm/e17-module-screenshot/pkg-plist
index 3b1727746708..c4d9fd929731 100644
--- a/x11-wm/e17-module-screenshot/pkg-plist
+++ b/x11-wm/e17-module-screenshot/pkg-plist
@@ -1,8 +1,40 @@
-lib/enlightenment/modules/screenshot/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/screenshot/%%E17_ARCH%%/module.la
-lib/enlightenment/modules/screenshot/%%E17_ARCH%%/module.so
lib/enlightenment/modules/screenshot/module.desktop
lib/enlightenment/modules/screenshot/e-module-screenshot.edj
+lib/enlightenment/modules/screenshot/%%E17_ARCH%%/module.so
+%%NLS%%lib/enlightenment/modules/screenshot/locale/fr/LC_MESSAGES/screenshot.mo
+%%NLS%%lib/enlightenment/modules/screenshot/locale/cs/LC_MESSAGES/screenshot.mo
+%%NLS%%lib/enlightenment/modules/screenshot/locale/lt/LC_MESSAGES/screenshot.mo
+%%NLS%%lib/enlightenment/modules/screenshot/locale/es/LC_MESSAGES/screenshot.mo
+%%NLS%%lib/enlightenment/modules/screenshot/locale/hu/LC_MESSAGES/screenshot.mo
+%%NLS%%lib/enlightenment/modules/screenshot/locale/hr/LC_MESSAGES/screenshot.mo
+%%NLS%%lib/enlightenment/modules/screenshot/locale/zh_CN/LC_MESSAGES/screenshot.mo
+%%NLS%%lib/enlightenment/modules/screenshot/locale/it/LC_MESSAGES/screenshot.mo
+%%NLS%%lib/enlightenment/modules/screenshot/locale/eo/LC_MESSAGES/screenshot.mo
+%%NLS%%lib/enlightenment/modules/screenshot/locale/ru/LC_MESSAGES/screenshot.mo
+%%NLS%%lib/enlightenment/modules/screenshot/locale/uk/LC_MESSAGES/screenshot.mo
+%%NLS%%@dirrm lib/enlightenment/modules/screenshot/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/screenshot/locale/uk
+%%NLS%%@dirrm lib/enlightenment/modules/screenshot/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/screenshot/locale/ru
+%%NLS%%@dirrm lib/enlightenment/modules/screenshot/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/screenshot/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/screenshot/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/screenshot/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/screenshot/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/screenshot/locale/zh_CN
+%%NLS%%@dirrm lib/enlightenment/modules/screenshot/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/screenshot/locale/hr
+%%NLS%%@dirrm lib/enlightenment/modules/screenshot/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/screenshot/locale/hu
+%%NLS%%@dirrm lib/enlightenment/modules/screenshot/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/screenshot/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/screenshot/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/screenshot/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/screenshot/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/screenshot/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/screenshot/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/screenshot/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/screenshot/locale
@dirrm lib/enlightenment/modules/screenshot/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/screenshot
@dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-slideshow/Makefile b/x11-wm/e17-module-slideshow/Makefile
index 8c829c0c97a1..f56e50afe684 100644
--- a/x11-wm/e17-module-slideshow/Makefile
+++ b/x11-wm/e17-module-slideshow/Makefile
@@ -6,24 +6,24 @@
#
PORTNAME= slideshow
-PORTVERSION= 20080223
-PORTREVISION= 5
-CATEGORIES= x11-wm
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= An e17 module which cycles desktop backgrounds
-BUILD_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
-RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+DIST_SUBDIR= e17
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnometarget pkgconfig
-USE_EFL= edje
+USE_EFL= edje libtool_hack modarch_hack
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff --git a/x11-wm/e17-module-slideshow/distinfo b/x11-wm/e17-module-slideshow/distinfo
index ce8938b85acc..8e43b2e7123e 100644
--- a/x11-wm/e17-module-slideshow/distinfo
+++ b/x11-wm/e17-module-slideshow/distinfo
@@ -1,3 +1,2 @@
-MD5 (slideshow-20080223.tar.bz2) = 451ba84f1f04ea04d23b5c9e313470c9
-SHA256 (slideshow-20080223.tar.bz2) = ddc5e1298512fb219c6ee7403d45b0e9be540f44a9f4b4cb49c106ff68e89e63
-SIZE (slideshow-20080223.tar.bz2) = 239915
+SHA256 (e17/slideshow-20101003.tar.bz2) = bd4ef13b062175403575d9a11d07eac898d9100195d5c63b3d7dcde23cc949ff
+SIZE (e17/slideshow-20101003.tar.bz2) = 493223
diff --git a/x11-wm/e17-module-slideshow/pkg-plist b/x11-wm/e17-module-slideshow/pkg-plist
index 60d0b7ec2b4e..a7ee170b9aaf 100644
--- a/x11-wm/e17-module-slideshow/pkg-plist
+++ b/x11-wm/e17-module-slideshow/pkg-plist
@@ -1,27 +1,85 @@
-lib/enlightenment/modules/slideshow/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/slideshow/%%E17_ARCH%%/module.la
lib/enlightenment/modules/slideshow/%%E17_ARCH%%/module.so
lib/enlightenment/modules/slideshow/module.desktop
lib/enlightenment/modules/slideshow/e-module-slideshow.edj
lib/enlightenment/modules/slideshow/slideshow.edj
-%%NLS%%lib/enlightenment/modules/slideshow/locale/eo/LC_MESSAGES/slideshow.mo
-%%NLS%%lib/enlightenment/modules/slideshow/locale/fi/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/hu/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/pl/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/es/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/bg/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/hr/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/nl/LC_MESSAGES/slideshow.mo
%%NLS%%lib/enlightenment/modules/slideshow/locale/fr/LC_MESSAGES/slideshow.mo
-%%NLS%%lib/enlightenment/modules/slideshow/locale/it/LC_MESSAGES/slideshow.mo
-%%NLS%%lib/enlightenment/modules/slideshow/locale/ja/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/pt_BR/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/lt/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/he/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/ar/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/cs/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/ru/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/id/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/pt/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/fi/LC_MESSAGES/slideshow.mo
%%NLS%%lib/enlightenment/modules/slideshow/locale/sv/LC_MESSAGES/slideshow.mo
-%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/eo/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/eo
-%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/fi/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/fi
-%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/fr/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/fr
+%%NLS%%lib/enlightenment/modules/slideshow/locale/el/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/uk/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/de/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/ja/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/zh_CN/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/tr/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/sk/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/eo/LC_MESSAGES/slideshow.mo
+%%NLS%%lib/enlightenment/modules/slideshow/locale/it/LC_MESSAGES/slideshow.mo
%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/it/LC_MESSAGES
%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/sk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/sk
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/tr
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/zh_CN
%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/ja/LC_MESSAGES
%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/de
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/uk
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/el
%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/sv/LC_MESSAGES
%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/pt
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/id/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/id
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/ru
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/ar
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/he/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/he
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/pt_BR
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/nl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/nl
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/hr
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/pl
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale/hu
%%NLS%%@dirrm lib/enlightenment/modules/slideshow/locale
@dirrm lib/enlightenment/modules/slideshow/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/slideshow
diff --git a/x11-wm/e17-module-snow/Makefile b/x11-wm/e17-module-snow/Makefile
index 3bf53bf3548a..0ef21a844995 100644
--- a/x11-wm/e17-module-snow/Makefile
+++ b/x11-wm/e17-module-snow/Makefile
@@ -6,24 +6,24 @@
#
PORTNAME= snow
-PORTVERSION= 20080223
-PORTREVISION= 5
-CATEGORIES= x11-wm
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= An e17 module which draws snowflakes on your screen
-BUILD_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
-RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+DIST_SUBDIR= e17
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnometarget pkgconfig
-USE_EFL= edje
+USE_EFL= edje libtool_hack modarch_hack
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff --git a/x11-wm/e17-module-snow/distinfo b/x11-wm/e17-module-snow/distinfo
index 70f2f1b77341..8f3aa71d25bf 100644
--- a/x11-wm/e17-module-snow/distinfo
+++ b/x11-wm/e17-module-snow/distinfo
@@ -1,3 +1,2 @@
-MD5 (snow-20080223.tar.bz2) = 34c2e67e72f3c5b77813e01ec0e6102d
-SHA256 (snow-20080223.tar.bz2) = 869ba38e49a929cab5dd31a1c3b0e7e66676e1aa41596f2088c9be8ef223013d
-SIZE (snow-20080223.tar.bz2) = 234493
+SHA256 (e17/snow-20101003.tar.bz2) = 47f1e3621996d2ce55cf6fdf6dc05377cd9cf207c4ee19986f7df184abbd5096
+SIZE (e17/snow-20101003.tar.bz2) = 491538
diff --git a/x11-wm/e17-module-snow/pkg-plist b/x11-wm/e17-module-snow/pkg-plist
index 2f328ce1cb46..942184b8a0a0 100644
--- a/x11-wm/e17-module-snow/pkg-plist
+++ b/x11-wm/e17-module-snow/pkg-plist
@@ -1,30 +1,92 @@
-lib/enlightenment/modules/snow/flake-l.png
-lib/enlightenment/modules/snow/flake-m.png
-lib/enlightenment/modules/snow/flake-s.png
-lib/enlightenment/modules/snow/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/snow/%%E17_ARCH%%/module.la
lib/enlightenment/modules/snow/%%E17_ARCH%%/module.so
-lib/enlightenment/modules/snow/module.desktop
+lib/enlightenment/modules/snow/flake-s.png
+lib/enlightenment/modules/snow/flake-l.png
lib/enlightenment/modules/snow/e-module-snow.edj
lib/enlightenment/modules/snow/tree.png
+lib/enlightenment/modules/snow/module.desktop
+lib/enlightenment/modules/snow/flake-m.png
+lib/enlightenment/modules/snow/module_icon.png
+%%NLS%%lib/enlightenment/modules/snow/locale/tr/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/sk/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/da/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/it/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/zh_CN/LC_MESSAGES/snow.mo
%%NLS%%lib/enlightenment/modules/snow/locale/eo/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/sv/LC_MESSAGES/snow.mo
%%NLS%%lib/enlightenment/modules/snow/locale/fi/LC_MESSAGES/snow.mo
-%%NLS%%lib/enlightenment/modules/snow/locale/fr/LC_MESSAGES/snow.mo
-%%NLS%%lib/enlightenment/modules/snow/locale/it/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/ru/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/uk/LC_MESSAGES/snow.mo
%%NLS%%lib/enlightenment/modules/snow/locale/ja/LC_MESSAGES/snow.mo
-%%NLS%%lib/enlightenment/modules/snow/locale/sv/LC_MESSAGES/snow.mo
-%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/eo/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/eo
-%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/fi/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/fi
+%%NLS%%lib/enlightenment/modules/snow/locale/de/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/el/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/fr/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/nl/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/cs/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/lt/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/he/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/pt/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/pt_BR/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/ar/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/hu/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/es/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/pl/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/nb/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/bg/LC_MESSAGES/snow.mo
+%%NLS%%lib/enlightenment/modules/snow/locale/hr/LC_MESSAGES/snow.mo
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/hr
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/nb/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/nb
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/pl
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/hu
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/ar
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/pt_BR
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/pt
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/he/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/he
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/nl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/nl
%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/fr/LC_MESSAGES
%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/fr
-%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/it/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/de
%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/ja/LC_MESSAGES
%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/uk
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/ru
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/fi
%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/sv/LC_MESSAGES
%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/zh_CN
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/da/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/da
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/sk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/sk
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/snow/locale/tr
%%NLS%%@dirrm lib/enlightenment/modules/snow/locale
@dirrm lib/enlightenment/modules/snow/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/snow
diff --git a/x11-wm/e17-module-taskbar/Makefile b/x11-wm/e17-module-taskbar/Makefile
new file mode 100644
index 000000000000..b31ee1950fc2
--- /dev/null
+++ b/x11-wm/e17-module-taskbar/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: e17-module-taskbar
+# Date created: 07 January 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= taskbar
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
+PKGNAMEPREFIX= e17-module-
+DISTNAME= ${PORTNAME}-${PORTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= A classic taskbar module for e17
+
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+
+DIST_SUBDIR= e17
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget pkgconfig
+USE_EFL= edje libtool_hack modarch_hack
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-taskbar/distinfo b/x11-wm/e17-module-taskbar/distinfo
new file mode 100644
index 000000000000..dce25f219028
--- /dev/null
+++ b/x11-wm/e17-module-taskbar/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/taskbar-20101003.tar.bz2) = d49800f0d09351ce2159db57cad0687e875b7750c0bee16bd462f57cd80a2ef4
+SIZE (e17/taskbar-20101003.tar.bz2) = 515310
diff --git a/x11-wm/e17-module-taskbar/pkg-descr b/x11-wm/e17-module-taskbar/pkg-descr
new file mode 100644
index 000000000000..33b868e4112c
--- /dev/null
+++ b/x11-wm/e17-module-taskbar/pkg-descr
@@ -0,0 +1,3 @@
+An e17 taskbar module.
+
+WWW: http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-taskbar/pkg-plist b/x11-wm/e17-module-taskbar/pkg-plist
new file mode 100644
index 000000000000..fd17300f2412
--- /dev/null
+++ b/x11-wm/e17-module-taskbar/pkg-plist
@@ -0,0 +1,96 @@
+lib/enlightenment/modules/taskbar/taskbar.edj
+lib/enlightenment/modules/taskbar/module.desktop
+lib/enlightenment/modules/taskbar/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/taskbar/e-module-taskbar.edj
+%%NLS%%lib/enlightenment/modules/taskbar/locale/uk/LC_MESSAGES/taskbar.mo
+%%NLS%%lib/enlightenment/modules/taskbar/locale/vi/LC_MESSAGES/taskbar.mo
+%%NLS%%lib/enlightenment/modules/taskbar/locale/de/LC_MESSAGES/taskbar.mo
+%%NLS%%lib/enlightenment/modules/taskbar/locale/pt/LC_MESSAGES/taskbar.mo
+%%NLS%%lib/enlightenment/modules/taskbar/locale/pt_BR/LC_MESSAGES/taskbar.mo
+%%NLS%%lib/enlightenment/modules/taskbar/locale/ja/LC_MESSAGES/taskbar.mo
+%%NLS%%lib/enlightenment/modules/taskbar/locale/el/LC_MESSAGES/taskbar.mo
+%%NLS%%lib/enlightenment/modules/taskbar/locale/fi/LC_MESSAGES/taskbar.mo
+%%NLS%%lib/enlightenment/modules/taskbar/locale/sv/LC_MESSAGES/taskbar.mo
+%%NLS%%lib/enlightenment/modules/taskbar/locale/ru/LC_MESSAGES/taskbar.mo
+%%NLS%%lib/enlightenment/modules/taskbar/locale/it/LC_MESSAGES/taskbar.mo
+%%NLS%%lib/enlightenment/modules/taskbar/locale/eo/LC_MESSAGES/taskbar.mo
+%%NLS%%lib/enlightenment/modules/taskbar/locale/sk/LC_MESSAGES/taskbar.mo
+%%NLS%%lib/enlightenment/modules/taskbar/locale/tr/LC_MESSAGES/taskbar.mo
+%%NLS%%lib/enlightenment/modules/taskbar/locale/da/LC_MESSAGES/taskbar.mo
+%%NLS%%lib/enlightenment/modules/taskbar/locale/nb/LC_MESSAGES/taskbar.mo
+%%NLS%%lib/enlightenment/modules/taskbar/locale/bg/LC_MESSAGES/taskbar.mo
+%%NLS%%lib/enlightenment/modules/taskbar/locale/zh_CN/LC_MESSAGES/taskbar.mo
+%%NLS%%lib/enlightenment/modules/taskbar/locale/hr/LC_MESSAGES/taskbar.mo
+%%NLS%%lib/enlightenment/modules/taskbar/locale/hu/LC_MESSAGES/taskbar.mo
+%%NLS%%lib/enlightenment/modules/taskbar/locale/fo/LC_MESSAGES/taskbar.mo
+%%NLS%%lib/enlightenment/modules/taskbar/locale/pl/LC_MESSAGES/taskbar.mo
+%%NLS%%lib/enlightenment/modules/taskbar/locale/es/LC_MESSAGES/taskbar.mo
+%%NLS%%lib/enlightenment/modules/taskbar/locale/cs/LC_MESSAGES/taskbar.mo
+%%NLS%%lib/enlightenment/modules/taskbar/locale/lt/LC_MESSAGES/taskbar.mo
+%%NLS%%lib/enlightenment/modules/taskbar/locale/ar/LC_MESSAGES/taskbar.mo
+%%NLS%%lib/enlightenment/modules/taskbar/locale/he/LC_MESSAGES/taskbar.mo
+%%NLS%%lib/enlightenment/modules/taskbar/locale/fr/LC_MESSAGES/taskbar.mo
+%%NLS%%lib/enlightenment/modules/taskbar/locale/nl/LC_MESSAGES/taskbar.mo
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/nl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/nl
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/he/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/he
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/ar
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/pl
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/fo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/fo
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/hu
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/hr
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/zh_CN
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/nb/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/nb
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/da/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/da
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/tr
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/sk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/sk
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/ru
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/pt_BR
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/pt
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/de
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/vi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/vi
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale/uk
+%%NLS%%@dirrm lib/enlightenment/modules/taskbar/locale
+@dirrm lib/enlightenment/modules/taskbar/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/taskbar
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-tclock/Makefile b/x11-wm/e17-module-tclock/Makefile
new file mode 100644
index 000000000000..13e3a23c06e3
--- /dev/null
+++ b/x11-wm/e17-module-tclock/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: e17-module-tclock
+# Date created: 07 January 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= tclock
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
+PKGNAMEPREFIX= e17-module-
+DISTNAME= ${PORTNAME}-${PORTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= A digital clock gadget module for e17
+
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+
+DIST_SUBDIR= e17
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget pkgconfig
+USE_EFL= edje libtool_hack modarch_hack
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-tclock/distinfo b/x11-wm/e17-module-tclock/distinfo
new file mode 100644
index 000000000000..d797f978ae1a
--- /dev/null
+++ b/x11-wm/e17-module-tclock/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/tclock-20101003.tar.bz2) = ebe26df32b3c36f5e6b1cc9b63d1bd79d0eb548bf4f2aa67adff30c8c0b736ed
+SIZE (e17/tclock-20101003.tar.bz2) = 483748
diff --git a/x11-wm/e17-module-tclock/pkg-descr b/x11-wm/e17-module-tclock/pkg-descr
new file mode 100644
index 000000000000..0e2572cea6ff
--- /dev/null
+++ b/x11-wm/e17-module-tclock/pkg-descr
@@ -0,0 +1,3 @@
+A digital clock gadget for e17.
+
+WWW: http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-tclock/pkg-plist b/x11-wm/e17-module-tclock/pkg-plist
new file mode 100644
index 000000000000..23449e2237f5
--- /dev/null
+++ b/x11-wm/e17-module-tclock/pkg-plist
@@ -0,0 +1,90 @@
+lib/enlightenment/modules/tclock/module.desktop
+lib/enlightenment/modules/tclock/tclock.edj
+lib/enlightenment/modules/tclock/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/tclock/e-module-tclock.edj
+%%NLS%%lib/enlightenment/modules/tclock/locale/ar/LC_MESSAGES/tclock.mo
+%%NLS%%lib/enlightenment/modules/tclock/locale/he/LC_MESSAGES/tclock.mo
+%%NLS%%lib/enlightenment/modules/tclock/locale/lt/LC_MESSAGES/tclock.mo
+%%NLS%%lib/enlightenment/modules/tclock/locale/cs/LC_MESSAGES/tclock.mo
+%%NLS%%lib/enlightenment/modules/tclock/locale/nl/LC_MESSAGES/tclock.mo
+%%NLS%%lib/enlightenment/modules/tclock/locale/fr/LC_MESSAGES/tclock.mo
+%%NLS%%lib/enlightenment/modules/tclock/locale/hr/LC_MESSAGES/tclock.mo
+%%NLS%%lib/enlightenment/modules/tclock/locale/bg/LC_MESSAGES/tclock.mo
+%%NLS%%lib/enlightenment/modules/tclock/locale/nb/LC_MESSAGES/tclock.mo
+%%NLS%%lib/enlightenment/modules/tclock/locale/zh_CN/LC_MESSAGES/tclock.mo
+%%NLS%%lib/enlightenment/modules/tclock/locale/es/LC_MESSAGES/tclock.mo
+%%NLS%%lib/enlightenment/modules/tclock/locale/pl/LC_MESSAGES/tclock.mo
+%%NLS%%lib/enlightenment/modules/tclock/locale/hu/LC_MESSAGES/tclock.mo
+%%NLS%%lib/enlightenment/modules/tclock/locale/fo/LC_MESSAGES/tclock.mo
+%%NLS%%lib/enlightenment/modules/tclock/locale/eo/LC_MESSAGES/tclock.mo
+%%NLS%%lib/enlightenment/modules/tclock/locale/it/LC_MESSAGES/tclock.mo
+%%NLS%%lib/enlightenment/modules/tclock/locale/sk/LC_MESSAGES/tclock.mo
+%%NLS%%lib/enlightenment/modules/tclock/locale/tr/LC_MESSAGES/tclock.mo
+%%NLS%%lib/enlightenment/modules/tclock/locale/el/LC_MESSAGES/tclock.mo
+%%NLS%%lib/enlightenment/modules/tclock/locale/ja/LC_MESSAGES/tclock.mo
+%%NLS%%lib/enlightenment/modules/tclock/locale/de/LC_MESSAGES/tclock.mo
+%%NLS%%lib/enlightenment/modules/tclock/locale/uk/LC_MESSAGES/tclock.mo
+%%NLS%%lib/enlightenment/modules/tclock/locale/ru/LC_MESSAGES/tclock.mo
+%%NLS%%lib/enlightenment/modules/tclock/locale/sv/LC_MESSAGES/tclock.mo
+%%NLS%%lib/enlightenment/modules/tclock/locale/fi/LC_MESSAGES/tclock.mo
+%%NLS%%lib/enlightenment/modules/tclock/locale/pt/LC_MESSAGES/tclock.mo
+%%NLS%%lib/enlightenment/modules/tclock/locale/pt_BR/LC_MESSAGES/tclock.mo
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/pt_BR
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/pt
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/ru
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/uk
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/de
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/tr
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/sk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/sk
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/fo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/fo
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/hu
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/pl
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/zh_CN
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/nb/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/nb
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/hr
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/nl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/nl
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/he/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/he
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale/ar
+%%NLS%%@dirrm lib/enlightenment/modules/tclock/locale
+@dirrm lib/enlightenment/modules/tclock/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/tclock
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-tiling/Makefile b/x11-wm/e17-module-tiling/Makefile
new file mode 100644
index 000000000000..b197d1a50cfb
--- /dev/null
+++ b/x11-wm/e17-module-tiling/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: e17-module-tiling
+# Date created: 07 January 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= tiling
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
+PKGNAMEPREFIX= e17-module-
+DISTNAME= ${PORTNAME}-${PORTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= A tiling-like windows control module for e17
+
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+
+DIST_SUBDIR= e17
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget pkgconfig
+USE_EFL= edje libtool_hack modarch_hack
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-tiling/distinfo b/x11-wm/e17-module-tiling/distinfo
new file mode 100644
index 000000000000..2c05aa7af9f7
--- /dev/null
+++ b/x11-wm/e17-module-tiling/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/tiling-20101003.tar.bz2) = e633a0ba82ac869ecbc9b2fffb8ea8b1d59b68273927f7df7c75cc556211acd6
+SIZE (e17/tiling-20101003.tar.bz2) = 485638
diff --git a/x11-wm/e17-module-tiling/pkg-descr b/x11-wm/e17-module-tiling/pkg-descr
new file mode 100644
index 000000000000..0803ea4d1911
--- /dev/null
+++ b/x11-wm/e17-module-tiling/pkg-descr
@@ -0,0 +1,4 @@
+An e17 module that allows you to control windows like tiling window
+managers do.
+
+WWW: http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-tiling/pkg-plist b/x11-wm/e17-module-tiling/pkg-plist
new file mode 100644
index 000000000000..f71f84fb0fa9
--- /dev/null
+++ b/x11-wm/e17-module-tiling/pkg-plist
@@ -0,0 +1,74 @@
+lib/enlightenment/modules/tiling/module.desktop
+lib/enlightenment/modules/tiling/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/tiling/e-module-tiling.edj
+%%NLS%%lib/enlightenment/modules/tiling/locale/it/LC_MESSAGES/tiling.mo
+%%NLS%%lib/enlightenment/modules/tiling/locale/eo/LC_MESSAGES/tiling.mo
+%%NLS%%lib/enlightenment/modules/tiling/locale/tr/LC_MESSAGES/tiling.mo
+%%NLS%%lib/enlightenment/modules/tiling/locale/sk/LC_MESSAGES/tiling.mo
+%%NLS%%lib/enlightenment/modules/tiling/locale/ja/LC_MESSAGES/tiling.mo
+%%NLS%%lib/enlightenment/modules/tiling/locale/uk/LC_MESSAGES/tiling.mo
+%%NLS%%lib/enlightenment/modules/tiling/locale/pt_BR/LC_MESSAGES/tiling.mo
+%%NLS%%lib/enlightenment/modules/tiling/locale/el/LC_MESSAGES/tiling.mo
+%%NLS%%lib/enlightenment/modules/tiling/locale/sv/LC_MESSAGES/tiling.mo
+%%NLS%%lib/enlightenment/modules/tiling/locale/pt/LC_MESSAGES/tiling.mo
+%%NLS%%lib/enlightenment/modules/tiling/locale/ru/LC_MESSAGES/tiling.mo
+%%NLS%%lib/enlightenment/modules/tiling/locale/cs/LC_MESSAGES/tiling.mo
+%%NLS%%lib/enlightenment/modules/tiling/locale/he/LC_MESSAGES/tiling.mo
+%%NLS%%lib/enlightenment/modules/tiling/locale/ar/LC_MESSAGES/tiling.mo
+%%NLS%%lib/enlightenment/modules/tiling/locale/lt/LC_MESSAGES/tiling.mo
+%%NLS%%lib/enlightenment/modules/tiling/locale/fr/LC_MESSAGES/tiling.mo
+%%NLS%%lib/enlightenment/modules/tiling/locale/nl/LC_MESSAGES/tiling.mo
+%%NLS%%lib/enlightenment/modules/tiling/locale/hr/LC_MESSAGES/tiling.mo
+%%NLS%%lib/enlightenment/modules/tiling/locale/zh_CN/LC_MESSAGES/tiling.mo
+%%NLS%%lib/enlightenment/modules/tiling/locale/pl/LC_MESSAGES/tiling.mo
+%%NLS%%lib/enlightenment/modules/tiling/locale/es/LC_MESSAGES/tiling.mo
+%%NLS%%lib/enlightenment/modules/tiling/locale/hu/LC_MESSAGES/tiling.mo
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/hu
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/pl
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/zh_CN
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/hr
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/nl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/nl
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/ar
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/he/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/he
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/ru
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/pt
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/pt_BR
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/uk
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/sk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/sk
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/tr
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/tiling/locale
+@dirrm lib/enlightenment/modules/tiling/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/tiling
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-uptime/Makefile b/x11-wm/e17-module-uptime/Makefile
index 94103cfa8911..2fb960fdedc1 100644
--- a/x11-wm/e17-module-uptime/Makefile
+++ b/x11-wm/e17-module-uptime/Makefile
@@ -6,31 +6,27 @@
#
PORTNAME= uptime
-PORTVERSION= 20080223
-PORTREVISION= 5
-CATEGORIES= x11-wm
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= An e17 uptime and load average indicator module
-BUILD_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
-RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+DIST_SUBDIR= e17
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnometarget pkgconfig
-USE_EFL= edje
+USE_EFL= edje libtool_hack modarch_hack
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 900007
-EXTRA_PATCHES= ${FILESDIR}/extra::e_mod_main.c
-.endif
-
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
PLIST_SUB+= NLS=""
diff --git a/x11-wm/e17-module-uptime/distinfo b/x11-wm/e17-module-uptime/distinfo
index 45f29f45c564..0bd6692faa62 100644
--- a/x11-wm/e17-module-uptime/distinfo
+++ b/x11-wm/e17-module-uptime/distinfo
@@ -1,3 +1,2 @@
-MD5 (uptime-20080223.tar.bz2) = 5e9d0e8da1f42c000179f32fd5366d72
-SHA256 (uptime-20080223.tar.bz2) = 73d354196917e907aa8568981cb650407d010954454745d76018ffe0f5c92e67
-SIZE (uptime-20080223.tar.bz2) = 272634
+SHA256 (e17/uptime-20101003.tar.bz2) = ae58970b52927d5b587206fd1f6c9c5b2e8fdc45eb0ff86a7ca95c80eb8966c2
+SIZE (e17/uptime-20101003.tar.bz2) = 497628
diff --git a/x11-wm/e17-module-uptime/files/extra::e_mod_main.c b/x11-wm/e17-module-uptime/files/extra::e_mod_main.c
deleted file mode 100644
index 5c67b053ff41..000000000000
--- a/x11-wm/e17-module-uptime/files/extra::e_mod_main.c
+++ /dev/null
@@ -1,58 +0,0 @@
---- e_mod_main.c
-+++ e_mod_main.c
-@@ -4,7 +4,7 @@
- #include <stdlib.h>
- #include <stdint.h>
- #include <sys/types.h>
--#include <utmp.h>
-+#include <utmpx.h>
-
- #if TIME_WITH_SYS_TIME
- # include <sys/time.h>
-@@ -445,11 +445,7 @@
- struct timeval boottime;
- time_t now;
-
-- FILE *utmp;
-- struct timespec tp;
-- struct utmp ut;
-- char ttybuf[MAXPATHLEN];
-- struct stat st;
-+ struct utmpx *utmpstruct;
- #endif
-
- if (!inst)
-@@ -498,26 +494,15 @@
- if (ret < 0)
- warn ("getloadavg()");
- # endif
--
-- /* retrive number of active users */
-- utmp = fopen (_PATH_UTMP, "r");
-- if (utmp == NULL)
-- inst->nusers = -1;
-- else
-+ inst->nusers = 0;
-+ setutxent ();
-+ while ((utmpstruct = getutxent ()))
- {
-- for (inst->nusers = 0; fread (&ut, sizeof (ut), 1, utmp);)
-- {
-- if (ut.ut_name[0] == '\0')
-- continue;
-- (void) snprintf (ttybuf, sizeof (ttybuf), "%s%.*s", _PATH_DEV,
-- UT_LINESIZE, ut.ut_line);
-- if (stat (ttybuf, &st) != 0)
-- continue; /* broken record */
--
-- inst->nusers++;
-- }
-- fclose (utmp);
-+ if ((utmpstruct->ut_type == USER_PROCESS) &&
-+ (utmpstruct->ut_user[0] != '\0'))
-+ inst->nusers++;
- }
-+ endutxent ();
- #else /* unsupported */
- inst->uptime = -1;
- inst->nusers = -1;
diff --git a/x11-wm/e17-module-uptime/files/patch-src_e_mod_main.c b/x11-wm/e17-module-uptime/files/patch-src_e_mod_main.c
new file mode 100644
index 000000000000..08e57c47e9c1
--- /dev/null
+++ b/x11-wm/e17-module-uptime/files/patch-src_e_mod_main.c
@@ -0,0 +1,63 @@
+--- src/e_mod_main.c.orig 2010-12-13 22:26:02.000000000 -0800
++++ src/e_mod_main.c 2010-12-13 22:31:44.000000000 -0800
+@@ -4,7 +4,17 @@
+ #include <stdlib.h>
+ #include <stdint.h>
+ #include <sys/types.h>
++#if defined(__FreeBSD__)
++#include <sys/param.h>
++#if __FreeBSD_version >= 900007
++#define USE_UTMPX
++#endif
++#endif
++#if defined(USE_UTMPX)
++#include <utmpx.h>
++#else
+ #include <utmp.h>
++#endif
+
+ #if TIME_WITH_SYS_TIME
+ # include <sys/time.h>
+@@ -434,12 +444,16 @@
+ struct timeval boottime;
+ time_t now;
+
++#if defined(USE_UTMPX)
++ struct utmpx *utmpstruct;
++#else
+ FILE *utmp;
+ struct timespec tp;
+ struct utmp ut;
+ char ttybuf[MAXPATHLEN];
+ struct stat st;
+ #endif
++#endif
+
+ if (!inst) return;
+
+@@ -487,6 +501,17 @@
+ # endif
+
+ /* retrive number of active users */
++#if defined(USE_UTMPX)
++ inst->nusers = 0;
++ setutxent ();
++ while ((utmpstruct = getutxent ()))
++ {
++ if ((utmpstruct->ut_type == USER_PROCESS) &&
++ (utmpstruct->ut_user[0] != '\0'))
++ inst->nusers++;
++ }
++ endutxent ();
++#else
+ utmp = fopen (_PATH_UTMP, "r");
+ if (!utmp)
+ inst->nusers = -1;
+@@ -504,6 +529,7 @@
+ }
+ fclose (utmp);
+ }
++#endif
+ #else /* unsupported */
+ inst->uptime = -1;
+ inst->nusers = -1;
diff --git a/x11-wm/e17-module-uptime/pkg-plist b/x11-wm/e17-module-uptime/pkg-plist
index af2dfdfb44aa..50db1e021a16 100644
--- a/x11-wm/e17-module-uptime/pkg-plist
+++ b/x11-wm/e17-module-uptime/pkg-plist
@@ -1,30 +1,79 @@
-lib/enlightenment/modules/uptime/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/uptime/%%E17_ARCH%%/module.la
-lib/enlightenment/modules/uptime/%%E17_ARCH%%/module.so
-lib/enlightenment/modules/uptime/module.desktop
-lib/enlightenment/modules/uptime/uptime.edj
lib/enlightenment/modules/uptime/e-module-uptime.edj
+lib/enlightenment/modules/uptime/uptime.edj
+lib/enlightenment/modules/uptime/module.desktop
+lib/enlightenment/modules/uptime/%%E17_ARCH%%/module.so
+%%NLS%%lib/enlightenment/modules/uptime/locale/fr/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/nl/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/cs/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/zh_CN/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/he/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/lt/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/pl/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/es/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/hu/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/nb/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/hr/LC_MESSAGES/uptime.mo
%%NLS%%lib/enlightenment/modules/uptime/locale/bg/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/sk/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/tr/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/it/LC_MESSAGES/uptime.mo
%%NLS%%lib/enlightenment/modules/uptime/locale/eo/LC_MESSAGES/uptime.mo
%%NLS%%lib/enlightenment/modules/uptime/locale/fi/LC_MESSAGES/uptime.mo
-%%NLS%%lib/enlightenment/modules/uptime/locale/fr/LC_MESSAGES/uptime.mo
-%%NLS%%lib/enlightenment/modules/uptime/locale/it/LC_MESSAGES/uptime.mo
-%%NLS%%lib/enlightenment/modules/uptime/locale/ja/LC_MESSAGES/uptime.mo
%%NLS%%lib/enlightenment/modules/uptime/locale/sv/LC_MESSAGES/uptime.mo
-%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/bg/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/bg
-%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/eo/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/eo
-%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/fi/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/fi
-%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/fr/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/fr
-%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/it/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/it
+%%NLS%%lib/enlightenment/modules/uptime/locale/pt/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/ru/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/de/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/ja/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/uk/LC_MESSAGES/uptime.mo
+%%NLS%%lib/enlightenment/modules/uptime/locale/el/LC_MESSAGES/uptime.mo
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/uk
%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/ja/LC_MESSAGES
%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/de
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/ru
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/pt
%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/sv/LC_MESSAGES
%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/tr
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/sk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/sk
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/hr
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/nb/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/nb
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/hu
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/pl
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/he/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/he
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/zh_CN
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/nl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/nl
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale/fr
%%NLS%%@dirrm lib/enlightenment/modules/uptime/locale
@dirrm lib/enlightenment/modules/uptime/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/uptime
diff --git a/x11-wm/e17-module-weather/Makefile b/x11-wm/e17-module-weather/Makefile
index bc9e7f2e7973..e7bcd9d8f525 100644
--- a/x11-wm/e17-module-weather/Makefile
+++ b/x11-wm/e17-module-weather/Makefile
@@ -6,25 +6,27 @@
#
PORTNAME= weather
-PORTVERSION= 20080223
-PORTREVISION= 5
+PORTVERSION= 20101003
PORTEPOCH= 1
-CATEGORIES= x11-wm
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
PKGNAMEPREFIX= e17-module-
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= An e17 weather module
-BUILD_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
-RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
+BROKEN= Does not build
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+
+DIST_SUBDIR= e17
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnometarget pkgconfig
-USE_EFL= edje
+USE_EFL= edje libtool_hack modarch_hack
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff --git a/x11-wm/e17-module-weather/distinfo b/x11-wm/e17-module-weather/distinfo
index e10aeab54741..dc6f2dd04a96 100644
--- a/x11-wm/e17-module-weather/distinfo
+++ b/x11-wm/e17-module-weather/distinfo
@@ -1,3 +1,2 @@
-MD5 (weather-20080223.tar.bz2) = b275301cf3bfc104c62b59ab59b7195a
-SHA256 (weather-20080223.tar.bz2) = 04ac1173638961708c3787d49bafff44a138da528a6e8b5bed81cc23f251d8bc
-SIZE (weather-20080223.tar.bz2) = 930951
+SHA256 (e17/weather-20100821.tar.bz2) = 7c044399e5086f484f1a0b92c84ac28bbf6f326ba223076b3a8d1cfa23ed6e9f
+SIZE (e17/weather-20100821.tar.bz2) = 1105691
diff --git a/x11-wm/e17-module-weather/pkg-plist b/x11-wm/e17-module-weather/pkg-plist
index 69beaa879d6a..b07d5002a00a 100644
--- a/x11-wm/e17-module-weather/pkg-plist
+++ b/x11-wm/e17-module-weather/pkg-plist
@@ -1,89 +1,154 @@
-lib/enlightenment/modules/weather/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/weather/%%E17_ARCH%%/module.la
-lib/enlightenment/modules/weather/%%E17_ARCH%%/module.so
-lib/enlightenment/modules/weather/module.desktop
-lib/enlightenment/modules/weather/weather.edj
-lib/enlightenment/modules/weather/e-module-weather.edj
-lib/enlightenment/modules/weather/images/blizzard.png
-lib/enlightenment/modules/weather/images/blowingsnow.png
+lib/enlightenment/modules/weather/images/pcloudy.png
+lib/enlightenment/modules/weather/images/sunny.png
lib/enlightenment/modules/weather/images/chancetstorm.png
-lib/enlightenment/modules/weather/images/chancetstormn.png
-lib/enlightenment/modules/weather/images/clear-sky.png
-lib/enlightenment/modules/weather/images/cloud.png
-lib/enlightenment/modules/weather/images/cloudy.png
-lib/enlightenment/modules/weather/images/cloudy_night.png
-lib/enlightenment/modules/weather/images/drizzle.png
-lib/enlightenment/modules/weather/images/fair.png
-lib/enlightenment/modules/weather/images/fdrizzle.png
-lib/enlightenment/modules/weather/images/flurries.png
-lib/enlightenment/modules/weather/images/fog.png
-lib/enlightenment/modules/weather/images/freezingrain.png
+lib/enlightenment/modules/weather/images/suncloud.png
+lib/enlightenment/modules/weather/images/module_icon.png
+lib/enlightenment/modules/weather/images/mostly-cloudy.png
+lib/enlightenment/modules/weather/images/sun.png
+lib/enlightenment/modules/weather/images/mcloudys.png
+lib/enlightenment/modules/weather/images/pcloudyrn.png
+lib/enlightenment/modules/weather/images/wind.png
lib/enlightenment/modules/weather/images/hazy.png
-lib/enlightenment/modules/weather/images/heavy-rain.png
-lib/enlightenment/modules/weather/images/ice.png
+lib/enlightenment/modules/weather/images/thunder.png
+lib/enlightenment/modules/weather/images/moon-tstorm.png
+lib/enlightenment/modules/weather/images/wswarning.png
+lib/enlightenment/modules/weather/images/pcloudyns.png
+lib/enlightenment/modules/weather/images/tstorm.png
+lib/enlightenment/modules/weather/images/clear-sky.png
+lib/enlightenment/modules/weather/images/pcloudys.png
+lib/enlightenment/modules/weather/images/blowingsnow.png
+lib/enlightenment/modules/weather/images/mcloudyr.png
lib/enlightenment/modules/weather/images/isolated.t-storm.png
-lib/enlightenment/modules/weather/images/light-rain.png
-lib/enlightenment/modules/weather/images/light-snow.png
lib/enlightenment/modules/weather/images/luna-ceatza.png
-lib/enlightenment/modules/weather/images/luna-nori.png
-lib/enlightenment/modules/weather/images/mcloudy.png
+lib/enlightenment/modules/weather/images/wswatch.png
lib/enlightenment/modules/weather/images/mcloudyn.png
-lib/enlightenment/modules/weather/images/mcloudynr.png
-lib/enlightenment/modules/weather/images/mcloudyns.png
-lib/enlightenment/modules/weather/images/mcloudyr.png
-lib/enlightenment/modules/weather/images/mcloudys.png
-lib/enlightenment/modules/weather/images/moon-rain.png
-lib/enlightenment/modules/weather/images/moon-snow.png
-lib/enlightenment/modules/weather/images/moon-tstorm.png
-lib/enlightenment/modules/weather/images/moon.png
-lib/enlightenment/modules/weather/images/mostly-cloudy.png
-lib/enlightenment/modules/weather/images/pcloudy.png
-lib/enlightenment/modules/weather/images/pcloudyn.png
-lib/enlightenment/modules/weather/images/pcloudynr.png
-lib/enlightenment/modules/weather/images/pcloudyns.png
+lib/enlightenment/modules/weather/images/cloud.png
lib/enlightenment/modules/weather/images/pcloudyr.png
-lib/enlightenment/modules/weather/images/pcloudyrn.png
-lib/enlightenment/modules/weather/images/pcloudys.png
+lib/enlightenment/modules/weather/images/pcloudynr.png
lib/enlightenment/modules/weather/images/rain.png
-lib/enlightenment/modules/weather/images/rainandsnow.png
-lib/enlightenment/modules/weather/images/showers.png
lib/enlightenment/modules/weather/images/sleet.png
+lib/enlightenment/modules/weather/images/moon-snow.png
+lib/enlightenment/modules/weather/images/light-snow.png
+lib/enlightenment/modules/weather/images/ice.png
+lib/enlightenment/modules/weather/images/tstormn.png
+lib/enlightenment/modules/weather/images/moon.png
lib/enlightenment/modules/weather/images/smoke.png
+lib/enlightenment/modules/weather/images/sunsnow.png
+lib/enlightenment/modules/weather/images/pcloudyn.png
+lib/enlightenment/modules/weather/images/rainandsnow.png
+lib/enlightenment/modules/weather/images/sunnyn.png
+lib/enlightenment/modules/weather/images/fair.png
+lib/enlightenment/modules/weather/images/luna-nori.png
+lib/enlightenment/modules/weather/images/fog.png
+lib/enlightenment/modules/weather/images/mcloudynr.png
+lib/enlightenment/modules/weather/images/blizzard.png
lib/enlightenment/modules/weather/images/snow.png
-lib/enlightenment/modules/weather/images/snowshowers.png
+lib/enlightenment/modules/weather/images/showers.png
+lib/enlightenment/modules/weather/images/freezingrain.png
lib/enlightenment/modules/weather/images/sun-light-clouds.png
-lib/enlightenment/modules/weather/images/sun.png
-lib/enlightenment/modules/weather/images/suncloud.png
-lib/enlightenment/modules/weather/images/sunny.png
-lib/enlightenment/modules/weather/images/sunnyn.png
+lib/enlightenment/modules/weather/images/light-rain.png
+lib/enlightenment/modules/weather/images/moon-rain.png
+lib/enlightenment/modules/weather/images/cloudy.png
lib/enlightenment/modules/weather/images/sunrain.png
-lib/enlightenment/modules/weather/images/sunsnow.png
+lib/enlightenment/modules/weather/images/drizzle.png
+lib/enlightenment/modules/weather/images/cloudy_night.png
+lib/enlightenment/modules/weather/images/mcloudyns.png
+lib/enlightenment/modules/weather/images/flurries.png
+lib/enlightenment/modules/weather/images/fdrizzle.png
+lib/enlightenment/modules/weather/images/snowshowers.png
+lib/enlightenment/modules/weather/images/heavy-rain.png
lib/enlightenment/modules/weather/images/t-storm_night.png
-lib/enlightenment/modules/weather/images/thunder.png
-lib/enlightenment/modules/weather/images/tstorm.png
-lib/enlightenment/modules/weather/images/tstormn.png
+lib/enlightenment/modules/weather/images/mcloudy.png
lib/enlightenment/modules/weather/images/unknown.png
-lib/enlightenment/modules/weather/images/wind.png
-lib/enlightenment/modules/weather/images/wswarning.png
-lib/enlightenment/modules/weather/images/wswatch.png
-%%NLS%%lib/enlightenment/modules/weather/locale/eo/LC_MESSAGES/weather.mo
-%%NLS%%lib/enlightenment/modules/weather/locale/fi/LC_MESSAGES/weather.mo
-%%NLS%%lib/enlightenment/modules/weather/locale/it/LC_MESSAGES/weather.mo
+lib/enlightenment/modules/weather/images/chancetstormn.png
+lib/enlightenment/modules/weather/e-module-weather.edj
+lib/enlightenment/modules/weather/weather.edj
+lib/enlightenment/modules/weather/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/weather/module.desktop
+%%NLS%%lib/enlightenment/modules/weather/locale/bg/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/hr/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/nb/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/zh_CN/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/hu/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/pl/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/es/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/lt/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/he/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/ar/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/cs/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/nl/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/fr/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/el/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/uk/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/de/LC_MESSAGES/weather.mo
%%NLS%%lib/enlightenment/modules/weather/locale/ja/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/ru/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/pt_BR/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/pt/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/fi/LC_MESSAGES/weather.mo
%%NLS%%lib/enlightenment/modules/weather/locale/sv/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/eo/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/it/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/ca/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/tr/LC_MESSAGES/weather.mo
+%%NLS%%lib/enlightenment/modules/weather/locale/sk/LC_MESSAGES/weather.mo
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/sk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/sk
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/tr
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/ca/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/ca
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/it
%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/eo/LC_MESSAGES
%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/sv
%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/fi/LC_MESSAGES
%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/fi
-%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/it/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/pt
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/pt_BR
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/ru
%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/ja/LC_MESSAGES
%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/ja
-%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/sv/LC_MESSAGES
-%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/de
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/uk
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/nl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/nl
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/ar
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/he/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/he
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/pl
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/hu
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/zh_CN
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/nb/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/nb
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/hr
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/weather/locale/bg
%%NLS%%@dirrm lib/enlightenment/modules/weather/locale
-@dirrm lib/enlightenment/modules/weather/images
@dirrm lib/enlightenment/modules/weather/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/weather/images
@dirrm lib/enlightenment/modules/weather
@dirrmtry lib/enlightenment/modules
@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-module-winselector/Makefile b/x11-wm/e17-module-winselector/Makefile
index 1b159d62f042..af6edd592fc5 100644
--- a/x11-wm/e17-module-winselector/Makefile
+++ b/x11-wm/e17-module-winselector/Makefile
@@ -7,22 +7,31 @@
#
PORTNAME= winselector
-PORTVERSION= 20080223
-PORTREVISION= 4
-CATEGORIES= x11-wm
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
PKGNAMEPREFIX= e17-module-
+DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= An e17 module to switch between windows
-BUILD_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
-RUN_DEPENDS= enlightenment-config:${PORTSDIR}/x11-wm/enlightenment
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+DIST_SUBDIR= e17
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GNOME= pkgconfig gnometarget
-USE_EFL= edje
+USE_GNOME= gnometarget pkgconfig
+USE_EFL= edje libtool_hack modarch_hack
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-winselector/distinfo b/x11-wm/e17-module-winselector/distinfo
index bf1bec42b879..ef3843c863b4 100644
--- a/x11-wm/e17-module-winselector/distinfo
+++ b/x11-wm/e17-module-winselector/distinfo
@@ -1,3 +1,2 @@
-MD5 (winselector-20080223.tar.bz2) = a3f10fee0c678ebff0dfa0a9f970362d
-SHA256 (winselector-20080223.tar.bz2) = 30a87d45b954627dcb44e5a2f404a59c6f5eb1dcb0938a2b4bfe07aec74f0332
-SIZE (winselector-20080223.tar.bz2) = 246692
+SHA256 (e17/winselector-20101003.tar.bz2) = 4b0bfe206177cf6c1dcee12a089baceba31abfd189b4fdb18c0ffe55ffddea43
+SIZE (e17/winselector-20101003.tar.bz2) = 377545
diff --git a/x11-wm/e17-module-winselector/pkg-plist b/x11-wm/e17-module-winselector/pkg-plist
index 61cdf4bfb075..9e2f6c6a4549 100644
--- a/x11-wm/e17-module-winselector/pkg-plist
+++ b/x11-wm/e17-module-winselector/pkg-plist
@@ -1,9 +1,7 @@
-lib/enlightenment/modules/winselector/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/winselector/%%E17_ARCH%%/module.la
-lib/enlightenment/modules/winselector/%%E17_ARCH%%/module.so
-lib/enlightenment/modules/winselector/module.desktop
-lib/enlightenment/modules/winselector/e-module-winselector.edj
lib/enlightenment/modules/winselector/winselector.edj
+lib/enlightenment/modules/winselector/e-module-winselector.edj
+lib/enlightenment/modules/winselector/module.desktop
+lib/enlightenment/modules/winselector/%%E17_ARCH%%/module.so
@dirrm lib/enlightenment/modules/winselector/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/winselector
@dirrmtry lib/enlightenment/modules
diff --git a/x11-wm/e17-module-wlan/Makefile b/x11-wm/e17-module-wlan/Makefile
new file mode 100644
index 000000000000..1ba2a8db7a1e
--- /dev/null
+++ b/x11-wm/e17-module-wlan/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for: e17-module-wlan
+# Date created: 07 January 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= wlan
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/modules/
+PKGNAMEPREFIX= e17-module-
+DISTNAME= ${PORTNAME}-${PORTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= An e17 wlan devices monitoring module
+
+BUILD_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS= enlightenment:${PORTSDIR}/x11-wm/enlightenment
+
+DIST_SUBDIR= e17
+GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget pkgconfig
+USE_EFL= edje libtool_hack modarch_hack
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-module-wlan/distinfo b/x11-wm/e17-module-wlan/distinfo
new file mode 100644
index 000000000000..72ccd7a14872
--- /dev/null
+++ b/x11-wm/e17-module-wlan/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/wlan-20101003.tar.bz2) = f8b41656e0c93c05f4b527105284ec99b1becaf284a45d7f72864312c438149c
+SIZE (e17/wlan-20101003.tar.bz2) = 527490
diff --git a/x11-wm/e17-module-wlan/pkg-descr b/x11-wm/e17-module-wlan/pkg-descr
new file mode 100644
index 000000000000..e395d86603ac
--- /dev/null
+++ b/x11-wm/e17-module-wlan/pkg-descr
@@ -0,0 +1,3 @@
+AN e17 gadget to monitor wlan devices.
+
+WWW: http://www.enlightenment.org/
diff --git a/x11-wm/e17-module-wlan/pkg-plist b/x11-wm/e17-module-wlan/pkg-plist
new file mode 100644
index 000000000000..56e37f058ab4
--- /dev/null
+++ b/x11-wm/e17-module-wlan/pkg-plist
@@ -0,0 +1,96 @@
+lib/enlightenment/modules/wlan/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/wlan/wlan.edj
+lib/enlightenment/modules/wlan/e-module-wlan.edj
+lib/enlightenment/modules/wlan/module.desktop
+%%NLS%%lib/enlightenment/modules/wlan/locale/pt_BR/LC_MESSAGES/wlan.mo
+%%NLS%%lib/enlightenment/modules/wlan/locale/cs/LC_MESSAGES/wlan.mo
+%%NLS%%lib/enlightenment/modules/wlan/locale/lt/LC_MESSAGES/wlan.mo
+%%NLS%%lib/enlightenment/modules/wlan/locale/he/LC_MESSAGES/wlan.mo
+%%NLS%%lib/enlightenment/modules/wlan/locale/ar/LC_MESSAGES/wlan.mo
+%%NLS%%lib/enlightenment/modules/wlan/locale/fr/LC_MESSAGES/wlan.mo
+%%NLS%%lib/enlightenment/modules/wlan/locale/nl/LC_MESSAGES/wlan.mo
+%%NLS%%lib/enlightenment/modules/wlan/locale/nb/LC_MESSAGES/wlan.mo
+%%NLS%%lib/enlightenment/modules/wlan/locale/bg/LC_MESSAGES/wlan.mo
+%%NLS%%lib/enlightenment/modules/wlan/locale/hr/LC_MESSAGES/wlan.mo
+%%NLS%%lib/enlightenment/modules/wlan/locale/hu/LC_MESSAGES/wlan.mo
+%%NLS%%lib/enlightenment/modules/wlan/locale/es/LC_MESSAGES/wlan.mo
+%%NLS%%lib/enlightenment/modules/wlan/locale/pl/LC_MESSAGES/wlan.mo
+%%NLS%%lib/enlightenment/modules/wlan/locale/ms/LC_MESSAGES/wlan.mo
+%%NLS%%lib/enlightenment/modules/wlan/locale/it/LC_MESSAGES/wlan.mo
+%%NLS%%lib/enlightenment/modules/wlan/locale/eo/LC_MESSAGES/wlan.mo
+%%NLS%%lib/enlightenment/modules/wlan/locale/zh_CN/LC_MESSAGES/wlan.mo
+%%NLS%%lib/enlightenment/modules/wlan/locale/tr/LC_MESSAGES/wlan.mo
+%%NLS%%lib/enlightenment/modules/wlan/locale/sk/LC_MESSAGES/wlan.mo
+%%NLS%%lib/enlightenment/modules/wlan/locale/da/LC_MESSAGES/wlan.mo
+%%NLS%%lib/enlightenment/modules/wlan/locale/uk/LC_MESSAGES/wlan.mo
+%%NLS%%lib/enlightenment/modules/wlan/locale/ja/LC_MESSAGES/wlan.mo
+%%NLS%%lib/enlightenment/modules/wlan/locale/de/LC_MESSAGES/wlan.mo
+%%NLS%%lib/enlightenment/modules/wlan/locale/el/LC_MESSAGES/wlan.mo
+%%NLS%%lib/enlightenment/modules/wlan/locale/pt/LC_MESSAGES/wlan.mo
+%%NLS%%lib/enlightenment/modules/wlan/locale/sv/LC_MESSAGES/wlan.mo
+%%NLS%%lib/enlightenment/modules/wlan/locale/fi/LC_MESSAGES/wlan.mo
+%%NLS%%lib/enlightenment/modules/wlan/locale/id/LC_MESSAGES/wlan.mo
+%%NLS%%lib/enlightenment/modules/wlan/locale/ru/LC_MESSAGES/wlan.mo
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/ru/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/ru
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/id/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/id
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/fi/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/fi
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/sv
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/pt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/pt
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/el/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/el
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/de/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/de
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/ja
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/uk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/uk
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/da/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/da
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/sk/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/sk
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/tr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/tr
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/zh_CN
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/eo/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/eo
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/it/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/it
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/ms/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/ms
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/pl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/pl
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/es/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/es
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/hu/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/hu
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/hr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/hr
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/bg/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/bg
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/nb/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/nb
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/nl/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/nl
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/fr
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/ar/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/ar
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/he/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/he
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/lt/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/lt
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/cs/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/cs
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale/pt_BR
+%%NLS%%@dirrm lib/enlightenment/modules/wlan/locale
+@dirrm lib/enlightenment/modules/wlan/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/wlan
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment
diff --git a/x11-wm/e17-modules/Makefile b/x11-wm/e17-modules/Makefile
new file mode 100644
index 000000000000..4bf47293630d
--- /dev/null
+++ b/x11-wm/e17-modules/Makefile
@@ -0,0 +1,58 @@
+# New ports collection makefile for: e17-modules
+# Date created: 12 November 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= e17-modules
+PORTVERSION= 20101003
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= # Empty
+DISTFILES= # Empty
+
+MAINTAINER= magik@roorback.net
+COMMENT= Meta-port for e17 modules
+
+NO_BUILD= yes
+WANT_EFL= yes
+E17_ARCH= freebsd${OSREL}-${ARCH}
+
+MODULES= alarm calendar cpu deskshow diskio \
+ drawer efm_nav efm_path efm_pathbar \
+ everything-mpris everything-pidgin \
+ everything-places everything-wallpaper \
+ everything-websearch exebuf execwatch \
+ flame forecasts iiirk itask-ng language \
+ mail mem moon mpdule net notification penguins \
+ photo places quickaccess rain screenshot slideshow \
+ snow taskbar tclock tiling uptime winselector wlan
+
+EVERYTHING_MPRIS_PATH= evry-mpris
+EVERYTHING_PIDGIN_PATH= evry-pidgin
+EVERYTHING_WEBSEARCH_PATH= evry-websearch
+
+.for M in ${MODULES}
+OPTIONS+= ${M:U:S,-,_,g} "Install ${M} module"
+. if !defined(${M:U:S,-,_,g}_OFF)
+OPTIONS+= on
+. else
+OPTIONS+= off
+. endif
+.endfor
+
+.include <bsd.port.options.mk>
+
+.for M in ${MODULES}
+MODULEOPT= ${M:U:S,-,_,g}
+. if !defined(${MODULEOPT}_PATH)
+${MODULEOPT}_PATH= ${M}
+. endif
+. if defined(WITH_${MODULEOPT})
+RUN_DEPENDS+= ${LOCALBASE}/lib/enlightenment/modules/${{MODULEOPT}_PATH}/${E17_ARCH}/module.so:${PORTSDIR}/x11-wm/e17-module-${M}
+. endif
+.endfor
+
+do-install: # empty
+
+.include <bsd.port.mk>
diff --git a/x11-wm/e17-modules/pkg-descr b/x11-wm/e17-modules/pkg-descr
new file mode 100644
index 000000000000..55a80a03847a
--- /dev/null
+++ b/x11-wm/e17-modules/pkg-descr
@@ -0,0 +1,3 @@
+Meta-port for enlightenment 0.17 modules.
+
+WWW: http://enlightenment.org/
diff --git a/x11-wm/e17-utils/Makefile b/x11-wm/e17-utils/Makefile
index 45c80ecd29d1..bfc1f6d159cf 100644
--- a/x11-wm/e17-utils/Makefile
+++ b/x11-wm/e17-utils/Makefile
@@ -26,6 +26,10 @@ USE_GNOME= gnometarget pkgconfig
USE_EFL= imlib2 engrave ecore
USE_EFL_ECORE= evas file config
+BROKEN= does not compile
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
OPTIONS= SETROOT "Build e17setroot" on \
ENTANGLE "Build entangle" on \
EXIGE "Build exige" on
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index a37a6c4a5420..1a6c4aa664ac 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -6,33 +6,52 @@
#
PORTNAME= enlightenment
-PORTVERSION= 0.16.999.042
-PORTREVISION= 6
+PORTVERSION= 0.16.999.52995
PORTEPOCH= 2
-CATEGORIES= x11-wm
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
- http://download.enlightenment.org/snapshots/2008-01-25/
+CATEGORIES= x11-wm enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/base/
MAINTAINER= stas@FreeBSD.org
COMMENT= A very artistic X window manager
-USE_GMAKE= yes
+LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo
+
+LICENSE= BSD
+DIST_SUBDIR= e17
USE_BZIP2= yes
+GNU_CONFIGURE= yes
+USE_EFL= eina eet evas ecore edbus efreet edje libtool_hack librt_hack
+USE_EFL_EVAS_LOADERS= eet jpeg png
+USE_EFL_EVAS_ENGINES= buffer
+USE_EFL_ECORE= ipc
USE_GNOME= gnomehack gnometarget pkgconfig
-USE_EFL= imlib2 evas edje ecore embryo eet efreet edbus
-USE_EFL_ECORE= evas config file ipc con job txt imf imf_evas
-USE_EFL_EVAS_LOADERS= edb eet jpeg png
USE_ICONV= yes
USE_GETTEXT= yes
+USE_GMAKE= yes
USE_LDCONFIG= yes
-NO_LATEST_LINK= yes
-GNU_CONFIGURE= yes
+
+CONFIGURE_ARGS= --with-profile=MEDIUM_PC \
+ --disable-bluez
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+CONFIGURE_ARGS+= --enable-nls
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS+= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|linkexec_info|link_execinfo|g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|\(setuid_root_mode = a=rx,u+x\)s|\1|g' ${WRKSRC}/src/bin/Makefile.in ${WRKSRC}/src/modules/cpufreq/Makefile.in
post-install:
@${ECHO_MSG} '********************************************************'
@${ECHO_MSG} 'NOTE: If you want "Shutdown" and "Restart"'
- @${ECHO_MSG} 'menu actions to work properly, manually set SUID bit'
- @${ECHO_MSG} 'on "${PREFIX}/bin/enlightenment_sys" executable.'
+ @${ECHO_MSG} 'menu actions to work properly, manually set SUID bit on'
+ @${ECHO_MSG} '"${PREFIX}/lib/enlightenment/utils/enlightenment_sys"'
+ @${ECHO_MSG} 'executable.'
@${ECHO_MSG}
@${ECHO_MSG} 'WARNING: this program might be vulnerable so do not'
@${ECHO_MSG} 'set suid bit if do not trust all users of this machine.'
diff --git a/x11-wm/enlightenment/distinfo b/x11-wm/enlightenment/distinfo
index 83f2a39f5600..3026cb5e1688 100644
--- a/x11-wm/enlightenment/distinfo
+++ b/x11-wm/enlightenment/distinfo
@@ -1,3 +1,2 @@
-MD5 (enlightenment-0.16.999.042.tar.bz2) = f729622a0dd21eafb6fadc44a12b8e28
-SHA256 (enlightenment-0.16.999.042.tar.bz2) = 7605e877fcf213b0a6a0bfc46101a981d2e3eb6f2dcec04795a3e314ab8d0981
-SIZE (enlightenment-0.16.999.042.tar.bz2) = 32566682
+SHA256 (e17/enlightenment-0.16.999.52995.tar.bz2) = ba906e5d50c3a7740e0bd6a410ed0929af014e27808c80991a7490742f134205
+SIZE (e17/enlightenment-0.16.999.52995.tar.bz2) = 5511869
diff --git a/x11-wm/enlightenment/files/patch-configure b/x11-wm/enlightenment/files/patch-configure
new file mode 100644
index 000000000000..a06c9cad6a5e
--- /dev/null
+++ b/x11-wm/enlightenment/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig 2010-12-05 21:26:21.000000000 -0800
++++ configure 2010-12-05 21:26:28.000000000 -0800
+@@ -12501,7 +12501,7 @@
+
+
+
+-MODULE_ARCH="$host_os-$host_cpu-ver-pre-svn-07"
++MODULE_ARCH="$host_os-$host_cpu"
+
+
+ cat >>confdefs.h <<_ACEOF
diff --git a/x11-wm/enlightenment/files/patch-src_bin_Makefile.in b/x11-wm/enlightenment/files/patch-src_bin_Makefile.in
deleted file mode 100644
index e5a89cd7e4b6..000000000000
--- a/x11-wm/enlightenment/files/patch-src_bin_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bin/Makefile.in.orig 2008-03-11 02:13:30.000000000 +0300
-+++ src/bin/Makefile.in 2008-03-11 02:13:34.000000000 +0300
-@@ -659,7 +659,7 @@
- e_xinerama.c
-
- enlightenment_init_LDFLAGS = @e_libs@
--setuid_root_mode = a=rx,u+xs
-+setuid_root_mode = a=rx,u+x
- installed_headersdir = $(prefix)/include/enlightenment
- installed_headers_DATA = $(ENLIGHTENMENTHEADERS)
- all: all-am
diff --git a/x11-wm/enlightenment/files/patch-src_modules_cpufreq_Makefile.in b/x11-wm/enlightenment/files/patch-src_modules_cpufreq_Makefile.in
deleted file mode 100644
index 595ace9be74f..000000000000
--- a/x11-wm/enlightenment/files/patch-src_modules_cpufreq_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/modules/cpufreq/Makefile.in.orig 2008-03-11 02:13:50.000000000 +0300
-+++ src/modules/cpufreq/Makefile.in 2008-03-11 02:13:54.000000000 +0300
-@@ -274,7 +274,7 @@
- freqset_DATA = \
- freqset$(EXEEXT)
-
--setuid_root_mode = a=rx,u+xs
-+setuid_root_mode = a=rx,u+x
- freqset_SOURCES = freqset.c
- all: all-am
-
diff --git a/x11-wm/enlightenment/pkg-plist b/x11-wm/enlightenment/pkg-plist
index fcef23c20028..d6178c0b0b43 100644
--- a/x11-wm/enlightenment/pkg-plist
+++ b/x11-wm/enlightenment/pkg-plist
@@ -1,15 +1,11 @@
bin/enlightenment
-bin/enlightenment-config
-bin/enlightenment_fm
bin/enlightenment_imc
-bin/enlightenment_init
bin/enlightenment_remote
bin/enlightenment_start
-bin/enlightenment_sys
-bin/enlightenment_thumb
%%ETCDIR%%/sysactions.conf
include/enlightenment/e.h
include/enlightenment/e_about.h
+include/enlightenment/e_acpi.h
include/enlightenment/e_actions.h
include/enlightenment/e_alert.h
include/enlightenment/e_atoms.h
@@ -44,8 +40,10 @@ include/enlightenment/e_filereg.h
include/enlightenment/e_flowlayout.h
include/enlightenment/e_fm.h
include/enlightenment/e_fm_custom.h
-include/enlightenment/e_fm_hal.h
+include/enlightenment/e_fm_dbus.h
include/enlightenment/e_fm_mime.h
+include/enlightenment/e_fm_op.h
+include/enlightenment/e_fm_op_registry.h
include/enlightenment/e_fm_prop.h
include/enlightenment/e_fm_shared.h
include/enlightenment/e_focus.h
@@ -71,8 +69,6 @@ include/enlightenment/e_intl.h
include/enlightenment/e_intl_data.h
include/enlightenment/e_ipc.h
include/enlightenment/e_ipc_codec.h
-include/enlightenment/e_ipc_handlers.h
-include/enlightenment/e_ipc_handlers_list.h
include/enlightenment/e_layout.h
include/enlightenment/e_livethumb.h
include/enlightenment/e_manager.h
@@ -94,14 +90,18 @@ include/enlightenment/e_pointer.h
include/enlightenment/e_popup.h
include/enlightenment/e_powersave.h
include/enlightenment/e_prefix.h
+include/enlightenment/e_randr.h
include/enlightenment/e_remember.h
include/enlightenment/e_resist.h
+include/enlightenment/e_scale.h
include/enlightenment/e_screensaver.h
include/enlightenment/e_scrollframe.h
include/enlightenment/e_sha1.h
include/enlightenment/e_shelf.h
include/enlightenment/e_signals.h
+include/enlightenment/e_slidecore.h
include/enlightenment/e_slider.h
+include/enlightenment/e_slidesel.h
include/enlightenment/e_spectrum.h
include/enlightenment/e_startup.h
include/enlightenment/e_stolen.h
@@ -111,7 +111,6 @@ include/enlightenment/e_test.h
include/enlightenment/e_theme.h
include/enlightenment/e_theme_about.h
include/enlightenment/e_thumb.h
-include/enlightenment/e_tlist.h
include/enlightenment/e_toolbar.h
include/enlightenment/e_user.h
include/enlightenment/e_utils.h
@@ -123,8 +122,9 @@ include/enlightenment/e_widget_color_well.h
include/enlightenment/e_widget_config_list.h
include/enlightenment/e_widget_csel.h
include/enlightenment/e_widget_cslider.h
-include/enlightenment/e_widget_desk_preview.h
+include/enlightenment/e_widget_deskpreview.h
include/enlightenment/e_widget_entry.h
+include/enlightenment/e_widget_flist.h
include/enlightenment/e_widget_font_preview.h
include/enlightenment/e_widget_framelist.h
include/enlightenment/e_widget_frametable.h
@@ -140,303 +140,367 @@ include/enlightenment/e_widget_slider.h
include/enlightenment/e_widget_spectrum.h
include/enlightenment/e_widget_table.h
include/enlightenment/e_widget_textblock.h
-include/enlightenment/e_widget_tlist.h
+include/enlightenment/e_widget_toolbar.h
+include/enlightenment/e_widget_toolbook.h
include/enlightenment/e_win.h
include/enlightenment/e_xinerama.h
include/enlightenment/e_zone.h
+include/enlightenment/evry_api.h
+include/enlightenment/evry_types.h
lib/enlightenment/modules/battery/e-module-battery.edj
-lib/enlightenment/modules/battery/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/battery/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/battery/%%E17_ARCH%%/batget
lib/enlightenment/modules/battery/%%E17_ARCH%%/module.so
lib/enlightenment/modules/battery/module.desktop
lib/enlightenment/modules/clock/e-module-clock.edj
-lib/enlightenment/modules/clock/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/clock/%%E17_ARCH%%/module.la
lib/enlightenment/modules/clock/%%E17_ARCH%%/module.so
lib/enlightenment/modules/clock/module.desktop
+lib/enlightenment/modules/comp/e-module-comp.edj
+lib/enlightenment/modules/comp/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/comp/module.desktop
+lib/enlightenment/modules/comp/shadow.edj
lib/enlightenment/modules/conf/e-module-conf.edj
-lib/enlightenment/modules/conf/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf/module.desktop
+lib/enlightenment/modules/conf_acpibindings/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_acpibindings/module.desktop
lib/enlightenment/modules/conf_applications/e-module-conf_applications.edj
-lib/enlightenment/modules/conf_applications/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_applications/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_applications/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_applications/module.desktop
lib/enlightenment/modules/conf_borders/e-module-conf_borders.edj
-lib/enlightenment/modules/conf_borders/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_borders/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_borders/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_borders/module.desktop
lib/enlightenment/modules/conf_clientlist/e-module-conf_clientlist.edj
-lib/enlightenment/modules/conf_clientlist/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_clientlist/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_clientlist/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_clientlist/module.desktop
lib/enlightenment/modules/conf_colors/e-module-conf_colors.edj
-lib/enlightenment/modules/conf_colors/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_colors/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_colors/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_colors/module.desktop
lib/enlightenment/modules/conf_desk/e-module-conf_desk.edj
-lib/enlightenment/modules/conf_desk/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_desk/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_desk/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_desk/module.desktop
lib/enlightenment/modules/conf_desklock/e-module-conf_desklock.edj
-lib/enlightenment/modules/conf_desklock/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_desklock/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_desklock/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_desklock/module.desktop
lib/enlightenment/modules/conf_desks/e-module-conf_desks.edj
-lib/enlightenment/modules/conf_desks/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_desks/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_desks/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_desks/module.desktop
lib/enlightenment/modules/conf_dialogs/e-module-conf_dialogs.edj
-lib/enlightenment/modules/conf_dialogs/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_dialogs/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_dialogs/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_dialogs/module.desktop
lib/enlightenment/modules/conf_display/e-module-conf_display.edj
-lib/enlightenment/modules/conf_display/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_display/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_display/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_display/module.desktop
lib/enlightenment/modules/conf_dpms/e-module-conf_dpms.edj
-lib/enlightenment/modules/conf_dpms/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_dpms/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_dpms/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_dpms/module.desktop
+lib/enlightenment/modules/conf_edgebindings/e-module-conf_edgebindings.edj
+lib/enlightenment/modules/conf_edgebindings/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_edgebindings/module.desktop
lib/enlightenment/modules/conf_engine/e-module-conf_engine.edj
-lib/enlightenment/modules/conf_engine/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_engine/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_engine/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_engine/module.desktop
-lib/enlightenment/modules/conf_exebuf/e-module-conf_exebuf.edj
-lib/enlightenment/modules/conf_exebuf/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_exebuf/%%E17_ARCH%%/module.la
-lib/enlightenment/modules/conf_exebuf/%%E17_ARCH%%/module.so
-lib/enlightenment/modules/conf_exebuf/module.desktop
-lib/enlightenment/modules/conf_fonts/e-module-conf_fonts.edj
-lib/enlightenment/modules/conf_fonts/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_fonts/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_fonts/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_fonts/module.desktop
lib/enlightenment/modules/conf_icon_theme/e-module-conf_icon_theme.edj
-lib/enlightenment/modules/conf_icon_theme/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_icon_theme/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_icon_theme/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_icon_theme/module.desktop
lib/enlightenment/modules/conf_imc/e-module-conf_imc.edj
-lib/enlightenment/modules/conf_imc/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_imc/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_imc/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_imc/module.desktop
lib/enlightenment/modules/conf_interaction/e-module-conf_interaction.edj
-lib/enlightenment/modules/conf_interaction/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_interaction/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_interaction/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_interaction/module.desktop
lib/enlightenment/modules/conf_intl/e-module-conf_intl.edj
-lib/enlightenment/modules/conf_intl/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_intl/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_intl/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_intl/module.desktop
-lib/enlightenment/modules/conf_keybindings/e-module-conf_keybindings.edj
-lib/enlightenment/modules/conf_keybindings/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_keybindings/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_keybindings/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_keybindings/module.desktop
lib/enlightenment/modules/conf_menus/e-module-conf_menus.edj
-lib/enlightenment/modules/conf_menus/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_menus/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_menus/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_menus/module.desktop
lib/enlightenment/modules/conf_mime/e-module-conf_mime.edj
-lib/enlightenment/modules/conf_mime/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_mime/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_mime/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_mime/module.desktop
lib/enlightenment/modules/conf_mouse/e-module-conf_mouse.edj
-lib/enlightenment/modules/conf_mouse/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_mouse/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_mouse/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_mouse/module.desktop
lib/enlightenment/modules/conf_mouse_cursor/e-module-conf_mouse_cursor.edj
-lib/enlightenment/modules/conf_mouse_cursor/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_mouse_cursor/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_mouse_cursor/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_mouse_cursor/module.desktop
lib/enlightenment/modules/conf_mousebindings/e-module-conf_mousebindings.edj
-lib/enlightenment/modules/conf_mousebindings/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_mousebindings/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_mousebindings/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_mousebindings/module.desktop
lib/enlightenment/modules/conf_paths/e-module-conf_paths.edj
-lib/enlightenment/modules/conf_paths/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_paths/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_paths/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_paths/module.desktop
lib/enlightenment/modules/conf_performance/e-module-conf_performance.edj
-lib/enlightenment/modules/conf_performance/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_performance/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_performance/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_performance/module.desktop
lib/enlightenment/modules/conf_profiles/e-module-conf_profiles.edj
-lib/enlightenment/modules/conf_profiles/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_profiles/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_profiles/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_profiles/module.desktop
-lib/enlightenment/modules/conf_screensaver/e-module-conf_screensaver.edj
-lib/enlightenment/modules/conf_screensaver/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_screensaver/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/conf_scale/e-module-conf_scale.edj
+lib/enlightenment/modules/conf_scale/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_scale/module.desktop
lib/enlightenment/modules/conf_screensaver/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_screensaver/module.desktop
lib/enlightenment/modules/conf_shelves/e-module-conf_shelves.edj
-lib/enlightenment/modules/conf_shelves/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_shelves/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_shelves/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_shelves/module.desktop
lib/enlightenment/modules/conf_startup/e-module-conf_startup.edj
-lib/enlightenment/modules/conf_startup/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_startup/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_startup/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_startup/module.desktop
-lib/enlightenment/modules/conf_theme/e-module-conf_theme.edj
-lib/enlightenment/modules/conf_theme/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_theme/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_theme/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_theme/module.desktop
lib/enlightenment/modules/conf_transitions/e-module-conf_transitions.edj
-lib/enlightenment/modules/conf_transitions/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_transitions/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_transitions/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_transitions/module.desktop
-lib/enlightenment/modules/conf_wallpaper/e-module-conf_wallpaper.edj
-lib/enlightenment/modules/conf_wallpaper/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_wallpaper/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_wallpaper/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_wallpaper/module.desktop
+lib/enlightenment/modules/conf_wallpaper2/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_wallpaper2/module.desktop
lib/enlightenment/modules/conf_window_display/e-module-conf_window_display.edj
-lib/enlightenment/modules/conf_window_display/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_window_display/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_window_display/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_window_display/module.desktop
lib/enlightenment/modules/conf_window_focus/e-module-conf_window_focus.edj
-lib/enlightenment/modules/conf_window_focus/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_window_focus/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_window_focus/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_window_focus/module.desktop
lib/enlightenment/modules/conf_window_manipulation/e-module-conf_winmanip.edj
-lib/enlightenment/modules/conf_window_manipulation/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_window_manipulation/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_window_manipulation/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_window_manipulation/module.desktop
+lib/enlightenment/modules/conf_window_remembers/e-module-conf_window_remembers.edj
+lib/enlightenment/modules/conf_window_remembers/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/conf_window_remembers/module.desktop
lib/enlightenment/modules/conf_winlist/e-module-conf_winlist.edj
-lib/enlightenment/modules/conf_winlist/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/conf_winlist/%%E17_ARCH%%/module.la
lib/enlightenment/modules/conf_winlist/%%E17_ARCH%%/module.so
lib/enlightenment/modules/conf_winlist/module.desktop
+lib/enlightenment/modules/connman/e-module-connman.edj
+lib/enlightenment/modules/connman/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/connman/module.desktop
lib/enlightenment/modules/cpufreq/e-module-cpufreq.edj
lib/enlightenment/modules/cpufreq/%%E17_ARCH%%/freqset
-lib/enlightenment/modules/cpufreq/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/cpufreq/%%E17_ARCH%%/module.la
lib/enlightenment/modules/cpufreq/%%E17_ARCH%%/module.so
lib/enlightenment/modules/cpufreq/module.desktop
lib/enlightenment/modules/dropshadow/e-module-dropshadow.edj
-lib/enlightenment/modules/dropshadow/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/dropshadow/%%E17_ARCH%%/module.la
lib/enlightenment/modules/dropshadow/%%E17_ARCH%%/module.so
lib/enlightenment/modules/dropshadow/module.desktop
-lib/enlightenment/modules/exebuf/e-module-exebuf.edj
-lib/enlightenment/modules/exebuf/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/exebuf/%%E17_ARCH%%/module.la
-lib/enlightenment/modules/exebuf/%%E17_ARCH%%/module.so
-lib/enlightenment/modules/exebuf/module.desktop
+lib/enlightenment/modules/everything-apps/e-module.edj
+lib/enlightenment/modules/everything-apps/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/everything-apps/module.desktop
+lib/enlightenment/modules/everything-aspell/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/everything-aspell/module.desktop
+lib/enlightenment/modules/everything-calc/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/everything-calc/module.desktop
+lib/enlightenment/modules/everything-files/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/everything-files/module.desktop
+lib/enlightenment/modules/everything-settings/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/everything-settings/module.desktop
+lib/enlightenment/modules/everything-windows/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/everything-windows/module.desktop
+lib/enlightenment/modules/everything/e-module-everything.edj
+lib/enlightenment/modules/everything/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/everything/module.desktop
lib/enlightenment/modules/fileman/e-module-fileman.edj
-lib/enlightenment/modules/fileman/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/fileman/%%E17_ARCH%%/module.la
lib/enlightenment/modules/fileman/%%E17_ARCH%%/module.so
lib/enlightenment/modules/fileman/module.desktop
+lib/enlightenment/modules/fileman_opinfo/e-module-fileman_opinfo.edj
+lib/enlightenment/modules/fileman_opinfo/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/fileman_opinfo/module.desktop
+lib/enlightenment/modules/gadman/e-module-gadman.edj
+lib/enlightenment/modules/gadman/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/gadman/module.desktop
lib/enlightenment/modules/ibar/e-module-ibar.edj
-lib/enlightenment/modules/ibar/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/ibar/%%E17_ARCH%%/module.la
lib/enlightenment/modules/ibar/%%E17_ARCH%%/module.so
lib/enlightenment/modules/ibar/module.desktop
lib/enlightenment/modules/ibox/e-module-ibox.edj
-lib/enlightenment/modules/ibox/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/ibox/%%E17_ARCH%%/module.la
lib/enlightenment/modules/ibox/%%E17_ARCH%%/module.so
lib/enlightenment/modules/ibox/module.desktop
-lib/enlightenment/modules/layout/e-module-layout.edj
-lib/enlightenment/modules/layout/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/layout/%%E17_ARCH%%/module.la
-lib/enlightenment/modules/layout/%%E17_ARCH%%/module.so
-lib/enlightenment/modules/layout/module.desktop
-lib/enlightenment/modules/msgbus_lang/e-module-msgbus_lang.edj
-lib/enlightenment/modules/msgbus_lang/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/msgbus_lang/%%E17_ARCH%%/module.la
-lib/enlightenment/modules/msgbus_lang/%%E17_ARCH%%/module.so
-lib/enlightenment/modules/msgbus_lang/module.desktop
+lib/enlightenment/modules/illume/keyboards/Default.kbd
+lib/enlightenment/modules/illume/keyboards/numeric.png
+lib/enlightenment/modules/illume/keyboards/Numbers.kbd
+lib/enlightenment/modules/illume/keyboards/up.png
+lib/enlightenment/modules/illume/keyboards/enter.png
+lib/enlightenment/modules/illume/keyboards/ignore_built_in_keyboards
+lib/enlightenment/modules/illume/keyboards/right.png
+lib/enlightenment/modules/illume/keyboards/Terminal.kbd
+lib/enlightenment/modules/illume/keyboards/qwerty.png
+lib/enlightenment/modules/illume/keyboards/shift.png
+lib/enlightenment/modules/illume/keyboards/tab.png
+lib/enlightenment/modules/illume/keyboards/alpha.png
+lib/enlightenment/modules/illume/keyboards/left.png
+lib/enlightenment/modules/illume/keyboards/down.png
+lib/enlightenment/modules/illume/keyboards/backspace.png
+lib/enlightenment/modules/illume/e-module-illume.edj
+lib/enlightenment/modules/illume/dicts/English_(US).dic
+lib/enlightenment/modules/illume/dicts/English_(US)_Small.dic
+lib/enlightenment/modules/illume/module.desktop
+lib/enlightenment/modules/illume/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/illume/%%E17_ARCH%%/wifiget
+lib/enlightenment/modules/illume-bluetooth/e-module-illume-bluetooth.edj
+lib/enlightenment/modules/illume-bluetooth/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/illume-bluetooth/module.desktop
+lib/enlightenment/modules/illume-home-toggle/e-module-illume-home-toggle.edj
+lib/enlightenment/modules/illume-home-toggle/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/illume-home-toggle/module.desktop
+lib/enlightenment/modules/illume-home/e-module-illume-home.edj
+lib/enlightenment/modules/illume-home/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/illume-home/module.desktop
+lib/enlightenment/modules/illume-indicator/e-module-illume-indicator.edj
+lib/enlightenment/modules/illume-indicator/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/illume-indicator/module.desktop
+lib/enlightenment/modules/illume-kbd-toggle/e-module-illume-kbd-toggle.edj
+lib/enlightenment/modules/illume-kbd-toggle/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/illume-kbd-toggle/module.desktop
+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
+lib/enlightenment/modules/illume-keyboard/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/illume-keyboard/keyboards/Default.kbd
+lib/enlightenment/modules/illume-keyboard/keyboards/Numbers.kbd
+lib/enlightenment/modules/illume-keyboard/keyboards/Terminal.kbd
+lib/enlightenment/modules/illume-keyboard/keyboards/alpha.png
+lib/enlightenment/modules/illume-keyboard/keyboards/backspace.png
+lib/enlightenment/modules/illume-keyboard/keyboards/down.png
+lib/enlightenment/modules/illume-keyboard/keyboards/enter.png
+lib/enlightenment/modules/illume-keyboard/keyboards/ignore_built_in_keyboards
+lib/enlightenment/modules/illume-keyboard/keyboards/left.png
+lib/enlightenment/modules/illume-keyboard/keyboards/numeric.png
+lib/enlightenment/modules/illume-keyboard/keyboards/qwerty.png
+lib/enlightenment/modules/illume-keyboard/keyboards/right.png
+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-mode-toggle/e-module-illume-mode-toggle.edj
+lib/enlightenment/modules/illume-mode-toggle/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/illume-mode-toggle/module.desktop
+lib/enlightenment/modules/illume-softkey/e-module-illume-softkey.edj
+lib/enlightenment/modules/illume-softkey/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/illume-softkey/module.desktop
+lib/enlightenment/modules/illume2/e-module-illume2.edj
+lib/enlightenment/modules/illume2/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/illume2/keyboards/ignore_built_in_keyboards
+lib/enlightenment/modules/illume2/module.desktop
+lib/enlightenment/modules/illume2/policies/illume.so
+lib/enlightenment/modules/mixer/e-module-mixer.edj
+lib/enlightenment/modules/mixer/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/mixer/module.desktop
+lib/enlightenment/modules/msgbus/e-module-msgbus.edj
+lib/enlightenment/modules/msgbus/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/msgbus/module.desktop
+lib/enlightenment/modules/ofono/e-module-ofono.edj
+lib/enlightenment/modules/ofono/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/ofono/module.desktop
lib/enlightenment/modules/pager/e-module-pager.edj
-lib/enlightenment/modules/pager/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/pager/%%E17_ARCH%%/module.la
lib/enlightenment/modules/pager/%%E17_ARCH%%/module.so
lib/enlightenment/modules/pager/module.desktop
lib/enlightenment/modules/start/e-module-start.edj
-lib/enlightenment/modules/start/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/start/%%E17_ARCH%%/module.la
lib/enlightenment/modules/start/%%E17_ARCH%%/module.so
lib/enlightenment/modules/start/module.desktop
+lib/enlightenment/modules/syscon/e-module-syscon.edj
+lib/enlightenment/modules/syscon/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/syscon/module.desktop
+lib/enlightenment/modules/systray/e-module-systray.edj
+lib/enlightenment/modules/systray/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/systray/module.desktop
lib/enlightenment/modules/temperature/e-module-temperature.edj
-lib/enlightenment/modules/temperature/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/temperature/%%E17_ARCH%%/module.la
lib/enlightenment/modules/temperature/%%E17_ARCH%%/module.so
lib/enlightenment/modules/temperature/%%E17_ARCH%%/tempget
lib/enlightenment/modules/temperature/module.desktop
lib/enlightenment/modules/winlist/e-module-winlist.edj
-lib/enlightenment/modules/winlist/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/winlist/%%E17_ARCH%%/module.la
lib/enlightenment/modules/winlist/%%E17_ARCH%%/module.so
lib/enlightenment/modules/winlist/module.desktop
-lib/enlightenment/modules/wizard/e-module-wizard.edj
-lib/enlightenment/modules/wizard/%%E17_ARCH%%/module.a
-lib/enlightenment/modules/wizard/%%E17_ARCH%%/module.la
lib/enlightenment/modules/wizard/%%E17_ARCH%%/module.so
-lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_000.a
-lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_000.la
lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_000.so
-lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_010.a
-lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_010.la
lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_010.so
-lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_020.a
-lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_020.la
lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_020.so
-lib/enlightenment/modules/wizard/module.desktop
-lib/enlightenment/preload/e_precache.a
-lib/enlightenment/preload/e_precache.la
+lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_030.so
+lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_070.so
+lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_080.so
+lib/enlightenment/modules/wizard/%%E17_ARCH%%/page_200.so
lib/enlightenment/preload/e_precache.so
+lib/enlightenment/utils/enlightenment_fm
+lib/enlightenment/utils/enlightenment_fm_op
+lib/enlightenment/utils/enlightenment_init
+lib/enlightenment/utils/enlightenment_sys
+lib/enlightenment/utils/enlightenment_thumb
+libdata/pkgconfig/enlightenment.pc
+libdata/pkgconfig/everything.pc
%%DATADIR%%/AUTHORS
%%DATADIR%%/COPYING
-%%DATADIR%%/data/backgrounds/Blue_Sky_Tree.edj
-%%DATADIR%%/data/backgrounds/Cracked_Earth.edj
-%%DATADIR%%/data/backgrounds/Ivy_Wall.edj
-%%DATADIR%%/data/backgrounds/Ladybug.edj
-%%DATADIR%%/data/fonts/Vera.COPYING
-%%DATADIR%%/data/fonts/Vera.ttf
-%%DATADIR%%/data/fonts/VeraBI.ttf
-%%DATADIR%%/data/fonts/VeraBd.ttf
-%%DATADIR%%/data/fonts/VeraIt.ttf
-%%DATADIR%%/data/fonts/VeraMoBI.ttf
-%%DATADIR%%/data/fonts/VeraMoBd.ttf
-%%DATADIR%%/data/fonts/VeraMoIt.ttf
-%%DATADIR%%/data/fonts/VeraMono.ttf
-%%DATADIR%%/data/fonts/VeraSe.ttf
-%%DATADIR%%/data/fonts/VeraSeBd.ttf
-%%DATADIR%%/data/fonts/fonts.alias
-%%DATADIR%%/data/fonts/fonts.dir
+%%DATADIR%%/data/backgrounds/Dark_Gradient.edj
+%%DATADIR%%/data/backgrounds/Light_Gradient.edj
+%%DATADIR%%/data/config/default/e.cfg
+%%DATADIR%%/data/config/default/icon.png
+%%DATADIR%%/data/config/default/profile.desktop
+%%DATADIR%%/data/config/illume-home/e.cfg
+%%DATADIR%%/data/config/illume-home/icon.png
+%%DATADIR%%/data/config/illume-home/module.battery.cfg
+%%DATADIR%%/data/config/illume-home/module.conf.cfg
+%%DATADIR%%/data/config/illume-home/module.illume-home.cfg
+%%DATADIR%%/data/config/illume-home/module.illume-indicator.cfg
+%%DATADIR%%/data/config/illume-home/module.illume-keyboard.cfg
+%%DATADIR%%/data/config/illume-home/module.illume-softkey.cfg
+%%DATADIR%%/data/config/illume-home/module.illume2.cfg
+%%DATADIR%%/data/config/illume-home/profile.desktop
+%%DATADIR%%/data/config/illume/e.cfg
+%%DATADIR%%/data/config/illume/icon.png
+%%DATADIR%%/data/config/illume/module.battery.cfg
+%%DATADIR%%/data/config/illume/module.conf.cfg
+%%DATADIR%%/data/config/illume/module.dropshadow.cfg
+%%DATADIR%%/data/config/illume/module.illume.cfg
+%%DATADIR%%/data/config/illume/module.mixer.cfg
+%%DATADIR%%/data/config/illume/module.pager.cfg
+%%DATADIR%%/data/config/illume/profile.desktop
+%%DATADIR%%/data/config/minimalist/e.cfg
+%%DATADIR%%/data/config/minimalist/icon.png
+%%DATADIR%%/data/config/minimalist/module.battery.cfg
+%%DATADIR%%/data/config/minimalist/module.conf.cfg
+%%DATADIR%%/data/config/minimalist/module.cpufreq.cfg
+%%DATADIR%%/data/config/minimalist/module.dropshadow.cfg
+%%DATADIR%%/data/config/minimalist/module.fileman.cfg
+%%DATADIR%%/data/config/minimalist/module.ibar.cfg
+%%DATADIR%%/data/config/minimalist/module.ibox.cfg
+%%DATADIR%%/data/config/minimalist/module.pager.cfg
+%%DATADIR%%/data/config/minimalist/module.temperature.cfg
+%%DATADIR%%/data/config/minimalist/profile.desktop
+%%DATADIR%%/data/config/netbook/e.cfg
+%%DATADIR%%/data/config/netbook/icon.png
+%%DATADIR%%/data/config/netbook/module.battery.cfg
+%%DATADIR%%/data/config/netbook/module.conf.cfg
+%%DATADIR%%/data/config/netbook/module.cpufreq.cfg
+%%DATADIR%%/data/config/netbook/module.dropshadow.cfg
+%%DATADIR%%/data/config/netbook/module.fileman.cfg
+%%DATADIR%%/data/config/netbook/module.ibar.cfg
+%%DATADIR%%/data/config/netbook/module.ibox.cfg
+%%DATADIR%%/data/config/netbook/module.pager.cfg
+%%DATADIR%%/data/config/netbook/module.temperature.cfg
+%%DATADIR%%/data/config/netbook/profile.desktop
+%%DATADIR%%/data/config/profile.cfg
+%%DATADIR%%/data/config/scaleable/e.cfg
+%%DATADIR%%/data/config/scaleable/icon.png
+%%DATADIR%%/data/config/scaleable/module.battery.cfg
+%%DATADIR%%/data/config/scaleable/module.conf.cfg
+%%DATADIR%%/data/config/scaleable/module.cpufreq.cfg
+%%DATADIR%%/data/config/scaleable/module.dropshadow.cfg
+%%DATADIR%%/data/config/scaleable/module.fileman.cfg
+%%DATADIR%%/data/config/scaleable/module.ibar.cfg
+%%DATADIR%%/data/config/scaleable/module.ibox.cfg
+%%DATADIR%%/data/config/scaleable/module.pager.cfg
+%%DATADIR%%/data/config/scaleable/module.temperature.cfg
+%%DATADIR%%/data/config/scaleable/profile.desktop
+%%DATADIR%%/data/config/standard/e.cfg
+%%DATADIR%%/data/config/standard/icon.png
+%%DATADIR%%/data/config/standard/module.battery.cfg
+%%DATADIR%%/data/config/standard/module.conf.cfg
+%%DATADIR%%/data/config/standard/module.cpufreq.cfg
+%%DATADIR%%/data/config/standard/module.dropshadow.cfg
+%%DATADIR%%/data/config/standard/module.fileman.cfg
+%%DATADIR%%/data/config/standard/module.ibar.cfg
+%%DATADIR%%/data/config/standard/module.ibox.cfg
+%%DATADIR%%/data/config/standard/module.pager.cfg
+%%DATADIR%%/data/config/standard/module.temperature.cfg
+%%DATADIR%%/data/config/standard/profile.desktop
%%DATADIR%%/data/icons/audio_player.png
%%DATADIR%%/data/icons/audio_player2.png
%%DATADIR%%/data/icons/image_viewer.png
@@ -446,10 +510,35 @@ lib/enlightenment/preload/e_precache.so
%%DATADIR%%/data/icons/web_browser.png
%%DATADIR%%/data/icons/xterm.png
%%DATADIR%%/data/images/enlightenment.png
+%%DATADIR%%/data/images/lang-bg_BG.png
+%%DATADIR%%/data/images/lang-ca_ES.png
+%%DATADIR%%/data/images/lang-cs_CZ.png
+%%DATADIR%%/data/images/lang-da_DK.png
+%%DATADIR%%/data/images/lang-de_DE.png
+%%DATADIR%%/data/images/lang-el_GR.png
+%%DATADIR%%/data/images/lang-en_US.png
+%%DATADIR%%/data/images/lang-es_AR.png
+%%DATADIR%%/data/images/lang-es_ES.png
+%%DATADIR%%/data/images/lang-fi_FI.png
+%%DATADIR%%/data/images/lang-fr_FR.png
+%%DATADIR%%/data/images/lang-hu_HU.png
+%%DATADIR%%/data/images/lang-it_IT.png
+%%DATADIR%%/data/images/lang-ja_JP.png
+%%DATADIR%%/data/images/lang-ko_KR.png
+%%DATADIR%%/data/images/lang-nb_NO.png
+%%DATADIR%%/data/images/lang-nl_NL.png
+%%DATADIR%%/data/images/lang-pl_PL.png
+%%DATADIR%%/data/images/lang-pt_BR.png
+%%DATADIR%%/data/images/lang-ru_RU.png
+%%DATADIR%%/data/images/lang-sk_SK.png
+%%DATADIR%%/data/images/lang-sl_SI.png
+%%DATADIR%%/data/images/lang-sv_SE.png
+%%DATADIR%%/data/images/lang-zh_CN.png
+%%DATADIR%%/data/images/lang-zh_TW.png
%%DATADIR%%/data/images/test.edj
%%DATADIR%%/data/images/test.jpg
%%DATADIR%%/data/images/test.png
-%%DATADIR%%/data/init/default.edj
+%%DATADIR%%/data/images/test.svg
%%DATADIR%%/data/input_methods/iiimf.imc
%%DATADIR%%/data/input_methods/scim.imc
%%DATADIR%%/data/input_methods/uim.imc
@@ -458,42 +547,79 @@ lib/enlightenment/preload/e_precache.so
%%DATADIR%%/data/other/efm_favorites.tar.gz
%%DATADIR%%/data/other/icon_example.tar.gz
%%DATADIR%%/data/themes/default.edj
+%%DATADIR%%/data/themes/illume.edj
%%DATADIR%%/doc/FDO.txt
%%DATADIR%%/doc/cache.txt
%%DATADIR%%/doc/documentation.html
%%DATADIR%%/doc/enlightenment.png
-share/locale/bg/LC_MESSAGES/enlightenment.mo
-share/locale/ca/LC_MESSAGES/enlightenment.mo
-share/locale/de/LC_MESSAGES/enlightenment.mo
-share/locale/eo/LC_MESSAGES/enlightenment.mo
-share/locale/es/LC_MESSAGES/enlightenment.mo
-share/locale/fi/LC_MESSAGES/enlightenment.mo
-share/locale/fr/LC_MESSAGES/enlightenment.mo
-share/locale/fr_CH/LC_MESSAGES/enlightenment.mo
-share/locale/hu/LC_MESSAGES/enlightenment.mo
-share/locale/it/LC_MESSAGES/enlightenment.mo
-share/locale/ja/LC_MESSAGES/enlightenment.mo
-share/locale/ko/LC_MESSAGES/enlightenment.mo
-share/locale/pt_BR/LC_MESSAGES/enlightenment.mo
-share/locale/ru/LC_MESSAGES/enlightenment.mo
-share/locale/sl/LC_MESSAGES/enlightenment.mo
-share/locale/zh_CN/LC_MESSAGES/enlightenment.mo
-share/locale/zh_TW/LC_MESSAGES/enlightenment.mo
+%%DATADIR%%/doc/illume2.html
+%%DATADIR%%/doc/illume2.png
share/xsessions/enlightenment.desktop
+%%NLS%%share/locale/ar/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/da/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/de/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/el/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/es/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/et/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/fo/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/fr_CH/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/he/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/it/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/km/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/ku/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/enlightenment.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/enlightenment.mo
+%%NLS%%@dirrmtry share/locale/fo/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fo
+%%NLS%%@dirrmtry share/locale/fr_CH/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fr_CH
+%%NLS%%@dirrmtry share/locale/km/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/km
+%%NLS%%@dirrmtry share/locale/ku/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ku
@dirrmtry share/xsessions
-@dirrmtry share/locale/fr_CH/LC_MESSAGES
-@dirrmtry share/locale/fr_CH
@dirrm %%DATADIR%%/doc
@dirrm %%DATADIR%%/data/themes
@dirrm %%DATADIR%%/data/other
@dirrm %%DATADIR%%/data/input_methods
-@dirrm %%DATADIR%%/data/init
@dirrm %%DATADIR%%/data/images
@dirrm %%DATADIR%%/data/icons
-@dirrm %%DATADIR%%/data/fonts
+@dirrm %%DATADIR%%/data/config/standard
+@dirrm %%DATADIR%%/data/config/scaleable
+@dirrm %%DATADIR%%/data/config/netbook
+@dirrm %%DATADIR%%/data/config/minimalist
+@dirrm %%DATADIR%%/data/config/illume-home
+@dirrm %%DATADIR%%/data/config/illume
+@dirrm %%DATADIR%%/data/config/default
+@dirrm %%DATADIR%%/data/config
@dirrm %%DATADIR%%/data/backgrounds
@dirrm %%DATADIR%%/data
@dirrm %%DATADIR%%
+@dirrm lib/enlightenment/utils
@dirrm lib/enlightenment/preload
@dirrm lib/enlightenment/modules/wizard/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/wizard
@@ -501,34 +627,88 @@ share/xsessions/enlightenment.desktop
@dirrm lib/enlightenment/modules/winlist
@dirrm lib/enlightenment/modules/temperature/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/temperature
+@dirrm lib/enlightenment/modules/systray/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/systray
+@dirrm lib/enlightenment/modules/syscon/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/syscon
@dirrm lib/enlightenment/modules/start/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/start
@dirrm lib/enlightenment/modules/pager/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/pager
-@dirrm lib/enlightenment/modules/msgbus_lang/%%E17_ARCH%%
-@dirrm lib/enlightenment/modules/msgbus_lang
-@dirrm lib/enlightenment/modules/layout/%%E17_ARCH%%
-@dirrm lib/enlightenment/modules/layout
+@dirrm lib/enlightenment/modules/ofono/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/ofono
+@dirrm lib/enlightenment/modules/msgbus/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/msgbus
+@dirrm lib/enlightenment/modules/mixer/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/mixer
+@dirrm lib/enlightenment/modules/illume2/policies
+@dirrm lib/enlightenment/modules/illume2/keyboards
+@dirrm lib/enlightenment/modules/illume2/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/illume2
+@dirrm lib/enlightenment/modules/illume-softkey/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/illume-softkey
+@dirrm lib/enlightenment/modules/illume-mode-toggle/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/illume-mode-toggle
+@dirrm lib/enlightenment/modules/illume-keyboard/keyboards
+@dirrm lib/enlightenment/modules/illume-keyboard/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/illume-keyboard/dicts
+@dirrm lib/enlightenment/modules/illume-keyboard
+@dirrm lib/enlightenment/modules/illume-kbd-toggle/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/illume-kbd-toggle
+@dirrm lib/enlightenment/modules/illume-indicator/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/illume-indicator
+@dirrm lib/enlightenment/modules/illume-home/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/illume-home
+@dirrm lib/enlightenment/modules/illume-home-toggle/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/illume-home-toggle
+@dirrm lib/enlightenment/modules/illume-bluetooth/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/illume-bluetooth
+@dirrm lib/enlightenment/modules/illume/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/illume/dicts
+@dirrm lib/enlightenment/modules/illume/keyboards
+@dirrm lib/enlightenment/modules/illume
@dirrm lib/enlightenment/modules/ibox/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/ibox
@dirrm lib/enlightenment/modules/ibar/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/ibar
+@dirrm lib/enlightenment/modules/gadman/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/gadman
+@dirrm lib/enlightenment/modules/fileman_opinfo/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/fileman_opinfo
@dirrm lib/enlightenment/modules/fileman/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/fileman
-@dirrm lib/enlightenment/modules/exebuf/%%E17_ARCH%%
-@dirrm lib/enlightenment/modules/exebuf
+@dirrm lib/enlightenment/modules/everything/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/everything
+@dirrm lib/enlightenment/modules/everything-windows/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/everything-windows
+@dirrm lib/enlightenment/modules/everything-settings/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/everything-settings
+@dirrm lib/enlightenment/modules/everything-files/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/everything-files
+@dirrm lib/enlightenment/modules/everything-calc/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/everything-calc
+@dirrm lib/enlightenment/modules/everything-aspell/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/everything-aspell
+@dirrm lib/enlightenment/modules/everything-apps/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/everything-apps
@dirrm lib/enlightenment/modules/dropshadow/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/dropshadow
@dirrm lib/enlightenment/modules/cpufreq/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/cpufreq
+@dirrm lib/enlightenment/modules/connman/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/connman
@dirrm lib/enlightenment/modules/conf_winlist/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/conf_winlist
+@dirrm lib/enlightenment/modules/conf_window_remembers/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_window_remembers
@dirrm lib/enlightenment/modules/conf_window_manipulation/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/conf_window_manipulation
@dirrm lib/enlightenment/modules/conf_window_focus/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/conf_window_focus
@dirrm lib/enlightenment/modules/conf_window_display/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/conf_window_display
+@dirrm lib/enlightenment/modules/conf_wallpaper2/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_wallpaper2
@dirrm lib/enlightenment/modules/conf_wallpaper/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/conf_wallpaper
@dirrm lib/enlightenment/modules/conf_transitions/%%E17_ARCH%%
@@ -541,6 +721,8 @@ share/xsessions/enlightenment.desktop
@dirrm lib/enlightenment/modules/conf_shelves
@dirrm lib/enlightenment/modules/conf_screensaver/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/conf_screensaver
+@dirrm lib/enlightenment/modules/conf_scale/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_scale
@dirrm lib/enlightenment/modules/conf_profiles/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/conf_profiles
@dirrm lib/enlightenment/modules/conf_performance/%%E17_ARCH%%
@@ -569,10 +751,10 @@ share/xsessions/enlightenment.desktop
@dirrm lib/enlightenment/modules/conf_icon_theme
@dirrm lib/enlightenment/modules/conf_fonts/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/conf_fonts
-@dirrm lib/enlightenment/modules/conf_exebuf/%%E17_ARCH%%
-@dirrm lib/enlightenment/modules/conf_exebuf
@dirrm lib/enlightenment/modules/conf_engine/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/conf_engine
+@dirrm lib/enlightenment/modules/conf_edgebindings/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_edgebindings
@dirrm lib/enlightenment/modules/conf_dpms/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/conf_dpms
@dirrm lib/enlightenment/modules/conf_display/%%E17_ARCH%%
@@ -593,8 +775,12 @@ share/xsessions/enlightenment.desktop
@dirrm lib/enlightenment/modules/conf_borders
@dirrm lib/enlightenment/modules/conf_applications/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/conf_applications
+@dirrm lib/enlightenment/modules/conf_acpibindings/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/conf_acpibindings
@dirrm lib/enlightenment/modules/conf/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/conf
+@dirrm lib/enlightenment/modules/comp/%%E17_ARCH%%
+@dirrm lib/enlightenment/modules/comp
@dirrm lib/enlightenment/modules/clock/%%E17_ARCH%%
@dirrm lib/enlightenment/modules/clock
@dirrm lib/enlightenment/modules/battery/%%E17_ARCH%%
@@ -602,4 +788,4 @@ share/xsessions/enlightenment.desktop
@dirrm lib/enlightenment/modules
@dirrm lib/enlightenment
@dirrm include/enlightenment
-@dirrmtry %%ETCDIR%%
+@dirrm %%ETCDIR%%
diff --git a/x11/Makefile b/x11/Makefile
index 440a4bebdb13..ce13dfd4216f 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -49,6 +49,8 @@
SUBDIR += ecore-desktop
SUBDIR += ecore-imf
SUBDIR += ecore-imf_evas
+ SUBDIR += ecore-input
+ SUBDIR += ecore-input_evas
SUBDIR += ecore-x11
SUBDIR += editres
SUBDIR += efreet
diff --git a/x11/ecore-desktop/Makefile b/x11/ecore-desktop/Makefile
index 579695dfcb84..010813ab2f43 100644
--- a/x11/ecore-desktop/Makefile
+++ b/x11/ecore-desktop/Makefile
@@ -17,6 +17,10 @@ DISTNAME= ecore-${PORTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= Enlightenment core abstraction library (desktop module)
+BROKEN= does not compile
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GNOME= gnomehack pkgconfig gnometarget
diff --git a/x11/ecore-imf/Makefile b/x11/ecore-imf/Makefile
index 032b932ebd9f..e209233c5697 100644
--- a/x11/ecore-imf/Makefile
+++ b/x11/ecore-imf/Makefile
@@ -6,45 +6,40 @@
#
PORTNAME= imf
-PORTVERSION= 0.9.9.042
-PORTREVISION= 0
-CATEGORIES= x11
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
- http://download.enlightenment.org/snapshots/2008-01-25/
+DISTVERSION= 1.0.0.beta
+CATEGORIES= x11 enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
PKGNAMEPREFIX= ecore-
-DISTNAME= ecore-${PORTVERSION}
+DISTNAME= ecore-${DISTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= Enlightenment core abstraction library (IMF module)
-GNU_CONFIGURE= yes
+LICENSE= BSD
+DIST_SUBDIR= e17
USE_BZIP2= yes
+GNU_CONFIGURE= yes
+USE_EFL= ecore libtool_hack
USE_GNOME= gnomehack pkgconfig gnometarget
USE_LDCONFIG= yes
-USE_EFL= ecore
BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_imf
INSTALL_WRKSRC= ${BUILD_WRKSRC}
-CONFIGURE_ARGS= --enable-ecore-con \
- --enable-ecore-config \
- --disable-ecore-desktop \
- --disable-ecore-directfb \
- --disable-ecore-evas \
- --disable-ecore-file \
- --disable-ecore-ipc \
- --disable-ecore-job \
- --disable-ecore-sdl \
- --disable-ecore-txt \
- --disable-ecore-x \
- --enable-ecore-imf \
- --disable-ecore-imf_evas
+.include <../../devel/ecore-main/Makefile.inc>
+
+CONFIGURE_ARGS+= --enable-ecore-con \
+ --enable-ecore-config \
+ --enable-ecore-imf
.include <bsd.port.pre.mk>
post-patch:
@${REINPLACE_CMD} -E \
-e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
+ -e 's,\$$\(top_builddir\)/src/lib/ecore_con/\.libs,${LOCALBASE}/lib,'\
-e 's,\$$\(top_builddir\)/src/lib/ecore/libecore\.la,-lecore,'\
+ -e 's,\$$\(top_builddir\)/src/lib/ecore_con/libecore_con\.la,-lecore_con,'\
${BUILD_WRKSRC}/Makefile.in
post-install:
diff --git a/x11/ecore-imf/distinfo b/x11/ecore-imf/distinfo
index 4672f6a1c167..36d07e85437a 100644
--- a/x11/ecore-imf/distinfo
+++ b/x11/ecore-imf/distinfo
@@ -1,3 +1,2 @@
-MD5 (ecore-0.9.9.042.tar.bz2) = a66df2b5f0b1a6abc47bb50bf2b26846
-SHA256 (ecore-0.9.9.042.tar.bz2) = 26486fd2c80e4000b673f81ce637aa50c17c767e4c2af8f56de5d110e387d136
-SIZE (ecore-0.9.9.042.tar.bz2) = 5285732
+SHA256 (e17/ecore-1.0.0.beta.tar.bz2) = 9fd367f9ff10568082e65c1def46e64fb96b359221e0d6aea11c6c3f6bd5282f
+SIZE (e17/ecore-1.0.0.beta.tar.bz2) = 916635
diff --git a/x11/ecore-imf/pkg-plist b/x11/ecore-imf/pkg-plist
index 2f0ba4d3e68e..c9c5eb771965 100644
--- a/x11/ecore-imf/pkg-plist
+++ b/x11/ecore-imf/pkg-plist
@@ -1,6 +1,5 @@
-include/Ecore_IMF.h
-lib/libecore_imf.a
-lib/libecore_imf.la
+include/ecore-1/Ecore_IMF.h
lib/libecore_imf.so
-lib/libecore_imf.so.9
+lib/libecore_imf.so.1
libdata/pkgconfig/ecore-imf.pc
+@dirrmtry include/ecore-1
diff --git a/x11/ecore-imf_evas/Makefile b/x11/ecore-imf_evas/Makefile
index d8940e2ce082..a063be5eb054 100644
--- a/x11/ecore-imf_evas/Makefile
+++ b/x11/ecore-imf_evas/Makefile
@@ -6,39 +6,34 @@
#
PORTNAME= imf_evas
-PORTVERSION= 0.9.9.042
-PORTREVISION= 2
-CATEGORIES= x11
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
- http://download.enlightenment.org/snapshots/2008-01-25/
+DISTVERSION= 1.0.0.beta
+CATEGORIES= x11 enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
PKGNAMEPREFIX= ecore-
-DISTNAME= ecore-${PORTVERSION}
+DISTNAME= ecore-${DISTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= Enlightenment core abstraction library (IMF-Evas module)
-GNU_CONFIGURE= yes
+LICENSE= BSD
+DIST_SUBDIR= e17
USE_BZIP2= yes
+GNU_CONFIGURE= yes
+USE_EFL= ecore evas libtool_hack
+USE_EFL_ECORE= imf
USE_GNOME= gnomehack pkgconfig gnometarget
USE_LDCONFIG= yes
-USE_EFL= ecore evas
-USE_EFL_ECORE= imf
BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_imf_evas
INSTALL_WRKSRC= ${BUILD_WRKSRC}
-CONFIGURE_ARGS= --enable-ecore-con \
- --enable-ecore-config \
- --disable-ecore-desktop \
- --disable-ecore-directfb \
- --disable-ecore-evas \
- --disable-ecore-file \
- --enable-ecore-ipc \
- --disable-ecore-job \
- --disable-ecore-sdl \
- --disable-ecore-txt \
- --disable-ecore-x \
- --enable-ecore-imf \
- --enable-ecore-imf_evas
+.include <../../devel/ecore-main/Makefile.inc>
+
+CONFIGURE_ARGS+= --enable-ecore-con \
+ --enable-ecore-config \
+ --enable-ecore-ipc \
+ --enable-ecore-imf \
+ --enable-ecore-imf_evas
.include <bsd.port.pre.mk>
diff --git a/x11/ecore-imf_evas/distinfo b/x11/ecore-imf_evas/distinfo
index 4672f6a1c167..36d07e85437a 100644
--- a/x11/ecore-imf_evas/distinfo
+++ b/x11/ecore-imf_evas/distinfo
@@ -1,3 +1,2 @@
-MD5 (ecore-0.9.9.042.tar.bz2) = a66df2b5f0b1a6abc47bb50bf2b26846
-SHA256 (ecore-0.9.9.042.tar.bz2) = 26486fd2c80e4000b673f81ce637aa50c17c767e4c2af8f56de5d110e387d136
-SIZE (ecore-0.9.9.042.tar.bz2) = 5285732
+SHA256 (e17/ecore-1.0.0.beta.tar.bz2) = 9fd367f9ff10568082e65c1def46e64fb96b359221e0d6aea11c6c3f6bd5282f
+SIZE (e17/ecore-1.0.0.beta.tar.bz2) = 916635
diff --git a/x11/ecore-imf_evas/pkg-plist b/x11/ecore-imf_evas/pkg-plist
index 05465e4c7e01..6f5604dda4a0 100644
--- a/x11/ecore-imf_evas/pkg-plist
+++ b/x11/ecore-imf_evas/pkg-plist
@@ -1,6 +1,5 @@
-include/Ecore_IMF_Evas.h
-lib/libecore_imf_evas.a
-lib/libecore_imf_evas.la
+include/ecore-1/Ecore_IMF_Evas.h
lib/libecore_imf_evas.so
-lib/libecore_imf_evas.so.9
+lib/libecore_imf_evas.so.1
libdata/pkgconfig/ecore-imf-evas.pc
+@dirrmtry include/ecore-1
diff --git a/x11/ecore-input/Makefile b/x11/ecore-input/Makefile
new file mode 100644
index 000000000000..cd05c1fcf026
--- /dev/null
+++ b/x11/ecore-input/Makefile
@@ -0,0 +1,45 @@
+# New ports collection makefile for: ecore-input
+# Date created: 16 May 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= input
+DISTVERSION= 1.0.0.beta
+CATEGORIES= x11 enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
+PKGNAMEPREFIX= ecore-
+DISTNAME= ecore-${DISTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= Enlightenment core abstraction library (input module)
+
+LICENSE= BSD
+DIST_SUBDIR= e17
+USE_BZIP2= yes
+GNU_CONFIGURE= yes
+USE_EFL= ecore libtool_hack
+USE_GNOME= gnomehack pkgconfig gnometarget
+USE_LDCONFIG= yes
+BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_input
+INSTALL_WRKSRC= ${BUILD_WRKSRC}
+
+.include <../../devel/ecore-main/Makefile.inc>
+
+CONFIGURE_ARGS+= --enable-ecore-input
+
+.include <bsd.port.pre.mk>
+
+post-patch:
+ @${REINPLACE_CMD} -E \
+ -e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
+ -e 's,\$$\(top_builddir\)/src/lib/ecore/libecore\.la,-lecore,'\
+ ${BUILD_WRKSRC}/Makefile.in
+
+post-install:
+ ${INSTALL_DATA} ${WRKSRC}/ecore-input.pc \
+ ${PREFIX}/libdata/pkgconfig/
+
+.include <bsd.port.post.mk>
diff --git a/x11/ecore-input/distinfo b/x11/ecore-input/distinfo
new file mode 100644
index 000000000000..36d07e85437a
--- /dev/null
+++ b/x11/ecore-input/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/ecore-1.0.0.beta.tar.bz2) = 9fd367f9ff10568082e65c1def46e64fb96b359221e0d6aea11c6c3f6bd5282f
+SIZE (e17/ecore-1.0.0.beta.tar.bz2) = 916635
diff --git a/x11/ecore-input/pkg-descr b/x11/ecore-input/pkg-descr
new file mode 100644
index 000000000000..2559668d0e57
--- /dev/null
+++ b/x11/ecore-input/pkg-descr
@@ -0,0 +1,5 @@
+A core event abstracter layer and X abstraction layer that makes doing
+selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers
+fast, optimised, and convenient.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Ecore/
diff --git a/x11/ecore-input/pkg-plist b/x11/ecore-input/pkg-plist
new file mode 100644
index 000000000000..5989e5e779db
--- /dev/null
+++ b/x11/ecore-input/pkg-plist
@@ -0,0 +1,5 @@
+include/ecore-1/Ecore_Input.h
+lib/libecore_input.so
+lib/libecore_input.so.1
+libdata/pkgconfig/ecore-input.pc
+@dirrmtry include/ecore-1
diff --git a/x11/ecore-input_evas/Makefile b/x11/ecore-input_evas/Makefile
new file mode 100644
index 000000000000..cd26db8d7d18
--- /dev/null
+++ b/x11/ecore-input_evas/Makefile
@@ -0,0 +1,49 @@
+# New ports collection makefile for: ecore-input_evas
+# Date created: 14 June 2010
+# Whom: Grzegorz Blach <magik@roorback.net>
+#
+# $FreeBSD$
+#
+
+PORTNAME= input_evas
+DISTVERSION= 1.0.0.beta
+CATEGORIES= x11 enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
+PKGNAMEPREFIX= ecore-
+DISTNAME= ecore-${DISTVERSION}
+
+MAINTAINER= magik@roorback.net
+COMMENT= Enlightenment core abstraction library (evas input module)
+
+LICENSE= BSD
+DIST_SUBDIR= e17
+USE_BZIP2= yes
+GNU_CONFIGURE= yes
+USE_EFL= ecore evas libtool_hack
+USE_EFL_ECORE= input
+USE_GNOME= gnomehack pkgconfig gnometarget
+USE_LDCONFIG= yes
+BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_input_evas
+INSTALL_WRKSRC= ${BUILD_WRKSRC}
+
+.include <../../devel/ecore-main/Makefile.inc>
+
+CONFIGURE_ARGS+= --enable-ecore-input \
+ --enable-ecore-input_evas
+
+.include <bsd.port.pre.mk>
+
+post-patch:
+ @${REINPLACE_CMD} -E \
+ -e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
+ -e 's,\$$\(top_builddir\)/src/lib/ecore_input/\.libs,${LOCALBASE}/lib,'\
+ -e 's,\$$\(top_builddir\)/src/lib/ecore/libecore\.la,-lecore,'\
+ -e 's,\$$\(top_builddir\)/src/lib/ecore_input/libecore_input\.la,-lecore_input,'\
+ ${BUILD_WRKSRC}/Makefile.in
+
+post-install:
+ ${INSTALL_DATA} ${WRKSRC}/ecore-input-evas.pc \
+ ${PREFIX}/libdata/pkgconfig/
+
+.include <bsd.port.post.mk>
diff --git a/x11/ecore-input_evas/distinfo b/x11/ecore-input_evas/distinfo
new file mode 100644
index 000000000000..36d07e85437a
--- /dev/null
+++ b/x11/ecore-input_evas/distinfo
@@ -0,0 +1,2 @@
+SHA256 (e17/ecore-1.0.0.beta.tar.bz2) = 9fd367f9ff10568082e65c1def46e64fb96b359221e0d6aea11c6c3f6bd5282f
+SIZE (e17/ecore-1.0.0.beta.tar.bz2) = 916635
diff --git a/x11/ecore-input_evas/pkg-descr b/x11/ecore-input_evas/pkg-descr
new file mode 100644
index 000000000000..2559668d0e57
--- /dev/null
+++ b/x11/ecore-input_evas/pkg-descr
@@ -0,0 +1,5 @@
+A core event abstracter layer and X abstraction layer that makes doing
+selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers
+fast, optimised, and convenient.
+
+WWW: http://enlightenment.sourceforge.net/Libraries/Ecore/
diff --git a/x11/ecore-input_evas/pkg-plist b/x11/ecore-input_evas/pkg-plist
new file mode 100644
index 000000000000..69513ee591f1
--- /dev/null
+++ b/x11/ecore-input_evas/pkg-plist
@@ -0,0 +1,5 @@
+include/ecore-1/Ecore_Input_Evas.h
+lib/libecore_input_evas.so
+lib/libecore_input_evas.so.1
+libdata/pkgconfig/ecore-input-evas.pc
+@dirrmtry include/ecore-1
diff --git a/x11/ecore-x11/Makefile b/x11/ecore-x11/Makefile
index e26cb373b20b..c36d00b8a9f4 100644
--- a/x11/ecore-x11/Makefile
+++ b/x11/ecore-x11/Makefile
@@ -6,40 +6,32 @@
#
PORTNAME= x11
-PORTVERSION= 0.9.9.042
-PORTREVISION= 0
-CATEGORIES= x11
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
- http://download.enlightenment.org/snapshots/2008-01-25/
+DISTVERSION= 1.0.0.beta
+CATEGORIES= x11 enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
PKGNAMEPREFIX= ecore-
-DISTNAME= ecore-${PORTVERSION}
+DISTNAME= ecore-${DISTVERSION}
MAINTAINER= stas@FreeBSD.org
COMMENT= Enlightenment core abstraction library (x11 module)
-GNU_CONFIGURE= yes
+LICENSE= BSD
+DIST_SUBDIR= e17
USE_BZIP2= yes
+GNU_CONFIGURE= yes
+USE_EFL= ecore libtool_hack
+USE_EFL_ECORE= input
USE_GNOME= gnomehack pkgconfig gnometarget
USE_LDCONFIG= yes
-USE_EFL= ecore
-USE_EFL_ECORE= txt
BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_x
INSTALL_WRKSRC= ${BUILD_WRKSRC}
XEXTDIR= ${LOCALBASE}/include/X11/extensions
-CONFIGURE_ARGS= --disable-ecore-con \
- --disable-ecore-config \
- --disable-ecore-desktop \
- --disable-ecore-directfb \
- --disable-ecore-evas \
- --disable-ecore-file \
- --disable-ecore-ipc \
- --disable-ecore-job \
- --disable-ecore-sdl \
- --disable-ecore-txt \
- --enable-ecore-x \
- --disable-ecore-imf \
- --disable-ecore-imf_evas
+.include <../../devel/ecore-main/Makefile.inc>
+
+CONFIGURE_ARGS+= --enable-ecore-x \
+ --enable-ecore-input
OPTIONS= XDAMAGE "Enable Xdamage support (requires X11)" on \
XDPMS "Enable Xdpms support (requires X11)" on \
@@ -102,10 +94,12 @@ WITH_X11= yes
post-patch:
@${REINPLACE_CMD} -E \
-e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
- -e 's,\$$\(top_builddir\)/src/lib/ecore_txt/\.libs,${LOCALBASE}/lib,'\
+ -e 's,\$$\(top_builddir\)/src/lib/ecore_input/\.libs,${LOCALBASE}/lib,'\
-e 's,\$$\(top_builddir\)/src/lib/ecore/libecore\.la,-lecore,'\
- -e 's,\$$\(top_builddir\)/src/lib/ecore_txt/libecore_txt\.la,-lecore_txt,'\
- ${BUILD_WRKSRC}/Makefile.in
+ -e 's,\$$\(top_builddir\)/src/lib/ecore_input/libecore_input\.la,-lecore_input,'\
+ ${BUILD_WRKSRC}/Makefile.in \
+ ${BUILD_WRKSRC}/xcb/Makefile.in \
+ ${BUILD_WRKSRC}/xlib/Makefile.in
post-install:
${INSTALL_DATA} ${WRKSRC}/ecore-x.pc \
diff --git a/x11/ecore-x11/distinfo b/x11/ecore-x11/distinfo
index 4672f6a1c167..36d07e85437a 100644
--- a/x11/ecore-x11/distinfo
+++ b/x11/ecore-x11/distinfo
@@ -1,3 +1,2 @@
-MD5 (ecore-0.9.9.042.tar.bz2) = a66df2b5f0b1a6abc47bb50bf2b26846
-SHA256 (ecore-0.9.9.042.tar.bz2) = 26486fd2c80e4000b673f81ce637aa50c17c767e4c2af8f56de5d110e387d136
-SIZE (ecore-0.9.9.042.tar.bz2) = 5285732
+SHA256 (e17/ecore-1.0.0.beta.tar.bz2) = 9fd367f9ff10568082e65c1def46e64fb96b359221e0d6aea11c6c3f6bd5282f
+SIZE (e17/ecore-1.0.0.beta.tar.bz2) = 916635
diff --git a/x11/ecore-x11/files/patch-src_lib_ecore_x_xlib_ecore_x_randr_12.c b/x11/ecore-x11/files/patch-src_lib_ecore_x_xlib_ecore_x_randr_12.c
new file mode 100644
index 000000000000..353f6734744e
--- /dev/null
+++ b/x11/ecore-x11/files/patch-src_lib_ecore_x_xlib_ecore_x_randr_12.c
@@ -0,0 +1,44 @@
+--- src/lib/ecore_x/xlib/ecore_x_randr_12.c.orig 2010-09-29 17:38:19.000000000 -0700
++++ src/lib/ecore_x/xlib/ecore_x_randr_12.c 2010-12-12 20:35:14.000000000 -0800
+@@ -370,6 +370,32 @@
+ #endif
+ }
+
++static size_t
++strnlen_local(const char *s, size_t maxlen)
++{
++ size_t len;
++
++ for (len = 0; len < maxlen; len++, s++) {
++ if (!*s)
++ break;
++ }
++ return (len);
++}
++
++static char *
++strndup_local(const char *str, size_t n)
++{
++ size_t len;
++ char *copy;
++
++ len = strnlen_local(str, n);
++ if ((copy = malloc(len + 1)) == NULL)
++ return (NULL);
++ memcpy(copy, str, len);
++ copy[len] = '\0';
++ return (copy);
++}
++
+ /*
+ * @brief get detailed information for a given mode id
+ * @param root window which's screen's ressources are queried
+@@ -405,7 +431,7 @@
+ ret->vSyncEnd = res->modes[i].vSyncEnd;
+ ret->vTotal = res->modes[i].vTotal;
+ if (!(ret->name =
+- strndup(res->modes[i].name, res->modes[i].nameLength)))
++ strndup_local(res->modes[i].name, res->modes[i].nameLength)))
+ {
+ ret->name = NULL;
+ ret->nameLength = 0;
diff --git a/x11/ecore-x11/pkg-plist b/x11/ecore-x11/pkg-plist
index acc2454607d3..8f712c5a4106 100644
--- a/x11/ecore-x11/pkg-plist
+++ b/x11/ecore-x11/pkg-plist
@@ -1,8 +1,7 @@
-include/Ecore_X.h
-include/Ecore_X_Atoms.h
-include/Ecore_X_Cursor.h
-lib/libecore_x.a
-lib/libecore_x.la
+include/ecore-1/Ecore_X.h
+include/ecore-1/Ecore_X_Atoms.h
+include/ecore-1/Ecore_X_Cursor.h
lib/libecore_x.so
-lib/libecore_x.so.9
+lib/libecore_x.so.1
libdata/pkgconfig/ecore-x.pc
+@dirrmtry include/ecore-1
diff --git a/x11/efreet/Makefile b/x11/efreet/Makefile
index a62b9bd2d73e..b23e01e30b95 100644
--- a/x11/efreet/Makefile
+++ b/x11/efreet/Makefile
@@ -6,22 +6,21 @@
#
PORTNAME= efreet
-PORTVERSION= 0.0.3.042
-CATEGORIES= x11
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \
- http://download.enlightenment.org/snapshots/2008-01-25/
+DISTVERSION= 1.0.0.beta
+CATEGORIES= x11 enlightenment
+MASTER_SITES= http://download.enlightenment.org/releases/ \
+ http://files.roorback.net/e17/2010-10-03/base/
MAINTAINER= stas@FreeBSD.org
COMMENT= Freedesktop.org EFL compatiblity layer
-GNU_CONFIGURE= yes
+LICENSE= BSD
+DIST_SUBDIR= e17
USE_BZIP2= yes
-USE_GNOME= gnomehack gnometarget pkgconfig
-USE_EFL= ecore
+GNU_CONFIGURE= yes
+USE_EFL= eet eina ecore libtool_hack librt_hack
USE_EFL_ECORE= file
+USE_GNOME= gnomehack gnometarget pkgconfig
USE_LDCONFIG= yes
-post-patch:
- @${REINPLACE_CMD} -E -e 's,-g -O0,,g' ${WRKSRC}/src/lib/Makefile.in
-
.include <bsd.port.mk>
diff --git a/x11/efreet/distinfo b/x11/efreet/distinfo
index ca14c8d1222b..981f34d84c2a 100644
--- a/x11/efreet/distinfo
+++ b/x11/efreet/distinfo
@@ -1,3 +1,2 @@
-MD5 (efreet-0.0.3.042.tar.bz2) = d6ff6e116a839ce81821359a1cc2924a
-SHA256 (efreet-0.0.3.042.tar.bz2) = 07f5830f68ebc29df76a73dc44a16f258b1dccaf999b96cf6aa580dda7d42e47
-SIZE (efreet-0.0.3.042.tar.bz2) = 272194
+SHA256 (e17/efreet-1.0.0.beta.tar.bz2) = 0c533029854096915769a1b48caa6837961d4296c96792c488b29f35a0720b9a
+SIZE (e17/efreet-1.0.0.beta.tar.bz2) = 368844
diff --git a/x11/efreet/pkg-descr b/x11/efreet/pkg-descr
index 099f48017260..da637f498641 100644
--- a/x11/efreet/pkg-descr
+++ b/x11/efreet/pkg-descr
@@ -7,4 +7,4 @@ specifications are included:
o Icon Theme
o Menu
-WWW: http://www.enlightenment.org/
+WWW: http://docs.enlightenment.org/auto/efreet/
diff --git a/x11/efreet/pkg-plist b/x11/efreet/pkg-plist
index 92ac4799ca01..83f2fd5ca1f0 100644
--- a/x11/efreet/pkg-plist
+++ b/x11/efreet/pkg-plist
@@ -3,23 +3,25 @@ bin/efreet_cache_test
bin/efreet_menu_alloc
bin/efreet_spec_test
bin/efreet_test
-include/efreet/Efreet.h
-include/efreet/Efreet_Mime.h
-include/efreet/efreet_base.h
-include/efreet/efreet_desktop.h
-include/efreet/efreet_icon.h
-include/efreet/efreet_ini.h
-include/efreet/efreet_menu.h
-include/efreet/efreet_utils.h
-lib/libefreet.a
-lib/libefreet.la
+include/efreet-1/Efreet.h
+include/efreet-1/Efreet_Mime.h
+include/efreet-1/Efreet_Trash.h
+include/efreet-1/efreet_base.h
+include/efreet-1/efreet_desktop.h
+include/efreet-1/efreet_icon.h
+include/efreet-1/efreet_ini.h
+include/efreet-1/efreet_menu.h
+include/efreet-1/efreet_uri.h
+include/efreet-1/efreet_utils.h
lib/libefreet.so
-lib/libefreet.so.0
-lib/libefreet_mime.a
-lib/libefreet_mime.la
+lib/libefreet.so.1
lib/libefreet_mime.so
-lib/libefreet_mime.so.0
+lib/libefreet_mime.so.1
+lib/libefreet_trash.so
+lib/libefreet_trash.so.1
+lib/efreet/efreet_desktop_cache_create
libdata/pkgconfig/efreet-mime.pc
+libdata/pkgconfig/efreet-trash.pc
libdata/pkgconfig/efreet.pc
%%DATADIR%%/test/entry
%%DATADIR%%/test/entry.png
@@ -29,9 +31,11 @@ libdata/pkgconfig/efreet.pc
%%DATADIR%%/test/test.desktop
%%DATADIR%%/test/test.ini
%%DATADIR%%/test/test.menu
+%%DATADIR%%/test/test_garbage
%%DATADIR%%/test/test_menu_slash_bad.menu
%%DATADIR%%/test/test_type.desktop
@dirrm %%DATADIR%%/test/sub
@dirrm %%DATADIR%%/test
@dirrm %%DATADIR%%
-@dirrm include/efreet
+@dirrm lib/efreet
+@dirrm include/efreet-1
diff --git a/x11/elicit/Makefile b/x11/elicit/Makefile
index 8de6d8b8d1b7..d2fe283a1369 100644
--- a/x11/elicit/Makefile
+++ b/x11/elicit/Makefile
@@ -9,7 +9,7 @@
PORTNAME= elicit
PORTVERSION= 20080223
PORTREVISION= 3
-CATEGORIES= x11
+CATEGORIES= x11 enlightenment
MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
MAINTAINER= stas@FreeBSD.org
@@ -23,6 +23,10 @@ USE_EFL= ecore eet edje evas imlib2
USE_EFL_ESMART= draggies container
USE_EFL_ECORE= evas file config
+BROKEN= does not compile
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
.include <bsd.port.pre.mk>
.if ${ARCH} == "ia64"
BROKEN= edje is broken on ia64
diff --git a/x11/emprint/Makefile b/x11/emprint/Makefile
index 0c0577a27196..82d7c4ae2960 100644
--- a/x11/emprint/Makefile
+++ b/x11/emprint/Makefile
@@ -6,18 +6,19 @@
#
PORTNAME= emprint
-PORTVERSION= 20080223
-PORTREVISION= 3
-CATEGORIES= x11
-MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/
+PORTVERSION= 20101003
+CATEGORIES= x11 enlightenment
+MASTER_SITES= http://files.roorback.net/e17/2010-10-03/extra/
MAINTAINER= stas@FreeBSD.org
COMMENT= Utility for taking screenshots for E17
-GNU_CONFIGURE= yes
+DIST_SUBDIR= e17
USE_BZIP2= yes
-USE_GNOME= gnomehack gnometarget pkgconfig
+GNU_CONFIGURE= yes
USE_EFL= ecore evas edje imlib2
USE_EFL_ECORE= file x11 evas
+USE_GNOME= gnomehack gnometarget pkgconfig
+USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/x11/emprint/distinfo b/x11/emprint/distinfo
index 98eb8710cd66..a9e23715a41b 100644
--- a/x11/emprint/distinfo
+++ b/x11/emprint/distinfo
@@ -1,3 +1,2 @@
-MD5 (emprint-20080223.tar.bz2) = 380daace1a8b290f427661f58f084f18
-SHA256 (emprint-20080223.tar.bz2) = bc32d9cf11be8ae0eb8760fb3756d6c694fb3f97ea1cc5a534f5f247ac3dfa60
-SIZE (emprint-20080223.tar.bz2) = 217507
+SHA256 (e17/emprint-20101003.tar.bz2) = f10a57fc185f1587ea2617111f9fb9729f2663ab166f3659e3fcfaa07f51724a
+SIZE (e17/emprint-20101003.tar.bz2) = 389682
diff --git a/x11/enity/Makefile b/x11/enity/Makefile
index 78e221df7a30..e8fde0997bf4 100644
--- a/x11/enity/Makefile
+++ b/x11/enity/Makefile
@@ -21,6 +21,10 @@ USE_GNOME= gnomehack pkgconfig gnometarget
USE_EFL= etk
GNU_CONFIGURE= yes
+BROKEN= does not compile
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
PLIST_FILES= bin/enity
.include <bsd.port.pre.mk>
diff --git a/x11/enterminus/Makefile b/x11/enterminus/Makefile
index ba55e1c8a98d..b17d87ebfef9 100644
--- a/x11/enterminus/Makefile
+++ b/x11/enterminus/Makefile
@@ -22,4 +22,6 @@ USE_EFL= evas ecore
USE_EFL_ECORE= evas job
GNU_CONFIGURE= yes
+BROKEN= does not compile
+
.include <bsd.port.mk>
diff --git a/x11/examine/Makefile b/x11/examine/Makefile
index 8d4ec2f3ceef..4de8d9d090d5 100644
--- a/x11/examine/Makefile
+++ b/x11/examine/Makefile
@@ -24,4 +24,8 @@ USE_EFL_ECORE= ipc config
PLIST_FILES= bin/examine bin/exsh
+BROKEN= does not compile
+DEPRECATED= abandoned upstream
+EXPIRATION_DATE= 2011-01-01
+
.include <bsd.port.mk>