update Sun Jun 20 18:37:00 PDT 2010

diff --git a/cross/avr-gcc/distinfo b/cross/avr-gcc/distinfo
index e2e689b..4eabb36 100644 (file)
--- a/cross/avr-gcc/distinfo
+++ b/cross/avr-gcc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2009/08/27 15:29:37 hasso Exp $
+$NetBSD: distinfo,v 1.5 2010/06/20 22:20:18 tron Exp $
 
 SHA1 (gcc-core-4.4.1.tar.bz2) = 7e18b5f49b77a78e0ccd31c82c6220c5756da754
 RMD160 (gcc-core-4.4.1.tar.bz2) = 6545aea8ad1c9ae55cb0f12991456a0dd3bc490d
@@ -8,3 +8,4 @@ RMD160 (gcc-g++-4.4.1.tar.bz2) = 67b2774d14eea8272b214f0d879e70fb6920b3bf
 Size (gcc-g++-4.4.1.tar.bz2) = 5936040 bytes
 SHA1 (patch-aa) = 17ee1942842186c4336d72bb8223bdb3023c85c1
 SHA1 (patch-ab) = 4a3ab9719a6714933954a120ad8c594c3a4a2e1f
+SHA1 (patch-ac) = 14dbe72be88bd6fb0fd8671494454a6d4c11c4b7

diff --git a/cross/avr-gcc/patches/patch-ac b/cross/avr-gcc/patches/patch-ac
new file mode 100644 (file)
index 0000000..ea519ab
--- /dev/null
+++ b/cross/avr-gcc/patches/patch-ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.3 2010/06/20 22:20:18 tron Exp $
+
+Avoid linking "tree-inline.o" twice which breaks the build under Mac OS X.
+
+--- gcc/cp/Make-lang.in.orig   2008-12-05 08:01:58.000000000 +0000
++++ gcc/cp/Make-lang.in        2010-06-20 23:11:07.000000000 +0100
+@@ -72,8 +72,8 @@
+ # Shared with C front end:
+ CXX_C_OBJS = attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o \
+       c-dump.o $(CXX_TARGET_OBJS) c-pretty-print.o c-opts.o c-pch.o \
+-      incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o \
+-      c-gimplify.o c-omp.o tree-inline.o
++      incpath.o c-ppoutput.o c-cppbuiltin.o prefix.o \
++      c-gimplify.o c-omp.o
+ 
+ # Language-specific object files for C++ and Objective C++.
+ CXX_AND_OBJCXX_OBJS = cp/call.o cp/decl.o cp/expr.o cp/pt.o cp/typeck2.o \

diff --git a/wip/siproxd/Makefile b/wip/siproxd/Makefile
index 413048a..8a067c5 100644 (file)
--- a/wip/siproxd/Makefile
+++ b/wip/siproxd/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=      siproxd-0.7.2
+DISTNAME=      siproxd-0.8.0
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=siproxd/}
 
@@ -28,5 +28,13 @@ INSTALLATION_DIRS=   sbin share/examples/siproxd
 PTHREAD_LIBS+= ${PTHREAD_LDFLAGS}
 # needed since siproxd's configure does not check for PTHREAD_LDFLAGS
 
+# work around a bug present in siproxd 0.8.0's Makefile
+# probably no longer needed for later versions
+SUBST_CLASSES+=        libltdl
+SUBST_STAGE.libltdl=   post-patch
+SUBST_FILES.libltdl=   Makefile.in
+SUBST_SED.libltdl=     -e 's/libltdl //g'
+
 .include "../../devel/libosip/buildlink3.mk"
+.include "../../devel/libltdl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

diff --git a/wip/siproxd/distinfo b/wip/siproxd/distinfo
index af0879f..0d9b0a7 100644 (file)
--- a/wip/siproxd/distinfo
+++ b/wip/siproxd/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (siproxd-0.7.2.tar.gz) = 6548767f720516e1d316ff875f68e251022b2f23
-RMD160 (siproxd-0.7.2.tar.gz) = 57697434c20042dbb3063233431cc3e58d6e8596
-Size (siproxd-0.7.2.tar.gz) = 821009 bytes
+SHA1 (siproxd-0.8.0.tar.gz) = d2f23a01ea60e3648efd46136e02bc84d1e934a1
+RMD160 (siproxd-0.8.0.tar.gz) = 447bc8891632dc23a7685af8d2e958fb5ee9cfb2
+Size (siproxd-0.8.0.tar.gz) = 824404 bytes
 SHA1 (patch-aa) = 79337bc117ae7e63698530dac680af055aae36b6