3 files changed, 23 insertions, 108 deletions

diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index 4f208af2980c..446375281531 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -2,21 +2,33 @@
 # $FreeBSD$
 
 PORTNAME=	e16
-PORTVERSION=	1.0.14
+PORTVERSION=	1.0.14.001
 CATEGORIES=	x11-wm enlightenment
-MASTER_SITES=	SF/enlightenment/${PORTNAME}/${PORTVERSION}/
+MASTER_SITES=	SF/enlightenment/${PORTNAME}/Snapshots/
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Enlightenment DR16 window manager
 
 LICENSE=	MIT
 
-OPTIONS_DEFINE=	DOCS NLS SOUND
-SOUND_DESC=	Sound support via pulseaudio/libsndfile
+OPTIONS_DEFINE=		DOCS NLS SOUND
+OPTIONS_SUB=		yes
+SOUND_DESC=		Sound support via pulseaudio/libsndfile
+SOUND_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio \
+    			libsndfile.so:${PORTSDIR}/audio/libsndfile
+SOUND_CONFIGURE_ON=	--enable-sound \
+			--enable-sound-pulse \
+			--with-sndldr=sndfile
+SOUND_CONFIGURE_OFF=	--disable-sound \
+			--with-sndldr=none
+NLS_USES=		gettext
+NLS_CONFIGURE_OFF=	--disable-nls
+DOCS_CONFIGURE_ON=	--enable-docs=yes
+DOCS_CONFIGURE_OFF=	--enable-docs=no
 
 USE_XORG=	compositeproto damageproto xextproto x11 xbitmaps xcomposite xdamage \
 		xext xfixes xft xinerama xrandr xrender xxf86vm
-USES=		gettext gmake iconv libtool pkgconfig shebangfix
+USES=		gettext gmake iconv libtool perl5 pkgconfig shebangfix
 SHEBANG_FILES=	scripts/e_gen_menu
 USE_EFL=	imlib2
 CFLAGS+=	-Wno-unused-parameter
@@ -26,31 +38,6 @@ CONFIGURE_ARGS=	--disable-dependency-tracking \
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MSOUND}
-LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio \
-		libsndfile.so:${PORTSDIR}/audio/libsndfile
-CONFIGURE_ARGS+=--enable-sound \
-		--enable-sound-pulse \
-		--with-sndldr=sndfile
-.else
-CONFIGURE_ARGS+=--disable-sound \
-		--with-sndldr=none
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-CONFIGURE_ARGS+=--enable-docs=yes
-.else
-CONFIGURE_ARGS+=--enable-docs=no
-.endif
-
 post-patch:
 .if !${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -e '/^SUBDIRS/s|docs ||' \
diff --git a/x11-wm/e16/distinfo b/x11-wm/e16/distinfo
index 95449b4a01f4..67b052608e94 100644
--- a/x11-wm/e16/distinfo
+++ b/x11-wm/e16/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e16-1.0.14.tar.gz) = 45b9a554e366f609764efaed1bf7230e999c3fd7ff5789abf08cccc13dc6d2d2
-SIZE (e16-1.0.14.tar.gz) = 2340182
+SHA256 (e16-1.0.14.001.tar.gz) = b2ab0eb6d722af10fe06b032044d3f3f1e7ba9d5995b0f8036b481511cb85b00
+SIZE (e16-1.0.14.001.tar.gz) = 2395772
diff --git a/x11-wm/e16/pkg-plist b/x11-wm/e16/pkg-plist
index 8ca4d5dbea30..00f074658c49 100644
--- a/x11-wm/e16/pkg-plist
+++ b/x11-wm/e16/pkg-plist
@@ -380,6 +380,7 @@ share/xsessions/e16-gnome3-session.desktop
 %%NLS%%share/locale/ar/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/csb/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/da/LC_MESSAGES/e16.mo
@@ -389,6 +390,7 @@ share/xsessions/e16-gnome3-session.desktop
 %%NLS%%share/locale/es/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/fo/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/e16.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/it/LC_MESSAGES/e16.mo
@@ -406,79 +408,5 @@ share/xsessions/e16-gnome3-session.desktop
 %%NLS%%share/locale/tr/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/e16.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/e16.mo
