--s9fJI615cBHmzTOP
Content-Type: multipart/mixed; boundary="0eh6TmSyL6TZE2Uz"
Content-Disposition: inline


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

Hello,

Attached is a diff against x11-links that I think may be necessary at
least for IRIX64.  It ensures that only ${ABI}bit libraries are included
in the x11-links package, as otherwise pkgsrc might attempt to link
applications against older libraries if the other ABI's library path
happens to be searched first.

My 32bit IRIX machine recently died, so I can't check if this patch
breaks things on that platform -- if anybody here uses pkgsrc on IRIX,
could you please pkg_delete x11-links, apply the patch, reinstall
x11-links and build one or two applications that use X and let me know
if it works?

Thanks in advance,
-Jan

--=20
If you are undertaking anything substantial, C is the only reasonable choice
of programming language.
	-- UNIX User's Supplementary Documents

--0eh6TmSyL6TZE2Uz
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=diff
Content-Transfer-Encoding: quoted-printable

Index: Makefile
=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/pkgtools/x11-links/Makefile,v
retrieving revision 1.64
diff -b -u -r1.64 Makefile
--- Makefile	20 Nov 2004 06:34:26 -0000	1.64
+++ Makefile	6 Mar 2005 00:10:15 -0000
@@ -47,7 +47,7 @@
 X11_LINKS_BUILD_DIR=3D	${WRKSRC}/${X11_LINKS_SUBDIR}
 X11_LINKS_DIR=3D		${PREFIX}/${X11_LINKS_SUBDIR}
=20
-FILES_LIST_CMD=3D	${CAT} ${FILES_LIST} | ${GREP} -v "^\#"
+FILES_LIST_CMD=3D	${SED} -e "s/@ABI@/${ABI}/" ${FILES_LIST} | ${GREP} -v "=
^\#"
=20
 CREATE_X11LINK?=3D	${LN} -fs $$src $$dest
=20
Index: files/xsgi
=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/pkgtools/x11-links/files/xsgi,v
retrieving revision 1.1
diff -b -u -r1.1 xsgi
--- files/xsgi	2 Sep 2003 07:14:49 -0000	1.1
+++ files/xsgi	6 Mar 2005 00:10:15 -0000
@@ -513,134 +513,46 @@
 lib/X11/config/sgiLib.rules
 lib/X11/config/sgiLib.tmpl
 lib/X11/config/site.def
