5 files changed, 25 insertions, 35 deletions

diff --git a/x11-toolkits/tktray/Makefile b/x11-toolkits/tktray/Makefile
index 8bfdc4c20c89..5aca1c293e6d 100644
--- a/x11-toolkits/tktray/Makefile
+++ b/x11-toolkits/tktray/Makefile
@@ -2,31 +2,25 @@
 # $FreeBSD$
 
 PORTNAME=	tktray
-PORTVERSION=	1.1
-PORTREVISION=	2
+PORTVERSION=	1.3.9
 CATEGORIES=	x11-toolkits tk
-MASTER_SITES=	http://www.sw4me.com/ CENKES
-DISTNAME=	${TKPKG}
+MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
+DISTNAME=	${PORTNAME}${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	System tray icon support
 
-USE_TK=		84
+USES+=		tk
 USE_XORG=	x11 xext
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} --with-tk=${TK_LIBDIR} \
-		--with-tkinclude=${TK_INCLUDEDIR} --enable-shared
-CPPFLAGS+=	-I${TK_INCLUDEDIR}/generic -I${TCL_INCLUDEDIR}/generic
+CONFIGURE_ARGS=	-exec-prefix=${PREFIX} \
+		--with-tcl=${TCL_LIBDIR} \
+		--with-tk=${TK_LIBDIR}
 TKPKG=		${PORTNAME}${PORTVERSION}
-PLIST_SUB=	TKPKG=${TKPKG}
-USE_LDCONFIG=	${PREFIX}/lib/${TKPKG}
-MANN=		${PORTNAME}.n
 
-NO_STAGE=	yes
-post-patch:
-	@${REINPLACE_CMD} -Ee '/^.+TCLLIBPATH/s#$$# \\#' ${WRKSRC}/Makefile.in
-
-post-install:
-	@${LN} -sf ${USE_LDCONFIG}/lib${TKPKG}.so ${USE_LDCONFIG}/lib${TKPKG}.so.0
+PLIST_FILES=	lib/${TKPKG}/libtktray.so.1 \
+		lib/${TKPKG}/pkgIndex.tcl \
+		man/mann/${PORTNAME}.n.gz
+PLIST_DIRS=	lib/${TKPKG}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/tktray/distinfo b/x11-toolkits/tktray/distinfo
index 3c5e6c7ef139..fe754b745caa 100644
--- a/x11-toolkits/tktray/distinfo
+++ b/x11-toolkits/tktray/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tktray1.1.tar.gz) = e4c4a8ad75eacbdf2a6950dd40249dfb82897d59b999afcc05c9587081c8926f
-SIZE (tktray1.1.tar.gz) = 109936
+SHA256 (tktray1.3.9.tar.gz) = ef48b75ea7979186a05b605f8c153f92bbcc46cb76dee8be1d30bcda179bfcfc
+SIZE (tktray1.3.9.tar.gz) = 134484
diff --git a/x11-toolkits/tktray/files/patch-Makefile.in b/x11-toolkits/tktray/files/patch-Makefile.in
new file mode 100644
index 000000000000..da25a1b60091
--- /dev/null
+++ b/x11-toolkits/tktray/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2013-10-14 09:43:04.000000000 +0200
++++ Makefile.in	2013-10-14 09:43:11.000000000 +0200
+@@ -134,7 +134,7 @@
+ TCLSH_ENV	= TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library`
+ PKG_ENV		= @LD_LIBRARY_PATH_VAR@="$(EXTRA_PATH):$(@LD_LIBRARY_PATH_VAR@)" \
+ 		  PATH="$(EXTRA_PATH):$(PATH)" \
+-		  TCLLIBPATH="$(TCLLIBPATH)"
++		  TCLLIBPATH="$(TCLLIBPATH)" \
+ 		  TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library`
+ 
+ TCLSH_PROG	= @TCLSH_PROG@
diff --git a/x11-toolkits/tktray/files/patch-configure b/x11-toolkits/tktray/files/patch-configure
deleted file mode 100644
index 801bf9a3ca47..000000000000
--- a/x11-toolkits/tktray/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2006-01-06 21:07:11.000000000 +0300
-+++ configure	2009-11-05 00:43:53.000000000 +0300
-@@ -7677,7 +7677,7 @@
- 	    # results, and the version is kept in special file).
- 
- 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
--		system=MP-RAS-`awk '{print }' /etc/.relid'`
-+		system=MP-RAS-`awk '{print $3}' /etc/.relid`
- 	    fi
- 	    if test "`uname -s`" = "AIX" ; then
- 		system=AIX-`uname -v`.`uname -r`
diff --git a/x11-toolkits/tktray/pkg-plist b/x11-toolkits/tktray/pkg-plist
deleted file mode 100644
index 7d2e230352e2..000000000000
--- a/x11-toolkits/tktray/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-lib/%%TKPKG%%/lib%%TKPKG%%.so
-lib/%%TKPKG%%/lib%%TKPKG%%.so.0
-lib/%%TKPKG%%/pkgIndex.tcl
-@dirrm lib/%%TKPKG%%