From nobody@FreeBSD.org  Tue Feb  9 19:19:00 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E5554106568B
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  9 Feb 2010 19:19:00 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id D4E108FC0A
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  9 Feb 2010 19:19:00 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o19JJ0Od085277
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 9 Feb 2010 19:19:00 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o19JJ0h2085274;
	Tue, 9 Feb 2010 19:19:00 GMT
	(envelope-from nobody)
Message-Id: <201002091919.o19JJ0h2085274@www.freebsd.org>
Date: Tue, 9 Feb 2010 19:19:00 GMT
From: Grzegorz Blach <magik@roorback.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: updated port www/weave
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         143709
>Category:       ports
>Synopsis:       updated port www/weave
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 09 19:20:01 UTC 2010
>Closed-Date:    Wed Feb 10 14:38:09 UTC 2010
>Last-Modified:  Wed Feb 10 14:40:08 UTC 2010
>Originator:     Grzegorz Blach
>Release:        8-STABLE
>Organization:
>Environment:
FreeBSD silver.nine 8.0-STABLE FreeBSD 8.0-STABLE #5 r203692: Tue Feb  9 03:09:55 CET 2010     root@silver.nine:/usr/obj/usr/src/sys/SILVER  amd64

>Description:
Allow weave to build with firefox 3.6 and 3.5, depending on currently installed version. Or using 3.6 when ff is not yet installed.

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN weave.old/Makefile weave/Makefile
--- weave.old/Makefile	2010-02-09 20:06:54.487401918 +0100
+++ weave/Makefile	2010-02-09 20:11:49.158307638 +0100
@@ -7,6 +7,7 @@
 
 PORTNAME=	weave
 PORTVERSION=	1.0
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	http://files.roorback.net/ \
@@ -15,7 +16,7 @@
 MAINTAINER=	magik@roorback.net
 COMMENT=	Mozilla Weave extension
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox35 \
+BUILD_DEPENDS=	${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox \
 		${LOCALBASE}/lib/libxul/xpidl:${PORTSDIR}/www/libxul
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff -ruN weave.old/files/patch-crypto-src-Makefile weave/files/patch-crypto-src-Makefile
--- weave.old/files/patch-crypto-src-Makefile	2009-11-05 20:35:25.000000000 +0100
+++ weave/files/patch-crypto-src-Makefile	2010-02-09 20:11:34.623064238 +0100
@@ -1,17 +1,19 @@
 --- crypto/src/Makefile.orig    2009-08-27 22:08:18.000000000 +0200
 +++ crypto/src/Makefile 2009-09-18 21:52:06.000000000 +0200
-@@ -45,6 +45,10 @@
+@@ -45,6 +45,12 @@
  sys := $(shell uname -s)
  wince = $(WINCE)
  
 +ifeq ($(sys), FreeBSD)
-+  xpidl = $(PREFIX)/lib/libxul/xpidl -I$(PREFIX)/share/idl/firefox3/stable
++  xpidl = $(PREFIX)/lib/libxul/xpidl \
++    -I$(PREFIX)/share/idl/firefox3 \
++    -I$(PREFIX)/share/idl/firefox3/stable
 +endif
 +
  ifeq ($(wince), 1)
    os = WINNT
    cxx = $(sdkdir)/sdk/bin/arm-wince-gcc
-@@ -66,6 +70,14 @@
+@@ -66,6 +72,14 @@
    so = so
    cppflags += -shared
  else
@@ -26,7 +28,7 @@
  ifeq ($(sys), MINGW32_NT-6.1)
    os = WINNT
    compiler = msvc
-@@ -92,6 +104,7 @@
+@@ -92,6 +106,7 @@
  endif
  endif
  endif
@@ -34,7 +36,7 @@
  
  # Arch detection
  
-@@ -121,6 +134,9 @@
+@@ -121,6 +136,9 @@
  ifeq ($(machine), x86_64)
    arch = x86_64
  else
@@ -44,7 +46,7 @@
    $(error: Sorry, your architecture is unknown/unsupported: $(machine))
  endif
  endif
-@@ -130,6 +146,7 @@
+@@ -130,6 +148,7 @@
  endif
  endif
  endif
@@ -52,12 +54,13 @@
  
  # Universal binary so no need for $(arch) for Darwin
  
-@@ -188,6 +205,13 @@
+@@ -188,6 +207,14 @@
            -I$(sdkdir)/include/nspr \
            -I$(sdkdir)/sdk/include
  
 +ifeq ($(sys), FreeBSD)
-+  headers += -I$(PREFIX)/include/firefox3/stable \
++  headers += -I$(PREFIX)/include/firefox3 \
++             -I$(PREFIX)/include/firefox3/stable \
 +             -I$(PREFIX)/include/nspr \
 +             -I$(PREFIX)/include/nss \
 +             -I$(PREFIX)/include/firefox3/unstable
@@ -66,7 +69,7 @@
  # libraries
  libdirs := $(sdkdir)/lib $(sdkdir)/bin
  ifeq ($(wince),1)
-@@ -202,6 +226,10 @@
+@@ -202,6 +229,10 @@
  
  ifeq ($(os), Linux)
    libs := xpcom_core $(libs)
@@ -77,7 +80,7 @@
  endif
  
  # compiler and Linker Flags
-@@ -264,6 +292,25 @@
+@@ -264,6 +295,25 @@
               $(sdkdir)/lib/libxpcomglue_s.a \
               $(libdirs) $(libs)
  else
@@ -103,7 +106,7 @@
  ifeq ($(os), SunOS)
    libdirs := $(patsubst %,-L%,$(libdirs))
    libs := $(patsubst %,-l%,$(libs))
-@@ -303,6 +350,7 @@
+@@ -303,6 +353,7 @@
  endif
  endif
  endif
@@ -111,9 +114,9 @@
  
  ######################################################################
  
-@@ -361,6 +409,11 @@
-        $(cxx) $(cppflags) -o $@ $(cpp_sources) $(ldflags)
-        chmod +x $@
+@@ -361,6 +412,11 @@
+ 	$(cxx) $(cppflags) -o $@ $(cpp_sources) $(ldflags)
+ 	chmod +x $@
  else
 +ifeq ($(os), FreeBSD)
 +  $(so_target): $(idl_headers)
@@ -122,8 +125,8 @@
 +else
  ifeq ($(os), SunOS)
    $(so_target): $(idl_headers)
-        $(cxx) $(cppflags) -o $@ $(cpp_sources) $(ldflags)
-@@ -380,3 +433,4 @@
+ 	$(cxx) $(cppflags) -o $@ $(cpp_sources) $(ldflags)
+@@ -380,3 +436,4 @@
  endif
  endif
  endif
diff -ruN weave.old/files/ww weave/files/ww
--- weave.old/files/ww	1970-01-01 01:00:00.000000000 +0100
+++ weave/files/ww	2010-02-09 20:11:38.495128638 +0100
@@ -0,0 +1,2 @@
+--- Makefile.orig	2010-01-29 00:14:05.000000000 +0100
++++ Makefile	2010-02-09 20:09:36.694102598 +0100


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Tue Feb 9 19:55:22 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=143709 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Wed Feb 10 14:38:08 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=143709 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/143709: commit references a PR
Date: Wed, 10 Feb 2010 14:39:15 +0000 (UTC)

 miwi        2010-02-10 14:38:25 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/weave            Makefile 
     www/weave/files      patch-crypto-src-Makefile 
   Log:
   Move over to firefox 3.6 as default.
   
   PR:             143709
   Submitted by:   Grzegorz Blach <magik@roorback.net> (maintainer)
   
   Revision  Changes    Path
   1.11      +1 -1      ports/www/weave/Makefile
   1.3       +19 -16    ports/www/weave/files/patch-crypto-src-Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
