[PR PATCH] Fix some gnu-makefile build style users

[PR PATCH] Fix some gnu-makefile build style users

[ericonr]

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

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

https://github.com/ericonr/void-packages makefile
https://github.com/void-linux/void-packages/pull/27005

Fix some gnu-makefile build style users
Mainly depends on the change from #27003 for CXXFLAGS inclusion.

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

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

From f1907f8db97f0c76f55e519f184b260b87f9a27b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:55:56 -0300
Subject: [PATCH 1/4] crypto++: remove CXXFLAGS workaround.

No longer necessary.
---
 srcpkgs/crypto++/template | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/srcpkgs/crypto++/template b/srcpkgs/crypto++/template
index d56e7ff2c20..18ed0314e3d 100644
--- a/srcpkgs/crypto++/template
+++ b/srcpkgs/crypto++/template
@@ -21,9 +21,6 @@ if [ "$XBPS_CROSS" ]; then
 	make_build_args+=" -f GNUmakefile-cross"
 fi
 
-post_extract() {
-	sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
-}
 post_install() {
 	vlicense License.txt LICENSE
 }

From d08642bb0791174547b92d3558dd33dfd679ffef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:56:15 -0300
Subject: [PATCH 2/4] espeak: remove CXXFLAGS workaround.

No longer necessary.
---
 srcpkgs/espeak/template | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/srcpkgs/espeak/template b/srcpkgs/espeak/template
index 354ae5d6988..4161b04dd94 100644
--- a/srcpkgs/espeak/template
+++ b/srcpkgs/espeak/template
@@ -5,6 +5,7 @@ revision=5
 wrksrc="${pkgname}-${version}-source"
 build_wrksrc=src
 build_style=gnu-makefile
+make_build_args="AUDIO=runtime"
 hostmakedepends="unzip"
 makedepends="pulseaudio-devel portaudio-devel"
 short_desc="Text to Speech engine"
@@ -18,10 +19,6 @@ pre_configure() {
 	cp portaudio19.h portaudio.h
 }
 
