[PR PATCH] dmd-bootstrap: fix template

[PR PATCH] dmd-bootstrap: fix template

[heliocat]

[-- Attachment #1: Type: text/plain, Size: 1635 bytes --]

There is a new pull request by heliocat against master on the void-packages repository

https://github.com/heliocat/void-packages dmd-bootstrap
https://github.com/void-linux/void-packages/pull/29834

dmd-bootstrap: fix template
Also changes here-doc style to satisfy xlint.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl



A patch file from https://github.com/void-linux/void-packages/pull/29834.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dmd-bootstrap-29834.patch --]
[-- Type: text/x-diff, Size: 1944 bytes --]

From 75987e9e622ff989b400624d3b3305566e618883 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:35:18 -0700
Subject: [PATCH] dmd-bootstrap: fix template

Also changes here-doc style to satisfy xlint.
---
 srcpkgs/dmd-bootstrap/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/dmd-bootstrap/template b/srcpkgs/dmd-bootstrap/template
index 2de0cf45fd9e..44ad3bb1f1b4 100644
--- a/srcpkgs/dmd-bootstrap/template
+++ b/srcpkgs/dmd-bootstrap/template
@@ -1,17 +1,16 @@
 # Template file for 'dmd-bootstrap'
 pkgname=dmd-bootstrap
 version=2.069.20180305
-revision=2
+revision=3
 _gitrev_dmd=75266348c8a2368945a339ab86d7c8960a9bfc08
 _gitrev_druntime=33ae38cef41564b12864470afaf8430eb7334d3b
 _gitrev_phobos=30ac23a0889dd183221ce531a057171dd45296c4
+archs="x86_64* i686*"
 create_wrksrc=yes
 build_style=gnu-makefile
-provides="d-compiler-${version}_${revision}"
-archs="x86_64* i686*"
 short_desc="DMD Compiler (last C++ version for bootstrap)"
 maintainer="Yuxuan Shui <yshuiv7@gmail.com>"
-license="custom"
+license="BSL-1.0"
 homepage="https://dlang.org/"
 distfiles="
  https://github.com/dlang/dmd/archive/${_gitrev_dmd}.tar.gz>dmd-${version}.tar.gz
@@ -21,6 +20,7 @@ checksum="
  015ad5ce9d60bc183b9b40ae649eafeced93cb2a211400d9280464b22acdb129
  7f4d84f2b5252c0cc33bffbb4de8aab9321df844b8512e27e90267cbb9bc7422
  57306f80a63b83b755043d05e85e83cf3178701c92d295c97d1a5a8be8ffce19"
+provides="d-compiler-${version}_${revision}"
 
 post_extract() {
 	rm -rf dmd druntime phobos
@@ -56,9 +56,9 @@ do_install() {
 	vbin dmd
 
 	vmkdir etc
-	cat > $DESTDIR/etc/dmd.conf <<EOF
-[Environment]
-DFLAGS=-I/usr/include/dlang/dmd -L-L/usr/lib${XBPS_TARGET_WRODSIZE} -L--export-dynamic
+	cat > $DESTDIR/etc/dmd.conf <<- EOF
+	[Environment]
+	DFLAGS=-I/usr/include/dlang/dmd -L-L/usr/lib${XBPS_TARGET_WRODSIZE} -L--export-dynamic
 EOF
 
 	vlicense backendlicense.txt

Re: [PR REVIEW] dmd-bootstrap: fix template

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 218 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/29834#discussion_r603727373

Comment:
If you're going to indent the block, might as well indent the EOF too.

Re: [PR PATCH] [Updated] dmd-bootstrap: fix template

[heliocat]

[-- Attachment #1: Type: text/plain, Size: 1640 bytes --]

There is an updated pull request by heliocat against master on the void-packages repository

https://github.com/heliocat/void-packages dmd-bootstrap
https://github.com/void-linux/void-packages/pull/29834

dmd-bootstrap: fix template
Also changes here-doc style to satisfy xlint.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl



A patch file from https://github.com/void-linux/void-packages/pull/29834.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dmd-bootstrap-29834.patch --]
[-- Type: text/x-diff, Size: 1982 bytes --]

From e6726919833968bab2d481d0dc5665804326bee5 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Sun, 28 Mar 2021 14:35:18 -0700
Subject: [PATCH] dmd-bootstrap: fix template

Also changes here-doc style to satisfy xlint.
---
 srcpkgs/dmd-bootstrap/template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/dmd-bootstrap/template b/srcpkgs/dmd-bootstrap/template
index 2de0cf45fd9e..029b0024faea 100644
--- a/srcpkgs/dmd-bootstrap/template
+++ b/srcpkgs/dmd-bootstrap/template
@@ -1,17 +1,16 @@
 # Template file for 'dmd-bootstrap'
 pkgname=dmd-bootstrap
 version=2.069.20180305
-revision=2
+revision=3
 _gitrev_dmd=75266348c8a2368945a339ab86d7c8960a9bfc08
 _gitrev_druntime=33ae38cef41564b12864470afaf8430eb7334d3b
 _gitrev_phobos=30ac23a0889dd183221ce531a057171dd45296c4
+archs="x86_64* i686*"
 create_wrksrc=yes
 build_style=gnu-makefile
-provides="d-compiler-${version}_${revision}"
-archs="x86_64* i686*"
 short_desc="DMD Compiler (last C++ version for bootstrap)"
 maintainer="Yuxuan Shui <yshuiv7@gmail.com>"
-license="custom"
+license="BSL-1.0"
 homepage="https://dlang.org/"
 distfiles="
  https://github.com/dlang/dmd/archive/${_gitrev_dmd}.tar.gz>dmd-${version}.tar.gz
@@ -21,6 +20,7 @@ checksum="
  015ad5ce9d60bc183b9b40ae649eafeced93cb2a211400d9280464b22acdb129
  7f4d84f2b5252c0cc33bffbb4de8aab9321df844b8512e27e90267cbb9bc7422
  57306f80a63b83b755043d05e85e83cf3178701c92d295c97d1a5a8be8ffce19"
+provides="d-compiler-${version}_${revision}"
 
 post_extract() {
 	rm -rf dmd druntime phobos
@@ -56,10 +56,10 @@ do_install() {
 	vbin dmd
 
 	vmkdir etc
-	cat > $DESTDIR/etc/dmd.conf <<EOF
-[Environment]
-DFLAGS=-I/usr/include/dlang/dmd -L-L/usr/lib${XBPS_TARGET_WRODSIZE} -L--export-dynamic
-EOF
+	cat > $DESTDIR/etc/dmd.conf <<- EOF
+	[Environment]
+	DFLAGS=-I/usr/include/dlang/dmd -L-L/usr/lib${XBPS_TARGET_WRODSIZE} -L--export-dynamic
+	EOF
 
 	vlicense backendlicense.txt
 	vlicense boostlicense.txt

Re: [PR REVIEW] dmd-bootstrap: fix template

[heliocat]

[-- Attachment #1: Type: text/plain, Size: 176 bytes --]

New review comment by heliocat on void-packages repository

https://github.com/void-linux/void-packages/pull/29834#discussion_r603745616

Comment:
You, with the good ideas. :P

Re: [PR PATCH] [Merged]: dmd-bootstrap: fix template

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 1476 bytes --]

There's a merged pull request on the void-packages repository

dmd-bootstrap: fix template
https://github.com/void-linux/void-packages/pull/29834

Description:
Also changes here-doc style to satisfy xlint.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl