Mark gnuradio packages as not MAKE_JOBS_SAFE.

Share patches and distinfo, overwrite for gnuradio-howto as the only
exception.
Fix gnuradio-core-docs to do something useful and mark it as user-destdir
ready.

6 files changed, 114 insertions, 1 deletions

diff --git a/meta-pkgs/gnuradio/Makefile.common b/meta-pkgs/gnuradio/Makefile.common
index 08c7c6dca7d..a4308bb7db9 100644
--- a/meta-pkgs/gnuradio/Makefile.common
+++ b/meta-pkgs/gnuradio/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2009/08/12 12:20:04 markd Exp $
+# $NetBSD: Makefile.common,v 1.15 2009/09/11 16:23:31 joerg Exp $
 #
 # This Makefile fragment is included at the top of package Makefiles for
 # GNU Radio distributed packages (they all share common configure and build
@@ -19,6 +19,11 @@ GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake automake autoconf pkg-config
 
+MAKE_JOBS_SAFE=	no
+
+DISTINFO_FILE=		${.CURDIR}/../../meta-pkgs/gnuradio/distinfo
+PATCHDIR=		${.CURDIR}/../../meta-pkgs/gnuradio/patches
+
 BUILD_DEPENDS+=doxygen>=1.5.1:../../devel/doxygen
 
 PY_PATCHPLIST=	yes