-do_build() {
-	make CXX=$CXX CXXFLAGS="$CXXFLAGS" AUDIO=runtime
-}
-
 libespeak_package() {
 	short_desc+=" - runtime libraries"
 	pkg_install() {

From d0ec9aa107eb7528b2ca877d6929c62eb621d142 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:56:29 -0300
Subject: [PATCH 3/4] fuse-zip: remove CXXFLAGS workaround.

No longer necessary.
---
 srcpkgs/fuse-zip/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/fuse-zip/template b/srcpkgs/fuse-zip/template
index db224196e5c..315bdcf530d 100644
--- a/srcpkgs/fuse-zip/template
+++ b/srcpkgs/fuse-zip/template
@@ -13,7 +13,3 @@ license="GPL-3.0-or-later"
 homepage="https://bitbucket.org/agalanin/fuse-zip"
 distfiles="${homepage}/downloads/${pkgname}-${version}.tar.gz"
 checksum=7dac61c3f27f9041545ab1a22bb772ea282ed2dea25a0220dcecfa6801b5b121
-
-pre_build() {
-	vsed -i '/^CXXFLAGS=/d' Makefile lib/Makefile
-}

From 2bb37e287135ae91f9943637e50561a83e25d35f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:56:48 -0300
Subject: [PATCH 4/4] splix: remove unnecessary build_style.

---
 srcpkgs/splix/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/splix/template b/srcpkgs/splix/template
index 60315c5d7b6..a1405f0793c 100644
--- a/srcpkgs/splix/template
+++ b/srcpkgs/splix/template
@@ -3,7 +3,6 @@ pkgname=splix
 version=2.0.0+svn315
 revision=3
 wrksrc="$pkgname-$version.orig"
-build_style=gnu-makefile
 makedepends="cups-devel mit-krb5-devel jbigkit-devel"
 short_desc="CUPS driver for SPL printers (Samsung and several Xerox printers)"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"

Re: [PR PATCH] [Updated] Fix some gnu-makefile build style users

[ericonr]

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

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

https://github.com/ericonr/void-packages makefile
https://github.com/void-linux/void-packages/pull/27005

Fix some gnu-makefile build style users
Mainly depends on the change from #27003 for CXXFLAGS inclusion.

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

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

From 1bead26d98194b56ec3a208912bf0904d2c3cf40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:55:56 -0300
Subject: [PATCH 1/4] crypto++: remove CXXFLAGS workaround.

No longer necessary.
---
 srcpkgs/crypto++/template | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/srcpkgs/crypto++/template b/srcpkgs/crypto++/template
index d56e7ff2c20..18ed0314e3d 100644
--- a/srcpkgs/crypto++/template
+++ b/srcpkgs/crypto++/template
@@ -21,9 +21,6 @@ if [ "$XBPS_CROSS" ]; then
 	make_build_args+=" -f GNUmakefile-cross"
 fi
 
-post_extract() {
-	sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
-}
 post_install() {
 	vlicense License.txt LICENSE
 }

From e2342c121ccab7006699cf343fcf0fc82bdc8a8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:56:15 -0300
Subject: [PATCH 2/4] espeak: remove CXXFLAGS workaround.

No longer necessary.
---
 srcpkgs/espeak/template | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/srcpkgs/espeak/template b/srcpkgs/espeak/template
index 354ae5d6988..4161b04dd94 100644
--- a/srcpkgs/espeak/template
+++ b/srcpkgs/espeak/template
@@ -5,6 +5,7 @@ revision=5
 wrksrc="${pkgname}-${version}-source"
 build_wrksrc=src
 build_style=gnu-makefile
+make_build_args="AUDIO=runtime"
 hostmakedepends="unzip"
 makedepends="pulseaudio-devel portaudio-devel"
 short_desc="Text to Speech engine"
@@ -18,10 +19,6 @@ pre_configure() {
 	cp portaudio19.h portaudio.h
 }
 
-do_build() {
-	make CXX=$CXX CXXFLAGS="$CXXFLAGS" AUDIO=runtime
-}
-
 libespeak_package() {
 	short_desc+=" - runtime libraries"
 	pkg_install() {

From 9dc1b6e34e49ef24b70566c3db9c0f77e699f030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:56:29 -0300
Subject: [PATCH 3/4] fuse-zip: remove CXXFLAGS workaround.

No longer necessary.

Also fix distfile location, for some reason the 0.7.1 tarball had been
removed from downloads.
---
 srcpkgs/fuse-zip/template | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/fuse-zip/template b/srcpkgs/fuse-zip/template
index db224196e5c..5b7859ce824 100644
--- a/srcpkgs/fuse-zip/template
+++ b/srcpkgs/fuse-zip/template
@@ -2,6 +2,7 @@
 pkgname=fuse-zip
 version=0.7.1
 revision=1
+wrksrc=agalanin-fuse-zip-0865d60054d9
 build_style=gnu-makefile
 make_build_args="all doc"
 make_install_args="prefix=/usr"
@@ -11,9 +12,5 @@ short_desc="FUSE file system for ZIP archives"
 maintainer="Matthias von Faber <mvf@gmx.eu>"
 license="GPL-3.0-or-later"
 homepage="https://bitbucket.org/agalanin/fuse-zip"
-distfiles="${homepage}/downloads/${pkgname}-${version}.tar.gz"
-checksum=7dac61c3f27f9041545ab1a22bb772ea282ed2dea25a0220dcecfa6801b5b121
-
-pre_build() {
-	vsed -i '/^CXXFLAGS=/d' Makefile lib/Makefile
-}
+distfiles="${homepage}/get/${version}.tar.gz"
+checksum=771302586ca734bf845effcea999c38f4c2e984e29605912eb3470fbeea0b195

From 1ab3bfc468dea9738861b3e0d235dd28a2d6f999 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:56:48 -0300
Subject: [PATCH 4/4] splix: remove unnecessary build_style.

---
 srcpkgs/splix/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/splix/template b/srcpkgs/splix/template
index 60315c5d7b6..a1405f0793c 100644
--- a/srcpkgs/splix/template
+++ b/srcpkgs/splix/template
@@ -3,7 +3,6 @@ pkgname=splix
 version=2.0.0+svn315
 revision=3
 wrksrc="$pkgname-$version.orig"
-build_style=gnu-makefile
 makedepends="cups-devel mit-krb5-devel jbigkit-devel"
 short_desc="CUPS driver for SPL printers (Samsung and several Xerox printers)"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"

Re: [PR PATCH] [Updated] Fix some gnu-makefile build style users

[ericonr]

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

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

https://github.com/ericonr/void-packages makefile
https://github.com/void-linux/void-packages/pull/27005

Fix some gnu-makefile build style users
Mainly depends on the change from #27003 for CXXFLAGS inclusion.

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

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

From 71261f81dbef1c268c2410c0a44c9ae7a67b62ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:55:56 -0300
Subject: [PATCH 1/4] crypto++: remove CXXFLAGS workaround.

No longer necessary.

Also fix distfiles location and wrksrc. Distfiles from the project's
homepage couldn't be fetched due to certificate errors.
---
 srcpkgs/crypto++/template | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/crypto++/template b/srcpkgs/crypto++/template
index d56e7ff2c20..cccd5e77ea8 100644
--- a/srcpkgs/crypto++/template
+++ b/srcpkgs/crypto++/template
@@ -2,7 +2,8 @@
 pkgname=crypto++
 version=820
 revision=2
-create_wrksrc=yes
+_version="${version:0:1}_${version:1:1}_${version:2:1}"
+wrksrc=cryptopp-CRYPTOPP_${_version}
 build_style=gnu-makefile
 make_build_args="PREFIX=/usr"
 make_build_target="dynamic static libcryptopp.pc"
@@ -11,9 +12,9 @@ hostmakedepends="unzip"
 short_desc="Free C++ class library of cryptographic schemes"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSL-1.0"
-homepage="http://www.cryptopp.com/"
-distfiles="http://www.cryptopp.com/cryptopp${version}.zip"
-checksum=03f0e2242e11b9d19b28d0ec5a3fa8ed5cc7b27640e6bed365744f593e858058
+homepage="https://www.cryptopp.com/"
+distfiles="https://github.com/weidai11/cryptopp/archive/CRYPTOPP_${_version}.tar.gz"
+checksum=e3bcd48a62739ad179ad8064b523346abb53767bcbefc01fe37303412292343e
 
 CXXFLAGS="-DNDEBUG -fPIC"
 
@@ -21,9 +22,6 @@ if [ "$XBPS_CROSS" ]; then
 	make_build_args+=" -f GNUmakefile-cross"
 fi
 
-post_extract() {
-	sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
-}
 post_install() {
 	vlicense License.txt LICENSE
 }

From dc60412de8a76088b5e5ce92d280592c4dfece37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:56:15 -0300
Subject: [PATCH 2/4] espeak: remove CXXFLAGS workaround.

No longer necessary.
---
 srcpkgs/espeak/template | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/srcpkgs/espeak/template b/srcpkgs/espeak/template
index 354ae5d6988..4161b04dd94 100644
--- a/srcpkgs/espeak/template
+++ b/srcpkgs/espeak/template
@@ -5,6 +5,7 @@ revision=5
 wrksrc="${pkgname}-${version}-source"
 build_wrksrc=src
 build_style=gnu-makefile
+make_build_args="AUDIO=runtime"
 hostmakedepends="unzip"
 makedepends="pulseaudio-devel portaudio-devel"
 short_desc="Text to Speech engine"
@@ -18,10 +19,6 @@ pre_configure() {
 	cp portaudio19.h portaudio.h
 }
 
-do_build() {
-	make CXX=$CXX CXXFLAGS="$CXXFLAGS" AUDIO=runtime
-}
-
 libespeak_package() {
 	short_desc+=" - runtime libraries"
 	pkg_install() {

From 88fbd59a1cdac1000c8ef661a979abb4a3aa378d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:56:29 -0300
Subject: [PATCH 3/4] fuse-zip: remove CXXFLAGS workaround.

No longer necessary.

Also fix distfile location, for some reason the 0.7.1 tarball had been
removed from downloads.
---
 srcpkgs/fuse-zip/template | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/fuse-zip/template b/srcpkgs/fuse-zip/template
index db224196e5c..5b7859ce824 100644
--- a/srcpkgs/fuse-zip/template
+++ b/srcpkgs/fuse-zip/template
@@ -2,6 +2,7 @@
 pkgname=fuse-zip
 version=0.7.1
 revision=1
+wrksrc=agalanin-fuse-zip-0865d60054d9
 build_style=gnu-makefile
 make_build_args="all doc"
 make_install_args="prefix=/usr"
@@ -11,9 +12,5 @@ short_desc="FUSE file system for ZIP archives"
 maintainer="Matthias von Faber <mvf@gmx.eu>"
 license="GPL-3.0-or-later"
 homepage="https://bitbucket.org/agalanin/fuse-zip"
-distfiles="${homepage}/downloads/${pkgname}-${version}.tar.gz"
-checksum=7dac61c3f27f9041545ab1a22bb772ea282ed2dea25a0220dcecfa6801b5b121
-
-pre_build() {
-	vsed -i '/^CXXFLAGS=/d' Makefile lib/Makefile
-}
+distfiles="${homepage}/get/${version}.tar.gz"
+checksum=771302586ca734bf845effcea999c38f4c2e984e29605912eb3470fbeea0b195

From e89495dc5b1ae054c0e6c2a59fb745b8c57071e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:56:48 -0300
Subject: [PATCH 4/4] splix: remove unnecessary build_style.

---
 srcpkgs/splix/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/splix/template b/srcpkgs/splix/template
index 60315c5d7b6..a1405f0793c 100644
--- a/srcpkgs/splix/template
+++ b/srcpkgs/splix/template
@@ -3,7 +3,6 @@ pkgname=splix
 version=2.0.0+svn315
 revision=3
 wrksrc="$pkgname-$version.orig"
-build_style=gnu-makefile
 makedepends="cups-devel mit-krb5-devel jbigkit-devel"
 short_desc="CUPS driver for SPL printers (Samsung and several Xerox printers)"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"

Re: Fix some gnu-makefile build style users

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27005#issuecomment-742922051

Comment:
`crypto++` only fails on glibc :/

Re: [PR PATCH] [Updated] Fix some gnu-makefile build style users

[ericonr]

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

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

https://github.com/ericonr/void-packages makefile
https://github.com/void-linux/void-packages/pull/27005

Fix some gnu-makefile build style users
Mainly depends on the change from #27003 for CXXFLAGS inclusion.

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

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

From 9b416a02f389ec7853076a208762f2762f70d489 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:56:29 -0300
Subject: [PATCH 1/2] fuse-zip: remove CXXFLAGS workaround.

No longer necessary.

Also fix distfile location, for some reason the 0.7.1 tarball had been
removed from downloads.
---
 srcpkgs/fuse-zip/template | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/fuse-zip/template b/srcpkgs/fuse-zip/template
index db224196e5c..5b7859ce824 100644
--- a/srcpkgs/fuse-zip/template
+++ b/srcpkgs/fuse-zip/template
@@ -2,6 +2,7 @@
 pkgname=fuse-zip
 version=0.7.1
 revision=1
+wrksrc=agalanin-fuse-zip-0865d60054d9
 build_style=gnu-makefile
 make_build_args="all doc"
 make_install_args="prefix=/usr"
@@ -11,9 +12,5 @@ short_desc="FUSE file system for ZIP archives"
 maintainer="Matthias von Faber <mvf@gmx.eu>"
 license="GPL-3.0-or-later"
 homepage="https://bitbucket.org/agalanin/fuse-zip"
-distfiles="${homepage}/downloads/${pkgname}-${version}.tar.gz"
-checksum=7dac61c3f27f9041545ab1a22bb772ea282ed2dea25a0220dcecfa6801b5b121
-
-pre_build() {
-	vsed -i '/^CXXFLAGS=/d' Makefile lib/Makefile
-}
+distfiles="${homepage}/get/${version}.tar.gz"
+checksum=771302586ca734bf845effcea999c38f4c2e984e29605912eb3470fbeea0b195

From 3cee62f370285b7b96c0b98bba7fcf5fde1edc8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:56:48 -0300
Subject: [PATCH 2/2] splix: remove unnecessary build_style.

---
 srcpkgs/splix/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/splix/template b/srcpkgs/splix/template
index 60315c5d7b6..a1405f0793c 100644
--- a/srcpkgs/splix/template
+++ b/srcpkgs/splix/template
@@ -3,7 +3,6 @@ pkgname=splix
 version=2.0.0+svn315
 revision=3
 wrksrc="$pkgname-$version.orig"
-build_style=gnu-makefile
 makedepends="cups-devel mit-krb5-devel jbigkit-devel"
 short_desc="CUPS driver for SPL printers (Samsung and several Xerox printers)"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"

Re: [PR PATCH] [Updated] Fix some gnu-makefile build style users

[ericonr]

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

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

https://github.com/ericonr/void-packages makefile
https://github.com/void-linux/void-packages/pull/27005

Fix some gnu-makefile build style users
Mainly depends on the change from #27003 for CXXFLAGS inclusion.

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

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

From 9b416a02f389ec7853076a208762f2762f70d489 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:56:29 -0300
Subject: [PATCH 1/2] fuse-zip: remove CXXFLAGS workaround.

No longer necessary.

Also fix distfile location, for some reason the 0.7.1 tarball had been
removed from downloads.
---
 srcpkgs/fuse-zip/template | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/fuse-zip/template b/srcpkgs/fuse-zip/template
index db224196e5c..5b7859ce824 100644
--- a/srcpkgs/fuse-zip/template
+++ b/srcpkgs/fuse-zip/template
@@ -2,6 +2,7 @@
 pkgname=fuse-zip
 version=0.7.1
 revision=1
+wrksrc=agalanin-fuse-zip-0865d60054d9
 build_style=gnu-makefile
 make_build_args="all doc"
 make_install_args="prefix=/usr"
@@ -11,9 +12,5 @@ short_desc="FUSE file system for ZIP archives"
 maintainer="Matthias von Faber <mvf@gmx.eu>"
 license="GPL-3.0-or-later"
 homepage="https://bitbucket.org/agalanin/fuse-zip"
-distfiles="${homepage}/downloads/${pkgname}-${version}.tar.gz"
-checksum=7dac61c3f27f9041545ab1a22bb772ea282ed2dea25a0220dcecfa6801b5b121
-
-pre_build() {
-	vsed -i '/^CXXFLAGS=/d' Makefile lib/Makefile
-}
+distfiles="${homepage}/get/${version}.tar.gz"
+checksum=771302586ca734bf845effcea999c38f4c2e984e29605912eb3470fbeea0b195

From dfdbbd808eac8f27a4acb4d17d128129a09ca26a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:56:48 -0300
Subject: [PATCH 2/2] splix: remove unnecessary build_style.

Also xlint.
---
 srcpkgs/splix/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/splix/template b/srcpkgs/splix/template
index 60315c5d7b6..366aab114bc 100644
--- a/srcpkgs/splix/template
+++ b/srcpkgs/splix/template
@@ -1,20 +1,19 @@
-# Template file for 'splix-svn'
+# Template file for 'splix'
 pkgname=splix
 version=2.0.0+svn315
 revision=3
 wrksrc="$pkgname-$version.orig"
-build_style=gnu-makefile
 makedepends="cups-devel mit-krb5-devel jbigkit-devel"
 short_desc="CUPS driver for SPL printers (Samsung and several Xerox printers)"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://splix.ap2c.org"
 distfiles="${DEBIAN_SITE}/main/s/$pkgname/${pkgname}_$version.orig.tar.gz"
 checksum="578a81bd5b1b97756a539c3bb6339fd109d54419887a73e705941da8aa7fac52"
-CXXFLAGS=" -fno-strict-aliasing"
+CXXFLAGS="-fno-strict-aliasing"
 
 do_build() {
-	sed -i rules.mk \
+	vsed -i rules.mk \
 		-e's;$(CXX) -o;$(CXX) $(LDFLAGS) -o;'
 	make CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
 		CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" STRIP="true" drv

Re: [PR PATCH] [Updated] Fix some gnu-makefile build style users

[ericonr]

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

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

https://github.com/ericonr/void-packages makefile
https://github.com/void-linux/void-packages/pull/27005

Fix some gnu-makefile build style users
Mainly depends on the change from #27003 for CXXFLAGS inclusion.

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

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

From 3da35e5a87aae6638ec7294c521cc8cc7a8db482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:56:29 -0300
Subject: [PATCH 1/2] fuse-zip: remove CXXFLAGS workaround.

No longer necessary.

Also fix distfile location, for some reason the 0.7.1 tarball had been
removed from downloads.
---
 srcpkgs/fuse-zip/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/fuse-zip/template b/srcpkgs/fuse-zip/template
index db224196e5c..80f9de31cbd 100644
--- a/srcpkgs/fuse-zip/template
+++ b/srcpkgs/fuse-zip/template
@@ -2,6 +2,7 @@
 pkgname=fuse-zip
 version=0.7.1
 revision=1
+wrksrc=agalanin-fuse-zip-0865d60054d9
 build_style=gnu-makefile
 make_build_args="all doc"
 make_install_args="prefix=/usr"
@@ -11,9 +12,9 @@ short_desc="FUSE file system for ZIP archives"
 maintainer="Matthias von Faber <mvf@gmx.eu>"
 license="GPL-3.0-or-later"
 homepage="https://bitbucket.org/agalanin/fuse-zip"
-distfiles="${homepage}/downloads/${pkgname}-${version}.tar.gz"
-checksum=7dac61c3f27f9041545ab1a22bb772ea282ed2dea25a0220dcecfa6801b5b121
+distfiles="${homepage}/get/${version}.tar.gz"
+checksum=771302586ca734bf845effcea999c38f4c2e984e29605912eb3470fbeea0b195
 
-pre_build() {
-	vsed -i '/^CXXFLAGS=/d' Makefile lib/Makefile
+do_check() {
+	: requires some tcl modules
 }

From 8d55fef25563f4a3d5d5fce211222a8f427a70fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 6 Dec 2020 19:56:48 -0300
Subject: [PATCH 2/2] splix: remove unnecessary build_style.

Also xlint.
---
 srcpkgs/splix/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/splix/template b/srcpkgs/splix/template
index 60315c5d7b6..366aab114bc 100644
--- a/srcpkgs/splix/template
+++ b/srcpkgs/splix/template
@@ -1,20 +1,19 @@
-# Template file for 'splix-svn'
+# Template file for 'splix'
 pkgname=splix
 version=2.0.0+svn315
 revision=3
 wrksrc="$pkgname-$version.orig"
-build_style=gnu-makefile
 makedepends="cups-devel mit-krb5-devel jbigkit-devel"
 short_desc="CUPS driver for SPL printers (Samsung and several Xerox printers)"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://splix.ap2c.org"
 distfiles="${DEBIAN_SITE}/main/s/$pkgname/${pkgname}_$version.orig.tar.gz"
 checksum="578a81bd5b1b97756a539c3bb6339fd109d54419887a73e705941da8aa7fac52"
-CXXFLAGS=" -fno-strict-aliasing"
+CXXFLAGS="-fno-strict-aliasing"
 
 do_build() {
-	sed -i rules.mk \
+	vsed -i rules.mk \
 		-e's;$(CXX) -o;$(CXX) $(LDFLAGS) -o;'
 	make CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
 		CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" STRIP="true" drv

Re: Fix some gnu-makefile build style users

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27005#issuecomment-767058689

Comment:
@mvf @thypon ok with changes?

Re: Fix some gnu-makefile build style users

[mvf]

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

New comment by mvf on void-packages repository

https://github.com/void-linux/void-packages/pull/27005#issuecomment-767177142

Comment:
Looks good, thanks @ericonr!

Something else to consider with `gnu-makefile`: Maybe `do_build` should also pass `PREFIX=/usr`. Some Makefiles compile in `PREFIX`-based paths, so not having it during `do_build` can cause subtly broken binaries. This has bitten me in the past with `spectrwm` (ae50942849724f9017a389ebec8a37fb3eb9b1ff) and it seems there are `gnu-makefile` templates that set `make_build_args` only for `PREFIX`.

Re: Fix some gnu-makefile build style users

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27005#issuecomment-767179425

Comment:
@mvf I've thought the same thing, but haven't tried to actually fix it. We could probably remove `make_build_args` from many templates and avoid weird surprises. I don't know of any objections against it, but I also don't know if it isn't passed because no one had the idea / implemented It or for some specific reason.

Re: [PR PATCH] [Merged]: Fix some gnu-makefile build style users

[ericonr]

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

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

Fix some gnu-makefile build style users
https://github.com/void-linux/void-packages/pull/27005

Description:
Mainly depends on the change from #27003 for CXXFLAGS inclusion.