From 47d8a8879cb00cb695cdeac6655c2c76417f6fdd Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sat, 17 Dec 2022 20:14:11 -0800 Subject: [PATCH] dmd2.081: fix conflicts --- srcpkgs/dmd2.081/template | 48 +++++++++++++++------------------------ 1 file changed, 18 insertions(+), 30 deletions(-) diff --git a/srcpkgs/dmd2.081/template b/srcpkgs/dmd2.081/template index 79aad094008..793de3fc379 100644 --- a/srcpkgs/dmd2.081/template +++ b/srcpkgs/dmd2.081/template @@ -1,11 +1,11 @@ # Template file for 'dmd2.081' pkgname=dmd2.081 version=2.081.1 -revision=3 +revision=4 create_wrksrc=yes hostmakedepends="which" makedepends="dmd-bootstrap" -depends="libphobos2.081>=${version} gcc" +depends="gcc" short_desc="Digital Mars D compiler, 2.081" maintainer="Orphaned " license="BSL-1.0" @@ -68,40 +68,28 @@ do_install() { vbin generated/linux/release/$_archbits/dmd vinstall ${FILESDIR}/dmd.conf 644 etc + # note: dmd, druntime and phobos all share the same license + vlicense LICENSE.txt + vman generated/docs/man/man1/dmd.1 vman generated/docs/man/man5/dmd.conf.5 + + vmkdir usr/include/d + + cp -r ${wrksrc}/phobos/{*.d,etc,std} ${PKGDESTDIR}/usr/include/d + vinstall ${wrksrc}/phobos/generated/linux/release/$_archbits/libphobos2.a 644 usr/lib libphobos2.a + + vmkdir usr/include/d/druntime + cp -r ${wrksrc}/druntime/import ${PKGDESTDIR}/usr/include/d/druntime + vinstall ${wrksrc}/druntime/generated/linux/release/$_archbits/libdruntime.a 644 usr/lib libdruntime.a } dmd2.081-doc_package() { - short_desc="Documentation and sample code for D programming language" - replaces="dmd-docs>=0" - - pkg_install() { - cd dmd2 - - vmkdir usr/share/doc/d - vcopy samples usr/share/doc/d - vcopy html usr/share/doc/d - - find ${PKGDESTDIR}/usr/share/doc/d -type f | xargs chmod 0644 - - vlicense license.txt - } + short_desc="Documentation for D programming language (dummy package)" + build_style="meta" } libphobos2.081_package() { - short_desc+=" - standard library" - conflicts="dmd-bootstrap libphobos" - pkg_install() { - vinstall ${wrksrc}/druntime/generated/linux/release/$_archbits/libdruntime.a 644 usr/lib libdruntime.a - vinstall ${wrksrc}/phobos/generated/linux/release/$_archbits/libphobos2.a 644 usr/lib libphobos2.a - - vmkdir usr/include/d - cp -r ${wrksrc}/phobos/{*.d,etc,std} ${PKGDESTDIR}/usr/include/d - - vmkdir usr/include/d/druntime - cp -r ${wrksrc}/druntime/import ${PKGDESTDIR}/usr/include/d/druntime - - vlicense ${wrksrc}/druntime/LICENSE.txt - } + short_desc+=" - standard library (dummy package)" + build_style="meta" }