Date: 02 Oct 2002 19:51:40 -0400 From: Joe Marcus Clarke <marcus@marcuscom.com> To: Cy Schubert - CITS Open Systems Group <Cy.Schubert@uumail.gov.bc.ca> Cc: FreeBSD GNOME Users <gnome@freebsd.org> Subject: Re: Message-ID: <1033602700.26547.4.camel@shumai.marcuscom.com> In-Reply-To: <200209280131.g8S1Vt8k044492@cwsys.cwsent.com> References: <200209280131.g8S1Vt8k044492@cwsys.cwsent.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-U0rFUyN0L7ASptPgTu4S
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
On Fri, 2002-09-27 at 21:31, Cy Schubert - CITS Open Systems Group
wrote:
> The following patch will allow mozilla and mozilla-devel to coexist on=20
> the same system. I'd like to play around with mozilla-devel without=20
> deinstalling the mozilla port. Does this make any sense? Would anyone=20
> else see any value in this? If so, here's a patch.
Thank you for this. I have to do some serious mozilla work after the
freeze. This patch in some incarnation will probably end up being used.
Joe
>=20
> 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: /home/ncvs/ports/www/mozilla-devel/Makefile,v
> retrieving revision 1.115
> diff -u -r1.115 Makefile
> --- Makefile 4 Sep 2002 05:07:23 -0000 1.115
> +++ Makefile 28 Sep 2002 01:31:14 -0000
> @@ -109,6 +109,10 @@
> BROKEN=3D"You must upgrade your freetype port to 1.3.1_2 or higher=20
> before installing Mozilla. If you have 1.3.1_2 installed, please=20
> remove ${LOCALBASE}/include/freetype, then build Mozilla"
> .endif
> =20
> +.if exists(${PREFIX}/bin/mozilla)
> +PLIST_SUB+=3D BINSUFFIX=3D"-devel"
> +.endif
> +
> post-build:
> ${SED} -e "s;@PREFIX@;${PREFIX};g" \
> ${FILESDIR}/mozilla.sh >${WRKSRC}/mozilla
> @@ -124,7 +128,9 @@
> ${CHMOD} 755 ${PREFIX}/lib/mozilla-devel
> cd ${WRKSRC}/dist/bin && ${FIND} . | \
> cpio -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/mozilla-devel
> - ${INSTALL_SCRIPT} ${WRKSRC}/mozilla ${PREFIX}/bin
> + ${TEST} -x ${PREFIX}/bin/mozilla && \
> + ${INSTALL_SCRIPT} ${WRKSRC}/mozilla ${PREFIX}/bin/mozilla-devel || \
> + ${INSTALL_SCRIPT} ${WRKSRC}/mozilla ${PREFIX}/bin/mozilla
> ${LN} -sf ${LOCALBASE}/jdk1.3.1/jre/plugin/i386/ns600/libjavaplugin_oj
> i.so \
> ${PREFIX}/lib/mozilla-devel/plugins/libjavaplugin_oji.so
> =20
> Index: pkg-plist
> =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: /home/ncvs/ports/www/mozilla-devel/pkg-plist,v
> retrieving revision 1.59
> diff -u -r1.59 pkg-plist
> --- pkg-plist 3 Sep 2002 20:45:54 -0000 1.59
> +++ pkg-plist 28 Sep 2002 01:31:15 -0000
> @@ -1,4 +1,4 @@
> -bin/mozilla
> +bin/mozilla%%BINSUFFIX%%
> lib/mozilla-devel/DocStream
> lib/mozilla-devel/HelloWorld
> lib/mozilla-devel/INSTALL.xmlterm
>=20
>=20
> --
> Cheers, Phone: 250-387-8437
> Cy Schubert Fax: 250-387-5766
> Team Leader, Sun/Alpha Team Email: Cy.Schubert@osg.gov.bc.ca
> Open Systems Group, CITS
> Ministry of Management Services
> Province of BC =20
> FreeBSD UNIX: cy@FreeBSD.org
>=20
>=20
>=20
>=20
> To Unsubscribe: send mail to majordomo@FreeBSD.org
> with "unsubscribe freebsd-gnome" in the body of the message
>=20
--=20
PGP Key : http://www.marcuscom.com/pgp.asc
--=-U0rFUyN0L7ASptPgTu4S
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (FreeBSD)
iD8DBQA9m4aLb2iPiv4Uz4cRAo8RAKCUWscw3SD8w2zF7TPQImK+xdrc2wCfUACG
50vTfFgz6dCRvjfVfKolZsE=
=MNdp
-----END PGP SIGNATURE-----
--=-U0rFUyN0L7ASptPgTu4S--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-gnome" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1033602700.26547.4.camel>