Subject: comms/hylafax patch fails
To: None <tech-pkg@netbsd.org>
From: Hauke Fath <hauke@Espresso.Rhein-Neckar.DE>
List: tech-pkg
Date: 10/14/2000 13:56:51
[Please keep me CC'ed in follow-ups as I am not on the list. Thanks.]

The tiff interfaces patch fails for the current hylafax package:

[hauke@pizza] /<3>comms/hylafax # make cleandir && make
===> Cleaning for hylafax-4.1b2nb2
===> Validating dependencies for hylafax-4.1b2nb2
=> Checksum OK for hylafax/hylafax-4.1beta2.tar.gz.
=> Checksum OK for hylafax/tiff-3.5-interfaces.patch.
===> Extracting for hylafax-4.1b2nb2
===> hylafax-4.1b2nb2 depends on installed package: tiff-* - tiff-3.5.5 found
===> hylafax-4.1b2nb2 depends on installed package: jpeg-6b - jpeg-6b found
===> hylafax-4.1b2nb2 depends on installed package: mawk>=1.2.2 - mawk-1.3.3 found
===> hylafax-4.1b2nb2 depends on installed package: ghostscript{,-nox11}-[6-9]* - ghostscript-6.01 found
===> Patching for hylafax-4.1b2nb2
===> Applying distribution patches for hylafax-4.1b2nb2
1 out of 5 hunks FAILED -- saving rejects to file faxd/tif_fax3.h.rej
Patch tiff-3.5-interfaces.patch failed
*** Error code 1

Stop.
*** Error code 1

Stop.
*** Error code 1

Stop.
[hauke@pizza] /<3>comms/hylafax #


The resulting reject file looks somewhat bogus (it has only comments)
but, with the complexity of the pkg system, I do not see an obvious way 
of ignoring the error and continuing.

[hauke@pizza] /<6>hylafax-4.1beta2/faxd # cat tif_fax3.h.rej 
***************
*** 1,8 ****
- /* $Id: tiff-3.5-interfaces.patch,v 1.1 2000/04/11 10:11:27 philw Exp $ */
  
  /*
-  * Copyright (c) 1990-1996 Sam Leffler
-  * Copyright (c) 1991-1996 Silicon Graphics, Inc.
   *
   * Permission to use, copy, modify, distribute, and sell this software and 
   * its documentation for any purpose is hereby granted without fee, provided
--- 1,8 ----
+ /* $Id: tiff-3.5-interfaces.patch,v 1.1 2000/04/11 10:11:27 philw Exp $ */
  
  /*
+  * Copyright (c) 1990-1997 Sam Leffler
+  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
   *
   * Permission to use, copy, modify, distribute, and sell this software and 
   * its documentation for any purpose is hereby granted without fee, provided
[hauke@pizza] /<6>hylafax-4.1beta2/faxd #


This is on Zoularis / Sparc Solaris 7. I applied the patch manually to ensure
the pkg patch(1) is used - same result.

    hauke

-- 
Now without signature.