Subject: Re: mk/bsd.pkg.mk broken
To: Ronald van der Pol <Ronald.vanderPol@rvdp.org>
From: Greg Troxel <gdt@ir.bbn.com>
List: tech-pkg
Date: 03/28/2005 14:11:12
I have a broken bsd.pkg.mk that I got from cvsup.  It claims to be
1.1604, and I got a complaint about line 531 when trying to build a
number of packages.  The file looks mostly ok, but seems to have a
spurious newline.  The following diff was the smallest thing I could
do to cause compiles to work.  But on looking at it, I see that it
looks messed up.

After this, I'm still having trouble with wip/gdal-lib, but I don't know that
that's related.

Off to rm the file in the cvsup repo and resync....


Index: bsd.pkg.mk
===================================================================
RCS file: /NETBSD-CVS/pkgsrc/mk/bsd.pkg.mk,v
retrieving revision 1.1604
diff -u -r1.1604 bsd.pkg.mk
--- bsd.pkg.mk	24 Mar 2005 17:46:00 -0000	1.1604
+++ bsd.pkg.mk	28 Mar 2005 17:37:27 -0000
@@ -520,7 +520,7 @@
 PKGSRC_PATCH_FAIL=	exit 1
 .else
 PKGSRC_PATCH_FAIL=							\
-if [ -n "${PKG_OPTIONS10.3/unstable/
+if [ -n "${PKG_OPTIONS10.3/unstable/\
 {_LOCALPATCHFILES}" ]; then	\
 	${ECHO} "=========================================================================="; \
 	${ECHO};							\

-- 
        Greg Troxel <gdt@ir.bbn.com>