Convert FreeBSD port to NetBSD package.

6 files changed, 70 insertions, 72 deletions

diff --git a/comms/tkhylafax/Makefile b/comms/tkhylafax/Makefile
index 7f28a318d31..0ea6b458e8e 100644
--- a/comms/tkhylafax/Makefile
+++ b/comms/tkhylafax/Makefile
@@ -1,24 +1,21 @@
-# New ports collection Makefile for:	tkhylafax-3.0
-# Version required:	3.0b2
-# Date created:		Sun Jun  8 11:51:21 CEST 1997
-# Whom:			Andreas Klemm <andreas@klemm.gtn.com>
-#
-# $Id: Makefile,v 1.1.1.1 1999/08/11 06:18:13 rh Exp $
+# $NetBSD: Makefile,v 1.2 1999/08/11 06:21:27 rh Exp $
+# FreeBSD Id: Makefile,v 1.6 1998/08/07 23:56:12 asami Exp
 #
 
-DISTNAME=	tkhylafax-3.0b2
-PKGNAME=	tkhylafax-3.0
-CATEGORIES=	comms tk42
-MASTER_SITES=	http://www.NeoSoft.com/tcl/ftparchive/sorted/comm/tkhylafax-3.0b2/
+DISTNAME=	tkhylafax-3.1
+CATEGORIES=	comms
+MASTER_SITES=	ftp://ftp.sgi.com/sgi/fax/contrib/tkhylafax/ \
+		ftp://ftp.tuwien.ac.at/infosys/fax/hylafax/contrib/tkhylafax/ \
+		http://gd.tuwien.ac.at/infosys/fax/hylafax/contrib/tkhylafax/
 
-MAINTAINER=	andreas@FreeBSD.ORG
+MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	http://www.elgro.demon.co.uk/resources.html
 
-RUN_DEPENDS=	wish4.2:${PORTSDIR}/x11-toolkits/tk42 \
-		sendfax:${PORTSDIR}/comms/hylafax \
-		gs:${PORTSDIR}/print/ghostscript4 \
-		gv:${PORTSDIR}/print/gv
+DEPENDS+=	hylafax-4.1b1:../../comms/hylafax
+RUN_DEPENDS+=	${PREFIX}/bin/wish8.0:../../lang/tcl80
+RUN_DEPENDS+=	${PREFIX}/bin/gs:../../print/ghostscript5
+RUN_DEPENDS+=	${X11BASE}/bin/gv:../../print/gv
 
-WRKSRC=		${WRKDIR}/tkhylafax-3.0
-MAN1=		tkhylafax.1
+WRKSRC=		${WRKDIR}/tkhylafax
 
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/comms/tkhylafax/files/md5 b/comms/tkhylafax/files/md5
index c78625ae48a..ae59a357db9 100644
--- a/comms/tkhylafax/files/md5
+++ b/comms/tkhylafax/files/md5
@@ -1 +1,2 @@
-MD5 (tkhylafax-3.0b2.tar.gz) = 69b349ff7c6509769d17080109d2c765
+$NetBSD: md5,v 1.2 1999/08/11 06:21:28 rh Exp $
+MD5 (tkhylafax-3.1.tar.gz) = 99535cf7a8cee6433ab9bcbe539cc534
diff --git a/comms/tkhylafax/files/patch-sum b/comms/tkhylafax/files/patch-sum
new file mode 100644
index 00000000000..42dbb6db6e1
--- /dev/null
+++ b/comms/tkhylafax/files/patch-sum
@@ -0,0 +1,4 @@
+$NetBSD: patch-sum,v 1.1 1999/08/11 06:21:29 rh Exp $
+
+MD5 (patch-aa) = 3265dc97f81793f7e433bfe263e14143
+MD5 (patch-ab) = c809f05310c6efd574b22096ed379de1
diff --git a/comms/tkhylafax/patches/patch-aa b/comms/tkhylafax/patches/patch-aa
index 269edad06a0..8e159bb0aa8 100644
--- a/comms/tkhylafax/patches/patch-aa
+++ b/comms/tkhylafax/patches/patch-aa
@@ -1,46 +1,39 @@
---- Makefile.orig	Sun Dec 29 19:26:39 1996
-+++ Makefile	Sun Jun  8 13:06:59 1997
-@@ -14,10 +14,10 @@
- TCLMAN_DEST = /usr/local/man/man1
+$NetBSD: patch-aa,v 1.2 1999/08/11 06:21:29 rh Exp $
+--- Makefile.orig	Sun Jan  4 23:47:29 1998
++++ Makefile	Tue Dec 29 18:38:29 1998
+@@ -5,19 +5,19 @@
+ 
+ ### EDIT THE NEXT FIVE LINES ONLY ###
+ # The directory where the tkhylafax library will be installed
+-TCLLIB_DEST = /usr/local/lib/tkhylafax-3.1
++TCLLIB_DEST = ${PREFIX}/lib/tkhylafax-3.1
+ 
+ # The directory where the tkhylafax command will be installed
+-TCLPRG_DEST = /usr/local/bin
++TCLPRG_DEST = ${PREFIX}/bin
+ 
+ # The directory where the man page will be installed
+-TCLMAN_DEST = /usr/local/man/man1
++TCLMAN_DEST = ${PREFIX}/man/man1
  
  # The full path to tclsh
 -TCLSH = /usr/local/bin/tclsh
-+TCLSH = tclsh7.6
++TCLSH = tclsh8.0
  
  # The full path to wish.
 -WISH = /usr/local/bin/wish
