From 834b18af560cdeccf3f75c4ccd2ed24083b485be Mon Sep 17 00:00:00 2001
From: giovanni <giovanni@openbsd.org>
Date: Thu, 7 May 2009 14:47:15 +0000
Subject: [PATCH] Use x11/tk module and ${SUBST_CMD} Add a few mirrors
 "ports-wise it's ok" sthen@

---
 comms/tkhylafax/Makefile                        | 17 ++++++++++-------
 comms/tkhylafax/patches/patch-Makefile          |  8 ++++----
 .../tkhylafax/patches/patch-tkhylafax-defaults  |  4 ++--
 comms/tkhylafax/patches/patch-tkhylafax_man     |  4 ++--
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/comms/tkhylafax/Makefile b/comms/tkhylafax/Makefile
index 2507625b11f..5a26f236568 100644
--- a/comms/tkhylafax/Makefile
+++ b/comms/tkhylafax/Makefile
@@ -1,11 +1,12 @@
-# $OpenBSD: Makefile,v 1.23 2008/02/08 23:12:37 okan Exp $
+# $OpenBSD: Makefile,v 1.24 2009/05/07 14:47:15 giovanni Exp $
 
 COMMENT=	Tcl/Tk interface to Sam Leffler's fax package
 
 DISTNAME=	tkhylafax-3.2
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	comms
 
-MAINTAINER=    Giovanni Bechis <g.bechis@snb.it>
+MAINTAINER=	Giovanni Bechis <giovanni@openbsd.org>
 
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
@@ -13,17 +14,19 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	ftp://ftp.hylafax.org/contrib/tkhylafax/
+MASTER_SITES=	ftp://ftp.hylafax.org/contrib/tkhylafax/ \
+		ftp://mirror.aarnet.edu.au/pub/hylafax/contrib/tkhylafax/ \
+		ftp://gd.tuwien.ac.at/infosys/fax/hylafax/contrib/tkhylafax/ \
+		ftp://ftp.ntua.gr/pub/net/hylafax/contrib/tkhylafax/
 
-BUILD_DEPENDS=	::x11/tk/8.4
+MODULES=	x11/tk
 RUN_DEPENDS=	::comms/hylafax \
 		::print/gv
 
 NO_REGRESS=	Yes
 
 pre-configure:
-	@perl -pi -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/Makefile \
-		${WRKSRC}/tkhylafax-defaults
-	@perl -pi -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/tkhylafax.man
+	${SUBST_CMD} ${WRKSRC}/Makefile \
+		${WRKSRC}/tkhylafax-defaults ${WRKSRC}/tkhylafax.man
 
 .include <bsd.port.mk>
diff --git a/comms/tkhylafax/patches/patch-Makefile b/comms/tkhylafax/patches/patch-Makefile
index 2552fab4205..ee3259f01b1 100644
--- a/comms/tkhylafax/patches/patch-Makefile
+++ b/comms/tkhylafax/patches/patch-Makefile
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Makefile,v 1.2 2008/02/08 23:12:37 okan Exp $
+$OpenBSD: patch-Makefile,v 1.3 2009/05/07 14:47:15 giovanni Exp $
 --- Makefile.orig	Sat Mar 14 14:57:48 1998
 +++ Makefile	Tue Jan 29 14:22:02 2008
 @@ -5,10 +5,8 @@ SHELL = /bin/sh
@@ -18,15 +18,15 @@ $OpenBSD: patch-Makefile,v 1.2 2008/02/08 23:12:37 okan Exp $
  
  # The full path to tclsh
 -TCLSH = /usr/bin/tclsh
-+TCLSH = %%LOCALBASE%%/bin/tclsh8.4
++TCLSH = ${MODTCL_BIN}
  
  # The full path to wish.
 -WISH = /usr/bin/wish
-+WISH = %%LOCALBASE%%/bin/wish8.4
++WISH = ${MODTK_BIN}
  
  # The full path to your postscript viewer
 -GHOSTVIEW = /usr/X11/bin/gv
-+GHOSTVIEW = %%LOCALBASE%%/bin/gv
++GHOSTVIEW = ${LOCALBASE}/bin/gv
  
  ### DON'T EDIT ANYTHING BELOW THIS LINE ###
  
diff --git a/comms/tkhylafax/patches/patch-tkhylafax-defaults b/comms/tkhylafax/patches/patch-tkhylafax-defaults
index 730552196c4..5aa2350d362 100644
--- a/comms/tkhylafax/patches/patch-tkhylafax-defaults
+++ b/comms/tkhylafax/patches/patch-tkhylafax-defaults
@@ -1,4 +1,4 @@
-$OpenBSD: patch-tkhylafax-defaults,v 1.1 2008/02/08 23:12:38 okan Exp $
+$OpenBSD: patch-tkhylafax-defaults,v 1.2 2009/05/07 14:47:15 giovanni Exp $
 --- tkhylafax-defaults.orig	Tue Jan 29 13:54:12 2008
 +++ tkhylafax-defaults	Tue Jan 29 13:55:14 2008
 @@ -10,4 +10,4 @@
@@ -6,4 +6,4 @@ $OpenBSD: patch-tkhylafax-defaults,v 1.1 2008/02/08 23:12:38 okan Exp $
  *commentLines:	4
  *iconBitmap:	tkhylafax.xbm
 -*coverPageDirs: /usr/local/lib/fax	
-+*coverPageDirs: %%LOCALBASE%%/lib/fax	
++*coverPageDirs: ${PREFIX}/lib/fax	
diff --git a/comms/tkhylafax/patches/patch-tkhylafax_man b/comms/tkhylafax/patches/patch-tkhylafax_man
index c53030374bd..1d5f80832d4 100644
--- a/comms/tkhylafax/patches/patch-tkhylafax_man
+++ b/comms/tkhylafax/patches/patch-tkhylafax_man
@@ -1,4 +1,4 @@
-$OpenBSD: patch-tkhylafax_man,v 1.1 2008/02/08 23:12:38 okan Exp $
+$OpenBSD: patch-tkhylafax_man,v 1.2 2009/05/07 14:47:15 giovanni Exp $
 --- tkhylafax.man.orig	Tue Jan 29 13:55:21 2008
 +++ tkhylafax.man	Tue Jan 29 13:56:22 2008
 @@ -273,7 +273,7 @@ A legal line in this file, for example, would be ``*fa
@@ -6,7 +6,7 @@ $OpenBSD: patch-tkhylafax_man,v 1.1 2008/02/08 23:12:38 okan Exp $
  sample .tkhylafax-default file is included in this distribution.
  If no such file in the user's home directory is found, the system-wide
 -resource file '/usr/local/lib/tkhylafax-<version>/tkhylafax-defaults is used.
-+resource file '%%PREFIX%%/lib/tkhylafax/tkhylafax-defaults is used.
++resource file '${PREFIX}/lib/tkhylafax/tkhylafax-defaults is used.
  
  I'm thinking of adding a 
  .I few