o Update to version 3.2beta

o Correction of MASTER_SITES
 o Includes patch for sendfax option handling modification,
   which prevents sending out a fax via tkhylafax

comms/tkhylafax/Makefile

@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	tkhylafax
-PORTVERSION=	3.0b2
+PORTVERSION=	3.2b
 CATEGORIES=	comms tk82
-MASTER_SITES=	http://www.NeoSoft.com/tcl/ftparchive/sorted/comm/tkhylafax-3.0b2/
+MASTER_SITES=	ftp://ftp.hylafax.org/contrib/tkhylafax/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/b/beta/}
 
 MAINTAINER=	ports@FreeBSD.org
 
@@ -17,7 +18,7 @@ RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82 \
 		gs:${PORTSDIR}/print/ghostscript-gnu \
 		gv:${PORTSDIR}/print/gv
 
-WRKSRC=		${WRKDIR}/tkhylafax-3.0
+WRKSRC=		${WRKDIR}/tkhylafax
 MAN1=		tkhylafax.1
 
 .include <bsd.port.mk>

comms/tkhylafax/distinfo

@@ -1 +1 @@
-MD5 (tkhylafax-3.0b2.tar.gz) = 69b349ff7c6509769d17080109d2c765
+MD5 (tkhylafax-3.2beta.tar.gz) = ee9e0fd2df2cb9f8c07a25f46f7083ca

comms/tkhylafax/files/patch-aa

