* Upgrade 0.52 -> 0.59

* Honor PREFIX
* Install into ${PREFIX}/share/tik instead of ${PREFIX}/lib/${PKGNAME}
* Clean up installation

4 files changed, 55 insertions, 65 deletions

diff --git a/net/tik/Makefile b/net/tik/Makefile
index 92f92323adad..5b93ff839276 100644
--- a/net/tik/Makefile
+++ b/net/tik/Makefile
@@ -1,37 +1,71 @@
 # New ports collection makefile for:	tik
-# Version required:	0.52
-# Date created:		13 January 1999
-# Whom:			Eugene M. Kim <astralblue@usa.net>
+# Version required:			0.59
+# Date created:				13 January 1999
+# Whom:					Eugene M. Kim <astralblue@usa.net>
 #
-# $Id: Makefile,v 1.1.1.1 1998/12/24 15:28:00 flathill Exp $
+# $Id: Makefile,v 1.2 1999/01/18 03:15:29 steve Exp $
 #
 
-DISTNAME=	tik-0.52
+DISTNAME=	tik-0.59
 CATEGORIES=	net tk80
-MASTER_SITES=	http://www.aim.aol.com/tik/
+MASTER_SITES=	http://www.aim.aol.com/tik/ \
+		http://www.nectar.com/distfiles/
 
 MAINTAINER=	astralblue@usa.net
 
 RUN_DEPENDS=	tclsh8.0:${PORTSDIR}/lang/tcl80 \
 		wish8.0:${PORTSDIR}/x11-toolkits/tk80
 
+NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/tik
+PLIST=		${WRKDIR}/PLIST
 
-NO_BUILD=	yes
-PLIST_SUB=	DISTNAME=${DISTNAME}
+SORT?=		sort
+
+SRCDIRS= 	share/tik share/tik/media share/tik/packages
+SRCFILES=	media/AOL.gif media/Admin.gif media/DT.gif media/Login.gif \
+		media/Logo.gif media/Logout.gif media/Oscar.gif            \
+		media/downarrow.gif media/uparrow.gif media/BuddyArrive.au \
+		media/BuddyLeave.au media/Pounce.au media/Receive.au       \
+		media/Send.au packages/away.tcl packages/imcapture.tcl     \
+		packages/mynews.tcl packages/pounce.tcl                    \
+		packages/quickchat.tcl packages/search.tcl                 \
+		packages/socksproxy.tcl packages/sslproxy.tcl              \
+		packages/stock.tcl packages/ticker.tcl sflap.tcl           \
+		configTool.tcl toc.tcl tik.tcl tac.tcl sag.tcl
+EGDIR=		share/examples/tik
+EGFILES=	example.tacrc example.tikpre example.tikrc
+DOCDIR=		share/doc/tik
+DOCFILES=	CHANGES LICENSE README PROTOCOL
 
+# The packing list starts with just bin/tik.  As we install things,
+# build onto the list.
 do-install:
-	cd ${WRKSRC} ; \
-	find -d media packages *.tcl -print0 | \
-	    cpio -dump0 --owner=root:wheel ${PREFIX}/lib/${DISTNAME} ; \
-	${MKDIR} ${PREFIX}/share/examples/${DISTNAME} ; \
-	${INSTALL_DATA} example.* ${PREFIX}/share/examples/${DISTNAME}/ ; \
-	${INSTALL_SCRIPT} ${FILESDIR}/tik ${PREFIX}/bin/${DISTNAME} ; \
-	ln -sf ${DISTNAME} ${PREFIX}/bin/tik
+	@${CP} ${PKGDIR}/PLIST ${PLIST}
+.for d in ${SRCDIRS}
+	@${MKDIR} ${PREFIX}/${d}
+	@${ECHO} @dirrm ${d} >> ${PLIST}.dirrm
+.endfor
+.for f in ${SRCFILES}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/tik/${f}
+	@${ECHO} share/tik/${f} >> ${PLIST}
+.endfor
+	@${MKDIR} ${PREFIX}/${EGDIR}
+	@${ECHO} @dirrm ${EGDIR} >> ${PLIST}.dirrm
+.for f in ${EGFILES}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${EGDIR}/${f}
+	@${ECHO} ${EGDIR}/${f} >> ${PLIST}
+.endfor
+	@${SED} 's#@PREFIX@#${PREFIX}#g' < ${FILESDIR}/tik >${WRKDIR}/tik.sh
+	${INSTALL_SCRIPT} ${WRKDIR}/tik.sh ${PREFIX}/bin/tik
 .if !defined(NOPORTDOCS)
