head	1.5;
access;
symbols
	RELEASE_7_3_0:1.3;
locks; strict;
comment	@# @;


1.5
date	2010.05.02.15.56.47;	author sylvio;	state dead;
branches;
next	1.4;

1.4
date	2010.03.14.17.11.26;	author wxs;	state Exp;
branches;
next	1.3;

1.3
date	2010.02.10.14.38.25;	author miwi;	state Exp;
branches;
next	1.2;

1.2
date	2009.11.05.19.35.25;	author glarkin;	state Exp;
branches;
next	1.1;

1.1
date	2009.10.07.19.52.47;	author glarkin;	state Exp;
branches;
next	;


desc
@@


1.5
log
@- Update to 1.2.3

PR:		ports/146094
Submitted by:	Grzegorz Blach <magik@@rootback.net> (maintainer)
@
text
@--- 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,12 @@@@
 sys := $(shell uname -s)
 wince = $(WINCE)
 
+ifeq ($(sys), FreeBSD)
+  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 +72,14 @@@@
   so = so
   cppflags += -shared
 else
+ifeq ($(sys), FreeBSD)
+  os = FreeBSD
+  compiler = gcc3
+  cxx = c++
+  so = so
+  cppflags += -shared
+  ldflags += -L$(PREFIX)/lib/firefox3 -L$(PREFIX)/lib -lc
+else
 ifeq ($(sys), MINGW32_NT-6.1)
   os = WINNT
   compiler = msvc
@@@@ -92,6 +106,7 @@@@
 endif
 endif
 endif
+endif
 
 # Arch detection
 
@@@@ -121,6 +136,9 @@@@
 ifeq ($(machine), x86_64)
   arch = x86_64
 else
+ifeq ($(machine), amd64)
+  arch = amd64
+else
   $(error: Sorry, your architecture is unknown/unsupported: $(machine))
 endif
 endif
@@@@ -130,6 +148,7 @@@@
 endif
 endif
 endif
+endif
 
 # Universal binary so no need for $(arch) for Darwin
 
@@@@ -188,6 +207,14 @@@@
           -I$(sdkdir)/include/nspr \
           -I$(sdkdir)/sdk/include
 
+ifeq ($(sys), FreeBSD)
+  headers += -I$(PREFIX)/include/firefox3 \
+             -I$(PREFIX)/include/firefox3/stable \
+             -I$(PREFIX)/include/nspr \
+             -I$(PREFIX)/include/nss \
+             -I$(PREFIX)/include/firefox3/unstable
+endif
+
 # libraries
 libdirs := $(sdkdir)/lib $(sdkdir)/bin
 ifeq ($(wince),1)
@@@@ -202,6 +229,10 @@@@
 
 ifeq ($(os), Linux)
   libs := xpcom_core $(libs)
+else
+ifeq ($(os), FreeBSD)
+  libs := xpcom $(libs)
+endif
 endif
 
 # compiler and Linker Flags
@@@@ -264,6 +295,25 @@@@
              $(sdkdir)/lib/libxpcomglue_s.a \
              $(libdirs) $(libs)
 else
+ifeq ($(os), FreeBSD)
+  libdirs := $(patsubst %,-L%,$(libdirs))
+  libs := $(patsubst %,-l%,$(libs))
+  cppflags += -pipe -O2 \
+              -fPIC -fno-rtti -fno-exceptions -fno-strict-aliasing \
+              -fno-common -pthread \
+              -Wall -Wconversion -Wpointer-arith -Woverloaded-virtual -Wsynth \
+              -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -Wcast-align \
+              -Wno-long-long \
+              -include xpcom-config.h $(headers) \
+              -fshort-wchar
+  ldflags += -pthread -pipe -DMOZILLA_STRICT_API \
+             -Wl,-dead_strip \
+             -Wl,-exported_symbol \
+             -Wl,-z,defs -Wl,-h,WeaveCrypto.so \
+             -Wl,-rpath-link,$(sdkdir)/bin \
+             $(sdkdir)/lib/libxpcomglue_s.a \
+             $(libdirs) $(libs)
+else
 ifeq ($(os), SunOS)
   libdirs := $(patsubst %,-L%,$(libdirs))
   libs := $(patsubst %,-l%,$(libs))
@@@@ -303,6 +353,7 @@@@
 endif
 endif
 endif
+endif
 
 ######################################################################
 
@@@@ -361,6 +412,11 @@@@
 	$(cxx) $(cppflags) -o $@@ $(cpp_sources) $(ldflags)
 	chmod +x $@@
 else
+ifeq ($(os), FreeBSD)
+  $(so_target): $(idl_headers)
+	$(cxx) $(cppflags) -o $@@ $(cpp_sources) $(ldflags)
+	chmod +x $@@
+else
 ifeq ($(os), SunOS)
   $(so_target): $(idl_headers)
 	$(cxx) $(cppflags) -o $@@ $(cpp_sources) $(ldflags)
@@@@ -380,3 +436,4 @@@@
 endif
 endif
 endif
+endif
@


1.4
log
@- Update to 1.1
- Fix amd64 also

PR:		ports/144345
Submitted by:	Grzegorz Blach <magik@@roorback.net> (maintainer)
@
text
@@


1.3
log
@Move over to firefox 3.6 as default.

PR:		143709
Submitted by:	Grzegorz Blach <magik@@roorback.net> (maintainer)
@
text
@d44 1
a44 1
+  arch = x86_64
@


1.2
log
@- Unbreak on 6.x systems

Reported by:	pointyhat
Input from:	Grzegorz Blach <magik@@roorback.net>
@
text
@d3 1
a3 1
@@@@ -45,6 +45,10 @@@@
d8 3
a10 1
+  xpidl = $(PREFIX)/lib/libxul/xpidl -I$(PREFIX)/share/idl/firefox3/stable
d16 1
a16 1
@@@@ -66,6 +70,14 @@@@
d31 1
a31 1
@@@@ -92,6 +104,7 @@@@
d39 1
a39 1
@@@@ -121,6 +134,9 @@@@
d49 1
a49 1
@@@@ -130,6 +146,7 @@@@
d57 1
a57 1
@@@@ -188,6 +205,13 @@@@
d62 2
a63 1
+  headers += -I$(PREFIX)/include/firefox3/stable \
d72 1
a72 1
@@@@ -202,6 +226,10 @@@@
d83 1
a83 1
@@@@ -264,6 +292,25 @@@@
d109 1
a109 1
@@@@ -303,6 +350,7 @@@@
d117 3
a119 3
@@@@ -361,6 +409,11 @@@@
        $(cxx) $(cppflags) -o $@@ $(cpp_sources) $(ldflags)
        chmod +x $@@
d128 2
a129 2
        $(cxx) $(cppflags) -o $@@ $(cpp_sources) $(ldflags)
@@@@ -380,3 +433,4 @@@@
@


1.1
log
@Weave is a Mozilla Labs project to explore ways in which
the browser can broker richer experiences on the Web,
by integrating more closely with online services.

WWW: http://labs.mozilla.com/weave/

PR:		ports/138539
Submitted by:	Grzegorz Blach <magik@@roorback.net>
@
text
@d24 1
a24 1
+  ldflags += -L$(PREFIX)/lib/firefox3 -L$(PREFIX)/lib
@

