Make this compile with libtiff-3.5.2.

3 files changed, 28 insertions, 17 deletions

diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index aac8be5b9db..644d708c1e1 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/10/08 21:12:47 jlam Exp $
+# $NetBSD: Makefile,v 1.4 1999/10/09 13:42:00 rh Exp $
 #
 
 DISTNAME=	hylafax-4.1beta2
@@ -22,7 +22,7 @@ CONFLICTS=	mgetty-*
 FAXUSER?=	uucp
 FAXGROUP?=	dialer
 
-USE_GMAKE=	YES
+#USE_GMAKE=	YES
 HAS_CONFIGURE=	YES
 CONFIGURE_ENV=	PREFIX="${PREFIX}" FAXUID="${FAXUSER}" FAXGID="${FAXGROUP}"
 CONFIGURE_ARGS=	--with-MAKE=${MAKE_PROGRAM} --with-INSTALL=""
diff --git a/comms/hylafax/files/patch-sum b/comms/hylafax/files/patch-sum
index 8410782da5b..c5e94afc087 100644
--- a/comms/hylafax/files/patch-sum
+++ b/comms/hylafax/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.2 1999/08/30 08:16:50 rh Exp $
+$NetBSD: patch-sum,v 1.3 1999/10/09 13:42:01 rh Exp $
 
-MD5 (patch-aa) = f5a737a58433188581e2519ed963f678
+MD5 (patch-aa) = 731c3ef4aba6b6f3ac9db28f99330243
 MD5 (patch-ab) = 365714e1edc1b975c7d1945e401abefa
 MD5 (patch-ac) = 5f5bab51efa426cce5905be84d5fbdf5
 MD5 (patch-ad) = 4d4e75fe187a6e808f443ff22512b85a
diff --git a/comms/hylafax/patches/patch-aa b/comms/hylafax/patches/patch-aa
index 3687f119f3f..5a07512d8e7 100644
--- a/comms/hylafax/patches/patch-aa
+++ b/comms/hylafax/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/08/11 06:04:28 rh Exp $
+$NetBSD: patch-aa,v 1.2 1999/10/09 13:42:01 rh Exp $
 
---- configure.orig	Thu Jul  1 12:30:54 1999
-+++ configure	Tue Aug 10 16:53:18 1999
+--- configure.orig	Mon Jul 26 16:57:29 1999
++++ configure	Sat Oct  9 15:22:19 1999
 @@ -37,21 +37,19 @@
  #
  # Setup general configuration parameters.
@@ -82,7 +82,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/08/11 06:04:28 rh Exp $
  	/*|-l*|-l[$]{DEPTH}/*)	echo "$i" ;;
  	-L|-L/*|-L[$]{DEPTH}/*)	echo "$i" ;;
  	-I|-I/*|-I[$]{DEPTH}/*)	echo "$i" ;;
-@@ -2809,7 +2809,7 @@
+@@ -2838,7 +2838,7 @@
  # Location of TIFF binaries
  #
  if [ -z "$TIFFBIN" ]; then
@@ -91,7 +91,18 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/08/11 06:04:28 rh Exp $
      for i in $DIRS; do
          test -x $i/tiff2ps && { TIFFBIN=$i; break; }
      done
-@@ -3385,7 +3385,7 @@
+@@ -2865,10 +2865,6 @@
+ 	printf("old include files: version %u\n", TIFFLIB_VERSION);
+         exit(-1);
+     }
+-    if (strncmp(TIFFGetVersion(), "LIBTIFF, Version 3.4", 20) != 0) {
+-	printf("old library: version %s\n", TIFFGetVersion());
+-	exit(-1);
+-    } else
+ 	exit(0);
+ }
+ EOF
+@@ -3414,7 +3410,7 @@
  if [ -z "$PATH_VGETTY" ]; then
      PATH_VGETTY=`findApp vgetty /usr/libexec:/sbin:$PATH` 
      if [ -z "$PATH_VGETTY" ]; then
@@ -100,7 +111,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/08/11 06:04:28 rh Exp $
  	Note "WARNING, no vgetty program found to handle a voice call, using $PATH_VGETTY."
      else
  	Note "Looks like $PATH_VGETTY is the program to exec for a voice call."
-@@ -3398,7 +3398,7 @@
+@@ -3427,7 +3423,7 @@
  if [ -z "$PATH_EGETTY" ]; then
      PATH_EGETTY=`findApp egetty /usr/libexec:/sbin:$PATH` 
      if [ -z "$PATH_EGETTY" ]; then
@@ -109,7 +120,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/08/11 06:04:28 rh Exp $
  	Note "WARNING, no egetty program found, using $PATH_EGETTY."
      else
  	Note "Looks like $PATH_EGETTY is the program to exec for an extern call."
-@@ -3468,6 +3468,7 @@
+@@ -3497,6 +3493,7 @@
  {
      if [ -z "$PATH_GSRIP" ]; then
  	GSLOCS="
@@ -117,7 +128,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/08/11 06:04:28 rh Exp $
  	    /usr/local/bin/gs
  	    /usr/contrib/bin/gs
  	    /usr/gnu/bin/gs
-@@ -3515,7 +3516,7 @@
+@@ -3544,7 +3541,7 @@
  on building Ghostscript with the necessary TIFF driver.
  
  EOF
@@ -126,7 +137,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/08/11 06:04:28 rh Exp $
  	PATH_GSRIP=$PATH_PSRIP
      fi
  }
-@@ -3578,9 +3579,9 @@
+@@ -3607,9 +3604,9 @@
      else
          DIR_AFMS="
  	    /usr/lib/afm
@@ -139,7 +150,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/08/11 06:04:28 rh Exp $
  	    /usr/share/ghostscript/fonts
  	    /usr/gnu/lib/ghostscript/fonts
  	    /opt/gnu/lib/ghostscript/fonts
-@@ -3600,7 +3601,7 @@
+@@ -3629,7 +3626,7 @@
  fi
  if [ -z "$PATH_AFM" ]; then
      # put it where ghostscript normally puts things
@@ -148,7 +159,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/08/11 06:04:28 rh Exp $
      Note "WARNING, could not locate a directory with font metric information,"
      Note "guessing that font metric information goes in $PATH_AFM."
  else
-@@ -3619,6 +3620,7 @@
+@@ -3648,6 +3645,7 @@
  #
  if [ -z "$DIR_MAN" ]; then
      MANPATH="
@@ -156,7 +167,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/08/11 06:04:28 rh Exp $
  	$MANPATH
  	/usr/local/man
  	/usr/contrib/man
-@@ -3628,7 +3630,7 @@
+@@ -3657,7 +3655,7 @@
      for i in $MANPATH; do
  	test -d $i && { DIR_MAN=$i; break; }
      done
@@ -165,7 +176,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/08/11 06:04:28 rh Exp $
  fi
  Note "Looks like manual pages go in $DIR_MAN."
  if [ -z "$MANSCHEME" ]; then
-@@ -4015,7 +4017,8 @@
+@@ -4044,7 +4042,8 @@
  	printConfig
  	checkForExecutable $PATH_SENDMAIL
  	checkForExecutable $PATH_GETTY