Permalink
Browse files

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.
  • Loading branch information...
1 parent 0321ef2 commit 325d8e98d6df2755d91d6ba8110c324178fd9834 joerg committed Sep 11, 2009
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2009/08/12 12:21:39 markd Exp $
-
-SHA1 (gnuradio-3.2.tar.gz) = 3d7e177a57f8c40ec5ac95161f06097872aef1ba
-RMD160 (gnuradio-3.2.tar.gz) = 9d36dc6427eaf59795c8d4853764d5a526cfbce8
-Size (gnuradio-3.2.tar.gz) = 6864952 bytes
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.7 2009/08/12 12:21:39 markd Exp $
-
-SHA1 (gnuradio-3.2.tar.gz) = 3d7e177a57f8c40ec5ac95161f06097872aef1ba
-RMD160 (gnuradio-3.2.tar.gz) = 9d36dc6427eaf59795c8d4853764d5a526cfbce8
-Size (gnuradio-3.2.tar.gz) = 6864952 bytes
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2009/08/12 12:21:39 markd Exp $
-
-SHA1 (gnuradio-3.2.tar.gz) = 3d7e177a57f8c40ec5ac95161f06097872aef1ba
-RMD160 (gnuradio-3.2.tar.gz) = 9d36dc6427eaf59795c8d4853764d5a526cfbce8
-Size (gnuradio-3.2.tar.gz) = 6864952 bytes
@@ -1,21 +1,18 @@
-# $NetBSD: Makefile,v 1.7 2009/05/26 05:55:15 hasso Exp $
+# $NetBSD: Makefile,v 1.8 2009/09/11 16:23:29 joerg Exp $
PKGNAME= gnuradio-core-docs-${VERSION}
COMMENT= GNU Radio core module documentation
-PKGREVISION= 3
+PKGREVISION= 4
+
+PKG_DESTDIR_SUPPORT= user-destdir
.include "../../meta-pkgs/gnuradio/Makefile.common"
-USE_TOOLS= make pkg-config
CONFIGURE_ARGS+=--enable-doxygen
BUILD_DEPENDS+=doxygen>=1.5.7.1:../../devel/doxygen
-do-build:
- cd ${WRKSRC}/gnuradio-core/doc && make
-
-do-install:
- cd ${WRKSRC}/gnuradio-core/doc && make install
+BUILD_DIRS= docs
.include "../../ham/gnuradio-core/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
View

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2007/08/08 03:07:46 wulf Exp $
-
-SHA1 (gnuradio-3.0.4.tar.gz) = ce2d0bd4c5217cdda8c675c80a446ca38f274121
-RMD160 (gnuradio-3.0.4.tar.gz) = a1d4ae0495f51c5b7349dd8d1305b4bfb16056dc
-Size (gnuradio-3.0.4.tar.gz) = 3381051 bytes
-SHA1 (patch-aa) = 20874513ffef211a5543955356e898efbfb76fc4
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/11/13 17:09:10 wulf Exp $
-
---- gnuradio-core/doc/Makefile.in.orig 2006-11-12 03:20:10.000000000 +1030
-+++ gnuradio-core/doc/Makefile.in 2006-11-12 03:20:26.000000000 +1030
-@@ -307,7 +307,7 @@
- build_vendor = @build_vendor@
- datadir = @datadir@
- datarootdir = @datarootdir@
--docdir = $(prefix)/share/doc/@PACKAGE@-@VERSION@
-+docdir = $(prefix)/share/doc/@PACKAGE@-@VERSION@/core
- dvidir = @dvidir@
- enable_dot = @enable_dot@
- enable_html_docs = @enable_html_docs@
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/08/12 12:21:39 markd Exp $
+# $NetBSD: Makefile,v 1.19 2009/09/11 16:23:28 joerg Exp $
PKGNAME= gnuradio-core-${VERSION}
COMMENT= Runtime system and DSP blocks for GNU Radio
@@ -7,8 +7,6 @@ PKG_DESTDIR_SUPPORT= user-destdir
.include "../../meta-pkgs/gnuradio/Makefile.common"
-PATCHDIR= ${.CURDIR}/../../ham/gnuradio-core/patches
-
CONF_FILES+= ${EGDIR}/gnuradio-core.conf ${PKG_SYSCONFDIR}/gnuradio-core.conf
CONFIGURE_ARGS+=--enable-gnuradio-core
CONFIGURE_ARGS+=--enable-omnithread
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.6 2009/08/12 12:21:40 markd Exp $
-
-SHA1 (gnuradio-3.2.tar.gz) = 3d7e177a57f8c40ec5ac95161f06097872aef1ba
-RMD160 (gnuradio-3.2.tar.gz) = 9d36dc6427eaf59795c8d4853764d5a526cfbce8
-Size (gnuradio-3.2.tar.gz) = 6864952 bytes
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.7 2009/08/12 12:21:40 markd Exp $
-
-SHA1 (gnuradio-3.2.tar.gz) = 3d7e177a57f8c40ec5ac95161f06097872aef1ba
-RMD160 (gnuradio-3.2.tar.gz) = 9d36dc6427eaf59795c8d4853764d5a526cfbce8
-Size (gnuradio-3.2.tar.gz) = 6864952 bytes
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/07/14 12:56:06 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2009/09/11 16:23:29 joerg Exp $
DISTNAME= gr-howto-write-a-block-${VERSION}
CATEGORIES= ham
@@ -9,6 +9,9 @@ PKG_DESTDIR_SUPPORT= user-destdir
.include "../../meta-pkgs/gnuradio/Makefile.common"
+DISTINFO_FILE= ${.CURDIR}/distinfo
+PATCHDIR= ${.CURDIR}/patches
+
PY_PATCHPLIST= yes
PYTHON_PATCH_SCRIPTS+= src/python/qa_howto.py
PYTHON_PATCH_SCRIPTS+= doc/qa_howto_1.py
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2009/08/12 12:21:40 markd Exp $
-
-SHA1 (gnuradio-3.2.tar.gz) = 3d7e177a57f8c40ec5ac95161f06097872aef1ba
-RMD160 (gnuradio-3.2.tar.gz) = 9d36dc6427eaf59795c8d4853764d5a526cfbce8
-Size (gnuradio-3.2.tar.gz) = 6864952 bytes
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2009/08/12 12:21:40 markd Exp $
-
-SHA1 (gnuradio-3.2.tar.gz) = 3d7e177a57f8c40ec5ac95161f06097872aef1ba
-RMD160 (gnuradio-3.2.tar.gz) = 9d36dc6427eaf59795c8d4853764d5a526cfbce8
-Size (gnuradio-3.2.tar.gz) = 6864952 bytes
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.7 2009/08/12 12:21:41 markd 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-ad) = 496fad80b4050a08c0f4e5197d491e7be6828c50
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2009/08/12 12:21:41 markd Exp $
-
-SHA1 (gnuradio-3.2.tar.gz) = 3d7e177a57f8c40ec5ac95161f06097872aef1ba
-RMD160 (gnuradio-3.2.tar.gz) = 9d36dc6427eaf59795c8d4853764d5a526cfbce8
-Size (gnuradio-3.2.tar.gz) = 6864952 bytes
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.7 2009/08/12 12:21:41 markd Exp $
-
-SHA1 (gnuradio-3.2.tar.gz) = 3d7e177a57f8c40ec5ac95161f06097872aef1ba
-RMD160 (gnuradio-3.2.tar.gz) = 9d36dc6427eaf59795c8d4853764d5a526cfbce8
-Size (gnuradio-3.2.tar.gz) = 6864952 bytes
View
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2009/08/12 12:21:41 markd Exp $
-
-SHA1 (gnuradio-3.2.tar.gz) = 3d7e177a57f8c40ec5ac95161f06097872aef1ba
-RMD160 (gnuradio-3.2.tar.gz) = 9d36dc6427eaf59795c8d4853764d5a526cfbce8
-Size (gnuradio-3.2.tar.gz) = 6864952 bytes
View
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.8 2009/08/12 12:21:41 markd 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) = bfd82ea0e6dd7ed0fc5194d0027323a4adbb306b
@@ -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
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.12 2009/08/24 05:33:04 hasso Exp $
+$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
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2009/08/12 12:21:40 markd Exp $
+$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
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2009/08/24 05:33:04 hasso Exp $
+$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
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2009/08/12 12:21:41 markd Exp $
+$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
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1 2009/08/12 12:21:41 markd Exp $
+$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

0 comments on commit 325d8e9

Please sign in to comment.