Index: head/www/mozilla/Makefile =================================================================== --- head/www/mozilla/Makefile (revision 70921) +++ head/www/mozilla/Makefile (revision 70922) @@ -1,153 +1,153 @@ # New ports collection makefile for: mozilla # Date created: 31 Mar 1998 # Whom: eivind/dima/jseger # # $FreeBSD$ # PORTNAME= mozilla PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} \ http://people.FreeBSD.org/~marcus/:local MASTER_SITE_SUBDIR= mozilla/releases/${PORTNAME}${PORTVERSION:S/.rc/rc/}/src \ marcus/:local DISTFILES= ${PORTNAME}-source-${PORTVERSION:S/.rc/rc/}${EXTRACT_SUFX} \ libart_lgpl-${PORTVERSION}${EXTRACT_SUFX}:local MAINTAINER= gnome@FreeBSD.org BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ freetype-config:${PORTSDIR}/print/freetype2 LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ mng.1:${PORTSDIR}/graphics/libmng \ freetype.9:${PORTSDIR}/print/freetype2 WRKSRC= ${WRKDIR}/${PORTNAME} WITHOUT_CHATZILLA= "Contains a buffer overflow reported at http://online.securityfocus.com/archive/1/270249" EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ --exclude */macbuild/*\ --exclude */package/* \ --exclude .cvsignore \ --exclude makefile.win \ --exclude MANIFEST USE_X_PREFIX= yes USE_PERL5= yes USE_GMAKE= yes USE_GNOMENG= yes USE_GNOME= orbit gtk12 USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= \ --disable-auto-deps \ --enable-chrome-format=jar \ --disable-cpp-exceptions \ --disable-cpp-rtti \ --enable-crypto \ --disable-debug \ --enable-default-toolkit=gtk \ --enable-double-buffer \ --enable-dtd-debug \ --enable-jsd \ --enable-mathml \ --disable-md \ --disable-optimize \ --disable-pedantic \ --disable-plaintext-editor-only \ --enable-strip \ --enable-svg \ --disable-tests \ --disable-xterm-updates \ --enable-xinerama \ --with-system-jpeg=${LOCALBASE} \ --with-system-mng=${LOCALBASE} \ --with-system-png=${LOCALBASE} \ --with-pthreads PLIST= ${WRKSRC}/pkg-plist # LDAP is only used by mail and news so disable both together .if defined(WITHOUT_MAILNEWS) CONFIGURE_ARGS+= --disable-ldap --disable-mailnews .else # mail and news desired, but not LDAP .if defined(WITHOUT_LDAP) CONFIGURE_ARGS+= --disable-ldap --enable-mailnews .else CONFIGURE_ARGS+= --enable-ldap --enable-mailnews .endif .endif .if !defined(WITHOUT_CHATZILLA) CONFIGURE_ARGS+= --enable-extensions=default,irc,xmlterm .else CONFIGURE_ARGS+= --enable-extensions=default,xmlterm .endif CONFIGURE_ENV= MOZ_INTERNAL_LIBART_LGPL=1 .include MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin \ MOZ_INTERNAL_LIBART_LGPL=1 ALL_TARGET= default .if ${ARCH} == "i386" CONFIGURE_ARGS+= --enable-reorder .endif .if ${ARCH} == "alpha" BROKEN= "core dumps on alpha during post-build" .endif .if exists(${LOCALBASE}/include/freetype/freetype.h) 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 post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/build/unix/run-mozilla.sh post-build: - ${SED} -e "s;@PREFIX@;${PREFIX};g" \ + ${SED} -e "s|%%PREFIX%%|${PREFIX}|g" \ ${FILESDIR}/mozilla.sh >${WRKSRC}/mozilla (cd ${WRKSRC}/dist/bin; \ ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom; \ ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome; \ ${TOUCH} ./chrome/user-skins.rdf ./chrome/user-locales.rdf) ${FIND} ${WRKSRC}/dist/bin -type d | /usr/bin/sort -r | \ ${XARGS} ${RMDIR} 2> /dev/null || ${TRUE} pre-install: ${ECHO_CMD} bin/mozilla > ${PLIST} if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ ${ECHO_CMD} lib/browser_plugins/libjavaplugin_oji.so >> ${PLIST} ; \ fi cd ${WRKSRC}/dist/bin && ${FIND} -s * -type f -o -type l | \ ${SED} -e 's:^:lib/mozilla/:' >> ${PLIST} \ && ${FIND} -d * -type d | \ ${SED} -e 's:^:@dirrm lib/mozilla/:' >> ${PLIST} ${ECHO_CMD} @dirrm lib/mozilla >> ${PLIST} do-install: ${MKDIR} ${PREFIX}/lib/mozilla ${CHMOD} 755 ${PREFIX}/lib/mozilla cd ${WRKSRC}/dist/bin && ${FIND} . | \ cpio -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/mozilla ${INSTALL_SCRIPT} ${WRKSRC}/mozilla ${PREFIX}/bin if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \ ${MKDIR} ${PREFIX}/lib/browser_plugins ; \ fi if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ ${LN} -sf ${LOCALBASE}/jdk1.3.1/jre/plugin/i386/ns600/libjavaplugin_oji.so \ ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ; \ fi post-install: @${CAT} ${PKGMESSAGE} .include Property changes on: head/www/mozilla/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.123 \ No newline at end of property +1.124 \ No newline at end of property Index: head/www/mozilla/files/mozilla.sh =================================================================== --- head/www/mozilla/files/mozilla.sh (revision 70921) +++ head/www/mozilla/files/mozilla.sh (revision 70922) @@ -1,6 +1,22 @@ #!/bin/sh -# -# $FreeBSD$ -cd @PREFIX@/lib/mozilla -exec ./mozilla "$@" +MOZILLA_DIR="%%PREFIX%%/lib/mozilla" +MOZILLA_EXEC="mozilla" +LOCATION='new-tab' + +cd $MOZILLA_DIR || exit 1 + +# catch calls for mozilla mail +if [ "$1" = "-mail" ]; then + REMOTE_COMMAND="xfeDoCommand (openInbox)" +else + REMOTE_COMMAND="openURL($@, $LOCATION)" +fi + +# process found +./$MOZILLA_EXEC -remote "ping()" && +./$MOZILLA_EXEC -remote "$REMOTE_COMMAND" && exit 0 + +# no existing process +exec ./$MOZILLA_EXEC "$@" + Property changes on: head/www/mozilla/files/mozilla.sh ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/www/mozilla-devel/Makefile =================================================================== --- head/www/mozilla-devel/Makefile (revision 70921) +++ head/www/mozilla-devel/Makefile (revision 70922) @@ -1,233 +1,233 @@ # New ports collection makefile for: mozilla # Date created: 31 Mar 1998 # Whom: eivind/dima/jseger # # $FreeBSD$ # PORTNAME?= mozilla PORTVERSION= 1.2b -PORTREVISION?= 1 +PORTREVISION?= 2 PORTEPOCH?= 1 CATEGORIES?= www MASTER_SITES= ${MASTER_SITE_MOZILLA} \ http://people.FreeBSD.org/~marcus/:local MASTER_SITE_SUBDIR= mozilla/releases/${PORTNAME}${PORTVERSION:S/.rc/rc/}/src \ marcus/:local DISTFILES= ${PORTNAME}-source-${PORTVERSION:S/.rc/rc/}${EXTRACT_SUFX} \ libart_lgpl-${PORTVERSION}${EXTRACT_SUFX}:local MAINTAINER= gnome@FreeBSD.org BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ freetype-config:${PORTSDIR}/print/freetype2 LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ mng.1:${PORTSDIR}/graphics/libmng \ freetype.9:${PORTSDIR}/print/freetype2 WRKSRC= ${WRKDIR}/${PORTNAME} MOZILLA?= mozilla-devel WITHOUT_CHATZILLA= "Contains a buffer overflow reported at http://online.securityfocus.com/archive/1/270249" .if defined(WITH_GTK2) LIB_DEPENDS+= gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \ ORBit-2.0:${PORTSDIR}/devel/ORBit2 .else USE_GNOME= gtk12 .endif .if !defined(WITHOUT_XFT) LIB_DEPENDS+= Xft2.2:${PORTSDIR}/x11-fonts/Xft .if exists(${X11BASE}/lib/X11/fonts/mozilla/fonts.dir) BROKEN= Mozilla-devel and Xft2 render the mozilla-fonts \ illegibly. Please remove the mozilla-fonts package. .endif .endif .if defined(WITH_CALENDAR) DISTFILES+= ${PORTNAME}-calendar-${PORTVERSION}${EXTRACT_SUFX}:local LIB_DEPENDS+= ical.0:${PORTSDIR}/devel/libical .endif LATEST_LINK= ${MOZILLA} EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ --exclude */macbuild/*\ --exclude */package/* \ --exclude .cvsignore \ --exclude makefile.win \ --exclude MANIFEST USE_X_PREFIX= yes USE_PERL5= yes USE_GMAKE= yes USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= \ --disable-auto-deps \ --enable-chrome-format=jar \ --disable-cpp-exceptions \ --disable-cpp-rtti \ --enable-crypto \ --disable-debug \ --enable-double-buffer \ --enable-dtd-debug \ --enable-jsd \ --enable-mathml \ --disable-md \ --disable-optimize \ --disable-pedantic \ --disable-plaintext-editor-only \ --enable-strip \ --enable-svg \ --disable-tests \ --disable-xterm-updates \ --enable-xinerama \ --with-system-jpeg=${LOCALBASE} \ --with-system-mng=${LOCALBASE} \ --with-system-png=${LOCALBASE} \ --with-pthreads .if !defined(WITH_GTK2) USE_GNOMENG= yes USE_GNOME+= orbit .endif PLIST= ${WRKDIR}/pkg-plist # LDAP is only used by mail and news so disable both together .if defined(WITHOUT_MAILNEWS) CONFIGURE_ARGS+= --disable-ldap --disable-mailnews .else # mail and news desired, but not LDAP .if defined(WITHOUT_LDAP) CONFIGURE_ARGS+= --disable-ldap --enable-mailnews .else CONFIGURE_ARGS+= --enable-ldap --enable-mailnews .endif .endif .if !defined(WITHOUT_CHATZILLA) CONFIGURE_ARGS+= --enable-extensions=default,irc,xmlterm .else CONFIGURE_ARGS+= --enable-extensions=default,xmlterm .endif CONFIGURE_ENV= MOZ_INTERNAL_LIBART_LGPL=1 .if defined(WITH_CALENDAR) CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" CONFIGURE_ARGS+= --enable-calendar .endif .if defined(WITHOUT_COMPOSER) CONFIGURE_ARGS+= --disable-composer .endif .if defined(WITH_GTK2) CONFIGURE_ARGS+= --enable-default-toolkit=gtk2 EXTRA_PATCHES= ${FILESDIR}/mozilla_12b_patch PKGCONFIG_FILES= mozilla-gtkmozembed.pc mozilla-js.pc mozilla-xpcom.pc \ mozilla-nspr.pc mozilla-nss.pc .else CONFIGURE_ARGS+= --enable-default-toolkit=gtk .endif .if !defined(WITHOUT_XFT) CONFIGURE_ARGS+= --enable-xft .endif .include MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin \ MOZ_INTERNAL_LIBART_LGPL=1 ALL_TARGET= default .if ${ARCH} == "i386" CONFIGURE_ARGS+= --enable-reorder .endif .if ${ARCH} == "alpha" BROKEN= "core dumps on alpha during post-build" .endif .if exists(${LOCALBASE}/include/freetype/freetype.h) 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 pre-everything:: .if defined(WITH_CALENDAR) @${ECHO_MSG} "Calendar is still beta software." @${ECHO_MSG} "Use at your own risk." @${ECHO_MSG} "http://mozilla.org/projects/calendar/" .endif post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/build/unix/run-mozilla.sh .if !defined(WITHOUT_XFT) @${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g' \ ${WRKSRC}/gfx/src/gtk/nsDrawingSurfaceGTK.cpp \ ${WRKSRC}/gfx/src/gtk/nsFontMetricsXft.h .endif @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ -e 's|%%HEADERS_SUFX%%|-devel|g' \ ${WRKSRC}/config/autoconf.mk.in post-build: - ${SED} -e "s;@PREFIX@;${PREFIX};g" -e "s;%%MOZILLA%%;${MOZILLA};g" \ + ${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%MOZILLA%%|${MOZILLA}|g" \ ${FILESDIR}/mozilla.sh >${WRKSRC}/${MOZILLA} (cd ${WRKSRC}/dist/bin; \ ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom; \ ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome; \ ${TOUCH} ./chrome/user-skins.rdf ./chrome/user-locales.rdf) ${FIND} ${WRKSRC}/dist/bin -type d | /usr/bin/sort -r | \ ${XARGS} ${RMDIR} 2> /dev/null || ${TRUE} pre-install: ${RM} -f ${PLIST} ${TOUCH} -f ${PLIST} if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then \ ${ECHO_CMD} bin/mozilla >> ${PLIST} ; \ fi ${ECHO_CMD} bin/${MOZILLA} >> ${PLIST} if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ ${ECHO_CMD} lib/browser_plugins/libjavaplugin_oji.so >> ${PLIST} ; \ fi cd ${WRKSRC}/dist/bin && ${FIND} -s * -type f -o -type l | \ ${SED} -e 's:^:lib/${MOZILLA}/:' >> ${PLIST} \ && ${FIND} -d * -type d | \ ${SED} -e 's:^:@dirrm lib/${MOZILLA}/:' >> ${PLIST} ${ECHO_CMD} @dirrm lib/${MOZILLA} >> ${PLIST} .if defined(WITH_GTK2) for pcfile in ${PKGCONFIG_FILES}; do \ ${ECHO_CMD} libdata/pkgconfig/$$pcfile >> ${PLIST} ; \ done .endif do-install: ${MKDIR} ${PREFIX}/lib/${MOZILLA} ${CHMOD} 755 ${PREFIX}/lib/${MOZILLA} cd ${WRKSRC}/dist/bin && ${FIND} . | \ cpio -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${MOZILLA} ${INSTALL_SCRIPT} ${WRKSRC}/${MOZILLA} ${PREFIX}/bin if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then \ ${LN} -sf ${PREFIX}/bin/${MOZILLA} ${PREFIX}/bin/mozilla ; \ fi if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \ ${MKDIR} ${PREFIX}/lib/browser_plugins ; \ fi if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ ${LN} -sf ${LOCALBASE}/jdk1.3.1/jre/plugin/i386/ns600/libjavaplugin_oji.so \ ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ; \ fi .if defined(WITH_GTK2) for pcfile in ${PKGCONFIG_FILES}; do \ ${INSTALL_DATA} ${WRKSRC}/build/unix/$$pcfile \ ${PREFIX}/libdata/pkgconfig ; \ done .endif post-install: @${CAT} ${PKGMESSAGE} .include Property changes on: head/www/mozilla-devel/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.129 \ No newline at end of property +1.130 \ No newline at end of property Index: head/www/mozilla-devel/files/mozilla.sh =================================================================== --- head/www/mozilla-devel/files/mozilla.sh (revision 70921) +++ head/www/mozilla-devel/files/mozilla.sh (revision 70922) @@ -1,6 +1,22 @@ #!/bin/sh -# -# $FreeBSD$ -cd @PREFIX@/lib/%%MOZILLA%% -exec ./mozilla "$@" +MOZILLA_DIR="%%PREFIX%%/lib/%%MOZILLA%%" +MOZILLA_EXEC="mozilla" +LOCATION='new-tab' + +cd $MOZILLA_DIR || exit 1 + +# catch calls for mozilla mail +if [ "$1" = "-mail" ]; then + REMOTE_COMMAND="xfeDoCommand (openInbox)" +else + REMOTE_COMMAND="openURL($@, $LOCATION)" +fi + +# process found +./$MOZILLA_EXEC -remote "ping()" && +./$MOZILLA_EXEC -remote "$REMOTE_COMMAND" && exit 0 + +# no existing process +exec ./$MOZILLA_EXEC "$@" + Property changes on: head/www/mozilla-devel/files/mozilla.sh ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/www/mozilla-devel-gtk1/Makefile =================================================================== --- head/www/mozilla-devel-gtk1/Makefile (revision 70921) +++ head/www/mozilla-devel-gtk1/Makefile (revision 70922) @@ -1,20 +1,20 @@ # New ports collection makefile for: mozilla-devel-gtk2 # Date created: 17 November 2002 # Whom: Joe Marcus Clarke # # $FreeBSD$ # PORTNAME= mozilla -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 0 CATEGORIES= www MASTERDIR= ${.CURDIR}/../mozilla-devel DESCR= ${PKGDIR}/pkg-descr.gtk2 WITH_GTK2= yes WITHOUT_XFT= "Causes crashes when used with apps such as Galeon 2" MOZILLA= mozilla-devel-gtk2 .include "${MASTERDIR}/Makefile" Property changes on: head/www/mozilla-devel-gtk1/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/www/mozilla-devel-gtk2/Makefile =================================================================== --- head/www/mozilla-devel-gtk2/Makefile (revision 70921) +++ head/www/mozilla-devel-gtk2/Makefile (revision 70922) @@ -1,20 +1,20 @@ # New ports collection makefile for: mozilla-devel-gtk2 # Date created: 17 November 2002 # Whom: Joe Marcus Clarke # # $FreeBSD$ # PORTNAME= mozilla -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 0 CATEGORIES= www MASTERDIR= ${.CURDIR}/../mozilla-devel DESCR= ${PKGDIR}/pkg-descr.gtk2 WITH_GTK2= yes WITHOUT_XFT= "Causes crashes when used with apps such as Galeon 2" MOZILLA= mozilla-devel-gtk2 .include "${MASTERDIR}/Makefile" Property changes on: head/www/mozilla-devel-gtk2/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/www/mozilla-gtk1/Makefile =================================================================== --- head/www/mozilla-gtk1/Makefile (revision 70921) +++ head/www/mozilla-gtk1/Makefile (revision 70922) @@ -1,20 +1,20 @@ # New ports collection makefile for: mozilla-devel-gtk2 # Date created: 17 November 2002 # Whom: Joe Marcus Clarke # # $FreeBSD$ # PORTNAME= mozilla -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 0 CATEGORIES= www MASTERDIR= ${.CURDIR}/../mozilla-devel DESCR= ${PKGDIR}/pkg-descr.gtk2 WITH_GTK2= yes WITHOUT_XFT= "Causes crashes when used with apps such as Galeon 2" MOZILLA= mozilla-devel-gtk2 .include "${MASTERDIR}/Makefile" Property changes on: head/www/mozilla-gtk1/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/www/mozilla-gtk2/Makefile =================================================================== --- head/www/mozilla-gtk2/Makefile (revision 70921) +++ head/www/mozilla-gtk2/Makefile (revision 70922) @@ -1,20 +1,20 @@ # New ports collection makefile for: mozilla-devel-gtk2 # Date created: 17 November 2002 # Whom: Joe Marcus Clarke # # $FreeBSD$ # PORTNAME= mozilla -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 0 CATEGORIES= www MASTERDIR= ${.CURDIR}/../mozilla-devel DESCR= ${PKGDIR}/pkg-descr.gtk2 WITH_GTK2= yes WITHOUT_XFT= "Causes crashes when used with apps such as Galeon 2" MOZILLA= mozilla-devel-gtk2 .include "${MASTERDIR}/Makefile" Property changes on: head/www/mozilla-gtk2/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/www/mozilla-vendor/Makefile =================================================================== --- head/www/mozilla-vendor/Makefile (revision 70921) +++ head/www/mozilla-vendor/Makefile (revision 70922) @@ -1,163 +1,163 @@ # New ports collection makefile for: mozilla # Date created: 31 Mar 1998 # Whom: eivind/dima/jseger # # $FreeBSD$ # PORTNAME= mozilla PORTVERSION= 1.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} \ http://people.FreeBSD.org/~marcus/:local MASTER_SITE_SUBDIR= mozilla/releases/${PORTNAME}${PORTVERSION:S/.rc/rc/}/src \ marcus/:local DISTFILES= ${PORTNAME}-source-${PORTVERSION:S/.rc/rc/}${EXTRACT_SUFX} \ libart_lgpl-${PORTVERSION}${EXTRACT_SUFX}:local MAINTAINER= gnome@FreeBSD.org BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ freetype-config:${PORTSDIR}/print/freetype2 LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ mng.1:${PORTSDIR}/graphics/libmng \ freetype.9:${PORTSDIR}/print/freetype2 WRKSRC= ${WRKDIR}/${PORTNAME} WITHOUT_CHATZILLA= "Contains a buffer overflow reported at http://online.securityfocus.com/archive/1/270249" LATEST_LINK= mozilla-vendor USE_BZIP2= yes EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ --exclude */macbuild/*\ --exclude */package/* \ --exclude .cvsignore \ --exclude makefile.win \ --exclude MANIFEST USE_X_PREFIX= yes USE_PERL5= yes USE_GMAKE= yes USE_GNOMENG= yes USE_GNOME= orbit gtk12 USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= \ --disable-auto-deps \ --enable-chrome-format=jar \ --disable-cpp-exceptions \ --disable-cpp-rtti \ --enable-crypto \ --disable-debug \ --enable-default-toolkit=gtk \ --enable-double-buffer \ --enable-dtd-debug \ --enable-jsd \ --enable-mathml \ --disable-md \ --disable-optimize \ --disable-pedantic \ --disable-plaintext-editor-only \ --enable-strip \ --enable-svg \ --disable-tests \ --disable-xterm-updates \ --enable-xinerama \ --with-system-jpeg=${LOCALBASE} \ --with-system-mng=${LOCALBASE} \ --with-system-png=${LOCALBASE} \ --with-pthreads PLIST= ${WRKSRC}/pkg-plist # LDAP is only used by mail and news so disable both together .if defined(WITHOUT_MAILNEWS) CONFIGURE_ARGS+= --disable-ldap --disable-mailnews .else # mail and news desired, but not LDAP .if defined(WITHOUT_LDAP) CONFIGURE_ARGS+= --disable-ldap --enable-mailnews .else CONFIGURE_ARGS+= --enable-ldap --enable-mailnews .endif .endif .if !defined(WITHOUT_CHATZILLA) CONFIGURE_ARGS+= --enable-extensions=default,irc,xmlterm .else CONFIGURE_ARGS+= --enable-extensions=default,xmlterm .endif CONFIGURE_ENV= MOZ_INTERNAL_LIBART_LGPL=1 .include MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin \ MOZ_INTERNAL_LIBART_LGPL=1 ALL_TARGET= default .if ${ARCH} == "i386" CONFIGURE_ARGS+= --enable-reorder .endif .if ${ARCH} == "alpha" BROKEN= "core dumps on alpha during post-build" .endif .if exists(${LOCALBASE}/include/freetype/freetype.h) 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 post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/build/unix/run-mozilla.sh post-build: - ${SED} -e "s;@PREFIX@;${PREFIX};g" \ + ${SED} -e "s|%%PREFIX%%|${PREFIX}|g" \ ${FILESDIR}/mozilla.sh >${WRKSRC}/mozilla-vendor (cd ${WRKSRC}/dist/bin; \ ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom; \ ${ECHO_CMD} skin,install,select,classic/1.0 >> chrome/installed-chrome.txt; \ ${ECHO_CMD} locale,install,select,en-US >> chrome/installed-chrome.txt; \ ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome) ${FIND} ${WRKSRC}/dist/bin -type d | /usr/bin/sort -r | \ ${XARGS} ${RMDIR} 2> /dev/null || ${TRUE} pre-install: ${RM} -f ${PLIST} ${TOUCH} -f ${PLIST} if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then \ ${ECHO_CMD} bin/mozilla >> ${PLIST} ; \ fi ${ECHO_CMD} bin/mozilla-vendor >> ${PLIST} if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ ${ECHO_CMD} lib/browser_plugins/libjavaplugin_oji.so >> ${PLIST} ; \ fi cd ${WRKSRC}/dist/bin && ${FIND} -s * -type f -o -type l | \ ${SED} -e 's:^:lib/mozilla-vendor/:' >> ${PLIST} \ && ${FIND} -d * -type d | \ ${SED} -e 's:^:@dirrm lib/mozilla-vendor/:' >> ${PLIST} ${ECHO_CMD} @dirrm lib/mozilla-vendor >> ${PLIST} do-install: ${MKDIR} ${PREFIX}/lib/mozilla-vendor ${CHMOD} 755 ${PREFIX}/lib/mozilla-vendor cd ${WRKSRC}/dist/bin && ${FIND} . | \ cpio -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/mozilla-vendor ${INSTALL_SCRIPT} ${WRKSRC}/mozilla-vendor ${PREFIX}/bin if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozill ]; then \ ${LN} -sf ${PREFIX}/bin/mozilla-vendor ${PREFIX}/bin/mozilla ; \ fi if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \ ${MKDIR} ${PREFIX}/lib/browser_plugins ; \ fi if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ ${LN} -sf ${LOCALBASE}/jdk1.3.1/jre/plugin/i386/ns600/libjavaplugin_oji.so \ ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ; \ fi post-install: @${CAT} ${PKGMESSAGE} .include Property changes on: head/www/mozilla-vendor/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.122 \ No newline at end of property +1.123 \ No newline at end of property Index: head/www/mozilla-vendor/files/mozilla.sh =================================================================== --- head/www/mozilla-vendor/files/mozilla.sh (revision 70921) +++ head/www/mozilla-vendor/files/mozilla.sh (revision 70922) @@ -1,6 +1,22 @@ #!/bin/sh -# -# $FreeBSD$ -cd @PREFIX@/lib/mozilla-vendor -exec ./mozilla "$@" +MOZILLA_DIR="%%PREFIX%%/lib/mozilla-vendor" +MOZILLA_EXEC="mozilla" +LOCATION='new-tab' + +cd $MOZILLA_DIR || exit 1 + +# catch calls for mozilla mail +if [ "$1" = "-mail" ]; then + REMOTE_COMMAND="xfeDoCommand (openInbox)" +else + REMOTE_COMMAND="openURL($@, $LOCATION)" +fi + +# process found +./$MOZILLA_EXEC -remote "ping()" && +./$MOZILLA_EXEC -remote "$REMOTE_COMMAND" && exit 0 + +# no existing process +exec ./$MOZILLA_EXEC "$@" + Property changes on: head/www/mozilla-vendor/files/mozilla.sh ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/www/seamonkey/Makefile =================================================================== --- head/www/seamonkey/Makefile (revision 70921) +++ head/www/seamonkey/Makefile (revision 70922) @@ -1,233 +1,233 @@ # New ports collection makefile for: mozilla # Date created: 31 Mar 1998 # Whom: eivind/dima/jseger # # $FreeBSD$ # PORTNAME?= mozilla PORTVERSION= 1.2b -PORTREVISION?= 1 +PORTREVISION?= 2 PORTEPOCH?= 1 CATEGORIES?= www MASTER_SITES= ${MASTER_SITE_MOZILLA} \ http://people.FreeBSD.org/~marcus/:local MASTER_SITE_SUBDIR= mozilla/releases/${PORTNAME}${PORTVERSION:S/.rc/rc/}/src \ marcus/:local DISTFILES= ${PORTNAME}-source-${PORTVERSION:S/.rc/rc/}${EXTRACT_SUFX} \ libart_lgpl-${PORTVERSION}${EXTRACT_SUFX}:local MAINTAINER= gnome@FreeBSD.org BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ freetype-config:${PORTSDIR}/print/freetype2 LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ mng.1:${PORTSDIR}/graphics/libmng \ freetype.9:${PORTSDIR}/print/freetype2 WRKSRC= ${WRKDIR}/${PORTNAME} MOZILLA?= mozilla-devel WITHOUT_CHATZILLA= "Contains a buffer overflow reported at http://online.securityfocus.com/archive/1/270249" .if defined(WITH_GTK2) LIB_DEPENDS+= gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \ ORBit-2.0:${PORTSDIR}/devel/ORBit2 .else USE_GNOME= gtk12 .endif .if !defined(WITHOUT_XFT) LIB_DEPENDS+= Xft2.2:${PORTSDIR}/x11-fonts/Xft .if exists(${X11BASE}/lib/X11/fonts/mozilla/fonts.dir) BROKEN= Mozilla-devel and Xft2 render the mozilla-fonts \ illegibly. Please remove the mozilla-fonts package. .endif .endif .if defined(WITH_CALENDAR) DISTFILES+= ${PORTNAME}-calendar-${PORTVERSION}${EXTRACT_SUFX}:local LIB_DEPENDS+= ical.0:${PORTSDIR}/devel/libical .endif LATEST_LINK= ${MOZILLA} EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ --exclude */macbuild/*\ --exclude */package/* \ --exclude .cvsignore \ --exclude makefile.win \ --exclude MANIFEST USE_X_PREFIX= yes USE_PERL5= yes USE_GMAKE= yes USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= \ --disable-auto-deps \ --enable-chrome-format=jar \ --disable-cpp-exceptions \ --disable-cpp-rtti \ --enable-crypto \ --disable-debug \ --enable-double-buffer \ --enable-dtd-debug \ --enable-jsd \ --enable-mathml \ --disable-md \ --disable-optimize \ --disable-pedantic \ --disable-plaintext-editor-only \ --enable-strip \ --enable-svg \ --disable-tests \ --disable-xterm-updates \ --enable-xinerama \ --with-system-jpeg=${LOCALBASE} \ --with-system-mng=${LOCALBASE} \ --with-system-png=${LOCALBASE} \ --with-pthreads .if !defined(WITH_GTK2) USE_GNOMENG= yes USE_GNOME+= orbit .endif PLIST= ${WRKDIR}/pkg-plist # LDAP is only used by mail and news so disable both together .if defined(WITHOUT_MAILNEWS) CONFIGURE_ARGS+= --disable-ldap --disable-mailnews .else # mail and news desired, but not LDAP .if defined(WITHOUT_LDAP) CONFIGURE_ARGS+= --disable-ldap --enable-mailnews .else CONFIGURE_ARGS+= --enable-ldap --enable-mailnews .endif .endif .if !defined(WITHOUT_CHATZILLA) CONFIGURE_ARGS+= --enable-extensions=default,irc,xmlterm .else CONFIGURE_ARGS+= --enable-extensions=default,xmlterm .endif CONFIGURE_ENV= MOZ_INTERNAL_LIBART_LGPL=1 .if defined(WITH_CALENDAR) CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" CONFIGURE_ARGS+= --enable-calendar .endif .if defined(WITHOUT_COMPOSER) CONFIGURE_ARGS+= --disable-composer .endif .if defined(WITH_GTK2) CONFIGURE_ARGS+= --enable-default-toolkit=gtk2 EXTRA_PATCHES= ${FILESDIR}/mozilla_12b_patch PKGCONFIG_FILES= mozilla-gtkmozembed.pc mozilla-js.pc mozilla-xpcom.pc \ mozilla-nspr.pc mozilla-nss.pc .else CONFIGURE_ARGS+= --enable-default-toolkit=gtk .endif .if !defined(WITHOUT_XFT) CONFIGURE_ARGS+= --enable-xft .endif .include MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin \ MOZ_INTERNAL_LIBART_LGPL=1 ALL_TARGET= default .if ${ARCH} == "i386" CONFIGURE_ARGS+= --enable-reorder .endif .if ${ARCH} == "alpha" BROKEN= "core dumps on alpha during post-build" .endif .if exists(${LOCALBASE}/include/freetype/freetype.h) 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 pre-everything:: .if defined(WITH_CALENDAR) @${ECHO_MSG} "Calendar is still beta software." @${ECHO_MSG} "Use at your own risk." @${ECHO_MSG} "http://mozilla.org/projects/calendar/" .endif post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/build/unix/run-mozilla.sh .if !defined(WITHOUT_XFT) @${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g' \ ${WRKSRC}/gfx/src/gtk/nsDrawingSurfaceGTK.cpp \ ${WRKSRC}/gfx/src/gtk/nsFontMetricsXft.h .endif @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ -e 's|%%HEADERS_SUFX%%|-devel|g' \ ${WRKSRC}/config/autoconf.mk.in post-build: - ${SED} -e "s;@PREFIX@;${PREFIX};g" -e "s;%%MOZILLA%%;${MOZILLA};g" \ + ${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%MOZILLA%%|${MOZILLA}|g" \ ${FILESDIR}/mozilla.sh >${WRKSRC}/${MOZILLA} (cd ${WRKSRC}/dist/bin; \ ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom; \ ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome; \ ${TOUCH} ./chrome/user-skins.rdf ./chrome/user-locales.rdf) ${FIND} ${WRKSRC}/dist/bin -type d | /usr/bin/sort -r | \ ${XARGS} ${RMDIR} 2> /dev/null || ${TRUE} pre-install: ${RM} -f ${PLIST} ${TOUCH} -f ${PLIST} if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then \ ${ECHO_CMD} bin/mozilla >> ${PLIST} ; \ fi ${ECHO_CMD} bin/${MOZILLA} >> ${PLIST} if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ ${ECHO_CMD} lib/browser_plugins/libjavaplugin_oji.so >> ${PLIST} ; \ fi cd ${WRKSRC}/dist/bin && ${FIND} -s * -type f -o -type l | \ ${SED} -e 's:^:lib/${MOZILLA}/:' >> ${PLIST} \ && ${FIND} -d * -type d | \ ${SED} -e 's:^:@dirrm lib/${MOZILLA}/:' >> ${PLIST} ${ECHO_CMD} @dirrm lib/${MOZILLA} >> ${PLIST} .if defined(WITH_GTK2) for pcfile in ${PKGCONFIG_FILES}; do \ ${ECHO_CMD} libdata/pkgconfig/$$pcfile >> ${PLIST} ; \ done .endif do-install: ${MKDIR} ${PREFIX}/lib/${MOZILLA} ${CHMOD} 755 ${PREFIX}/lib/${MOZILLA} cd ${WRKSRC}/dist/bin && ${FIND} . | \ cpio -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${MOZILLA} ${INSTALL_SCRIPT} ${WRKSRC}/${MOZILLA} ${PREFIX}/bin if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then \ ${LN} -sf ${PREFIX}/bin/${MOZILLA} ${PREFIX}/bin/mozilla ; \ fi if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \ ${MKDIR} ${PREFIX}/lib/browser_plugins ; \ fi if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ ${LN} -sf ${LOCALBASE}/jdk1.3.1/jre/plugin/i386/ns600/libjavaplugin_oji.so \ ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ; \ fi .if defined(WITH_GTK2) for pcfile in ${PKGCONFIG_FILES}; do \ ${INSTALL_DATA} ${WRKSRC}/build/unix/$$pcfile \ ${PREFIX}/libdata/pkgconfig ; \ done .endif post-install: @${CAT} ${PKGMESSAGE} .include Property changes on: head/www/seamonkey/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.129 \ No newline at end of property +1.130 \ No newline at end of property Index: head/www/seamonkey/files/mozilla.sh =================================================================== --- head/www/seamonkey/files/mozilla.sh (revision 70921) +++ head/www/seamonkey/files/mozilla.sh (revision 70922) @@ -1,6 +1,22 @@ #!/bin/sh -# -# $FreeBSD$ -cd @PREFIX@/lib/%%MOZILLA%% -exec ./mozilla "$@" +MOZILLA_DIR="%%PREFIX%%/lib/%%MOZILLA%%" +MOZILLA_EXEC="mozilla" +LOCATION='new-tab' + +cd $MOZILLA_DIR || exit 1 + +# catch calls for mozilla mail +if [ "$1" = "-mail" ]; then + REMOTE_COMMAND="xfeDoCommand (openInbox)" +else + REMOTE_COMMAND="openURL($@, $LOCATION)" +fi + +# process found +./$MOZILLA_EXEC -remote "ping()" && +./$MOZILLA_EXEC -remote "$REMOTE_COMMAND" && exit 0 + +# no existing process +exec ./$MOZILLA_EXEC "$@" + Property changes on: head/www/seamonkey/files/mozilla.sh ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property Index: head/www/seamonkey2/Makefile =================================================================== --- head/www/seamonkey2/Makefile (revision 70921) +++ head/www/seamonkey2/Makefile (revision 70922) @@ -1,233 +1,233 @@ # New ports collection makefile for: mozilla # Date created: 31 Mar 1998 # Whom: eivind/dima/jseger # # $FreeBSD$ # PORTNAME?= mozilla PORTVERSION= 1.2b -PORTREVISION?= 1 +PORTREVISION?= 2 PORTEPOCH?= 1 CATEGORIES?= www MASTER_SITES= ${MASTER_SITE_MOZILLA} \ http://people.FreeBSD.org/~marcus/:local MASTER_SITE_SUBDIR= mozilla/releases/${PORTNAME}${PORTVERSION:S/.rc/rc/}/src \ marcus/:local DISTFILES= ${PORTNAME}-source-${PORTVERSION:S/.rc/rc/}${EXTRACT_SUFX} \ libart_lgpl-${PORTVERSION}${EXTRACT_SUFX}:local MAINTAINER= gnome@FreeBSD.org BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ freetype-config:${PORTSDIR}/print/freetype2 LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ mng.1:${PORTSDIR}/graphics/libmng \ freetype.9:${PORTSDIR}/print/freetype2 WRKSRC= ${WRKDIR}/${PORTNAME} MOZILLA?= mozilla-devel WITHOUT_CHATZILLA= "Contains a buffer overflow reported at http://online.securityfocus.com/archive/1/270249" .if defined(WITH_GTK2) LIB_DEPENDS+= gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \ ORBit-2.0:${PORTSDIR}/devel/ORBit2 .else USE_GNOME= gtk12 .endif .if !defined(WITHOUT_XFT) LIB_DEPENDS+= Xft2.2:${PORTSDIR}/x11-fonts/Xft .if exists(${X11BASE}/lib/X11/fonts/mozilla/fonts.dir) BROKEN= Mozilla-devel and Xft2 render the mozilla-fonts \ illegibly. Please remove the mozilla-fonts package. .endif .endif .if defined(WITH_CALENDAR) DISTFILES+= ${PORTNAME}-calendar-${PORTVERSION}${EXTRACT_SUFX}:local LIB_DEPENDS+= ical.0:${PORTSDIR}/devel/libical .endif LATEST_LINK= ${MOZILLA} EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ --exclude */macbuild/*\ --exclude */package/* \ --exclude .cvsignore \ --exclude makefile.win \ --exclude MANIFEST USE_X_PREFIX= yes USE_PERL5= yes USE_GMAKE= yes USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= \ --disable-auto-deps \ --enable-chrome-format=jar \ --disable-cpp-exceptions \ --disable-cpp-rtti \ --enable-crypto \ --disable-debug \ --enable-double-buffer \ --enable-dtd-debug \ --enable-jsd \ --enable-mathml \ --disable-md \ --disable-optimize \ --disable-pedantic \ --disable-plaintext-editor-only \ --enable-strip \ --enable-svg \ --disable-tests \ --disable-xterm-updates \ --enable-xinerama \ --with-system-jpeg=${LOCALBASE} \ --with-system-mng=${LOCALBASE} \ --with-system-png=${LOCALBASE} \ --with-pthreads .if !defined(WITH_GTK2) USE_GNOMENG= yes USE_GNOME+= orbit .endif PLIST= ${WRKDIR}/pkg-plist # LDAP is only used by mail and news so disable both together .if defined(WITHOUT_MAILNEWS) CONFIGURE_ARGS+= --disable-ldap --disable-mailnews .else # mail and news desired, but not LDAP .if defined(WITHOUT_LDAP) CONFIGURE_ARGS+= --disable-ldap --enable-mailnews .else CONFIGURE_ARGS+= --enable-ldap --enable-mailnews .endif .endif .if !defined(WITHOUT_CHATZILLA) CONFIGURE_ARGS+= --enable-extensions=default,irc,xmlterm .else CONFIGURE_ARGS+= --enable-extensions=default,xmlterm .endif CONFIGURE_ENV= MOZ_INTERNAL_LIBART_LGPL=1 .if defined(WITH_CALENDAR) CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" CONFIGURE_ARGS+= --enable-calendar .endif .if defined(WITHOUT_COMPOSER) CONFIGURE_ARGS+= --disable-composer .endif .if defined(WITH_GTK2) CONFIGURE_ARGS+= --enable-default-toolkit=gtk2 EXTRA_PATCHES= ${FILESDIR}/mozilla_12b_patch PKGCONFIG_FILES= mozilla-gtkmozembed.pc mozilla-js.pc mozilla-xpcom.pc \ mozilla-nspr.pc mozilla-nss.pc .else CONFIGURE_ARGS+= --enable-default-toolkit=gtk .endif .if !defined(WITHOUT_XFT) CONFIGURE_ARGS+= --enable-xft .endif .include MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin \ MOZ_INTERNAL_LIBART_LGPL=1 ALL_TARGET= default .if ${ARCH} == "i386" CONFIGURE_ARGS+= --enable-reorder .endif .if ${ARCH} == "alpha" BROKEN= "core dumps on alpha during post-build" .endif .if exists(${LOCALBASE}/include/freetype/freetype.h) 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 pre-everything:: .if defined(WITH_CALENDAR) @${ECHO_MSG} "Calendar is still beta software." @${ECHO_MSG} "Use at your own risk." @${ECHO_MSG} "http://mozilla.org/projects/calendar/" .endif post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/build/unix/run-mozilla.sh .if !defined(WITHOUT_XFT) @${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g' \ ${WRKSRC}/gfx/src/gtk/nsDrawingSurfaceGTK.cpp \ ${WRKSRC}/gfx/src/gtk/nsFontMetricsXft.h .endif @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ -e 's|%%HEADERS_SUFX%%|-devel|g' \ ${WRKSRC}/config/autoconf.mk.in post-build: - ${SED} -e "s;@PREFIX@;${PREFIX};g" -e "s;%%MOZILLA%%;${MOZILLA};g" \ + ${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%MOZILLA%%|${MOZILLA}|g" \ ${FILESDIR}/mozilla.sh >${WRKSRC}/${MOZILLA} (cd ${WRKSRC}/dist/bin; \ ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom; \ ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome; \ ${TOUCH} ./chrome/user-skins.rdf ./chrome/user-locales.rdf) ${FIND} ${WRKSRC}/dist/bin -type d | /usr/bin/sort -r | \ ${XARGS} ${RMDIR} 2> /dev/null || ${TRUE} pre-install: ${RM} -f ${PLIST} ${TOUCH} -f ${PLIST} if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then \ ${ECHO_CMD} bin/mozilla >> ${PLIST} ; \ fi ${ECHO_CMD} bin/${MOZILLA} >> ${PLIST} if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ ${ECHO_CMD} lib/browser_plugins/libjavaplugin_oji.so >> ${PLIST} ; \ fi cd ${WRKSRC}/dist/bin && ${FIND} -s * -type f -o -type l | \ ${SED} -e 's:^:lib/${MOZILLA}/:' >> ${PLIST} \ && ${FIND} -d * -type d | \ ${SED} -e 's:^:@dirrm lib/${MOZILLA}/:' >> ${PLIST} ${ECHO_CMD} @dirrm lib/${MOZILLA} >> ${PLIST} .if defined(WITH_GTK2) for pcfile in ${PKGCONFIG_FILES}; do \ ${ECHO_CMD} libdata/pkgconfig/$$pcfile >> ${PLIST} ; \ done .endif do-install: ${MKDIR} ${PREFIX}/lib/${MOZILLA} ${CHMOD} 755 ${PREFIX}/lib/${MOZILLA} cd ${WRKSRC}/dist/bin && ${FIND} . | \ cpio -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${MOZILLA} ${INSTALL_SCRIPT} ${WRKSRC}/${MOZILLA} ${PREFIX}/bin if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then \ ${LN} -sf ${PREFIX}/bin/${MOZILLA} ${PREFIX}/bin/mozilla ; \ fi if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \ ${MKDIR} ${PREFIX}/lib/browser_plugins ; \ fi if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ ${LN} -sf ${LOCALBASE}/jdk1.3.1/jre/plugin/i386/ns600/libjavaplugin_oji.so \ ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ; \ fi .if defined(WITH_GTK2) for pcfile in ${PKGCONFIG_FILES}; do \ ${INSTALL_DATA} ${WRKSRC}/build/unix/$$pcfile \ ${PREFIX}/libdata/pkgconfig ; \ done .endif post-install: @${CAT} ${PKGMESSAGE} .include Property changes on: head/www/seamonkey2/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.129 \ No newline at end of property +1.130 \ No newline at end of property Index: head/www/seamonkey2/files/mozilla.sh =================================================================== --- head/www/seamonkey2/files/mozilla.sh (revision 70921) +++ head/www/seamonkey2/files/mozilla.sh (revision 70922) @@ -1,6 +1,22 @@ #!/bin/sh -# -# $FreeBSD$ -cd @PREFIX@/lib/%%MOZILLA%% -exec ./mozilla "$@" +MOZILLA_DIR="%%PREFIX%%/lib/%%MOZILLA%%" +MOZILLA_EXEC="mozilla" +LOCATION='new-tab' + +cd $MOZILLA_DIR || exit 1 + +# catch calls for mozilla mail +if [ "$1" = "-mail" ]; then + REMOTE_COMMAND="xfeDoCommand (openInbox)" +else + REMOTE_COMMAND="openURL($@, $LOCATION)" +fi + +# process found +./$MOZILLA_EXEC -remote "ping()" && +./$MOZILLA_EXEC -remote "$REMOTE_COMMAND" && exit 0 + +# no existing process +exec ./$MOZILLA_EXEC "$@" + Property changes on: head/www/seamonkey2/files/mozilla.sh ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property