@@ -1,60 +1,87 @@
---- Makefile.orig	Sun Dec 29 13:26:39 1996
+*** Makefile.orig	Sat Mar 14 20:57:48 1998
-+++ Makefile	Thu Sep 14 18:07:32 2000
+--- Makefile	Thu Jan 16 21:12:09 2003
-@@ -14,10 +14,10 @@
+***************
- TCLMAN_DEST = /usr/local/man/man1
+*** 5,11 ****
- 
+  
- # The full path to tclsh
+  ### EDIT THE NEXT LINES ONLY ###
--TCLSH = /usr/local/bin/tclsh
+  
-+TCLSH = tclsh8.2
+! PREFIX = /usr/local
- 
+  
- # The full path to wish.
+  # The directory where the tkhylafax library will be installed
--WISH = /usr/local/bin/wish
+  TCLLIB_DEST = $(PREFIX)/lib/tkhylafax-3.2
-+WISH = wish8.2
+--- 5,11 ----
- ### DON'T EDIT ANYTHING BELOW THIS LINE ###
+  
- 
+  ### EDIT THE NEXT LINES ONLY ###
- TCLLIB_FILES =  \
+  
-@@ -40,35 +40,36 @@
+! #PREFIX = ${PREFIX}
- TCLPRG_FILE = tkhylafax
+  
- TCLMAN_FILE = tkhylafax
+  # The directory where the tkhylafax library will be installed
- 
+  TCLLIB_DEST = $(PREFIX)/lib/tkhylafax-3.2
--all: lib install.man tkhylafax
+***************
-+all:
+*** 17,29 ****
-+
+  TCLMAN_DEST = $(PREFIX)/man/man1
-+install: lib install.man tkhylafax.inst
+  
- 	echo 'auto_mkindex $(TCLLIB_DEST) *.tcl *.t' | $(TCLSH);
+  # The full path to tclsh
- 
+! TCLSH = /usr/bin/tclsh
- $(TCLLIB_DEST):
+  
- 	if [ ! -d $(TCLLIB_DEST) ]; then mkdir -p $(TCLLIB_DEST); fi
+  # The full path to wish.
--	chmod 775 $(TCLLIB_DEST)
+! WISH = /usr/bin/wish
-+	chmod 755 $(TCLLIB_DEST)
+  
- 
+  # The full path to your postscript viewer
- lib: $(TCLLIB_DEST)
+! GHOSTVIEW = /usr/X11/bin/gv
- 	@echo "Installing tkhylafax library..." 
+  
- 	-for i in $(TCLLIB_FILES) ; do \
+  ### DON'T EDIT ANYTHING BELOW THIS LINE ###
- 	    cp $$i $(TCLLIB_DEST)/$$i ; \
+  
--	    chmod 664 $(TCLLIB_DEST)/$$i ; \
+--- 17,29 ----
-+	    chmod 644 $(TCLLIB_DEST)/$$i ; \
+  TCLMAN_DEST = $(PREFIX)/man/man1
- 	done
+  
- 	@echo "Done" 
+  # The full path to tclsh
- 
+! TCLSH = tclsh8.2
- $(TCLPRG_DEST):
+  
- 	if [ ! -d $(TCLPRG_DEST) ]; then mkdir -p $(TCLPRG_DEST); fi
+  # The full path to wish.
--	chmod 775 $(TCLPRG_DEST)
+! WISH = wish8.2
-+	chmod 755 $(TCLPRG_DEST)
+  
- 
+  # The full path to your postscript viewer
--tkhylafax: $(TCLPRG_DEST)
+! GHOSTVIEW = ${X11BASE}/bin/gv
-+tkhylafax.inst: $(TCLPRG_DEST)
+  
- 	@echo "Patching tkhylafax..." 
+  ### DON'T EDIT ANYTHING BELOW THIS LINE ###
- 	mv tkhylafax tkhylafax.unpatched
+  
- 	sed -e 's|XXX_TKHYLAFAX_XXX|$(TCLLIB_DEST)|g' \
+***************
- 	    tkhylafax.unpatched > tkhylafax
+*** 52,58 ****
- 	@echo "Done" 
+  
- 	@echo "Installing tkhylafax command..." 
+  all:
--	cp $(TCLPRG_FILE) $(TCLPRG_DEST)/$@
+  	$(MAKE) build
--	chmod 775 $(TCLPRG_DEST)/$@
+- 	$(MAKE) install
--	mv tkhylafax.unpatched tkhylafax
+  
-+	cp $(TCLPRG_FILE) $(TCLPRG_DEST)/tkhylafax
+  build: Makefile
-+	chmod 755 $(TCLPRG_DEST)/tkhylafax
+  	@echo "Patching tkhylafax..."
- 	@echo "Done" 
+--- 52,57 ----
- 
+***************
- install.man:
+*** 66,78 ****
+  
+  $(TCLLIB_DEST):
+  	if [ ! -d $(TCLLIB_DEST) ]; then mkdir -p $(TCLLIB_DEST); fi
+! 	chmod 775 $(TCLLIB_DEST)
+  
+  install.lib: $(TCLLIB_DEST)
+  	@echo "Installing tkhylafax library..." 
+  	-for i in $(TCLLIB_FILES) ; do \
+  	    cp $$i $(TCLLIB_DEST)/$$i ; \
+! 	    chmod 664 $(TCLLIB_DEST)/$$i ; \
+  	done
+  	@echo "Done" 
+  
+--- 65,77 ----
+  
+  $(TCLLIB_DEST):
+  	if [ ! -d $(TCLLIB_DEST) ]; then mkdir -p $(TCLLIB_DEST); fi
+! 	chmod 755 $(TCLLIB_DEST)
+  
+  install.lib: $(TCLLIB_DEST)
+  	@echo "Installing tkhylafax library..."
+  	-for i in $(TCLLIB_FILES) ; do \
+  	    cp $$i $(TCLLIB_DEST)/$$i ; \
+! 	    chmod 644 $(TCLLIB_DEST)/$$i ; \
+  	done
+  	@echo "Done"
+  

comms/tkhylafax/files/patch-ab

