invalid patchfile in ports/x11/XFree86-4-libraries

[Andreas Kasparz]

Hi folks,

the patch provided by

|    files/patch-dps

seems to be broken; it never changes the line

|    lib/dps/Imakefile:52

from

|    RunProgram(PSWRAP,-o $*.c -a -f $*.h -h $*.h $<)

to 

|    RunProgram(PSWRAP,-o $*.c -a -h $*.h $<)

This results in the following build error:

|    including in lib/dpstk...
|    + mkdir unshared
|    pswrap -o XDPSpwraps.c -a -f XDPSpwraps.h -h XDPSpwraps.h XDPSpwraps.psw
|    pswrap:  bad option '-f'
|    Usage:  pswrap [options] [input-file]
|        -a              produce ANSI C procedure prototypes
|        -b              process a big file
|        -h filename     specify header filename
|        -o filename     specify output C filename
|        -r              make wraps re-entrant
|        -s length       set maximum string length
|    *** Error code 1
    
I don't overview the other affectetd changes within this patch; but
the following patch fixes the above error:

|    --- lib/dpstk/Imakefile.orig    Sat Apr 17 00:09:57 2004
|    +++ lib/dpstk/Imakefile Sat Apr 17 00:10:26 2004
|    @@ -49,7 +49,7 @@
|     .SUFFIXES: .psw
|     
|     .psw.c :
|    -       RunProgram(PSWRAP,-o $*.c -a -f $*.h -h $*.h $<)
|    +       RunProgram(PSWRAP,-o $*.c -a -h $*.h $<)
|     
|     includes:: $(SRCS)
|     

My environment:

    $uname -a
    FreeBSD wayo.interface-business.de 5.2.1-RELEASE-p5 FreeBSD 5.2.1-RELEASE-p5 #0: Fri Apr 16 14:36:12 CEST 2004     root at wayo.interface-business.de:/usr/obj/usr/src/sys/GENERIC  i386
    
    $ ident /usr/ports/x11/XFree86-4-libraries/Makefile
        $FreeBSD: ports/x11/XFree86-4-libraries/Makefile,v 1.136 2004/03/28 12:46:25 lofi Exp $

    $ cat /usr/ports/x11/XFree86-4-libraries/distinfo
    MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af
    SIZE (xc/X430src-1.tgz) = 10993622
    MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4
    SIZE (xc/X430src-2.tgz) = 7962239
    MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6
    SIZE (xc/X430src-3.tgz) = 12366363
    MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535
    SIZE (xc/Wraphelp2.gz) = 3376
    
Best regards,
andy

-- 
************************************************************************
* Andreas Kasparz andy at interface-projects.de  Tel: +49 351 31809 0     *
* interface:projects GmbH, Tolkewitzer Str. 49, 01277 Dresden, Germany *
************************************************************************