- Update to 0.19.4

- Add NLS option

4 files changed, 15 insertions, 27 deletions

diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index 1654b78f9e7..9fe3671c4cc 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	enlightenment
-PORTVERSION=	0.19.3
-PORTREVISION=	1
+PORTVERSION=	0.19.4
 PORTEPOCH=	2
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://download.enlightenment.org/rel/apps/${PORTNAME}/
@@ -29,33 +28,29 @@ INSTALL_TARGET=	install-strip
 SUB_FILES=	pkg-message
 
 CONFIGURE_ARGS=	--with-profile=MEDIUM_PC \
-		--disable-connman --disable-bluez4 --disable-temperature \
+		--disable-connman --disable-bluez4 \
 		--disable-device-udev --disable-mount-udisks
 
+CPPFLAGS+=	-I${LOCALBASE}/include/e_dbus-1
+
 .include "Makefile.plist"
 
-DOCS_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
-DOCS_CONFIGURE_ENABLE=	doc
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-PLIST_SUB+=		NLS=""
-.else
-PLIST_SUB+=		NLS="@comment "
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's/\(setuid_root_mode = a=rx,u+x\)s/\1/g' \
 		${WRKSRC}/src/bin/Makefile.mk \
 		${WRKSRC}/src/modules/Makefile_cpufreq.mk
 
+.include <bsd.port.pre.mk>
+
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not install on sparc64: signal 10
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-wm/enlightenment/distinfo b/x11-wm/enlightenment/distinfo
index 566bdd45bd6..fb7b4381c7e 100644
--- a/x11-wm/enlightenment/distinfo
+++ b/x11-wm/enlightenment/distinfo
@@ -1,2 +1,2 @@
-SHA256 (enlightenment/enlightenment-0.19.3.tar.xz) = 5635c83a1bd6b7b3d8196c4edfab71d7755d2625c783ed8edaefbba78621dbd7
-SIZE (enlightenment/enlightenment-0.19.3.tar.xz) = 24596912
+SHA256 (enlightenment/enlightenment-0.19.4.tar.xz) = e777febb2fa751ec3320fdc3e2ecb0a9b70ec75f2d188fb02edd31004e536b64
+SIZE (enlightenment/enlightenment-0.19.4.tar.xz) = 24597128
diff --git a/x11-wm/enlightenment/files/patch-src-modules-cpufreq-freqset.c b/x11-wm/enlightenment/files/patch-src-modules-cpufreq-freqset.c
deleted file mode 100644
index ec61d484770..00000000000
--- a/x11-wm/enlightenment/files/patch-src-modules-cpufreq-freqset.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/modules/cpufreq/freqset.c	2015-01-24 11:58:59.000000000 +0200
-+++ src/modules/cpufreq/freqset.c	2015-01-24 11:58:51.000000000 +0200
-@@ -59,7 +59,7 @@ 
-      {
-         int new_frequency = atoi(argv[2]);
-         size_t len = sizeof(new_frequency);
--        if (sysctlbyname("dev.cpu.0.freq", NULL, 0, &new_frequency, &len) == -1)
-+        if (sysctlbyname("dev.cpu.0.freq", NULL, 0, &new_frequency, len) == -1)
-           {
-              fprintf(stderr, "Unable to open frequency interface for writing.\n");
-              return 1;
diff --git a/x11-wm/enlightenment/pkg-plist b/x11-wm/enlightenment/pkg-plist
index 5b181730a4b..49092ecc321 100644
--- a/x11-wm/enlightenment/pkg-plist
+++ b/x11-wm/enlightenment/pkg-plist
@@ -294,6 +294,10 @@ lib/enlightenment/modules/tasks/module.desktop
 lib/enlightenment/modules/teamwork/e-module-teamwork.edj
 lib/enlightenment/modules/teamwork/%%ENLIGHTENMENT_ARCH%%/module.so
 lib/enlightenment/modules/teamwork/module.desktop
+lib/enlightenment/modules/temperature/e-module-temperature.edj
+lib/enlightenment/modules/temperature/%%ENLIGHTENMENT_ARCH%%/module.so
+lib/enlightenment/modules/temperature/%%ENLIGHTENMENT_ARCH%%/tempget
+lib/enlightenment/modules/temperature/module.desktop
 lib/enlightenment/modules/tiling/e-module-tiling.edj
 lib/enlightenment/modules/tiling/%%ENLIGHTENMENT_ARCH%%/module.so
 lib/enlightenment/modules/tiling/module.desktop