Date: Wed, 25 Nov 2009 20:55:11 GMT From: Grzegorz Blach <magik@roorback.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/140877: update of port www/weave Message-ID: <200911252055.nAPKtBm7039186@www.freebsd.org> Resent-Message-ID: <200911252100.nAPL098c088474@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 140877
>Category: ports
>Synopsis: update of port www/weave
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Nov 25 21:00:09 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Grzegorz Blach
>Release: 8.0-PRERELEASE
>Organization:
>Environment:
FreeBSD silver 8.0-PRERELEASE FreeBSD 8.0-PRERELEASE #8 r199738:
4:50 CET 2009 root@silver:/usr/obj/usr/src/sys/SILVER i386
>Description:
I updated www/weave port to 1.0b2 version.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# weave
# weave/files
# weave/files/patch-Makefile
# weave/files/patch-crypto-src-Makefile
# weave/pkg-descr
# weave/pkg-plist
# weave/distinfo
# weave/Makefile
#
echo c - weave
mkdir -p weave > /dev/null 2>&1
echo c - weave/files
mkdir -p weave/files > /dev/null 2>&1
echo x - weave/files/patch-Makefile
sed 's/^X//' >weave/files/patch-Makefile << '2bbb377499acbb7ddb915f073be2d38b'
X--- Makefile.orig 2009-10-01 01:19:33.000000000 +0000
X+++ Makefile 2009-10-04 19:49:04.000000000 +0000
X@@ -64,7 +64,7 @@
X buildid_short := $(buildid)
X ifeq ($(buildid),)
X date := $(shell date -u +%Y%m%d%H%M)
X- revid := $(shell hg tip --template '{node|short}')
X+ revid := fe353cf870d1
X buildid := $(date)-$(revid)
X buildid_short := $(date)
X endif
2bbb377499acbb7ddb915f073be2d38b
echo x - weave/files/patch-crypto-src-Makefile
sed 's/^X//' >weave/files/patch-crypto-src-Makefile << '45162eb65fc522f1c6b0c53a88dd02e3'
X--- crypto/src/Makefile.orig 2009-08-27 22:08:18.000000000 +0200
X+++ crypto/src/Makefile 2009-09-18 21:52:06.000000000 +0200
X@@ -45,6 +45,10 @@
X sys := $(shell uname -s)
X wince = $(WINCE)
X
X+ifeq ($(sys), FreeBSD)
X+ xpidl = $(PREFIX)/lib/libxul/xpidl -I$(PREFIX)/share/idl/firefox3/stable
X+endif
X+
X ifeq ($(wince), 1)
X os = WINNT
X cxx = $(sdkdir)/sdk/bin/arm-wince-gcc
X@@ -66,6 +70,14 @@
X so = so
X cppflags += -shared
X else
X+ifeq ($(sys), FreeBSD)
X+ os = FreeBSD
X+ compiler = gcc3
X+ cxx = c++
X+ so = so
X+ cppflags += -shared
X+ ldflags += -L$(PREFIX)/lib/firefox3 -L$(PREFIX)/lib -lc
X+else
X ifeq ($(sys), MINGW32_NT-6.1)
X os = WINNT
X compiler = msvc
X@@ -92,6 +104,7 @@
X endif
X endif
X endif
X+endif
X
X # Arch detection
X
X@@ -121,6 +134,9 @@
X ifeq ($(machine), x86_64)
X arch = x86_64
X else
X+ifeq ($(machine), amd64)
X+ arch = x86_64
X+else
X $(error: Sorry, your architecture is unknown/unsupported: $(machine))
X endif
X endif
X@@ -130,6 +146,7 @@
X endif
X endif
X endif
X+endif
X
X # Universal binary so no need for $(arch) for Darwin
X
X@@ -188,6 +205,13 @@
X -I$(sdkdir)/include/nspr \
X -I$(sdkdir)/sdk/include
X
X+ifeq ($(sys), FreeBSD)
X+ headers += -I$(PREFIX)/include/firefox3/stable \
X+ -I$(PREFIX)/include/nspr \
X+ -I$(PREFIX)/include/nss \
X+ -I$(PREFIX)/include/firefox3/unstable
X+endif
X+
X # libraries
X libdirs := $(sdkdir)/lib $(sdkdir)/bin
X ifeq ($(wince),1)
X@@ -202,6 +226,10 @@
X
X ifeq ($(os), Linux)
X libs := xpcom_core $(libs)
X+else
X+ifeq ($(os), FreeBSD)
X+ libs := xpcom $(libs)
X+endif
X endif
X
X # compiler and Linker Flags
X@@ -264,6 +292,25 @@
X $(sdkdir)/lib/libxpcomglue_s.a \
X $(libdirs) $(libs)
X else
X+ifeq ($(os), FreeBSD)
X+ libdirs := $(patsubst %,-L%,$(libdirs))
X+ libs := $(patsubst %,-l%,$(libs))
X+ cppflags += -pipe -O2 \
X+ -fPIC -fno-rtti -fno-exceptions -fno-strict-aliasing \
X+ -fno-common -pthread \
X+ -Wall -Wconversion -Wpointer-arith -Woverloaded-virtual -Wsynth \
X+ -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -Wcast-align \
X+ -Wno-long-long \
X+ -include xpcom-config.h $(headers) \
X+ -fshort-wchar
X+ ldflags += -pthread -pipe -DMOZILLA_STRICT_API \
X+ -Wl,-dead_strip \
X+ -Wl,-exported_symbol \
X+ -Wl,-z,defs -Wl,-h,WeaveCrypto.so \
X+ -Wl,-rpath-link,$(sdkdir)/bin \
X+ $(sdkdir)/lib/libxpcomglue_s.a \
X+ $(libdirs) $(libs)
X+else
X ifeq ($(os), SunOS)
X libdirs := $(patsubst %,-L%,$(libdirs))
X libs := $(patsubst %,-l%,$(libs))
X@@ -303,6 +350,7 @@
X endif
X endif
X endif
X+endif
X
X ######################################################################
X
X@@ -361,6 +409,11 @@
X $(cxx) $(cppflags) -o $@ $(cpp_sources) $(ldflags)
X chmod +x $@
X else
X+ifeq ($(os), FreeBSD)
X+ $(so_target): $(idl_headers)
X+ $(cxx) $(cppflags) -o $@ $(cpp_sources) $(ldflags)
X+ chmod +x $@
X+else
X ifeq ($(os), SunOS)
X $(so_target): $(idl_headers)
X $(cxx) $(cppflags) -o $@ $(cpp_sources) $(ldflags)
X@@ -380,3 +433,4 @@
X endif
X endif
X endif
X+endif
45162eb65fc522f1c6b0c53a88dd02e3
echo x - weave/pkg-descr
sed 's/^X//' >weave/pkg-descr << 'c8392bc4c31c45d1314067f4362fa5bb'
XWeave is a Mozilla Labs project to explore ways in which
Xthe browser can broker richer experiences on the Web,
Xby integrating more closely with online services.
X
XWWW: http://labs.mozilla.com/weave/
c8392bc4c31c45d1314067f4362fa5bb
echo x - weave/pkg-plist
sed 's/^X//' >weave/pkg-plist << '41e8e6eb1c0fee99398bff081f35f0da'
X%%XPI_XPIDIR%%/chrome/sync.jar
X%%XPI_XPIDIR%%/defaults/preferences/sync.js
X%%XPI_XPIDIR%%/components/IWeaveCrypto.xpt
X%%XPI_XPIDIR%%/components/Weave.js
X%%XPI_XPIDIR%%/modules/base_records/collection.js
X%%XPI_XPIDIR%%/modules/base_records/crypto.js
X%%XPI_XPIDIR%%/modules/base_records/keys.js
X%%XPI_XPIDIR%%/modules/base_records/wbo.js
X%%XPI_XPIDIR%%/modules/engines/themes.js
X%%XPI_XPIDIR%%/modules/engines/clientData.js
X%%XPI_XPIDIR%%/modules/engines/cookies.js
X%%XPI_XPIDIR%%/modules/engines/extensions.js
X%%XPI_XPIDIR%%/modules/engines/forms.js
X%%XPI_XPIDIR%%/modules/engines/history.js
X%%XPI_XPIDIR%%/modules/engines/input.js
X%%XPI_XPIDIR%%/modules/engines/microformats.js
X%%XPI_XPIDIR%%/modules/engines/passwords.js
X%%XPI_XPIDIR%%/modules/engines/plugins.js
X%%XPI_XPIDIR%%/modules/engines/prefs.js
X%%XPI_XPIDIR%%/modules/engines/tabs.js
X%%XPI_XPIDIR%%/modules/engines/bookmarks.js
X%%XPI_XPIDIR%%/modules/type_records/history.js
X%%XPI_XPIDIR%%/modules/type_records/clientData.js
X%%XPI_XPIDIR%%/modules/type_records/forms.js
X%%XPI_XPIDIR%%/modules/type_records/bookmark.js
X%%XPI_XPIDIR%%/modules/type_records/passwords.js
X%%XPI_XPIDIR%%/modules/type_records/prefs.js
X%%XPI_XPIDIR%%/modules/type_records/tabs.js
X%%XPI_XPIDIR%%/modules/ext/Observers.js
X%%XPI_XPIDIR%%/modules/ext/Preferences.js
X%%XPI_XPIDIR%%/modules/ext/StringBundle.js
X%%XPI_XPIDIR%%/modules/ext/Sync.js
X%%XPI_XPIDIR%%/modules/auth.js
X%%XPI_XPIDIR%%/modules/notifications.js
X%%XPI_XPIDIR%%/modules/resource.js
X%%XPI_XPIDIR%%/modules/service.js
X%%XPI_XPIDIR%%/modules/status.js
X%%XPI_XPIDIR%%/modules/stores.js
X%%XPI_XPIDIR%%/modules/trackers.js
X%%XPI_XPIDIR%%/modules/util.js
X%%XPI_XPIDIR%%/modules/log4moz.js
X%%XPI_XPIDIR%%/modules/engines.js
X%%XPI_XPIDIR%%/modules/identity.js
X%%XPI_XPIDIR%%/modules/constants.js
X%%XPI_XPIDIR%%/platform/%%PLATFORM%%/components/WeaveCrypto.so
X%%XPI_XPIDIR%%/install.rdf
X%%XPI_XPIDIR%%/chrome.manifest
Xlib/firefox3/extensions/%%XPI_XPIID%%
X@dirrm %%XPI_XPIDIR%%/platform/%%PLATFORM%%/components
X@dirrm %%XPI_XPIDIR%%/platform/%%PLATFORM%%
X@dirrm %%XPI_XPIDIR%%/platform
X@dirrm %%XPI_XPIDIR%%/modules/ext
X@dirrm %%XPI_XPIDIR%%/modules/type_records
X@dirrm %%XPI_XPIDIR%%/modules/engines
X@dirrm %%XPI_XPIDIR%%/modules/base_records
X@dirrm %%XPI_XPIDIR%%/modules
X@dirrm %%XPI_XPIDIR%%/components
X@dirrm %%XPI_XPIDIR%%/defaults/preferences
X@dirrm %%XPI_XPIDIR%%/defaults
X@dirrm %%XPI_XPIDIR%%/chrome
X@dirrm %%XPI_XPIDIR%%
X@dirrmtry lib/xpi
41e8e6eb1c0fee99398bff081f35f0da
echo x - weave/distinfo
sed 's/^X//' >weave/distinfo << '11f77058d15488f6cb9d4a620461dfb2'
XMD5 (weave-1.0b2.tar.bz2) = a5d1680aa09d24e7ef5337f18d9decd2
XSHA256 (weave-1.0b2.tar.bz2) = ad51ae92eacd5fb9a3858f2230c97f1ef88a3b83c686e7f45799362551927523
XSIZE (weave-1.0b2.tar.bz2) = 435106
11f77058d15488f6cb9d4a620461dfb2
echo x - weave/Makefile
sed 's/^X//' >weave/Makefile << 'e11388eb87fd6ec574dadb1ed689a2fc'
X# New ports collection makefile for: weave
X# Date created: 31 Aug 2009
X# Whom: Grzegorz Blach <magik@roorback.net>
X#
X# $FreeBSD: ports/www/weave/Makefile,v 1.4 2009/11/21 11:35:51 miwi Exp $
X#
X
XPORTNAME= weave
XPORTVERSION= 1.0b2
XCATEGORIES= www
XMASTER_SITES= http://files.roorback.net/ \
X LOCAL/glarkin
X
XMAINTAINER= magik@roorback.net
XCOMMENT= Mozilla Weave extension
X
XBUILD_DEPENDS= ${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox35 \
X ${LOCALBASE}/lib/libxul/xpidl:${PORTSDIR}/www/libxul
XRUN_DEPENDS= ${BUILD_DEPENDS}
X
XONLY_FOR_ARCHS= i386 amd64
XUSE_BZIP2= yes
XUSE_GMAKE= yes
X
X.include <bsd.port.options.mk>
X
X.if ${ARCH} == i386
XPLATFORM= FreeBSD_x86-gcc3
X.elif ${ARCH} == amd64
XPLATFORM= FreeBSD_x86_64-gcc3
X.endif
X
XGMAKE_FLAGS= sdkdir=${PREFIX}/lib/firefox3/sdk rebuild_crypto=1 release_build=1 platform_target=${PLATFORM}
XALL_TARGET= ${GMAKE_FLAGS} build
XINSTALL_TARGET= ${GMAKE_FLAGS} xpi
X
XXPI_ID= {340c2bbc-ce74-4362-90b5-7c26312808ef}
XXPI_DIR= ${PREFIX}/lib/xpi/${XPI_ID}
X
XPLIST_SUB+= XPI_XPIDIR="${XPI_DIR:S,^${PREFIX}/,,}" \
X XPI_XPIID=${XPI_ID} \
X PLATFORM=${PLATFORM}
X
Xpost-install:
X ${MKDIR} ${XPI_DIR}
X (cd ${XPI_DIR}; tar -xf ${WRKSRC}/dist/xpi/weave-${PORTVERSION}-rel.xpi)
X ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_DIR}/
X ${CHMOD} -R a+rX,go-w ${XPI_DIR}/
X ${MKDIR} ${PREFIX}/lib/firefox3/extensions
X ${LN} -sf ${XPI_DIR} ${PREFIX}/lib/firefox3/extensions
X
X.include <bsd.port.mk>
e11388eb87fd6ec574dadb1ed689a2fc
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911252055.nAPKtBm7039186>