-	cd ${WRKSRC} ; \
-	${MKDIR} ${PREFIX}/share/doc/${DISTNAME} ; \
-	${INSTALL_DATA} PROTOCOL CHANGES README LICENSE ${PREFIX}/share/doc/${DISTNAME}/
+	@${MKDIR} ${PREFIX}/${DOCDIR}
+	@${ECHO} @dirrm ${DOCDIR} >> ${PLIST}.dirrm
+.for f in ${DOCFILES}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${DOCDIR}/${f}
+	@${ECHO} ${DOCDIR}/${f} >> ${PLIST}
+.endfor
 .endif
+	@${SORT} -r ${PLIST}.dirrm >> ${PLIST} && ${RM} ${PLIST}.dirrm
 
 .include <bsd.port.mk>
diff --git a/net/tik/distinfo b/net/tik/distinfo
index f545d3c39512..ef66d41bebd1 100644
--- a/net/tik/distinfo
+++ b/net/tik/distinfo
@@ -1 +1 @@
-MD5 (tik-0.52.tar.gz) = b5aae395350de95d98ee150dd226ae2e
+MD5 (tik-0.59.tar.gz) = baaec15a9e16ecd5d5c56ebd8414db57
diff --git a/net/tik/files/tik b/net/tik/files/tik
index 3f69fc02ec78..cb9d056c7af3 100644
--- a/net/tik/files/tik
+++ b/net/tik/files/tik
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec wish8.0 /usr/local/lib/tik-0.52/tik.tcl
+exec wish8.0 @PREFIX@/share/tik/tik.tcl
diff --git a/net/tik/pkg-plist b/net/tik/pkg-plist
index d09fd94548bd..5096cc31a512 100644
--- a/net/tik/pkg-plist
+++ b/net/tik/pkg-plist
@@ -1,45 +1 @@
-bin/%%DISTNAME%%
-@exec ln -sf %%DISTNAME%% %B/tik
-@unexec rm %B/tik
-lib/%%DISTNAME%%/media/AOL.gif
-lib/%%DISTNAME%%/media/Admin.gif
-lib/%%DISTNAME%%/media/DT.gif
-lib/%%DISTNAME%%/media/Login.gif
-lib/%%DISTNAME%%/media/Logo.gif
-lib/%%DISTNAME%%/media/Logout.gif
-lib/%%DISTNAME%%/media/Oscar.gif
-lib/%%DISTNAME%%/media/downarrow.gif
-lib/%%DISTNAME%%/media/uparrow.gif
-lib/%%DISTNAME%%/media/BuddyArrive.au
-lib/%%DISTNAME%%/media/BuddyLeave.au
-lib/%%DISTNAME%%/media/Pounce.au
-lib/%%DISTNAME%%/media/Receive.au
-lib/%%DISTNAME%%/media/Send.au
-lib/%%DISTNAME%%/packages/away.tcl
-lib/%%DISTNAME%%/packages/imcapture.tcl
-lib/%%DISTNAME%%/packages/mynews.tcl
-lib/%%DISTNAME%%/packages/pounce.tcl
-lib/%%DISTNAME%%/packages/quickchat.tcl
-lib/%%DISTNAME%%/packages/search.tcl
-lib/%%DISTNAME%%/packages/socksproxy.tcl
-lib/%%DISTNAME%%/packages/sslproxy.tcl
-lib/%%DISTNAME%%/packages/stock.tcl
-lib/%%DISTNAME%%/packages/ticker.tcl
-lib/%%DISTNAME%%/sflap.tcl
-lib/%%DISTNAME%%/configTool.tcl
-lib/%%DISTNAME%%/toc.tcl
-lib/%%DISTNAME%%/tik.tcl
-lib/%%DISTNAME%%/tac.tcl
-lib/%%DISTNAME%%/sag.tcl
-share/doc/%%DISTNAME%%/PROTOCOL
-share/doc/%%DISTNAME%%/CHANGES
-share/doc/%%DISTNAME%%/README
-share/doc/%%DISTNAME%%/LICENSE
-share/examples/%%DISTNAME%%/example.tikrc
-share/examples/%%DISTNAME%%/example.tacrc
-share/examples/%%DISTNAME%%/example.tikpre
-@dirrm lib/%%DISTNAME%%/media
-@dirrm lib/%%DISTNAME%%/packages
-@dirrm lib/%%DISTNAME%%
-@dirrm share/doc/%%DISTNAME%%
-@dirrm share/examples/%%DISTNAME%%
+bin/tik