diff -ruN tpad.bak/Makefile tpad/Makefile
--- tpad.bak/Makefile	Fri Jan 30 22:06:01 2004
+++ tpad/Makefile	Wed Sep  1 14:36:50 2004
@@ -2,30 +2,48 @@
 # Date created:		10 November 2003
 # Whom:			Antonio Bonifati <ant@monitor.deis.unical.it>
 #
-# $FreeBSD: ports/editors/tpad/Makefile,v 1.3 2004/01/30 21:06:01 pav Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	tpad
-PORTVERSION=	1.2
+PORTVERSION=	1.3
 CATEGORIES=	editors tcl84 tk84
-MASTER_SITES=	http://monitor.deis.unical.it/ant/tpad/ \
-		http://queen.rett.polimi.it/~ant/tcl/script/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		http://monitor.deis.unical.it/ant/tpad/ \
+		http://queen.rett.polimi.it/~ant/tcl/script/ \
+		http://sarovar.org/download.php/382/
+MASTER_SITE_SUBDIR=	tclpad
 
 MAINTAINER=	ant@monitor.deis.unical.it
-COMMENT=	Windows XP (TM) Notepad clone written in Tcl/Tk
+COMMENT=	Windows XP (TM) enhanced Notepad clone written in Tcl/Tk
 
 RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
 
 NO_BUILD=	yes
 PKGMESSAGE=	${WRKDIR}/MESSAGE
 
-PORTDOCS=	ChangeLog conf.html index.html intro.html keys.html \
-		log.html mouse.html todo tpad.html
+PORTDOCS=	ChangeLog bug.html conf.html embed.html index.html intro.html \
+		keys.html log.html mouse.html tidy.html tidy.png todo tpad.html
 MAN1=		tpad.1
 MLINKS=		tpad.1 tview.1
+PLIST_SUB=	LIBDIR=lib/tpad${PORTVERSION}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/bin/tpad ${PREFIX}/bin/tpad
+	@${MKDIR} ${PREFIX}/lib/tpad${PORTVERSION}/msgs
+	cd ${WRKDIR}/lib/tpad${PORTVERSION}; \
+	for libfile in *.tcl; do \
+		${INSTALL_DATA} $$libfile ${PREFIX}/lib/tpad${PORTVERSION}; \
+	done
+	cd ${WRKDIR}/lib/tpad${PORTVERSION}/msgs; \
+	for msgfile in *.msg; do \
+		${INSTALL_DATA} $$msgfile ${PREFIX}/lib/tpad${PORTVERSION}/msgs; \
+	done
+	@${MKDIR} ${DATADIR}
+	cd ${WRKDIR}/share/tpad/; \
+	for  datafile in *; do \
+		${INSTALL_DATA} $$datafile ${DATADIR}; \
+	done
 
 post-install:
 	${TEST} -e ${PREFIX}/bin/tview || (cd ${PREFIX}/bin ; ${LN} -s tpad tview)
@@ -38,8 +56,7 @@
 	${INSTALL_DATA} ${WRKDIR}/share/doc/tpad/${docfile} ${DOCSDIR}
 .endfor
 .endif
-	${INSTALL_DATA} ${WRKDIR}/etc/tpad.conf \
-		${PREFIX}/etc/tpad.conf.sample
+	${INSTALL_DATA} ${WRKDIR}/etc/tpad.conf ${PREFIX}/etc/tpad.conf.sample
 	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${PKGDIR}/pkg-message > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
diff -ruN tpad.bak/distinfo tpad/distinfo
--- tpad.bak/distinfo	Wed Mar 31 05:07:39 2004
+++ tpad/distinfo	Tue Aug 31 18:19:17 2004
@@ -1,2 +1,2 @@
-MD5 (tpad-1.2.tar.gz) = 95a5d1b74866a5268696ac97d9698255
-SIZE (tpad-1.2.tar.gz) = 21451
+MD5 (tpad-1.3.tar.gz) = 8ddb7a2511ed98c71aa43a19b284efd8
+SIZE (tpad-1.3.tar.gz) = 61217
diff -ruN tpad.bak/pkg-descr tpad/pkg-descr
--- tpad.bak/pkg-descr	Thu Nov 13 19:24:52 2003
+++ tpad/pkg-descr	Tue Aug 31 18:19:16 2004
@@ -1,10 +1,11 @@
-The executable tpad is a wish(1) shell script.
+Apart from all the features Notepad has, tpad adds
+plugins to invoke some common text utilities without
+leaving the editor, an Ascii table, a tip database
+and support for regexps. It also is fully configurable.
 
-I think the only difference with Notepad
-is that it doesn't limit the size of the
-file to edit :-)
+The executable `tpad' is a wish(1) shell script.
 
 WWW: http://monitor.deis.unical.it/ant/tpad/
 
 - Antonio Bonifati
-ant@monitor.deis.unical.it
+ant at monitor.deis.unical.it
diff -ruN tpad.bak/pkg-plist tpad/pkg-plist
--- tpad.bak/pkg-plist	Fri Jan 30 22:06:01 2004
+++ tpad/pkg-plist	Tue Aug 31 18:19:16 2004
@@ -1,3 +1,18 @@
 bin/tpad
 bin/tview
 etc/tpad.conf.sample
+%%DATADIR%%/Makefile
+%%DATADIR%%/tpad-tips
+%%DATADIR%%/tpad-tips.dat
+%%LIBDIR%%/BSDfmt.tcl
+%%LIBDIR%%/GNUfmt.tcl
+%%LIBDIR%%/ascii.tcl
+%%LIBDIR%%/msgs/en.msg
+%%LIBDIR%%/msgs/it.msg
+%%LIBDIR%%/pkgIndex.tcl
+%%LIBDIR%%/tidy.tcl
+%%LIBDIR%%/tpad.tcl
+%%LIBDIR%%/xmlwf.tcl
+@dirrm %%DATADIR%%
+@dirrm %%LIBDIR%%/msgs
+@dirrm %%LIBDIR%%