From c72a82e32b3e8851de8e37728d1e74d65f79d911 Mon Sep 17 00:00:00 2001 From: joerg Date: Sun, 7 Jun 2009 18:07:00 +0000 Subject: Split pbulk into pbulk-base (the backend programs) and pbulk (rest). --- pkgtools/Makefile | 3 ++- pkgtools/pbulk-base/DESCR | 16 ++++++++++++++++ pkgtools/pbulk-base/Makefile | 34 ++++++++++++++++++++++++++++++++++ pkgtools/pbulk-base/PLIST | 10 ++++++++++ pkgtools/pbulk/DESCR | 19 ++----------------- pkgtools/pbulk/Makefile | 32 +++++++------------------------- pkgtools/pbulk/PLIST | 11 +---------- 7 files changed, 72 insertions(+), 53 deletions(-) create mode 100644 pkgtools/pbulk-base/DESCR create mode 100644 pkgtools/pbulk-base/Makefile create mode 100644 pkgtools/pbulk-base/PLIST (limited to 'pkgtools') diff --git a/pkgtools/Makefile b/pkgtools/Makefile index 9183603d7d3..aff87823ac0 100644 --- a/pkgtools/Makefile +++ b/pkgtools/Makefile @@ -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 diff --git a/pkgtools/pbulk-base/DESCR b/pkgtools/pbulk-base/DESCR new file mode 100644 index 00000000000..2db678a322e --- /dev/null +++ b/pkgtools/pbulk-base/DESCR @@ -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. diff --git a/pkgtools/pbulk-base/Makefile b/pkgtools/pbulk-base/Makefile new file mode 100644 index 00000000000..c8572c71cc0 --- /dev/null +++ b/pkgtools/pbulk-base/Makefile @@ -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" diff --git a/pkgtools/pbulk-base/PLIST b/pkgtools/pbulk-base/PLIST new file mode 100644 index 00000000000..11f15cb65cd --- /dev/null +++ b/pkgtools/pbulk-base/PLIST @@ -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 diff --git a/pkgtools/pbulk/DESCR b/pkgtools/pbulk/DESCR index 24f05660d14..3e678175c70 100644 --- a/pkgtools/pbulk/DESCR +++ b/pkgtools/pbulk/DESCR @@ -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. diff --git a/pkgtools/pbulk/Makefile b/pkgtools/pbulk/Makefile index 96bf14e1275..c6bfe1007ee 100644 --- a/pkgtools/pbulk/Makefile +++ b/pkgtools/pbulk/Makefile @@ -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,12 +43,10 @@ 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} @@ -63,13 +54,4 @@ do-extract: 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" diff --git a/pkgtools/pbulk/PLIST b/pkgtools/pbulk/PLIST index 8a04c96d0a5..827c6393955 100644 --- a/pkgtools/pbulk/PLIST +++ b/pkgtools/pbulk/PLIST @@ -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 -- cgit v1.2.3