1 files changed, 65 insertions, 87 deletions

diff --git a/comms/tkhylafax/files/patch-aa b/comms/tkhylafax/files/patch-aa
index ed1ac31e50ad..5f2eb18318d6 100644
--- a/comms/tkhylafax/files/patch-aa
+++ b/comms/tkhylafax/files/patch-aa
@@ -1,87 +1,65 @@
-*** Makefile.orig	Sat Mar 14 20:57:48 1998
---- Makefile	Thu Jan 16 21:12:09 2003
-***************
-*** 5,11 ****
-  
-  ### EDIT THE NEXT LINES ONLY ###
-  
-! PREFIX = /usr/local
-  
-  # The directory where the tkhylafax library will be installed
-  TCLLIB_DEST = $(PREFIX)/lib/tkhylafax-3.2
---- 5,11 ----
-  
-  ### EDIT THE NEXT LINES ONLY ###
-  
-! #PREFIX = ${PREFIX}
-  
-  # The directory where the tkhylafax library will be installed
-  TCLLIB_DEST = $(PREFIX)/lib/tkhylafax-3.2
-***************
-*** 17,29 ****
-  TCLMAN_DEST = $(PREFIX)/man/man1
-  
-  # The full path to tclsh
-! TCLSH = /usr/bin/tclsh
-  
-  # The full path to wish.
-! WISH = /usr/bin/wish
-  
-  # The full path to your postscript viewer
-! GHOSTVIEW = /usr/X11/bin/gv
-  
-  ### DON'T EDIT ANYTHING BELOW THIS LINE ###
-  
---- 17,29 ----
-  TCLMAN_DEST = $(PREFIX)/man/man1
-  
-  # The full path to tclsh
-! TCLSH = tclsh8.2
-  
-  # The full path to wish.
-! WISH = wish8.2
-  
-  # The full path to your postscript viewer
-! GHOSTVIEW = ${X11BASE}/bin/gv
-  
-  ### DON'T EDIT ANYTHING BELOW THIS LINE ###
-  
-***************
-*** 52,58 ****
-  
-  all:
-  	$(MAKE) build
-- 	$(MAKE) install
-  
-  build: Makefile
-  	@echo "Patching tkhylafax..."
---- 52,57 ----
-***************
-*** 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"
-  
+--- Makefile.orig	Sat Mar 14 11:57:48 1998
++++ Makefile	Mon Apr 21 02:56:19 2003
+@@ -5,7 +5,7 @@
+ 
+ ### EDIT THE NEXT LINES ONLY ###
+ 
+-PREFIX = /usr/local
++#PREFIX = ${PREFIX}
+ 
+ # The directory where the tkhylafax library will be installed
+ TCLLIB_DEST = $(PREFIX)/lib/tkhylafax-3.2
+@@ -17,13 +17,13 @@
+ TCLMAN_DEST = $(PREFIX)/man/man1
+ 
+ # The full path to tclsh
+-TCLSH = /usr/bin/tclsh
++TCLSH = tclsh8.2
+ 
+ # The full path to wish.
+-WISH = /usr/bin/wish
++WISH = wish8.2
+ 
+ # The full path to your postscript viewer
+-GHOSTVIEW = /usr/X11/bin/gv
++GHOSTVIEW = ${X11BASE}/bin/gv
+ 
+ ### DON'T EDIT ANYTHING BELOW THIS LINE ###
+ 
+@@ -52,7 +52,6 @@
+ 
+ all:
+ 	$(MAKE) build
+-	$(MAKE) install
+ 
+ build: Makefile
+ 	@echo "Patching tkhylafax..."
+@@ -66,24 +65,24 @@
+ 
+ $(TCLLIB_DEST):
+ 	if [ ! -d $(TCLLIB_DEST) ]; then mkdir -p $(TCLLIB_DEST); fi
+-	chmod 775 $(TCLLIB_DEST)
++	chmod 755 $(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 ; \
++	    chmod 644 $(TCLLIB_DEST)/$$i ; \
+ 	done
+ 	@echo "Done" 
+ 
+ $(TCLPRG_DEST):
+ 	if [ ! -d $(TCLPRG_DEST) ]; then mkdir -p $(TCLPRG_DEST); fi
+-	chmod 775 $(TCLPRG_DEST)
++	chmod 755 $(TCLPRG_DEST)
+ 
+ install.tkhylafax: $(TCLPRG_DEST) $(TCLPRG_FILE) 
+ 	@echo "Installing tkhylafax command..." 
+ 	cp $(TCLPRG_FILE) $(TCLPRG_DEST)/$(TCLPRG_FILE)
+-	chmod 775 $(TCLPRG_DEST)/$(TCLPRG_FILE)
++	chmod 755 $(TCLPRG_DEST)/$(TCLPRG_FILE)
+ 	@echo "Done" 
+ 
+ install.man: