From 6a3569bd40839c745394cdcba29f0c67c5c57603 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Wed, 18 Mar 2009 08:01:08 +0000
Subject: [PATCH] convert to tk.port.mk; fixes RUN_DEPENDS-x11 - ok bernd@

---
 devel/git/Makefile | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/devel/git/Makefile b/devel/git/Makefile
index 9ec8fdf97a4..23eb1c545e8 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.42 2009/02/09 19:45:19 bernd Exp $
+# $OpenBSD: Makefile,v 1.43 2009/03/18 08:01:08 sthen Exp $
 
 COMMENT-main=		GIT - Tree History Storage Tool
 COMMENT-svn=		GIT - subversion interoperability tools
@@ -8,14 +8,14 @@ V=			1.6.1.3
 DISTNAME=		git-${V}
 PKGNAME-main=		${DISTNAME}
 PKGNAME-svn=		git-svn-${V}
-PKGNAME-x11=		git-x11-${V}
+PKGNAME-x11=		git-x11-${V}p0
 CATEGORIES=		devel
 
 HOMEPAGE=		http://git.or.cz/
 
 MAINTAINER=		Bernd Ahlers <bernd@openbsd.org>
 
-# GPL
+# GPLv2 only
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
@@ -32,7 +32,7 @@ MASTER_SITES=		ftp://ftp.kernel.org/pub/software/scm/git/ \
 
 TAR=			${LOCALBASE}/bin/gtar
 
-MODULES=		converters/libiconv
+MODULES=		converters/libiconv x11/tk
 
 BUILD_DEPENDS=		::archivers/gtar \
 			::devel/p5-Error
@@ -55,16 +55,15 @@ LIB_DEPENDS-svn=
 PKG_ARCH-svn=		*
 
 RUN_DEPENDS-x11=	:${PKGNAME}:${BASE_PKGPATH},-main \
-			:tk-8.5.*:x11/tk/8.5
+			${MODTK_RUN_DEPENDS}
 LIB_DEPENDS-x11=
 PKG_ARCH-x11=		*
 
 MAKE_ENV=		prefix=${PREFIX} CC="${CC}" CFLAGS="${CFLAGS}" V=1 \
 			SYSCONFDIR=${SYSCONFDIR} \
-			TCLTK_PATH=${LOCALBASE}/bin/wish8.5 \
-			TCL_PATH=${LOCALBASE}/bin/tclsh8.5
+			TCLTK_PATH=${MODTK_BIN} \
+			TCL_PATH=${MODTCL_BIN}
 
-USE_X11=		Yes
 USE_GMAKE=		Yes
 
 REGRESS_DEPENDS=	:zip-*:archivers/zip \