Date: Fri, 27 Sep 2002 18:31:54 -0700 From: Cy Schubert - CITS Open Systems Group <Cy.Schubert@uumail.gov.bc.ca> To: gnome@FreeBSD.org Message-ID: <200209280131.g8S1Vt8k044492@cwsys.cwsent.com>
next in thread | raw e-mail | index | archive | help
The following patch will allow mozilla and mozilla-devel to coexist on
the same system. I'd like to play around with mozilla-devel without
deinstalling the mozilla port. Does this make any sense? Would anyone
else see any value in this? If so, here's a patch.
Index: Makefile
===================================================================
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="You must upgrade your freetype port to 1.3.1_2 or higher
before installing Mozilla. If you have 1.3.1_2 installed, please
remove ${LOCALBASE}/include/freetype, then build Mozilla"
.endif
+.if exists(${PREFIX}/bin/mozilla)
+PLIST_SUB+= BINSUFFIX="-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
Index: pkg-plist
===================================================================
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
--
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
FreeBSD UNIX: cy@FreeBSD.org
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?200209280131.g8S1Vt8k044492>