misc/122355: cannot apply pathset with some combination options

[Alex Keda]

>Number:         122355
>Category:       misc
>Synopsis:       cannot apply pathset with some combination options
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 01 20:20:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Alex Keda
>Release:        7.0-PRERELEASE
>Organization:
USSR
>Environment:
FreeBSD lissyara.int.otradno.ru 7.0-PRERELEASE FreeBSD 7.0-PRERELEASE #0: Sat Jan 26 19:40:10 MSK 2008     root at lissyara.int.otradno.ru:/shares/tmp/obj/usr/src/sys/main.7.0  i386

>Description:
PORTNAME=       proftpd
DISTVERSION=    1.3.1
PORTREVISION=   11
===========
if I set both
[X] CYRFIX           Patch to fix cyrillic encoding  
[X] CODECONV         Use charset conversion (mod_codeconv) 
I have:
make
===>  Vulnerability check disabled, database not found
===>  Found saved configuration for proftpd-1.3.1_11
===>  Extracting for proftpd-1.3.1_11
=> MD5 Checksum OK for proftpd-1.3.1.tar.bz2.
=> SHA256 Checksum OK for proftpd-1.3.1.tar.bz2.
===>  Patching for proftpd-1.3.1_11
===>  Applying extra patch /usr/ports/ftp/proftpd/files/extra-patch-cyrillic-fix-netio.c
===>  Applying extra patch /usr/ports/ftp/proftpd/files/extra-patch-mod-codeconv
1 out of 3 hunks failed--saving rejects to src/netio.c.rej
*** Error code 1

Stop in /usr/ports/ftp/proftpd.
*** Error code 1

Stop in /usr/ports/ftp/proftpd.

>How-To-Repeat:
always with both options
>Fix:
include patch CYRFIX to CODECONV?

>Release-Note:
>Audit-Trail:
>Unformatted: