From 264cd5e8126f6164835646ac28ad7c4fc520aab8 Mon Sep 17 00:00:00 2001 From: Yuuki Enomoto Date: Sat, 11 Jan 2020 15:36:47 +0900 Subject: [PATCH] basepkg: Update wip/basepkg to 1.7 Changes: * Remove basepkg's sets/lists directory * Remove any metadata same as NetBSD upstream * install, deinstall, essentials are keeping * Replace option --setsdir to --src to refer NetBSD source tree --- basepkg/DESCR | 6 +- basepkg/Makefile | 22 ++-- basepkg/PLIST | 321 +---------------------------------------------- basepkg/distinfo | 8 +- 4 files changed, 26 insertions(+), 331 deletions(-) diff --git a/basepkg/DESCR b/basepkg/DESCR index bb520f15bc..9d918ef005 100644 --- a/basepkg/DESCR +++ b/basepkg/DESCR @@ -1,8 +1,10 @@ -The basepkg is a build framework for NetBSD base system packages. +The basepkg is a build framework for NetBSD base system packages to make an +experiment for NetBSD syspkg. + It aims which makes it possible to managing NetBSD base system based on package like as Debian apt, RHEL yum, and others. -The basepkg.sh builds all categories packages into the "packages" directory. +The basepkg.sh builds all category packages into the "packages" directory. We can manage these packages to own NetBSD system using pkg_add(1), pkg_delete(1) and pkg_info(1) same as pkgsrc(7). diff --git a/basepkg/Makefile b/basepkg/Makefile index 9ef33c1452..2d5b390f42 100644 --- a/basepkg/Makefile +++ b/basepkg/Makefile @@ -1,15 +1,15 @@ # $NetBSD$ -DISTNAME= basepkg-1.6.6 +DISTNAME= basepkg-1.7 CATEGORIES= pkgtools MASTER_SITES= ${MASTER_SITE_GITHUB:=user340/} MAINTAINER= uki@e-yuuki.org HOMEPAGE= https://github.com/user340/ -COMMENT= NetBSD system packages +COMMENT= NetBSD system packages (Experimental stage of syspkg) LICENSE= 2-clause-bsd -DEPENDS+= pkg_install>=20170419:../../pkgtools/pkg_install +DEPENDS+= pkg_install>=20191008:../../pkgtools/pkg_install NO_CONFIGURE= yes NO_BUILD= yes @@ -19,22 +19,24 @@ WRKSRC= ${WRKDIR}/${DISTNAME} USE_LANGUAGES= # none USE_TOOLS+= pax -INSTALLATION_DIRS+= basepkg basepkg/sets basepkg/distrib/www.must-have-coffee.gen.nz/lloyd ${PKGMANDIR}/man1 +do-build: + sed -e 's|^libbasepkg="./lib"|libbasepkg="${PREFIX}/basepkg/lib"|' ${WRKSRC}/basepkg.sh > ${WRKSRC}/basepkg.sh.new + mv ${WRKSRC}/basepkg.sh.new ${WRKSRC}/basepkg.sh do-install: ${INSTALL_SCRIPT} ${WRKSRC}/basepkg.sh ${DESTDIR}${PREFIX}/basepkg + ${INSTALL_SCRIPT} ${WRKSRC}/lib/Command ${DESTDIR}${PREFIX}/basepkg/lib/Command + ${INSTALL_SCRIPT} ${WRKSRC}/lib/Common ${DESTDIR}${PREFIX}/basepkg/lib/Common + ${INSTALL_SCRIPT} ${WRKSRC}/lib/Logging ${DESTDIR}${PREFIX}/basepkg/lib/Logging + ${INSTALL_SCRIPT} ${WRKSRC}/lib/NetBSD ${DESTDIR}${PREFIX}/basepkg/lib/NetBSD + ${INSTALL_SCRIPT} ${WRKSRC}/lib/Package ${DESTDIR}${PREFIX}/basepkg/lib/Package + ${INSTALL_SCRIPT} ${WRKSRC}/lib/valid_MACHINE_ARCH ${DESTDIR}${PREFIX}/basepkg/lib/valid_MACHINE_ARCH ${INSTALL_MAN} ${WRKSRC}/man/man1/basepkg.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_MAN} ${WRKSRC}/man/man1/basepkg.sh.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/basepkg/README ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${PREFIX}/basepkg/LICENSE - ${INSTALL_DATA} ${WRKSRC}/distrib/www.must-have-coffee.gen.nz/lloyd/README ${DESTDIR}${PREFIX}/basepkg/distrib/www.must-have-coffee.gen.nz/lloyd - ${INSTALL_DATA} ${WRKSRC}/distrib/www.must-have-coffee.gen.nz/lloyd/syspkg-fixes-6.diff ${DESTDIR}${PREFIX}/basepkg/distrib/www.must-have-coffee.gen.nz/lloyd - ${INSTALL_DATA} ${WRKSRC}/sets/comments ${DESTDIR}${PREFIX}/basepkg/sets/comments - ${INSTALL_DATA} ${WRKSRC}/sets/deps ${DESTDIR}${PREFIX}/basepkg/sets/deps - ${INSTALL_DATA} ${WRKSRC}/sets/descrs ${DESTDIR}${PREFIX}/basepkg/sets/descrs ${INSTALL_DATA} ${WRKSRC}/sets/install ${DESTDIR}${PREFIX}/basepkg/sets/install ${INSTALL_DATA} ${WRKSRC}/sets/deinstall ${DESTDIR}${PREFIX}/basepkg/sets/deinstall ${INSTALL_DATA} ${WRKSRC}/sets/essentials ${DESTDIR}${PREFIX}/basepkg/sets/essentials - cd ${WRKSRC}/sets && ${PAX} -wr lists ${DESTDIR}${PREFIX}/basepkg/sets .include "../../mk/bsd.pkg.mk" diff --git a/basepkg/PLIST b/basepkg/PLIST index 616af0aba0..c8d9eb5bb6 100644 --- a/basepkg/PLIST +++ b/basepkg/PLIST @@ -2,323 +2,14 @@ basepkg/LICENSE basepkg/README basepkg/basepkg.sh -basepkg/distrib/www.must-have-coffee.gen.nz/lloyd/README -basepkg/distrib/www.must-have-coffee.gen.nz/lloyd/syspkg-fixes-6.diff -basepkg/sets/comments +basepkg/lib/Command +basepkg/lib/Common +basepkg/lib/Logging +basepkg/lib/NetBSD +basepkg/lib/Package +basepkg/lib/valid_MACHINE_ARCH basepkg/sets/deinstall -basepkg/sets/deps -basepkg/sets/descrs basepkg/sets/essentials basepkg/sets/install -basepkg/sets/lists/base/ad.aarch64 -basepkg/sets/lists/base/ad.arm -basepkg/sets/lists/base/ad.arm.shl -basepkg/sets/lists/base/ad.m68000 -basepkg/sets/lists/base/ad.m68k -basepkg/sets/lists/base/ad.m68k.shl -basepkg/sets/lists/base/ad.mips -basepkg/sets/lists/base/ad.powerpc -basepkg/sets/lists/base/ad.riscv -basepkg/sets/lists/base/md.acorn32 -basepkg/sets/lists/base/md.alpha -basepkg/sets/lists/base/md.amd64 -basepkg/sets/lists/base/md.amiga -basepkg/sets/lists/base/md.arc -basepkg/sets/lists/base/md.atari -basepkg/sets/lists/base/md.bebox -basepkg/sets/lists/base/md.cats -basepkg/sets/lists/base/md.cobalt -basepkg/sets/lists/base/md.emips -basepkg/sets/lists/base/md.evbmips -basepkg/sets/lists/base/md.ews4800mips -basepkg/sets/lists/base/md.hp300 -basepkg/sets/lists/base/md.hpcarm -basepkg/sets/lists/base/md.hpcmips -basepkg/sets/lists/base/md.hpcsh -basepkg/sets/lists/base/md.hppa -basepkg/sets/lists/base/md.i386 -basepkg/sets/lists/base/md.ia64 -basepkg/sets/lists/base/md.landisk -basepkg/sets/lists/base/md.luna68k -basepkg/sets/lists/base/md.mac68k -basepkg/sets/lists/base/md.macppc -basepkg/sets/lists/base/md.mipsco -basepkg/sets/lists/base/md.mmeye -basepkg/sets/lists/base/md.mvme68k -basepkg/sets/lists/base/md.mvmeppc -basepkg/sets/lists/base/md.netwinder -basepkg/sets/lists/base/md.news68k -basepkg/sets/lists/base/md.newsmips -basepkg/sets/lists/base/md.next68k -basepkg/sets/lists/base/md.ofppc -basepkg/sets/lists/base/md.pmax -basepkg/sets/lists/base/md.prep -basepkg/sets/lists/base/md.rs6000 -basepkg/sets/lists/base/md.sandpoint -basepkg/sets/lists/base/md.sbmips -basepkg/sets/lists/base/md.sgimips -basepkg/sets/lists/base/md.shark -basepkg/sets/lists/base/md.sparc -basepkg/sets/lists/base/md.sparc64 -basepkg/sets/lists/base/md.sun2 -basepkg/sets/lists/base/md.sun3 -basepkg/sets/lists/base/md.vax -basepkg/sets/lists/base/md.x68k -basepkg/sets/lists/base/mi -basepkg/sets/lists/base/module.mi -basepkg/sets/lists/base/rescue.ad.arm -basepkg/sets/lists/base/rescue.ad.m68k -basepkg/sets/lists/base/rescue.ad.m68k.shl -basepkg/sets/lists/base/rescue.i386 -basepkg/sets/lists/base/rescue.mac68k -basepkg/sets/lists/base/rescue.macppc -basepkg/sets/lists/base/rescue.mi -basepkg/sets/lists/base/rescue.shark -basepkg/sets/lists/base/rescue.sparc -basepkg/sets/lists/base/rescue.sparc64 -basepkg/sets/lists/base/rescue.sun2 -basepkg/sets/lists/base/rescue.vax -basepkg/sets/lists/base/shl.mi -basepkg/sets/lists/comp/ad.aarch64 -basepkg/sets/lists/comp/ad.arm -basepkg/sets/lists/comp/ad.arm.shl -basepkg/sets/lists/comp/ad.hppa -basepkg/sets/lists/comp/ad.m68k -basepkg/sets/lists/comp/ad.m68k.shl -basepkg/sets/lists/comp/ad.mips -basepkg/sets/lists/comp/ad.powerpc -basepkg/sets/lists/comp/ad.riscv -basepkg/sets/lists/comp/ad.sh3 -basepkg/sets/lists/comp/md.algor -basepkg/sets/lists/comp/md.alpha -basepkg/sets/lists/comp/md.amd64 -basepkg/sets/lists/comp/md.amiga -basepkg/sets/lists/comp/md.amigappc -basepkg/sets/lists/comp/md.arc -basepkg/sets/lists/comp/md.atari -basepkg/sets/lists/comp/md.bebox -basepkg/sets/lists/comp/md.cesfic -basepkg/sets/lists/comp/md.cobalt -basepkg/sets/lists/comp/md.dreamcast -basepkg/sets/lists/comp/md.emips -basepkg/sets/lists/comp/md.evbcf -basepkg/sets/lists/comp/md.evbmips -basepkg/sets/lists/comp/md.evbppc -basepkg/sets/lists/comp/md.evbsh3 -basepkg/sets/lists/comp/md.ews4800mips -basepkg/sets/lists/comp/md.hp300 -basepkg/sets/lists/comp/md.hpcmips -basepkg/sets/lists/comp/md.hpcsh -basepkg/sets/lists/comp/md.hppa -basepkg/sets/lists/comp/md.i386 -basepkg/sets/lists/comp/md.ia64 -basepkg/sets/lists/comp/md.ibmnws -basepkg/sets/lists/comp/md.landisk -basepkg/sets/lists/comp/md.luna68k -basepkg/sets/lists/comp/md.mac68k -basepkg/sets/lists/comp/md.macppc -basepkg/sets/lists/comp/md.mipsco -basepkg/sets/lists/comp/md.mmeye -basepkg/sets/lists/comp/md.mvme68k -basepkg/sets/lists/comp/md.mvmeppc -basepkg/sets/lists/comp/md.news68k -basepkg/sets/lists/comp/md.newsmips -basepkg/sets/lists/comp/md.next68k -basepkg/sets/lists/comp/md.ofppc -basepkg/sets/lists/comp/md.or1k -basepkg/sets/lists/comp/md.playstation2 -basepkg/sets/lists/comp/md.pmax -basepkg/sets/lists/comp/md.prep -basepkg/sets/lists/comp/md.rs6000 -basepkg/sets/lists/comp/md.sandpoint -basepkg/sets/lists/comp/md.sbmips -basepkg/sets/lists/comp/md.sgimips -basepkg/sets/lists/comp/md.sparc -basepkg/sets/lists/comp/md.sparc64 -basepkg/sets/lists/comp/md.sun2 -basepkg/sets/lists/comp/md.sun3 -basepkg/sets/lists/comp/md.vax -basepkg/sets/lists/comp/md.x68k -basepkg/sets/lists/comp/mi -basepkg/sets/lists/comp/shl.mi -basepkg/sets/lists/comp/stl.mi -basepkg/sets/lists/debug/ad.aarch64 -basepkg/sets/lists/debug/ad.arm -basepkg/sets/lists/debug/ad.m68k -basepkg/sets/lists/debug/ad.m68k.shl -basepkg/sets/lists/debug/ad.mips -basepkg/sets/lists/debug/ad.powerpc -basepkg/sets/lists/debug/ad.riscv -basepkg/sets/lists/debug/md.alpha -basepkg/sets/lists/debug/md.amd64 -basepkg/sets/lists/debug/md.amiga -basepkg/sets/lists/debug/md.atari -basepkg/sets/lists/debug/md.bebox -basepkg/sets/lists/debug/md.dreamcast -basepkg/sets/lists/debug/md.ews4800mips -basepkg/sets/lists/debug/md.hp300 -basepkg/sets/lists/debug/md.hpcmips -basepkg/sets/lists/debug/md.hpcsh -basepkg/sets/lists/debug/md.hppa -basepkg/sets/lists/debug/md.i386 -basepkg/sets/lists/debug/md.ia64 -basepkg/sets/lists/debug/md.luna68k -basepkg/sets/lists/debug/md.mac68k -basepkg/sets/lists/debug/md.macppc -basepkg/sets/lists/debug/md.mipsco -basepkg/sets/lists/debug/md.mmeye -basepkg/sets/lists/debug/md.mvme68k -basepkg/sets/lists/debug/md.newsmips -basepkg/sets/lists/debug/md.ofppc -basepkg/sets/lists/debug/md.pmax -basepkg/sets/lists/debug/md.prep -basepkg/sets/lists/debug/md.rs6000 -basepkg/sets/lists/debug/md.sgimips -basepkg/sets/lists/debug/md.sparc -basepkg/sets/lists/debug/md.sparc64 -basepkg/sets/lists/debug/md.sun2 -basepkg/sets/lists/debug/md.sun3 -basepkg/sets/lists/debug/md.vax -basepkg/sets/lists/debug/md.x68k -basepkg/sets/lists/debug/mi -basepkg/sets/lists/debug/module.mi -basepkg/sets/lists/debug/shl.mi -basepkg/sets/lists/etc/md.amd64 -basepkg/sets/lists/etc/md.evbarm -basepkg/sets/lists/etc/md.i386 -basepkg/sets/lists/etc/md.sparc -basepkg/sets/lists/etc/md.sun2 -basepkg/sets/lists/etc/md.sun3 -basepkg/sets/lists/etc/mi -basepkg/sets/lists/games/mi -basepkg/sets/lists/man/mi -basepkg/sets/lists/misc/mi -basepkg/sets/lists/modules/ad.aarch64 -basepkg/sets/lists/modules/ad.arm -basepkg/sets/lists/modules/ad.m68k -basepkg/sets/lists/modules/ad.mips -basepkg/sets/lists/modules/ad.powerpc -basepkg/sets/lists/modules/ad.sh3 -basepkg/sets/lists/modules/md.alpha -basepkg/sets/lists/modules/md.amd64 -basepkg/sets/lists/modules/md.evbppc.powerpc -basepkg/sets/lists/modules/md.hppa -basepkg/sets/lists/modules/md.i386 -basepkg/sets/lists/modules/md.ia64 -basepkg/sets/lists/modules/md.prep -basepkg/sets/lists/modules/md.sgimips -basepkg/sets/lists/modules/md.sparc -basepkg/sets/lists/modules/md.sparc64 -basepkg/sets/lists/modules/md.vax -basepkg/sets/lists/modules/mi -basepkg/sets/lists/tests/ad.aarch64 -basepkg/sets/lists/tests/md.amd64 -basepkg/sets/lists/tests/md.i386 -basepkg/sets/lists/tests/mi -basepkg/sets/lists/tests/module.mi -basepkg/sets/lists/tests/shl.mi -basepkg/sets/lists/text/mi -basepkg/sets/lists/xbase/md.amd64 -basepkg/sets/lists/xbase/md.evbarm -basepkg/sets/lists/xbase/md.i386 -basepkg/sets/lists/xbase/mi -basepkg/sets/lists/xbase/shl.mi -basepkg/sets/lists/xcomp/md.acorn32 -basepkg/sets/lists/xcomp/md.alpha -basepkg/sets/lists/xcomp/md.amd64 -basepkg/sets/lists/xcomp/md.amiga -basepkg/sets/lists/xcomp/md.dreamcast -basepkg/sets/lists/xcomp/md.evbarm -basepkg/sets/lists/xcomp/md.evbmips -basepkg/sets/lists/xcomp/md.ews4800mips -basepkg/sets/lists/xcomp/md.hp300 -basepkg/sets/lists/xcomp/md.hpcarm -basepkg/sets/lists/xcomp/md.hpcmips -basepkg/sets/lists/xcomp/md.hpcsh -basepkg/sets/lists/xcomp/md.i386 -basepkg/sets/lists/xcomp/md.luna68k -basepkg/sets/lists/xcomp/md.mac68k -basepkg/sets/lists/xcomp/md.macppc -basepkg/sets/lists/xcomp/md.newsmips -basepkg/sets/lists/xcomp/md.ofppc -basepkg/sets/lists/xcomp/md.pmax -basepkg/sets/lists/xcomp/md.sparc -basepkg/sets/lists/xcomp/md.sparc64 -basepkg/sets/lists/xcomp/md.sun3 -basepkg/sets/lists/xcomp/md.vax -basepkg/sets/lists/xcomp/md.x68k -basepkg/sets/lists/xcomp/md.zaurus -basepkg/sets/lists/xcomp/mi -basepkg/sets/lists/xcomp/shl.mi -basepkg/sets/lists/xdebug/md.alpha -basepkg/sets/lists/xdebug/md.amd64 -basepkg/sets/lists/xdebug/md.amiga -basepkg/sets/lists/xdebug/md.bebox -basepkg/sets/lists/xdebug/md.cats -basepkg/sets/lists/xdebug/md.dreamcast -basepkg/sets/lists/xdebug/md.evbarm -basepkg/sets/lists/xdebug/md.evbarm.armeb -basepkg/sets/lists/xdebug/md.evbmips -basepkg/sets/lists/xdebug/md.ews4800mips -basepkg/sets/lists/xdebug/md.hp300 -basepkg/sets/lists/xdebug/md.hpcarm -basepkg/sets/lists/xdebug/md.hpcmips -basepkg/sets/lists/xdebug/md.hpcsh -basepkg/sets/lists/xdebug/md.i386 -basepkg/sets/lists/xdebug/md.ibmnws -basepkg/sets/lists/xdebug/md.luna68k -basepkg/sets/lists/xdebug/md.mac68k -basepkg/sets/lists/xdebug/md.macppc -basepkg/sets/lists/xdebug/md.netwinder -basepkg/sets/lists/xdebug/md.newsmips -basepkg/sets/lists/xdebug/md.ofppc -basepkg/sets/lists/xdebug/md.prep -basepkg/sets/lists/xdebug/md.sgimips -basepkg/sets/lists/xdebug/md.shark -basepkg/sets/lists/xdebug/md.sparc -basepkg/sets/lists/xdebug/md.sparc64 -basepkg/sets/lists/xdebug/md.vax -basepkg/sets/lists/xdebug/md.x68k -basepkg/sets/lists/xdebug/md.zaurus -basepkg/sets/lists/xdebug/mi -basepkg/sets/lists/xdebug/shl.mi -basepkg/sets/lists/xetc/md.x68k -basepkg/sets/lists/xetc/mi -basepkg/sets/lists/xfont/mi -basepkg/sets/lists/xserver/ad.arm -basepkg/sets/lists/xserver/ad.mipseb -basepkg/sets/lists/xserver/ad.mipsel -basepkg/sets/lists/xserver/ad.powerpc -basepkg/sets/lists/xserver/ad.x86_64 -basepkg/sets/lists/xserver/md.alpha -basepkg/sets/lists/xserver/md.amd64 -basepkg/sets/lists/xserver/md.amiga -basepkg/sets/lists/xserver/md.bebox -basepkg/sets/lists/xserver/md.cats -basepkg/sets/lists/xserver/md.dreamcast -basepkg/sets/lists/xserver/md.evbarm -basepkg/sets/lists/xserver/md.evbmips -basepkg/sets/lists/xserver/md.ews4800mips -basepkg/sets/lists/xserver/md.hp300 -basepkg/sets/lists/xserver/md.hpcarm -basepkg/sets/lists/xserver/md.hpcmips -basepkg/sets/lists/xserver/md.hpcsh -basepkg/sets/lists/xserver/md.i386 -basepkg/sets/lists/xserver/md.ibmnws -basepkg/sets/lists/xserver/md.luna68k -basepkg/sets/lists/xserver/md.mac68k -basepkg/sets/lists/xserver/md.macppc -basepkg/sets/lists/xserver/md.netwinder -basepkg/sets/lists/xserver/md.newsmips -basepkg/sets/lists/xserver/md.ofppc -basepkg/sets/lists/xserver/md.prep -basepkg/sets/lists/xserver/md.sgimips -basepkg/sets/lists/xserver/md.shark -basepkg/sets/lists/xserver/md.sparc -basepkg/sets/lists/xserver/md.sparc64 -basepkg/sets/lists/xserver/md.vax -basepkg/sets/lists/xserver/md.x68k -basepkg/sets/lists/xserver/md.zaurus -basepkg/sets/lists/xserver/mi man/man1/basepkg.1 man/man1/basepkg.sh.1 diff --git a/basepkg/distinfo b/basepkg/distinfo index 17ae3a3fbf..acd52711dd 100644 --- a/basepkg/distinfo +++ b/basepkg/distinfo @@ -1,6 +1,6 @@ $NetBSD$ -SHA1 (basepkg-1.6.6.tar.gz) = cb8156b0c05e8060ea686da0af35a1681bce0636 -RMD160 (basepkg-1.6.6.tar.gz) = 429cbc42635e06420ebf26d03958665d97b270e9 -SHA512 (basepkg-1.6.6.tar.gz) = 9e228e4faba8d24f54521b9df3cbb7b48f809b0cbd32cc4128172a498153bccd2920d05deeea0679567ebf2a7c581079c6e36fb6b525dc0017101ad6aec1eb5e -Size (basepkg-1.6.6.tar.gz) = 494658 bytes +SHA1 (basepkg-1.7.tar.gz) = 64ea31e13fabb27db49f416aab45ca87c389f37b +RMD160 (basepkg-1.7.tar.gz) = db30a5cc0acc8a5bbfbc4fc785f0c2d1f629495b +SHA512 (basepkg-1.7.tar.gz) = 9453dc9ef01b32071aa84a13523f66a287d3353e76bbad3f40eac3958fe90045f9b37b5a4f663785625515847eff915168ac335c11a1d8b211a1b801a6ca9077 +Size (basepkg-1.7.tar.gz) = 36344 bytes