Update internal e16keyedit to 0.7 [1]

Add USE_PKGCONFIG which is required by e16keyedit
Add dependency on gtk2 for e16keyedit
Use PLIST_FILES instead of pkg-plist

It will be prefered to split this ports into two separate one imho, one for
e16keyedit and one for e16menuedit

Submitted by:	"George L. Yermulnik" <yz@yz.kiev.ua> [1]
Feature safe:	yes

4 files changed, 24 insertions, 60 deletions

diff --git a/x11-wm/e16utils/Makefile b/x11-wm/e16utils/Makefile
index 23550826de32..16e4ac96015d 100644
--- a/x11-wm/e16utils/Makefile
+++ b/x11-wm/e16utils/Makefile
@@ -3,36 +3,49 @@
 
 PORTNAME=	e16utils
 PORTVERSION=	0.16
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	SF/enlightenment/e16menuedit/e16menuedit:src1 \
-		SF/enlightenment/e16keyedit/0.2:src2
-
+		SF/enlightenment/e16keyedit/0.7:src2
 DISTFILES=	e16menuedit-0.1.tar.gz:src1 \
-		e16keyedit-0.2.tar.gz:src2
+		e16keyedit-0.7.tar.gz:src2
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Standalone menu and keybinding editors for enlightenment 0.16
 
-LIB_DEPENDS=	gdbm.4:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS=	gdbm:${PORTSDIR}/databases/gdbm
+
+USE_GNOME=	imlib gtk20
+USE_PKGCONFIG=	build
 
-USE_GNOME=	imlib
+SUB_STUBS=	e16menuedit-0.1 e16keyedit-0.7
 
-SUB_STUBS=	e16menuedit-0.1 e16keyedit-0.2
+PLIST_FILES=	bin/e16menuedit \
+		bin/e16keyedit
 
 do-patch:
 .for i in ${SUB_STUBS}
+.if exists(${PATCHDIR}/patch-${i})
 	@cd ${WRKDIR}/${i} ; ${PATCH} -s < ${PATCHDIR}/patch-${i}
+.endif
+.endfor
+
+do-configure:
+.for i in ${SUB_STUBS}
+	if [ -f "${WRKDIR}/${i}/${CONFIGURE_SCRIPT}" ]; then \
+		cd ${WRKDIR}/${i} && ${SETENV} ${CONFIGURE_ENV} \
+			./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; \
+	fi
 .endfor
 
 do-build:
 .for i in ${SUB_STUBS}
-	@cd ${WRKDIR}/${i} ; ${SETENV} ${MAKE_ENV} ${MAKE} all
+	@cd ${WRKDIR}/${i} && ${SETENV} ${MAKE_ENV} ${MAKE} all
 .endfor
 
 do-install:
 .for i in ${SUB_STUBS}
-	@cd ${WRKDIR}/${i} ; \
+	@cd ${WRKDIR}/${i} && \
 	${INSTALL_PROGRAM} `${ECHO_CMD} '${i}' | ${SED} -e 's,-\(.*\),,'` \
 	${PREFIX}/bin
 .endfor
diff --git a/x11-wm/e16utils/distinfo b/x11-wm/e16utils/distinfo
index dcec2042a16b..61c46f437ada 100644
--- a/x11-wm/e16utils/distinfo
+++ b/x11-wm/e16utils/distinfo
@@ -1,4 +1,4 @@
 SHA256 (e16menuedit-0.1.tar.gz) = 2a5ed9b02af9788c1028cf052e78a4932ad52e42de037c6f0c5cf3b7e3c02a8b
 SIZE (e16menuedit-0.1.tar.gz) = 8450
-SHA256 (e16keyedit-0.2.tar.gz) = f95f05981c54372f2205694c4e2e27a060573c0608e187e1ba2d07bb4d8f5178
-SIZE (e16keyedit-0.2.tar.gz) = 13749
+SHA256 (e16keyedit-0.7.tar.gz) = 8f9aa35ca5355f7a5bee04f4cced0922ed0f690be2d10f5a8e39680e391c09a2
+SIZE (e16keyedit-0.7.tar.gz) = 88323
diff --git a/x11-wm/e16utils/files/patch-e16keyedit-0.2 b/x11-wm/e16utils/files/patch-e16keyedit-0.2
deleted file mode 100644
index 2b6ab682c812..000000000000
--- a/x11-wm/e16utils/files/patch-e16keyedit-0.2
+++ /dev/null
@@ -1,47 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.orig	Fri Mar 24 04:04:16 2000
-+++ Makefile	Sat Aug  3 02:32:20 2002
-@@ -10,23 +10,23 @@
- BUILD    = \
- 
- LIB_DIRS = \
--    -L/usr/local/lib -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/dt/lib
-+    -L${LOCALBASE}/lib
- LIBS     = \
--    `gtk-config --libs` -lgdbm -lgdk_imlib
--CFLAGS   = \
--    -O -g -D_GNU_SOURCE $(DEVFLAGS)
-+    `${IMLIB_CONFIG} --libs-gdk` -lgdbm
-+CFLAGS   += \
-+    -D_GNU_SOURCE $(DEVFLAGS)
- #CFLAGS   = \
- #    -O -g -W -Wall -Wno-unused  -pedantic -pedantic-errors -ansi -D_GNU_SOURCE
--OPTFLAGS   = \
--    -O6 -mpentium -mcpu=pentium -march=pentium -ffast-math -D_GNU_SOURCE
-+#OPTFLAGS   = \
-+#    -O6 -mpentium -mcpu=pentium -march=pentium -ffast-math -D_GNU_SOURCE
- INCLUDES = \
--    `gtk-config --cflags` -I..
-+    `${IMLIB_CONFIG} --cflags-gdk` -I..
- 
- BIN      = e16keyedit
- 
- # configurable stuff
--BINARY_DESTINATION = /usr/local/enlightenment/bin
--DATA_DESTINATION   = /usr/local/enlightenment/share
-+BINARY_DESTINATION = ${PREFIX}/bin
-+DATA_DESTINATION   = ${PREFIX}/share
- 
- # commands to do things
- INSTALL  = install
-@@ -39,7 +39,7 @@
- MAKE     = make
- STRIP    = strip
- SED      = sed
--MAKEDEP  = gcc -MM $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDES) $(EXTRA_INCLUDES)
-+MAKEDEP  = ${CC} -MM $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDES) $(EXTRA_INCLUDES)
- #MAKEDEP = makedepend -f- -s'\# CUT' -- -Y $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDES) $(EXTRA_INCLUDES) --
- 
- # piece together variables
diff --git a/x11-wm/e16utils/pkg-plist b/x11-wm/e16utils/pkg-plist
deleted file mode 100644
index 585bfd696d87..000000000000
--- a/x11-wm/e16utils/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/e16menuedit
-bin/e16keyedit