--Signature=_Sat__6_Mar_2004_07_24_31_+0100_0n.heu8Y2MD1+Wc/
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: 7bit


Hi,

I've upgraded pkgsrc, and now when I try to update abiword:

[juan@Nocturno][/usr/pkgsrc/editors/abiword]> make clean                       
make:
"../../mk/buildlink3/../../mk/buildlink3/bsd.buildlink3.mk" line 1: Malformed
conditional (empty(_BLNK_DEPENDS:Mx11-links) &&
!empty(USE_BUILTIN.x11-links:M[nN][oO])) make: "../../mk/../../mk/bsd.pkg.mk"
line 1369: if-less endif make: "../../mk/../../mk/bsd.pkg.mk" line 1369: Need
an operator make: Fatal errors encountered -- cannot continue

make: stopped in /usr/pkgsrc/editors/abiword
[juan@Nocturno][/usr/pkgsrc/editors/abiword]>

This patch seems to fix this problem:

Index: bsd.buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/buildlink3/bsd.buildlink3.mk,v
retrieving revision 1.102
diff -u -r1.102 bsd.buildlink3.mk
--- bsd.buildlink3.mk   5 Mar 2004 19:25:37 -0000       1.102
+++ bsd.buildlink3.mk   6 Mar 2004 06:23:59 -0000
@@ -123,7 +123,8 @@
 #
 _BLNK_DEPENDS= # empty
 .for _pkg_ in ${BUILDLINK_DEPENDS}   
-.  if empty(_BLNK_DEPENDS:M${_pkg_}) && !empty(USE_BUILTIN.${_pkg_}:M[nN][oO])
+.  if empty(_BLNK_DEPENDS:M${_pkg_}) && defined(USE_BUILTIN.${_pkg_}) && \
+    !empty(USE_BUILTIN.${_pkg_}:M[nN][oO])
 _BLNK_DEPENDS+=        ${_pkg_}
 .  endif
 .endfor

-- 
	Juan RP <juan@xtraeme.unixbsd.org>

--Signature=_Sat__6_Mar_2004_07_24_31_+0100_0n.heu8Y2MD1+Wc/
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (NetBSD)

iD8DBQFASW6iypkLYVDran0RAtBbAKCjfluZ9E3Pmn+Ek5ox7ALQyCaQiQCgxohd
q1GiSC02KqnYK2bDB2+Ivec=
=z7Y4
-----END PGP SIGNATURE-----

--Signature=_Sat__6_Mar_2004_07_24_31_+0100_0n.heu8Y2MD1+Wc/--