Date: Wed, 10 Aug 2011 21:29:29 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r612 - branches/experimental/www/seamonkey branches/experimental/www/seamonkey/files trunk/www/seamonkey trunk/www/seamonkey/files Message-ID: <201108102129.p7ALTT4r069336@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: flo
Date: Wed Aug 10 21:29:29 2011
New Revision: 612
Log:
sync with ports
Modified:
branches/experimental/www/seamonkey/Makefile
branches/experimental/www/seamonkey/files/seamonkey.desktop.in
trunk/www/seamonkey/Makefile
trunk/www/seamonkey/files/seamonkey.desktop.in
Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile Wed Aug 10 14:26:40 2011 (r611)
+++ branches/experimental/www/seamonkey/Makefile Wed Aug 10 21:29:29 2011 (r612)
@@ -2,11 +2,12 @@
# Date created: 31 Mar 1998
# Whom: eivind/dima/jseger
#
-# $FreeBSD: ports/www/seamonkey/Makefile,v 1.300 2011/08/01 23:31:53 flo Exp $
+# $FreeBSD: ports/www/seamonkey/Makefile,v 1.301 2011/08/10 21:25:33 flo Exp $
#
PORTNAME= seamonkey
DISTVERSION= 2.2
+PORTREVISION= 1
CATEGORIES?= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source
@@ -15,9 +16,9 @@
MAINTAINER= gecko@FreeBSD.org
COMMENT= The open source, standards compliant web browser
-BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr
-LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \
- event-1.4:${PORTSDIR}/devel/libevent
+BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr
+LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \
+ event-1.4:${PORTSDIR}/devel/libevent
USE_AUTOTOOLS= autoconf213
CONFLICTS_BUILD= spidermonkey-1.[0-7]*
@@ -71,6 +72,8 @@
MOZSRC:= ${WRKDIR}/comm-release/mozilla
WRKSRC= ${WRKDIR}/comm-release
+GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
+
.if ${HAVE_GNOME:Mlibgnomeui}!=""
USE_GNOME+= libgnomeui
MOZ_OPTIONS+= --enable-gnomeui
@@ -128,7 +131,7 @@
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
${WRKSRC}/mozilla/security/manager/ssl/src/Makefile.in \
${WRKSRC}/mozilla/js/src/config/mkdepend/Makefile.in
- ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
+ ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
${MOZSRC}/storage/build/Makefile.in \
${MOZSRC}/toolkit/library/Makefile.in \
${MOZSRC}/db/sqlite3/src/Makefile.in
Modified: branches/experimental/www/seamonkey/files/seamonkey.desktop.in
==============================================================================
--- branches/experimental/www/seamonkey/files/seamonkey.desktop.in Wed Aug 10 14:26:40 2011 (r611)
+++ branches/experimental/www/seamonkey/files/seamonkey.desktop.in Wed Aug 10 21:29:29 2011 (r612)
@@ -164,6 +164,6 @@
StartupNotify=true
Terminal=false
Type=Application
-Icon=%%PREFIX%%/lib/seamonkey/chrome/icons/default/default48.png
+Icon=%%PREFIX%%/lib/seamonkey-2.2/chrome/icons/default/default48.png
Categories=Application;Network;
MimeType=text/html;text/xml;application/xhtml+xml;
Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile Wed Aug 10 14:26:40 2011 (r611)
+++ trunk/www/seamonkey/Makefile Wed Aug 10 21:29:29 2011 (r612)
@@ -2,11 +2,12 @@
# Date created: 31 Mar 1998
# Whom: eivind/dima/jseger
#
-# $FreeBSD: ports/www/seamonkey/Makefile,v 1.300 2011/08/01 23:31:53 flo Exp $
+# $FreeBSD: ports/www/seamonkey/Makefile,v 1.301 2011/08/10 21:25:33 flo Exp $
#
PORTNAME= seamonkey
DISTVERSION= 2.2
+PORTREVISION= 1
CATEGORIES?= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source
@@ -15,9 +16,9 @@
MAINTAINER= gecko@FreeBSD.org
COMMENT= The open source, standards compliant web browser
-BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr
-LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \
- event-1.4:${PORTSDIR}/devel/libevent
+BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr
+LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \
+ event-1.4:${PORTSDIR}/devel/libevent
USE_AUTOTOOLS= autoconf213
CONFLICTS_BUILD= spidermonkey-1.[0-7]*
Modified: trunk/www/seamonkey/files/seamonkey.desktop.in
==============================================================================
--- trunk/www/seamonkey/files/seamonkey.desktop.in Wed Aug 10 14:26:40 2011 (r611)
+++ trunk/www/seamonkey/files/seamonkey.desktop.in Wed Aug 10 21:29:29 2011 (r612)
@@ -164,6 +164,6 @@
StartupNotify=true
Terminal=false
Type=Application
-Icon=%%PREFIX%%/lib/seamonkey/chrome/icons/default/default48.png
+Icon=%%PREFIX%%/lib/seamonkey-2.2/chrome/icons/default/default48.png
Categories=Application;Network;
MimeType=text/html;text/xml;application/xhtml+xml;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108102129.p7ALTT4r069336>