ports/122714: [patch] ports/net/vnc build failure WITHOUT_SERVER

[Helge Oldach]

>Number:         122714
>Category:       ports
>Synopsis:       [patch] ports/net/vnc build failure WITHOUT_SERVER
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 13 10:30:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Helge Oldach
>Release:        FreeBSD 6.3-1189 i386
>Organization:
>Environment:

System: FreeBSD localhost 6.3-1189 FreeBSD 6.3-1189 #0: Fri Apr 11 11:53:41 CEST 2008 toor at localhost:/usr/obj/usr/src/sys/HMO i386

>Description:

ports/net/vnc does not patch properly when WITHOUT_SERVER is enabled:

# make -DPATCH_DEBUG
===>  Vulnerability check disabled, database not found
===>  Found saved configuration for vnc-4.1.2_2
===>  Extracting for vnc-4.1.2_2
=> MD5 Checksum OK for xc/vnc-4_1_2-unixsrc.tar.gz.
=> SHA256 Checksum OK for xc/vnc-4_1_2-unixsrc.tar.gz.
===>  Patching for vnc-4.1.2_2
===>  Applying FreeBSD patches for vnc-4.1.2_2
===>   Applying FreeBSD patch /usr/ports/net/vnc/files/patch-xc-config-util-printver.c
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- xc/config/util/printver.c.orig     2003-02-26 10:21:33.000000000 +0100
|+++ xc/config/util/printver.c  2008-03-16 10:07:56.000000000 +0100
--------------------------
File to patch:

The reason is that all files following the ${PATCHDIR}/patch*
naming scheme are applied automatically and unconditionally.
This includes files/patch-xc-config-util-printver.c which is only
applicable for WITH_SERVER builds.

>How-To-Repeat:

>Fix:

Rename ${PATCHDIR}/patch-xc-config-util-printver.c to
${PATCHDIR}/extra-patch-xc-config-util-printver.c

and

add ${PATCHDIR}/extra-patch-xc-config-util-printver.c to
EXTRA_PATCHES in Makefile.
>Release-Note:
>Audit-Trail:
>Unformatted: