ports/110327: Use TCL/TL 8.4: deskutils/zorro

[Martin Tournoij]

>Number:         110327
>Category:       ports
>Synopsis:       Use TCL/TL 8.4: deskutils/zorro
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 15 09:00:12 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Martin Tournoij
>Release:        FreeBSD 6.2-RELEASE-p1 i386
>Organization:
>Environment:
FreeBSD glitch.carpetsmoker.net 6.2-RELEASE-p1 FreeBSD 6.2-RELEASE-p1 #0: Thu Feb 15 20:56:16 CET 2007 carpetsmoker at glitch.carpetsmoker.net:/usr/obj/nfs/tinderbox/jails/6.2/src/sys/GENERICri386

>Description:
- Use TCL/TK 8.4
- Take maintainership

>How-To-Repeat:

>Fix:

--- patch-zorro begins here ---
diff -urN /usr/ports/deskutils/zorro/Makefile ./Makefile
--- /usr/ports/deskutils/zorro/Makefile	Thu May  4 23:40:21 2006
+++ ./Makefile	Thu Mar 15 07:39:48 2007
@@ -7,29 +7,34 @@
 
 PORTNAME=	zorro
 PORTVERSION=	1.1.8
+PORTREVISION=	1
-CATEGORIES=	deskutils tk82
+CATEGORIES=	deskutils tk84
 MASTER_SITES=	ftp://ftp.nuug.no/pub/anders/distfiles/ \
 		http://atreides.freenix.no/~anders/ \
 		ftp://totem.fix.no/pub/mirrors/misc/
-
 DISTNAME=	${PORTNAME}-1.1p8
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	carpetsmoker at xs4all.nl
 COMMENT=	A simple to-do list manager
 
-LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
-
+USE_TK=		yes
 NO_BUILD=	yes
+PLIST_FILES=	bin/zorro
+PORTDOCS=	DOTzorrorc
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/zorro
+	@${REINPLACE_CMD} -e 's|/usr/local/bin/wish|${WISH}|' \
+		${WRKSRC}/zorro
+	@${REINPLACE_CMD} -e 's|oof|of|' ${WRKSRC}/DOTzorrorc
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/zorro ${PREFIX}/bin/zorro
-	${MKDIR} ${PREFIX}/share/zorro
-	${INSTALL_DATA} ${WRKSRC}/DOTzorrorc ${PREFIX}/share/zorro
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/DOTzorrorc ${DOCSDIR}
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Take a look at ${PREFIX}/share/zorro/DOTzorrorc"
+	@${ECHO_MSG} "Take a look at ${DOCSDIR}/DOTzorrorc"
 	@${ECHO_MSG} ""
+.endif
 
 .include <bsd.port.mk>
diff -urN /usr/ports/deskutils/zorro/files/patch-aa ./files/patch-aa
--- /usr/ports/deskutils/zorro/files/patch-aa	Fri Jun 23 15:44:03 2000
+++ ./files/patch-aa	Thu Jan  1 01:00:00 1970
@@ -1,17 +0,0 @@
-*** zorro.orig	Sat Aug  3 22:52:54 1996
---- zorro	Sat Aug  3 22:53:10 1996
-***************
-*** 1,6 ****
-! #!/usr/local/bin/wish
-  #
-! # Version 1.1 Patch 7
-  #
-  # ----------------------------------------------------------------------
-  #   AUTHOR:  Lindsay Marshall <lindsay.marshall at newcastle.ac.uk>
---- 1,6 ----
-! #!%%LOCALBASE%%/bin/wish8.2
-  #
-! # Version 1.1 Patch 8
-  #
-  # ----------------------------------------------------------------------
-  #   AUTHOR:  Lindsay Marshall <lindsay.marshall at newcastle.ac.uk>
diff -urN /usr/ports/deskutils/zorro/files/patch-ab ./files/patch-ab
--- /usr/ports/deskutils/zorro/files/patch-ab	Sun Aug  4 02:22:21 1996
+++ ./files/patch-ab	Thu Jan  1 01:00:00 1970
@@ -1,19 +0,0 @@
-*** DOTzorrorc.orig	Sat Aug  3 23:02:53 1996
---- DOTzorrorc	Sat Aug  3 23:06:44 1996
-***************
-*** 3,9 ****
-  # the defaults so if you like them dont do anything! You can probably
-  # configure all kinds of things using X resources as well but I havent
-  # got it set up for that yet. The easiest way to set many of these is
-! # using the configure option oof the program.
-  #
-  # Set the sort order controlling how actions are displayed.
-  #
---- 3,9 ----
-  # the defaults so if you like them dont do anything! You can probably
-  # configure all kinds of things using X resources as well but I havent
-  # got it set up for that yet. The easiest way to set many of these is
-! # using the configure option of the program.
-  #
-  # Set the sort order controlling how actions are displayed.
-  #
--- patch-zorro ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: