ports/123671: [patch] net/freenet6 doesn't apply patch properly

[Josh Paetzel]

>Number:         123671
>Category:       ports
>Synopsis:       [patch] net/freenet6 doesn't apply patch properly
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 14 15:10:06 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Josh Paetzel
>Release:        7.0-RELEASE-p1
>Organization:
>Environment:
FreeBSD roadrash.tcbug.org 7.0-RELEASE-p1 FreeBSD 7.0-RELEASE-p1 #2: Sun Apr 27 21:15:26 UTC 2008     root at roadrash.tcbug.org:/usr/obj/data/src/sys/ROADRASH  i386

>Description:
root at roadrash /usr/ports/net/freenet6 ->make clean install
===>  Cleaning for freenet6-2.1.1_8
===>  Vulnerability check disabled, database not found
===>  Extracting for freenet6-2.1.1_8
=> MD5 Checksum OK for tspc-2.1.1-src.tgz.
=> SHA256 Checksum OK for tspc-2.1.1-src.tgz.
===>  Patching for freenet6-2.1.1_8
===>  Applying extra patch /data/ports/net/freenet6/files/patch5-template::freebsd.sh
===>  Applying extra patch patch7-plstform__freebsd__tsp_local.c
cannot open patch7-plstform__freebsd__tsp_local.c: No such file or directory
*** Error code 2

>How-To-Repeat:
cd /usr/ports/net/freenet6 && make install
>Fix:
--- Makefile.old        2008-05-14 09:59:22.000000000 +0000
+++ Makefile    2008-05-14 09:59:50.000000000 +0000
@@ -30,7 +30,7 @@
 .include <bsd.port.pre.mk>

 .if ${OSVERSION} > 700000
-EXTRA_PATCHES+=        patch7-plstform__freebsd__tsp_local.c
+EXTRA_PATCHES+=        ${FILESDIR}/patch7-plstform__freebsd__tsp_local.c
 .endif

 do-install:


--- patch7-plstform__freebsd__tsp_local.c       2008-05-14 10:05:02.000000000 +0000
+++ patch7-plstform__freebsd__tsp_local.c.old   2008-05-14 10:01:39.000000000 +0000
@@ -1,6 +1,6 @@
 diff --unified=5 /usr/gnu/fbsd/ports/net/freenet6/work/tspc2/platform/freebsd/tsp_local.c.\~1\~ /usr/gnu/fbsd/ports/net/freenet6/work/tspc2/platform/freebsd/tsp_local.c
---- platform/freebsd/tsp_local.c
-+++ platform/freebsd/tsp_local.c
+--- /usr/gnu/fbsd/ports/net/freenet6/work/tspc2/platform/freebsd/tsp_local.c.~1~       2004-03-30 23:27:35.000000000 +0200
++++ /usr/gnu/fbsd/ports/net/freenet6/work/tspc2/platform/freebsd/tsp_local.c   2007-07-11 13:40:26.000000000 +0200
 @@ -74,21 +74,16 @@
  /* freebsd specific to setup an env variable */





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