From 914f0e64c655335b400d82abea46f7d0298081ad Mon Sep 17 00:00:00 2001
From: fgsch <fgsch@openbsd.org>
Date: Mon, 3 Dec 2007 18:59:04 +0000
Subject: [PATCH] update to 0.5; ex-maintainer ok (removed as per his request).

---
 x11/e16keyedit/Makefile               | 29 ++++++++-------
 x11/e16keyedit/distinfo               | 10 ++---
 x11/e16keyedit/patches/patch-Makefile | 53 ---------------------------
 3 files changed, 21 insertions(+), 71 deletions(-)
 delete mode 100644 x11/e16keyedit/patches/patch-Makefile

diff --git a/x11/e16keyedit/Makefile b/x11/e16keyedit/Makefile
index 53f453bbfe3..f442b8cd748 100644
--- a/x11/e16keyedit/Makefile
+++ b/x11/e16keyedit/Makefile
@@ -1,26 +1,29 @@
-# $OpenBSD: Makefile,v 1.9 2007/09/15 22:11:38 merdely Exp $
+# $OpenBSD: Makefile,v 1.10 2007/12/03 18:59:04 fgsch Exp $
 
-COMMENT=		edit enlightenment's keybindings
+COMMENT=	edit enlightenment's keybindings
 
-DISTNAME=		e16keyedit-0.2
-PKGNAME=		${DISTNAME}p0
-CATEGORIES=     	x11
-
-MAINTAINER=		Nick Nauwelaerts <nick@nauwelaerts.net>
+DISTNAME=	e16keyedit-0.5
+CATEGORIES=    	x11
 
 # X11
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		X11 Xext Xi c glib gmodule iconv intl m
 
-MASTER_SITES=		${MASTER_SITES_SOURCEFORCE:=enlightenment/}
+WANTLIB= 	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
+		Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig \
+		freetype glib-2.0 glitz gmodule-2.0 gobject-2.0 iconv \
+		intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 png z
 
-LIB_DEPENDS=		gtk.>=1.2,gdk.>=1.2::x11/gtk+
-RUN_DEPENDS=		:enlightenment-0.16*:x11/enlightenment
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=enlightenment/}
 
-USE_X11=		Yes
-NO_REGRESS=		Yes
+LIB_DEPENDS=	gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2
+RUN_DEPENDS=	:enlightenment-0.16*:x11/enlightenment
+
+USE_X11=	Yes
+CONFIGURE_STYLE=gnu
+
+NO_REGRESS=	Yes
 
 .include <bsd.port.mk>
diff --git a/x11/e16keyedit/distinfo b/x11/e16keyedit/distinfo
index 60a28b6b26f..80094074fd6 100644
--- a/x11/e16keyedit/distinfo
+++ b/x11/e16keyedit/distinfo
@@ -1,5 +1,5 @@
-MD5 (e16keyedit-0.2.tar.gz) = Dr/yxvt0kRMIGyISx3fhmw==
-RMD160 (e16keyedit-0.2.tar.gz) = Mi/910xTTG+2NyLcIaHW4kwD4gc=
-SHA1 (e16keyedit-0.2.tar.gz) = aukBr6r20QlcWLe5y/em0OHQzMg=
-SHA256 (e16keyedit-0.2.tar.gz) = +V8FmBxUNy8iBWlMTi4noGBXPAYI4Yfhui0Hu02PUXg=
-SIZE (e16keyedit-0.2.tar.gz) = 13749
+MD5 (e16keyedit-0.5.tar.gz) = bT/iu5P4FAPzM4Rha//CBA==
+RMD160 (e16keyedit-0.5.tar.gz) = ixyP2M/lfTxKwmq4rd71h5F8f/Y=
+SHA1 (e16keyedit-0.5.tar.gz) = K7Cav9xdLXnbS8zAFgTjJATHQ6o=
+SHA256 (e16keyedit-0.5.tar.gz) = MV78zW2BWz79TXutZ9mu3ahF86o10JLCs8ENKaYAe0A=
+SIZE (e16keyedit-0.5.tar.gz) = 81252
diff --git a/x11/e16keyedit/patches/patch-Makefile b/x11/e16keyedit/patches/patch-Makefile
deleted file mode 100644
index b6826b72fca..00000000000
--- a/x11/e16keyedit/patches/patch-Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.2 2005/07/23 18:39:44 fgsch Exp $
---- Makefile.orig	Thu Mar 23 20:04:16 2000
-+++ Makefile	Tue Nov 13 19:28:20 2001
-@@ -9,25 +9,21 @@ DATA     =
- EXTRAS   =
- BUILD    = \
- 
--LIB_DIRS = \
--    -L/usr/local/lib -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/dt/lib
-+#LIB_DIRS = \
-+#     -L/usr/local/lib -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/dt/lib
- LIBS     = \
--    `gtk-config --libs` -lgdbm -lgdk_imlib
--CFLAGS   = \
--    -O -g -D_GNU_SOURCE $(DEVFLAGS)
-+    `gtk-config --libs`
-+#CFLAGS   = \
-+#    -O -g -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..
- 
- BIN      = e16keyedit
- 
--# configurable stuff
--BINARY_DESTINATION = /usr/local/enlightenment/bin
--DATA_DESTINATION   = /usr/local/enlightenment/share
--
- # commands to do things
- INSTALL  = install
- MKDIR    = mkdir
-@@ -92,14 +88,8 @@ clean::
- 	$(RMRF) $(BIN) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut $(DIST) $(DIST).tar $(DIST).tar.gz ./=build ./=install "#"*
- 
- # how to install
--install:: e
--	@echo 
--	@echo 
--	@echo "You don't really want to do this. it doesn't work yet."
--	@echo 
--	@echo 
--#	for I in $(BIN); do $(INSTALL) -D -m 0775 $$I $(prefix)$(BINARY_DESTINATION)/$$I; done
--#	for I in $(DATA); do $(INSTALL) -D -m 0664 $$I $(prefix)$(DATA_DESTINATION)/$$I; done
-+install::
-+	$(BSD_INSTALL_PROGRAM) $(BIN) $(PREFIX)/bin
- 
- # how to make a dist tarball
- dist::