4 files changed, 14 insertions, 48 deletions

diff --git a/deskutils/zorro/Makefile b/deskutils/zorro/Makefile
index 2635eaf80086..3db9a0128ae6 100644
--- a/deskutils/zorro/Makefile
+++ b/deskutils/zorro/Makefile
@@ -7,29 +7,34 @@
 
 PORTNAME=	zorro
 PORTVERSION=	1.1.8
-CATEGORIES=	deskutils tk82
+PORTREVISION=	1
+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@FreeBSD.org
+MAINTAINER=	carpetsmoker@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 --git a/deskutils/zorro/files/patch-aa b/deskutils/zorro/files/patch-aa
deleted file mode 100644
index a62e966242bd..000000000000
--- a/deskutils/zorro/files/patch-aa
+++ /dev/null
@@ -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@newcastle.ac.uk>
---- 1,6 ----
-! #!%%LOCALBASE%%/bin/wish8.2
-  #
-! # Version 1.1 Patch 8
-  #
-  # ----------------------------------------------------------------------
-  #   AUTHOR:  Lindsay Marshall <lindsay.marshall@newcastle.ac.uk>
diff --git a/deskutils/zorro/files/patch-ab b/deskutils/zorro/files/patch-ab
deleted file mode 100644
index 7efefb9b34bc..000000000000
--- a/deskutils/zorro/files/patch-ab
+++ /dev/null
@@ -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.
-  #
diff --git a/deskutils/zorro/pkg-plist b/deskutils/zorro/pkg-plist
deleted file mode 100644
index 3aa830b1ff26..000000000000
--- a/deskutils/zorro/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/zorro
-share/zorro/DOTzorrorc
-@dirrm share/zorro