- Update to 0.8.2

- Support tcl84, tcl85 and tcl86
- Take maintainership

4 files changed, 62 insertions, 19 deletions

diff --git a/x11-toolkits/tile/Makefile b/x11-toolkits/tile/Makefile
index 4574f3b44fda..5f8722760cca 100644
--- a/x11-toolkits/tile/Makefile
+++ b/x11-toolkits/tile/Makefile
@@ -6,28 +6,31 @@
 #
 
 PORTNAME=	tile
-PORTVERSION=	0.7.8
-PORTREVISION=	1
+PORTVERSION=	0.8.2
 CATEGORIES=	x11-toolkits tk
 MASTER_SITES=	SF/tktable
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Themed widget set for Tk
 
-USE_TK=		yes
+USE_TK=		84+
+
+USE_AUTOTOOLS=	autoconf:262
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} \
-		--with-tk=${TK_LIBDIR} \
-		--exec-prefix=${PREFIX} --enable-shared
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDES} ${TK_INCLUDES}"
-TCL_INCLUDES=	-I${LOCALBASE}/include/tcl${TK_VER} -I${LOCALBASE}/include/tcl${TK_VER}/generic
-TK_INCLUDES=	-I${LOCALBASE}/include/tk${TK_VER} -I${LOCALBASE}/include/tk${TK_VER}/generic
 TKPKG=		${PORTNAME}${PORTVERSION}
 PLIST_SUB=	VER=${PORTVERSION} TKPKG=${TKPKG}
-USE_LDCONFIG=	${PREFIX}/lib/${TKPKG}
 
-post-install:
-	@${LN} -sf ${USE_LDCONFIG}/lib${TKPKG}.so ${USE_LDCONFIG}/lib${TKPKG}.so.0
+.include <bsd.port.pre.mk>
+
+CONFIGURE_ARGS+=	--with-tcl=${TCL_LIBDIR} \
+		--with-tk=${TK_LIBDIR} \
+		--exec-prefix=${PREFIX} --enable-shared
+CONFIGURE_ENV+=	TCL_INCLUDEDIR="${TCL_INCLUDEDIR}" \
+		TK_INCLUDEDIR="${TK_INCLUDEDIR}"
+
+pre-configure:
+	@${REINPLACE_CMD} -e "s/package require Tcl 8\../package require Tcl ${TCL_VER}/g" \
+		${WRKSRC}/Makefile.in
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/tile/distinfo b/x11-toolkits/tile/distinfo
index 38255340767d..513c55e907e6 100644
--- a/x11-toolkits/tile/distinfo
+++ b/x11-toolkits/tile/distinfo
@@ -1,3 +1,3 @@
-MD5 (tile-0.7.8.tar.gz) = 1172c1875ae63d7a73d8ba27835e16d4
-SHA256 (tile-0.7.8.tar.gz) = 86536244a202c1d69679ee6ae0b58a7ea64731f9a10c8cfff013774a417843bf
-SIZE (tile-0.7.8.tar.gz) = 597832
+MD5 (tile-0.8.2.tar.gz) = 7ffdd0350270a59bc1318e9e90acc4fd
+SHA256 (tile-0.8.2.tar.gz) = eecfebe8976569a62b4f182c480efff4f1119242559645954e04f781c7b21479
+SIZE (tile-0.8.2.tar.gz) = 608832
diff --git a/x11-toolkits/tile/files/patch-tclconfig-tcl.m4 b/x11-toolkits/tile/files/patch-tclconfig-tcl.m4
new file mode 100644
index 000000000000..5dd170ee16bd
--- /dev/null
+++ b/x11-toolkits/tile/files/patch-tclconfig-tcl.m4
@@ -0,0 +1,42 @@
+--- tclconfig/tcl.m4.orig	2007-12-16 19:19:16.000000000 +0100
++++ tclconfig/tcl.m4	2009-02-14 11:22:54.000000000 +0100
+@@ -3513,7 +3513,7 @@
+ AC_DEFUN([TEA_PRIVATE_TCL_HEADERS], [
+     AC_MSG_CHECKING([for Tcl private include files])
+ 
+-    TCL_SRC_DIR_NATIVE=`${CYGPATH} ${TCL_SRC_DIR}`
++    TCL_SRC_DIR_NATIVE=`${CYGPATH} ${TCL_INCLUDEDIR}`
+     TCL_TOP_DIR_NATIVE=\"${TCL_SRC_DIR_NATIVE}\"
+     TCL_GENERIC_DIR_NATIVE=\"${TCL_SRC_DIR_NATIVE}/generic\"
+     TCL_UNIX_DIR_NATIVE=\"${TCL_SRC_DIR_NATIVE}/unix\"
+@@ -3541,8 +3541,8 @@
+ 	        ;;
+ 	esac
+     else
+-	if test ! -f "${TCL_SRC_DIR}/generic/tclInt.h" ; then
+-	    AC_MSG_ERROR([Cannot find private header tclInt.h in ${TCL_SRC_DIR}])
++	if test ! -f "${TCL_INCLUDEDIR}/generic/tclInt.h" ; then
++	    AC_MSG_ERROR([yes])
+ 	fi
+     fi
+ 
+@@ -3671,7 +3671,7 @@
+ AC_DEFUN([TEA_PRIVATE_TK_HEADERS], [
+     AC_MSG_CHECKING([for Tk private include files])
+ 
+-    TK_SRC_DIR_NATIVE=`${CYGPATH} ${TK_SRC_DIR}`
++    TK_SRC_DIR_NATIVE=`${CYGPATH} ${TK_INCLUDEDIR}`
+     TK_TOP_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}\"
+     TK_UNIX_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}/unix\"
+     TK_WIN_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}/win\"
+@@ -3706,8 +3706,8 @@
+ 	        ;;
+ 	esac
+     else
+-	if test ! -f "${TK_SRC_DIR}/generic/tkInt.h" ; then
+-	    AC_MSG_ERROR([Cannot find private header tkInt.h in ${TK_SRC_DIR}])
++	if test ! -f "${TK_INCLUDEDIR}/generic/tkInt.h" ; then
++	    AC_MSG_ERROR([yes])
+ 	fi
+     fi
+ 
diff --git a/x11-toolkits/tile/pkg-plist b/x11-toolkits/tile/pkg-plist
index bd7a318ee3e9..7cce18ae6c6f 100644
--- a/x11-toolkits/tile/pkg-plist
+++ b/x11-toolkits/tile/pkg-plist
@@ -1,7 +1,6 @@
 include/tkTheme.h
 include/ttkDecls.h
 lib/%%TKPKG%%/lib%%TKPKG%%.so
-lib/%%TKPKG%%/lib%%TKPKG%%.so.0
 lib/libttkstub.a
 lib/%%TKPKG%%/altTheme.tcl
 lib/%%TKPKG%%/aquaTheme.tcl
@@ -24,7 +23,6 @@ lib/%%TKPKG%%/progress.tcl
 lib/%%TKPKG%%/scale.tcl
 lib/%%TKPKG%%/scrollbar.tcl
 lib/%%TKPKG%%/sizegrip.tcl
-lib/%%TKPKG%%/stepTheme.tcl
 lib/%%TKPKG%%/tile.tcl
 lib/%%TKPKG%%/treeview.tcl
 lib/%%TKPKG%%/utils.tcl