From 349ad98a764aaf53d87abb46f8727f3e2a825e55 Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Mon, 11 Jan 2010 15:03:47 +0000
Subject: [PATCH] - spacing tweaks - MAINTAINER moved to ../Makefile.inc

committing on behalf of laurent@
---
 x11/e17/epeg/Makefile | 37 ++++++++++++++++++++++++-------------
 x11/e17/etk/Makefile  | 20 +++++++++-----------
 2 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/x11/e17/epeg/Makefile b/x11/e17/epeg/Makefile
index 76dd7ad2665..9811e66d701 100644
--- a/x11/e17/epeg/Makefile
+++ b/x11/e17/epeg/Makefile
@@ -1,24 +1,35 @@
-# $OpenBSD: Makefile,v 1.4 2007/12/17 23:00:08 laurent Exp $
+# $OpenBSD: Makefile,v 1.5 2010/01/11 15:03:47 jasper Exp $
 
-COMMENT=	immensly fast JPEG thumbnailer library
-DISTNAME=	epeg-20071211
+BROKEN =		needs an update
 
-HOMEPAGE=	http://docs.enlightenment.org/api/epeg/html/
+COMMENT =		immensly fast JPEG thumbnailer library
+DISTNAME =		epeg-20071211
+PKGNAME =		${DISTNAME}p0
 
-SHARED_LIBS=	epeg 0.0	# .0.9
+HOMEPAGE =		http://docs.enlightenment.org/api/epeg/html/
+
+SHARED_LIBS =		epeg 0.0	# .0.9
 
 # BSD
-PERMIT_PACKAGE_CDROM=	Yes
-PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP=	Yes
+PERMIT_PACKAGE_CDROM =	Yes
+PERMIT_PACKAGE_FTP =	Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP =	Yes
 
-WANTLIB= 		c
+WANTLIB =		c
 
-LIB_DEPENDS=		jpeg::graphics/jpeg
+LIB_DEPENDS =		jpeg::graphics/jpeg
 
-CONFIGURE_STYLE=	automake autoconf
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_STYLE =	automake autoconf
+
+USE_LIBTOOL =		Yes
+
+AUTOCONF_VERSION =	2.61
+AUTOMAKE_VERSION =	1.9
+AUTOMAKE_ENV =		AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+			AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
+
+CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/x11/e17/etk/Makefile b/x11/e17/etk/Makefile
index aecb3cbc353..d710d111aee 100644
--- a/x11/e17/etk/Makefile
+++ b/x11/e17/etk/Makefile
@@ -1,8 +1,10 @@
-# $OpenBSD: Makefile,v 1.9 2009/08/11 08:42:07 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.10 2010/01/11 15:04:32 jasper Exp $
 
-COMMENT=	toolkit based on the EFL
-DISTNAME=	etk-20071211
-PKGNAME=        ${DISTNAME}p3
+BROKEN =		needs an update
+
+COMMENT=		toolkit based on the EFL
+DISTNAME=		etk-20071211
+PKGNAME =		${DISTNAME}p4
 
 SHARED_LIBS +=  etk                 0.0          # .1.0
 
@@ -14,17 +16,13 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MODULES=		devel/gettext
 
-WANTLIB += SDL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
-WANTLIB += Xinerama Xp Xrandr Xrender Xss c crypto curl eet evas
-WANTLIB += expat fontconfig freetype idn jpeg m pthread sndio
-WANTLIB += ssl usbhid z pthread-stubs xcb
 
-LIB_DEPENDS=		ecore,ecore_evas,ecore_file,ecore_job,ecore_txt,ecore_x,ecore_imf,ecore_imf_evas::x11/e17/ecore \
-			embryo::x11/e17/embryo \
-			edje::x11/e17/edje
+
+LIB_DEPENDS=		edje::x11/e17/edje
 
 RUN_DEPENDS=		::devel/desktop-file-utils
 
+USE_LIBTOOL =		Yes
 USE_GMAKE=		Yes
 
 CONFIGURE_STYLE=	automake autoconf