Permalink
Browse files

Split pbulk into pbulk-base (the backend programs) and pbulk (rest).

  • Loading branch information...
1 parent 4a01335 commit 03e0ba966aaf6f08adaa936ce2851dac94ec8e3f joerg committed Jun 7, 2009
Showing with 72 additions and 53 deletions.
  1. +2 −1 pkgtools/Makefile
  2. +16 −0 pkgtools/pbulk-base/DESCR
  3. +34 −0 pkgtools/pbulk-base/Makefile
  4. +10 −0 pkgtools/pbulk-base/PLIST
  5. +2 −17 pkgtools/pbulk/DESCR
  6. +7 −25 pkgtools/pbulk/Makefile
  7. +1 −10 pkgtools/pbulk/PLIST
View
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2009/01/08 00:26:05 jmcneill Exp $
+# $NetBSD: Makefile,v 1.94 2009/06/07 18:07:00 joerg Exp $
#
COMMENT= Tools for use in the packages collection
@@ -22,6 +22,7 @@ SUBDIR+= mtree
SUBDIR+= p5-pkgsrc-Dewey
SUBDIR+= packagekit
SUBDIR+= pbulk
+SUBDIR+= pbulk-base
SUBDIR+= pkg_alternatives
SUBDIR+= pkg_chk
SUBDIR+= pkg_comp
View
@@ -0,0 +1,16 @@
+pbulk is the modular bulk build framework for pkgsrc.
+
+This package contains the core components:
+
+- pbulk-scan, a program to scan the entire pkgsrc tree
+ or a list of directories therein for packages and
+ dependencies. Distributed operation using a master/client
+ mode is supported.
+
+- pbulk-resolve, a program to resolve the dependencies
+ from the output of pbulk-scan
+
+- pbulk-build, the build scheduler. Distributed builds via TCP
+ are supported.
+
+This package does not contain the script logic to build actual packages.
@@ -0,0 +1,34 @@
+# $NetBSD: Makefile,v 1.1 2009/06/07 18:07:00 joerg Exp $
+
+DISTNAME= pbulk-base-0.38
+COMMENT= Core components of the modular bulk build framework
+
+PKG_DESTDIR_SUPPORT= user-destdir
+
+.include "../../pkgtools/pbulk/Makefile.common"
+
+USE_FEATURES= nbcompat
+USE_TOOLS+= groff nroff
+
+INSTALLATION_DIRS= bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
+USE_BSD_MAKEFILE= yes
+
+CONFLICTS= pbulk<0.39
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+LDADD+= -lsocket -lresolv
+MAKE_ENV+= LDADD=${LDADD:Q}
+.endif
+
+.if ${OPSYS} == "Linux"
+CPPFLAGS+= -D_GNU_SOURCE
+.endif
+
+BUILD_DIRS= lib pbuild presolve pscan
+
+do-extract:
+ ${CP} -r ${FILESDIR}/pbulk ${WRKDIR}
+
+.include "../../mk/bsd.pkg.mk"
View
@@ -0,0 +1,10 @@
+@comment $NetBSD: PLIST,v 1.1 2009/06/07 18:07:00 joerg Exp $
+bin/pbulk-build
+bin/pbulk-resolve
+bin/pbulk-scan
+man/cat1/pbulk-build.0
+man/cat1/pbulk-resolve.0
+man/cat1/pbulk-scan.0
+man/man1/pbulk-build.1
+man/man1/pbulk-resolve.1
+man/man1/pbulk-scan.1
View
@@ -1,19 +1,4 @@
pbulk is the modular bulk build framework for pkgsrc.
-This package contains:
-
-- pbulk-scan, a program to scan the entire pkgsrc tree
- or a list of directories therein for packages and
- dependencies. Distributed operation using a master/client
- mode is supported.
-
-- pbulk-resolve, a program to resolve the dependencies
- from the output of pbulk-scan
-
-- pbulk-build, the build scheduler. Distributed builds via TCP
- are supported.
-
-- bulkbuild and related scripts to implement full and limited
- bulk builds on top of those programs.
-
-The pbulk framework is considered experimental.
+This package contains the front end bulk build and the script logic
+for full and limited bulk builds.
View
@@ -1,23 +1,16 @@
-# $NetBSD: Makefile,v 1.52 2009/06/07 17:59:50 joerg Exp $
+# $NetBSD: Makefile,v 1.53 2009/06/07 18:07:00 joerg Exp $
-DISTNAME= pbulk-0.38
-CATEGORIES= pkgtools
-MASTER_SITES= # empty
-DISTFILES= # empty
-
-MAINTAINER= joerg@NetBSD.org
-HOMEPAGE= ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
+DISTNAME= pbulk-0.39
COMMENT= Modular bulk build framework
PKG_DESTDIR_SUPPORT= user-destdir
-WRKSRC= ${WRKDIR}/pbulk
-MAKE_JOBS_SAFE= no
+.include "../../pkgtools/pbulk/Makefile.common"
-USE_FEATURES= nbcompat
USE_TOOLS+= awk:run bzip2:run digest:run gzip:run ident:run make:run \
- mail:run sed:run tar:run groff nroff
+ mail:run sed:run tar:run
DEPENDS+= rsync-[0-9]*:../../net/rsync
+DEPENDS+= pbulk-base>=0.38:../../pkgtools/pbulk-base
.include "../../mk/bsd.prefs.mk"
@@ -50,26 +43,15 @@ CONF_FILES+= share/examples/pbulk/pbulk.conf ${PKG_SYSCONFDIR}/pbulk.conf
PBULK_CONFIG= ${PKG_SYSCONFDIR}/pbulk.conf
PBULK_CONFIG_VERSION= 0.34
-INSTALLATION_DIRS= bin libexec/pbulk \
- ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1 \
- share/examples/pbulk
+INSTALLATION_DIRS= bin libexec/pbulk share/examples/pbulk
USE_BSD_MAKEFILE= yes
-.include "../../mk/bsd.prefs.mk"
+BUILD_DIRS= scripts
do-extract:
${CP} -r ${FILESDIR}/pbulk ${WRKDIR}
post-install:
${INSTALL_DATA} ${WRKSRC}/pbulk.conf ${DESTDIR}${PREFIX}/share/examples/pbulk/pbulk.conf
-.if ${OPSYS} == "SunOS"
-LDADD+= -lsocket -lresolv
-MAKE_ENV+= LDADD=${LDADD:Q}
-.endif
-
-.if ${OPSYS} == "Linux"
-CPPFLAGS+= -D_GNU_SOURCE
-.endif
-
.include "../../mk/bsd.pkg.mk"
View
@@ -1,10 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2008/04/04 17:58:59 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/06/07 18:07:00 joerg Exp $
bin/bulkbuild
bin/bulkbuild-rebuild
bin/bulkbuild-restart
-bin/pbulk-build
-bin/pbulk-resolve
-bin/pbulk-scan
libexec/pbulk/build
libexec/pbulk/build-client-start
libexec/pbulk/client-clean
@@ -20,12 +17,6 @@ libexec/pbulk/report
libexec/pbulk/scan
libexec/pbulk/scan-client-start
libexec/pbulk/upload
-man/cat1/pbulk-build.0
-man/cat1/pbulk-resolve.0
-man/cat1/pbulk-scan.0
-man/man1/pbulk-build.1
-man/man1/pbulk-resolve.1
-man/man1/pbulk-scan.1
share/examples/pbulk/pbulk.conf
@dirrm share/examples/pbulk
@dirrm libexec/pbulk

0 comments on commit 03e0ba9

Please sign in to comment.