Subject: pkg/26790: pkgsrc/comms/estic patch fails
To: None <gnats-bugs@gnats.NetBSD.org>
From: None <geos@epost.de>
List: pkgsrc-bugs
Date: 08/28/2004 17:03:34
>Number:         26790
>Category:       pkg
>Synopsis:       pkgsrc/comms/estic patch fails
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Aug 28 17:04:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Georg Schwarz
>Release:        current pkgsrc
>Organization:
>Environment:
>Description:
=> Checksum OK for estic-1.60-sources.zip.
=> Checksum OK for estic-1.61-patch-from-1.60.zip.
===> Extracting for estic-1.61
===> Required installed package patch>=2.2: patch-2.5.4nb2 found
===> Required installed package x11-links>=0.23: x11-links-0.23 found
===> Required installed package unzip-[0-9]*: unzip-5.50nb2 found
can't find file to patch at input line 7
Perhaps you should have used the -p or --strip option?
The text leading up to this was:
--------------------------
|Index: icconfig.cc
|===================================================================
|RCS file: /usr/local/cvsroot/uz/c/estic/icconfig.cc,v
|retrieving revision 1.11
|retrieving revision 1.12
|diff -r1.11 -r1.12
--------------------------
File to patch: 
>How-To-Repeat:

>Fix:
The following patch worked for me:

--- Makefile.orig       2004-08-28 18:52:20.000000000 +0200
+++ Makefile    2004-08-28 19:04:36.000000000 +0200
@@ -27,8 +27,9 @@
 MAKEFILE=      make/freebsd-x.mak
 
 post-extract:
-       ${_PKG_SILENT}${_PKG_DEBUG}${GZCAT} ${DISTDIR}/${ESTICPATCH} | \
-       ${PATCH} ${PATCH_DIST_ARGS}
+       ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC} && \
+       ${GZCAT} ${DISTDIR}/${ESTICPATCH} | \
+       ${PATCH} -p0 ${PATCH_DIST_ARGS}
 
 pre-build:
        ${_PKG_SILENT}${_PKG_DEBUG}cd ${LIBSRC} && \

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