diff --git a/meta-pkgs/gnuradio/distinfo b/meta-pkgs/gnuradio/distinfo
new file mode 100644
index 00000000000..cbbd3299bf6
--- /dev/null
+++ b/meta-pkgs/gnuradio/distinfo
@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.1 2009/09/11 16:23:31 joerg Exp $
+
+SHA1 (gnuradio-3.2.tar.gz) = 3d7e177a57f8c40ec5ac95161f06097872aef1ba
+RMD160 (gnuradio-3.2.tar.gz) = 9d36dc6427eaf59795c8d4853764d5a526cfbce8
+Size (gnuradio-3.2.tar.gz) = 6864952 bytes
+SHA1 (patch-aa) = 08c9b0fc725bcb2f6795445cbd64af431f9ce9a1
+SHA1 (patch-ab) = f7db7741c27b3dd32eb104637b537b304234d12c
+SHA1 (patch-ac) = bfd82ea0e6dd7ed0fc5194d0027323a4adbb306b
+SHA1 (patch-ad) = 496fad80b4050a08c0f4e5197d491e7be6828c50
diff --git a/meta-pkgs/gnuradio/patches/patch-aa b/meta-pkgs/gnuradio/patches/patch-aa
new file mode 100644
index 00000000000..b442a2f0fba
--- /dev/null
+++ b/meta-pkgs/gnuradio/patches/patch-aa
@@ -0,0 +1,32 @@
+$NetBSD: patch-aa,v 1.1 2009/09/11 16:24:31 joerg Exp $
+
+--- gnuradio-core/src/lib/runtime/gr_dispatcher.cc.orig	2008-05-09 18:35:10.000000000 +1200
++++ gnuradio-core/src/lib/runtime/gr_dispatcher.cc
+@@ -30,18 +30,17 @@
+ #include <stdio.h>
+ 
+ #ifdef HAVE_SELECT
++#  ifdef HAVE_SYS_TIME_H
++#    include <sys/time.h>
++#  endif
+ #  ifdef HAVE_SYS_SELECT_H
+ #    include <sys/select.h>
+-#  else
+-#    ifdef HAVE_SYS_TIME_H
+-#      include <sys/time.h>
+-#    endif
+-#    ifdef HAVE_SYS_TYPES_H
+-#      include <sys/types.h>
+-#    endif
+-#    ifdef HAVE_UNISTD_H
+-#      include <unistd.h>
+-#    endif
++#  endif
++#  ifdef HAVE_SYS_TYPES_H
++#    include <sys/types.h>
++#  endif
++#  ifdef HAVE_UNISTD_H
++#    include <unistd.h>
+ #  endif
+ #endif
+ 
diff --git a/meta-pkgs/gnuradio/patches/patch-ab b/meta-pkgs/gnuradio/patches/patch-ab
new file mode 100644
index 00000000000..e279abb0b6e
--- /dev/null
+++ b/meta-pkgs/gnuradio/patches/patch-ab
@@ -0,0 +1,21 @@
+$NetBSD: patch-ab,v 1.1 2009/09/11 16:24:31 joerg Exp $
+
+--- config/gr_python.m4.orig	2009-08-23 23:30:58 +0300
++++ config/gr_python.m4	2009-08-23 23:32:15 +0300
+@@ -36,6 +36,8 @@ AC_DEFUN([PYTHON_DEVEL],[
+ 	# if we're cross-compiling, asking the host python about any of
+ 	# this is completely useless...
+ 
++	AC_LANG_PUSH([C])
++
+ 	if test x$cross_compiling != xno
+ 	then
+ 		pythondir=$with_pythondir
+@@ -124,6 +126,7 @@ print path
+ 	    esac
+ 
+ 	    AC_SUBST(PYTHON_LDFLAGS)
++	    AC_LANG_POP
+ 	fi
+ ])
+ 
diff --git a/meta-pkgs/gnuradio/patches/patch-ac b/meta-pkgs/gnuradio/patches/patch-ac
new file mode 100644
index 00000000000..2a957fe4d99
--- /dev/null
+++ b/meta-pkgs/gnuradio/patches/patch-ac
@@ -0,0 +1,34 @@
+$NetBSD: patch-ac,v 1.1 2009/09/11 16:24:31 joerg Exp $
+
+--- usrp/doc/Makefile.am.orig	2009-03-16 07:44:27.000000000 +1300
++++ usrp/doc/Makefile.am
+@@ -44,7 +44,7 @@ DOCBOOK_HTML_FILES=
+ all-local: dox
+ endif
+ 
+-dist_usrp_doc_DATA = $(top_srcdir)/usrp/README
++# dist_usrp_doc_DATA = $(top_srcdir)/usrp/README
+ 
+ dox: html/index.html
+ html/index.html:
+@@ -56,13 +56,13 @@ docbook-html: usrp_guide.html
+ usrp_guide.html: usrp_guide.xml
+ 	xmlto html-nochunks $(top_srcdir)/usrp/doc/usrp_guide.xml
+ 
+-install-data-local:
+-	$(MKDIR_P) $(DESTDIR)$(usrp_docdir)/html
+-	@for i in $(DOCBOOK_HTML_FILES); do \
+-		echo "$(INSTALL_DATA) $$i $(DESTDIR)$(usrp_docdir)/html"; \
+-		$(INSTALL_DATA) $$i $(DESTDIR)$(usrp_docdir)/html; \
+-	done
+-	cp -r html $(DESTDIR)$(usrp_docdir)
++#install-data-local:
++#	$(MKDIR_P) $(DESTDIR)$(usrp_docdir)/html
++#	@for i in $(DOCBOOK_HTML_FILES); do \
++#		echo "$(INSTALL_DATA) $$i $(DESTDIR)$(usrp_docdir)/html"; \
++#		$(INSTALL_DATA) $$i $(DESTDIR)$(usrp_docdir)/html; \
++#	done
++#	cp -r html $(DESTDIR)$(usrp_docdir)
+ 
+ uninstall-local:
+ 	$(RM) -fr $(DESTDIR)$(usrp_docdir)/html
diff --git a/meta-pkgs/gnuradio/patches/patch-ad b/meta-pkgs/gnuradio/patches/patch-ad
new file mode 100644
index 00000000000..f06d37c26d2
--- /dev/null
+++ b/meta-pkgs/gnuradio/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2009/09/11 16:24:31 joerg Exp $
+
+--- config/grc_usrp.m4.orig	2009-06-05 17:12:19.000000000 +1200
++++ config/grc_usrp.m4
+@@ -19,6 +19,7 @@ dnl Boston, MA 02110-1301, USA.
+ 
+ AC_DEFUN([GRC_USRP],[
+     GRC_ENABLE(usrp)
++    GRC_WITH(usrp)
+ 
+     dnl Don't do usrp if omnithread skipped
+     GRC_CHECK_DEPENDENCY(usrp, omnithread)