-+WISH = wish4.2
++WISH = wish8.0
  ### DON'T EDIT ANYTHING BELOW THIS LINE ###
  
  TCLLIB_FILES =  \
-@@ -40,7 +40,9 @@
+@@ -41,7 +41,9 @@
  TCLPRG_FILE = tkhylafax
  TCLMAN_FILE = tkhylafax
  
 -all: lib install.man tkhylafax
 +all:
 +
-+install: lib install.man tkhylafax.inst
++install: lib install.man tkhylafax
  	echo 'auto_mkindex $(TCLLIB_DEST) *.tcl *.t' | $(TCLSH);
  
  $(TCLLIB_DEST):
-@@ -59,16 +61,15 @@
- 	if [ ! -d $(TCLPRG_DEST) ]; then mkdir -p $(TCLPRG_DEST); fi
- 	chmod 775 $(TCLPRG_DEST)
- 
--tkhylafax: $(TCLPRG_DEST)
-+tkhylafax.inst: $(TCLPRG_DEST)
- 	@echo "Patching tkhylafax..." 
- 	mv tkhylafax tkhylafax.unpatched
- 	sed -e 's|XXX_TKHYLAFAX_XXX|$(TCLLIB_DEST)|g' \
- 	    tkhylafax.unpatched > tkhylafax
- 	@echo "Done" 
- 	@echo "Installing tkhylafax command..." 
--	cp $(TCLPRG_FILE) $(TCLPRG_DEST)/$@
--	chmod 775 $(TCLPRG_DEST)/$@
--	mv tkhylafax.unpatched tkhylafax
-+	cp $(TCLPRG_FILE) $(TCLPRG_DEST)/tkhylafax
-+	chmod 775 $(TCLPRG_DEST)/tkhylafax
- 	@echo "Done" 
- 
- install.man:
diff --git a/comms/tkhylafax/patches/patch-ab b/comms/tkhylafax/patches/patch-ab
index 22301325fc6..cc0efd72fff 100644
--- a/comms/tkhylafax/patches/patch-ab
+++ b/comms/tkhylafax/patches/patch-ab
@@ -1,14 +1,13 @@
---- tkhylafax.orig	Tue Dec 31 02:49:43 1996
-+++ tkhylafax	Sun Jun  8 12:34:58 1997
-@@ -1,6 +1,6 @@
- #!/bin/sh
- #\
--exec wish "$0" ${1+"$@"}
-+exec wish4.2 "$0" ${1+"$@"}
+$NetBSD: patch-ab,v 1.2 1999/08/11 06:21:29 rh Exp $
+--- tkhylafax.unpatched.orig	Mon Jan  5 00:11:02 1998
++++ tkhylafax.unpatched	Tue Dec 29 18:29:51 1998
+@@ -290,12 +290,12 @@
+ }
  
  #
- # 
-@@ -291,7 +291,7 @@
+-# Preview fax cover sheet via ghostview.
++# Preview fax cover sheet via gv.
+ #
  
  proc previewCover { args } {
  
diff --git a/comms/tkhylafax/pkg/PLIST b/comms/tkhylafax/pkg/PLIST
index 72952708bcd..cd15ee1054e 100644
--- a/comms/tkhylafax/pkg/PLIST
+++ b/comms/tkhylafax/pkg/PLIST
@@ -1,17 +1,21 @@
+@comment $NetBSD: PLIST,v 1.2 1999/08/11 06:21:30 rh Exp $
 bin/tkhylafax
-lib/tkhylafax-3.0/entryDialog.t
-lib/tkhylafax-3.0/extract.t
-lib/tkhylafax-3.0/faxIt.t
-lib/tkhylafax-3.0/fileSelect.t
-lib/tkhylafax-3.0/listBatches.t
-lib/tkhylafax-3.0/mkCover.t
-lib/tkhylafax-3.0/mkWidgets.t
-lib/tkhylafax-3.0/options.t
-lib/tkhylafax-3.0/preferences.t
-lib/tkhylafax-3.0/rolodex.t
-lib/tkhylafax-3.0/searchEntries.t
-lib/tkhylafax-3.0/sendBatch.t
-lib/tkhylafax-3.0/svrStatus.t
-lib/tkhylafax-3.0/tkhylafax.xbm
-lib/tkhylafax-3.0/viewBatch.t
-lib/tkhylafax-3.0/tclIndex
+lib/tkhylafax-3.1/entryDialog.t
+lib/tkhylafax-3.1/extract.t
+lib/tkhylafax-3.1/faxIt.t
+lib/tkhylafax-3.1/fileSelect.t
+lib/tkhylafax-3.1/listBatches.t
+lib/tkhylafax-3.1/mkCover.t
+lib/tkhylafax-3.1/mkWidgets.t
+lib/tkhylafax-3.1/options.t
+lib/tkhylafax-3.1/preferences.t
+lib/tkhylafax-3.1/rolodex.t
+lib/tkhylafax-3.1/searchEntries.t
+lib/tkhylafax-3.1/sendBatch.t
+lib/tkhylafax-3.1/svrStatus.t
+lib/tkhylafax-3.1/tkhylafax.xbm
+lib/tkhylafax-3.1/trace.t
+lib/tkhylafax-3.1/viewBatch.t
+lib/tkhylafax-3.1/tclIndex
+man/man1/tkhylafax.1
+@dirrm lib/tkhylafax-3.1