Re: [PR PATCH] [Updated] New package: civetweb-1.15

[bingulo <bingulo@users.noreply.github.com>]

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

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

https://github.com/bingulo/void-packages master
https://github.com/void-linux/void-packages/pull/38419

New package: civetweb-1.15
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_664-LIBC)


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

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

From d1c8514699947f1c6dc0c14cb2bc46ce4044b798 Mon Sep 17 00:00:00 2001
From: bingulo <gcarlos@disroot.org>
Date: Tue, 2 Aug 2022 00:16:13 -0300
Subject: [PATCH 1/3] New package: civetweb-1.15

---
 srcpkgs/civetweb-devel                     |  1 +
 srcpkgs/civetweb-doc                       |  1 +
 srcpkgs/civetweb/patches/install-fix.patch | 16 +++++++++
 srcpkgs/civetweb/template                  | 42 ++++++++++++++++++++++
 4 files changed, 60 insertions(+)
 create mode 120000 srcpkgs/civetweb-devel
 create mode 120000 srcpkgs/civetweb-doc
 create mode 100644 srcpkgs/civetweb/patches/install-fix.patch
 create mode 100644 srcpkgs/civetweb/template

diff --git a/srcpkgs/civetweb-devel b/srcpkgs/civetweb-devel
new file mode 120000
index 000000000000..f740b5313316
--- /dev/null
+++ b/srcpkgs/civetweb-devel
@@ -0,0 +1 @@
+civetweb
\ No newline at end of file
diff --git a/srcpkgs/civetweb-doc b/srcpkgs/civetweb-doc
new file mode 120000
index 000000000000..f740b5313316
--- /dev/null
+++ b/srcpkgs/civetweb-doc
@@ -0,0 +1 @@
+civetweb
\ No newline at end of file
diff --git a/srcpkgs/civetweb/patches/install-fix.patch b/srcpkgs/civetweb/patches/install-fix.patch
new file mode 100644
index 000000000000..be282dbf613c
--- /dev/null
+++ b/srcpkgs/civetweb/patches/install-fix.patch
@@ -0,0 +1,16 @@
+--- a/Makefile
++++ b/Makefile
+@@ -19,10 +19,10 @@
+ # http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
+ PREFIX ?= /usr/local
+ EXEC_PREFIX = $(PREFIX)
+-BINDIR = $(EXEC_PREFIX)/bin
+-DATAROOTDIR = $(PREFIX)/share
++BINDIR = $(DESTDIR)$(EXEC_PREFIX)/bin
++DATAROOTDIR = $(DESTDIR)$(PREFIX)/share
+ DOCDIR = $(DATAROOTDIR)/doc/$(CPROG)
+-SYSCONFDIR ?= $(PREFIX)/etc
++SYSCONFDIR ?= $(DESTDIR)/etc
+ HTMLDIR = $(DOCDIR)
+ INCLUDEDIR = $(DESTDIR)$(PREFIX)/include
+ LIBDIR = $(DESTDIR)$(EXEC_PREFIX)/lib
diff --git a/srcpkgs/civetweb/template b/srcpkgs/civetweb/template
new file mode 100644
index 000000000000..540808c22aca
--- /dev/null
+++ b/srcpkgs/civetweb/template
@@ -0,0 +1,42 @@
+# Template file for 'civetweb'
+pkgname=civetweb
+version=1.15
+revision=1
+build_style=gnu-makefile
+make_install_target="install install-headers install-lib install-slib"
+make_use_env=yes
+hostmakedepends="openssl-devel"
+makedepends="openssl-devel"
+short_desc="Embedded C/C++ web server"
+maintainer="bingulo <gcarlos@disroot.org>"
+license="MIT"
+homepage="https://civetweb.github.io/civetweb/"
+distfiles="https://github.com/civetweb/civetweb/archive/refs/tags/v${version}.tar.gz"
+checksum=90a533422944ab327a4fbb9969f0845d0dba05354f9cacce3a5005fa59f593b9
+
+pre_install() {
+	vmkdir usr/include
+}
+
+post_install() {
+	vlicense LICENSE.md
+}
+
+civetweb-devel_package() {
+	depends="civetweb-${version}_${revision}"
+		short_desc+=' - development files'
+		pkg_install() {
+			vmove usr/include
+				vmove "usr/lib/*.a"
+				vmove "usr/lib/*.so"
+				vmove "usr/lib/*.so.1"
+		}
+}
+
+civetweb-doc_package() {
+	depends="civetweb-${version}_${revision}"
+		short_desc+=' - documentation'
+		pkg_install() {
+			vmove usr/share/doc
+		}
+}

From c7a942b6f7a30e5d20809514478fc7af4918689b Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Gallo Filho <gcarlos@disroot.org>
Date: Tue, 2 Aug 2022 13:46:25 -0300
Subject: [PATCH 2/3] Update srcpkgs/civetweb/template

Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
---
 srcpkgs/civetweb/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/civetweb/template b/srcpkgs/civetweb/template
index 540808c22aca..3f923f3b6825 100644
--- a/srcpkgs/civetweb/template
+++ b/srcpkgs/civetweb/template
@@ -5,7 +5,6 @@ revision=1
 build_style=gnu-makefile
 make_install_target="install install-headers install-lib install-slib"
 make_use_env=yes
-hostmakedepends="openssl-devel"
 makedepends="openssl-devel"
 short_desc="Embedded C/C++ web server"
 maintainer="bingulo <gcarlos@disroot.org>"

From 0642bbc47d66df9846fc6585b7d0151e69811ff0 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Gallo Filho <gcarlos@disroot.org>
Date: Tue, 2 Aug 2022 13:46:38 -0300
Subject: [PATCH 3/3] Update srcpkgs/civetweb/template

Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
---
 srcpkgs/civetweb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/civetweb/template b/srcpkgs/civetweb/template
index 3f923f3b6825..54b70cbe0bdf 100644
--- a/srcpkgs/civetweb/template
+++ b/srcpkgs/civetweb/template
@@ -22,7 +22,7 @@ post_install() {
 }
 
 civetweb-devel_package() {
-	depends="civetweb-${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 		short_desc+=' - development files'
 		pkg_install() {
 			vmove usr/include