-lib/libFS.a
-lib/libICE.a
-lib/libSM.a
-lib/libXTrap.a
-lib/libXau.a
-lib/libXaw.a
-lib/libXdmcp.a
-lib/libXext.a
-lib/libXi.a
-lib/libXmu.a
-lib/libXnmbx.a
-lib/libXSgivc.a
-lib/libXt.a
-lib/libXtst.a
-lib/liboldX.a
-lib/libxkbfile.a
-lib/libz.a
-lib32/libFS.a
-lib32/libICE.a
-lib32/libSM.a
-lib32/libXTrap.a
-lib32/libXau.a
-lib32/libXaw.a
-lib32/libXdmcp.a
-lib32/libXext.a
-lib32/libXi.a
-lib32/libXmu.a
-lib32/libXnmbx.a
-lib32/libXSgivc.a
-lib32/libXt.a
-lib32/libXtst.a
-lib32/liboldX.a
-lib32/libxkbfile.a
-lib32/libxkbui.a
-lib32/libz.a
-lib/libICE.so
-lib/libSM.so
-lib/libX11.so
-lib/libX11.so.1
-lib/libX11.so.2
-lib/libX11.so.3
-lib/libXaw.so
-lib/libXaw.so.1
-lib/libXaw.so.2
-lib/libXext.so
-lib/libXi.so
-lib/libXmu.so
-lib/libXSgivc.so
-lib/libXt.so
-lib/libXt.so.3
-lib32/libICE.so
-lib32/libSM.so
-lib32/libX11.so
-lib32/libX11.so.1
-lib32/libXaw.so
-lib32/libXaw.so.2
-lib32/libXext.so
-lib32/libXi.so
-lib32/libXmu.so
-lib32/libXSgivc.so
-lib32/libXt.so
-lib/libMrm.so.1
-lib/libMrm.so
-lib/libSgm.so
-lib/libSgm.so.1
-lib/libSgw.so
-lib/libSgw.so.1
-lib/libUil.so
-lib/libUil.so.1
-lib/libXm.so
-lib/libXm.so.1
-lib32/libMrm.so
-lib32/libMrm.so.1
-lib32/libMrm.so.2
-lib32/libSgm.so
-lib32/libSgm.so.1
-lib32/libSgm.so.2
-lib32/libSgw.so
-lib32/libSgw.so.1
-lib32/libUil.so
-lib32/libUil.so.1
-lib32/libUil.so.2
-lib32/libXm.so
-lib32/libXm.so.1
-lib32/libXm.so.2
-lib32/libXpm.so
-lib32/libXpm.so.1
-lib32/libXpm.so.2
-lib64/libFS.a
-lib64/libICE.a
-lib64/libSM.a
-lib64/libXTrap.a
-lib64/libXau.a
-lib64/libXaw.a
-lib64/libXdmcp.a
-lib64/libXext.a
-lib64/libXi.a
-lib64/libXmu.a
-lib64/libXnmbx.a
-lib64/libXt.a
-lib64/libXtst.a
-lib64/liboldX.a
-lib64/libxkbfile.a
-lib64/libz.a
-lib64/libICE.so
-lib64/libSM.so
-lib64/libX11.so
-lib64/libX11.so.1
-lib64/libXaw.so
-lib64/libXaw.so.2
-lib64/libXext.so
-lib64/libXi.so
-lib64/libXmu.so
-lib64/libXt.so
-lib64/libMrm.so
-lib64/libMrm.so.1
-lib64/libMrm.so.2
-lib64/libSgm.so
-lib64/libSgm.so.1
-lib64/libSgm.so.2
-lib64/libSgw.so
-lib64/libSgw.so.1
-lib64/libUil.so
-lib64/libUil.so.1
-lib64/libUil.so.2
-lib64/libXm.so
-lib64/libXm.so.1
-lib64/libXm.so.2
-lib64/libXpm.so
-lib64/libXpm.so.1
-lib64/libXpm.so.2
+lib@ABI@/libFS.a
+lib@ABI@/libICE.a
+lib@ABI@/libSM.a
+lib@ABI@/libXTrap.a
+lib@ABI@/libXau.a
+lib@ABI@/libXaw.a
+lib@ABI@/libXdmcp.a
+lib@ABI@/libXext.a
+lib@ABI@/libXi.a
+lib@ABI@/libXmu.a
+lib@ABI@/libXnmbx.a
+lib@ABI@/libXt.a
+lib@ABI@/libXtst.a
+lib@ABI@/liboldX.a
+lib@ABI@/libxkbfile.a
+lib@ABI@/libz.a
+lib@ABI@/libICE.so
+lib@ABI@/libSM.so
+lib@ABI@/libX11.so
+lib@ABI@/libX11.so.1
+lib@ABI@/libXaw.so
+lib@ABI@/libXaw.so.2
+lib@ABI@/libXext.so
+lib@ABI@/libXi.so
+lib@ABI@/libXmu.so
+lib@ABI@/libXt.so
+lib@ABI@/libMrm.so
+lib@ABI@/libMrm.so.1
+lib@ABI@/libMrm.so.2
+lib@ABI@/libSgm.so
+lib@ABI@/libSgm.so.1
+lib@ABI@/libSgm.so.2
+lib@ABI@/libSgw.so
+lib@ABI@/libSgw.so.1
+lib@ABI@/libUil.so
+lib@ABI@/libUil.so.1
+lib@ABI@/libUil.so.2
+lib@ABI@/libXm.so
+lib@ABI@/libXm.so.1
+lib@ABI@/libXm.so.2
+lib@ABI@/libXpm.so
+lib@ABI@/libXpm.so.1
+lib@ABI@/libXpm.so.2

--0eh6TmSyL6TZE2Uz--

--s9fJI615cBHmzTOP
Content-Type: application/pgp-signature
Content-Disposition: inline

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

iD8DBQFCKkxEfFtkr68iakwRAsHpAKDqaqMJh71z+VF8EBnCpwlgVEQjaACcC72L
ZNeocor5zlxUCS85e3Ehkbo=
=TgSb
-----END PGP SIGNATURE-----

--s9fJI615cBHmzTOP--