--9jxsPFA5p3P2qPhR
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Sun, May 09, 2004 at 06:13:34PM -0400, Bill Sommerfeld wrote:

> > is this necessary? the effect on Solaris is that graphics/xpm is
> > depended on for buildlink3 packages when the base system xpm is
> > perfectly acceptable (ie. this is a regression from previous working
> > behaviour).
>=20
> The net effect of this is that, at least on my systems, the xpm
> package itself refuses to build on solaris -- either it should find
> the installed one sufficient, or it should let me build a new one.

I propose the following patch which restores previous behaviour
where xpm-3.4 is acceptable. any objections?


Index: builtin.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/graphics/xpm/builtin.mk,v
retrieving revision 1.3
diff -u -r1.3 builtin.mk
--- builtin.mk	24 Apr 2004 21:20:56 -0000	1.3
+++ builtin.mk	15 May 2004 06:10:43 -0000
@@ -53,16 +53,14 @@
=20
 .  if defined(BUILTIN_PKG.xpm)
 USE_BUILTIN.xpm=3D	yes
-.    for _depend_ in ${BUILDLINK_DEPENDS.xpm}
-.      if !empty(USE_BUILTIN.xpm:M[yY][eE][sS])
+.    if !empty(USE_BUILTIN.xpm:M[yY][eE][sS])
 USE_BUILTIN.xpm!=3D							\
-	if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.xpm}; then	\
+       if ${PKG_ADMIN} pmatch 'xpm>=3D3.4' ${BUILTIN_PKG.xpm}; then	\
 		${ECHO} "yes";						\
-	else								\
+       else								\
 		${ECHO} "no";						\
-	fi
-.      endif
-.    endfor
+       fi
+.    endif
 .  endif
 .endif	# USE_BUILTIN.xpm
=20

--9jxsPFA5p3P2qPhR
Content-Type: application/pgp-signature
Content-Disposition: inline

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

iD8DBQFApbUyluYOb9yiFXoRAk7pAKCX+VJvEBGV79bCLlJhpLi2GbT3zwCgjilK
kOhkCxiDSajHmT8QqoPq3xQ=
=8zLy
-----END PGP SIGNATURE-----

--9jxsPFA5p3P2qPhR--