@@ -1,19 +1,35 @@
---- tkhylafax.orig	Tue Dec 31 02:49:43 1996
+*** faxIt.t.org	Thu Jan 16 21:08:00 2003
-+++ tkhylafax	Sun Jun  8 12:34:58 1997
+--- faxIt.t	Thu Jan 16 21:10:58 2003
-@@ -1,6 +1,6 @@
+***************
- #!/bin/sh
+*** 66,80 ****
- #\
+  	          $Th_Info(notifyOnRetry)
--exec wish "$0" ${1+"$@"}
+  
-+exec wish8.2 "$0" ${1+"$@"}
+      if {[string length $Th_Info(name)]} {
- 
+-         # This MUST appear.
- #
+- 	regsub -all {["'$\\]} $Th_Info(name) {\\&} name
- # 
+-         append options " -d \"$name@$Th_Info(phone)\""
-@@ -291,7 +291,7 @@
+- 
- 
+          # Make an ID string for later usage
- proc previewCover { args } {
+  	regsub -all {["'$\\]} $Th_Info(company) {\\&} company
- 
+          append options " -i \"$name@$company\"" 
--    set faxcmd "[mkCover] | ghostview -"
+      } else {
-+    set faxcmd "[mkCover] | gv -"
+!         # This MUST appear.
- 
+          append options " -d $Th_Info(phone)"
-     # Exec it
+      }
-     if {[catch {eval exec $faxcmd &} err]} {
+  
+--- 66,80 ----
+  	          $Th_Info(notifyOnRetry)
+  
+      if {[string length $Th_Info(name)]} {
+  	# Make an ID string for later usage
++ 	regsub -all {["'$\\]} $Th_Info(name) {\\&} name
+            regsub -all {["'$\\]} $Th_Info(company) {\\&} company
+  	append options " -i \"$name@$company\""
++ 
++ 	# This MUST appear last.
++ 	append options " -d \"$name@$Th_Info(phone)\""
+      } else {
+! 	# This MUST appear last.
+  	append options " -d $Th_Info(phone)"
+      }
+  

comms/tkhylafax/pkg-plist

@@ -1,18 +1,21 @@
 bin/tkhylafax
-lib/tkhylafax-3.0/entryDialog.t
+lib/tkhylafax-3.2/entryDialog.t
-lib/tkhylafax-3.0/extract.t
+lib/tkhylafax-3.2/extract.t
-lib/tkhylafax-3.0/faxIt.t
+lib/tkhylafax-3.2/faxIt.t
-lib/tkhylafax-3.0/fileSelect.t
+lib/tkhylafax-3.2/fileSelect.t
-lib/tkhylafax-3.0/listBatches.t
+lib/tkhylafax-3.2/listBatches.t
-lib/tkhylafax-3.0/mkCover.t
+lib/tkhylafax-3.2/mkCover.t
-lib/tkhylafax-3.0/mkWidgets.t
+lib/tkhylafax-3.2/mkWidgets.t
-lib/tkhylafax-3.0/options.t
+lib/tkhylafax-3.2/options.t
-lib/tkhylafax-3.0/preferences.t
+lib/tkhylafax-3.2/preferences.t
-lib/tkhylafax-3.0/rolodex.t
+lib/tkhylafax-3.2/rolodex.t
-lib/tkhylafax-3.0/searchEntries.t
+lib/tkhylafax-3.2/searchEntries.t
-lib/tkhylafax-3.0/sendBatch.t
+lib/tkhylafax-3.2/sendBatch.t
-lib/tkhylafax-3.0/svrStatus.t
+lib/tkhylafax-3.2/svrStatus.t
-lib/tkhylafax-3.0/tkhylafax.xbm
+lib/tkhylafax-3.2/trace.t
-lib/tkhylafax-3.0/viewBatch.t
+lib/tkhylafax-3.2/viewBatch.t
-lib/tkhylafax-3.0/tclIndex
+lib/tkhylafax-3.2/tclIndex
-@dirrm lib/tkhylafax-3.0
+lib/tkhylafax-3.2/tkhylafax.xbm
+lib/tkhylafax-3.2/dn.xbm
+lib/tkhylafax-3.2/up.xbm
+@dirrm lib/tkhylafax-3.2