-%%PORTDOCS%%%%DOCSDIR%%/e16.html
-%%PORTDOCS%%man/man1/e16.1.gz
-@dirrm %%DATADIR%%/themes/winter/tooltips/images
-@dirrm %%DATADIR%%/themes/winter/tooltips
-@dirrm %%DATADIR%%/themes/winter/sound
-@dirrm %%DATADIR%%/themes/winter/slideouts
-@dirrm %%DATADIR%%/themes/winter/pager/images
-@dirrm %%DATADIR%%/themes/winter/pager
-@dirrm %%DATADIR%%/themes/winter/menustyles/images
-@dirrm %%DATADIR%%/themes/winter/menustyles
-@dirrm %%DATADIR%%/themes/winter/init/images
-@dirrm %%DATADIR%%/themes/winter/init
-@dirrm %%DATADIR%%/themes/winter/iconbox/images
-@dirrm %%DATADIR%%/themes/winter/iconbox
-@dirrm %%DATADIR%%/themes/winter/focuslist/images
-@dirrm %%DATADIR%%/themes/winter/focuslist
-@dirrm %%DATADIR%%/themes/winter/eterm/images
-@dirrm %%DATADIR%%/themes/winter/eterm
-@dirrm %%DATADIR%%/themes/winter/epplets/images
-@dirrm %%DATADIR%%/themes/winter/epplets
-@dirrm %%DATADIR%%/themes/winter/dragbar/images
-@dirrm %%DATADIR%%/themes/winter/dragbar
-@dirrm %%DATADIR%%/themes/winter/dock
-@dirrm %%DATADIR%%/themes/winter/dialogs/images
-@dirrm %%DATADIR%%/themes/winter/dialogs
-@dirrm %%DATADIR%%/themes/winter/cursors
-@dirrm %%DATADIR%%/themes/winter/coords
-@dirrm %%DATADIR%%/themes/winter/common/images
-@dirrm %%DATADIR%%/themes/winter/common
-@dirrm %%DATADIR%%/themes/winter/buttons
-@dirrm %%DATADIR%%/themes/winter/borders/common/images
-@dirrm %%DATADIR%%/themes/winter/borders/common
-@dirrm %%DATADIR%%/themes/winter/borders/TRANSIENT
-@dirrm %%DATADIR%%/themes/winter/borders/SHAPED
-@dirrm %%DATADIR%%/themes/winter/borders/RIGHT_PAGER_SHADE_LEFT
-@dirrm %%DATADIR%%/themes/winter/borders/RIGHT_PAGER/images
-@dirrm %%DATADIR%%/themes/winter/borders/RIGHT_PAGER
-@dirrm %%DATADIR%%/themes/winter/borders/PAGER_SHADE_RIGHT
-@dirrm %%DATADIR%%/themes/winter/borders/PAGER_AUTOSHADE
-@dirrm %%DATADIR%%/themes/winter/borders/PAGER/images
-@dirrm %%DATADIR%%/themes/winter/borders/PAGER
-@dirrm %%DATADIR%%/themes/winter/borders/MENU_BORDER_ONLY
-@dirrm %%DATADIR%%/themes/winter/borders/MENU
-@dirrm %%DATADIR%%/themes/winter/borders/ICONBOX
-@dirrm %%DATADIR%%/themes/winter/borders/FIXED_SIZE
-@dirrm %%DATADIR%%/themes/winter/borders/DIALOG
-@dirrm %%DATADIR%%/themes/winter/borders/DEFAULT
-@dirrm %%DATADIR%%/themes/winter/borders/BORDER_ONLY/images
-@dirrm %%DATADIR%%/themes/winter/borders/BORDER_ONLY
-@dirrm %%DATADIR%%/themes/winter/borders/BORDERLESS
-@dirrm %%DATADIR%%/themes/winter/borders/AUTOSHADE
-@dirrm %%DATADIR%%/themes/winter/borders
-@dirrm %%DATADIR%%/themes/winter/backgrounds/images
-@dirrm %%DATADIR%%/themes/winter/backgrounds
-@dirrm %%DATADIR%%/themes/winter/ABOUT
-@dirrm %%DATADIR%%/themes/winter
-@dirrm %%DATADIR%%/themes
-@dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%/pix
-@dirrm %%DATADIR%%/misc
-@dirrm %%DATADIR%%/menus
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%/fonts
-@dirrm %%DATADIR%%/config
-@dirrm %%DATADIR%%/E-docs
-@dirrmtry %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/xsessions
-%%NLS%%@dirrmtry share/locale/en_US/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/en_US
-%%NLS%%@dirrmtry share/locale/csb/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/csb
-%%NLS%%@dirrmtry share/locale/fo/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fo
-@dirrmtry share/gnome-session/sessions
-@dirrmtry share/gnome-session
+%%DOCS%%%%DOCSDIR%%/e16.html
+%%DOCS%%man/man1/e16.1.gz