* [PR PATCH] New package: civetweb-1.15
@ 2022-08-02 3:27 bingulo
2022-08-02 3:41 ` [PR REVIEW] " classabbyamp
` (39 more replies)
0 siblings, 40 replies; 41+ messages in thread
From: bingulo @ 2022-08-02 3:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1079 bytes --]
There is a new 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: 3061 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] 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
+ }
+}
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR REVIEW] New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
2022-08-02 3:41 ` [PR REVIEW] " classabbyamp
@ 2022-08-02 3:41 ` classabbyamp
2022-08-02 3:41 ` classabbyamp
` (37 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: classabbyamp @ 2022-08-02 3:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 206 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38419#discussion_r935084233
Comment:
```suggestion
```
this should be in the main package
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR REVIEW] New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
@ 2022-08-02 3:41 ` classabbyamp
2022-08-02 3:41 ` classabbyamp
` (38 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: classabbyamp @ 2022-08-02 3:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 497 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38419#discussion_r935085258
Comment:
I don't think there's enough documentation here to warrant a subpkg
```
/usr/share/doc/civetweb/CREDITS.md
/usr/share/doc/civetweb/LICENSE.md
/usr/share/doc/civetweb/README.md
/usr/share/doc/civetweb/RELEASE_NOTES.md
/usr/share/doc/civetweb/SECURITY.md
/usr/share/doc/civetweb/civetweb_64x64.png
/usr/share/doc/civetweb/index.html
```
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR REVIEW] New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (2 preceding siblings ...)
2022-08-02 3:41 ` classabbyamp
@ 2022-08-02 3:41 ` classabbyamp
2022-08-02 16:46 ` [PR PATCH] [Updated] " bingulo
` (35 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: classabbyamp @ 2022-08-02 3:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 227 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38419#discussion_r935083618
Comment:
```suggestion
```
is only used for headers/linking, not necessary on host
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR REVIEW] New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
2022-08-02 3:41 ` [PR REVIEW] " classabbyamp
2022-08-02 3:41 ` classabbyamp
@ 2022-08-02 3:41 ` classabbyamp
2022-08-02 3:41 ` classabbyamp
` (36 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: classabbyamp @ 2022-08-02 3:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 219 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38419#discussion_r935084316
Comment:
```suggestion
depends="${sourcepkg}>=${version}_${revision}"
```
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR PATCH] [Updated] New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (3 preceding siblings ...)
2022-08-02 3:41 ` classabbyamp
@ 2022-08-02 16:46 ` bingulo
2022-08-02 16:46 ` bingulo
` (34 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: bingulo @ 2022-08-02 16:46 UTC (permalink / raw)
To: ml
[-- 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: 3890 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/2] 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/2] 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>"
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR PATCH] [Updated] New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (4 preceding siblings ...)
2022-08-02 16:46 ` [PR PATCH] [Updated] " bingulo
@ 2022-08-02 16:46 ` bingulo
2022-08-02 16:47 ` bingulo
` (33 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: bingulo @ 2022-08-02 16:46 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR PATCH] [Updated] New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (5 preceding siblings ...)
2022-08-02 16:46 ` bingulo
@ 2022-08-02 16:47 ` bingulo
2022-08-02 16:47 ` [PR REVIEW] " bingulo
` (32 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: bingulo @ 2022-08-02 16:47 UTC (permalink / raw)
To: ml
[-- 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: 5375 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/4] 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/4] 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/4] 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
From 0f8220d0194769c12839bf52c333603069d13bf0 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Gallo Filho <gcarlos@disroot.org>
Date: Tue, 2 Aug 2022 13:46:58 -0300
Subject: [PATCH 4/4] 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 54b70cbe0bdf..bddae7480510 100644
--- a/srcpkgs/civetweb/template
+++ b/srcpkgs/civetweb/template
@@ -28,7 +28,6 @@ civetweb-devel_package() {
vmove usr/include
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
- vmove "usr/lib/*.so.1"
}
}
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR REVIEW] New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (6 preceding siblings ...)
2022-08-02 16:47 ` bingulo
@ 2022-08-02 16:47 ` bingulo
2022-08-02 16:54 ` [PR PATCH] [Updated] " bingulo
` (31 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: bingulo @ 2022-08-02 16:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 179 bytes --]
New review comment by bingulo on void-packages repository
https://github.com/void-linux/void-packages/pull/38419#discussion_r935815470
Comment:
I'll remove the doc subpkg, thx.
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR PATCH] [Updated] New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (7 preceding siblings ...)
2022-08-02 16:47 ` [PR REVIEW] " bingulo
@ 2022-08-02 16:54 ` bingulo
2022-08-02 16:55 ` [PR REVIEW] " classabbyamp
` (30 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: bingulo @ 2022-08-02 16:54 UTC (permalink / raw)
To: ml
[-- 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: 7011 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/6] 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/6] 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/6] 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
From 0f8220d0194769c12839bf52c333603069d13bf0 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Gallo Filho <gcarlos@disroot.org>
Date: Tue, 2 Aug 2022 13:46:58 -0300
Subject: [PATCH 4/6] 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 54b70cbe0bdf..bddae7480510 100644
--- a/srcpkgs/civetweb/template
+++ b/srcpkgs/civetweb/template
@@ -28,7 +28,6 @@ civetweb-devel_package() {
vmove usr/include
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
- vmove "usr/lib/*.so.1"
}
}
From e3bfe11bb73c3eb74cec8ae00b05d092df197263 Mon Sep 17 00:00:00 2001
From: bingulo <gcarlos@disroot.org>
Date: Tue, 2 Aug 2022 13:53:10 -0300
Subject: [PATCH 5/6] adjusted indentation
---
srcpkgs/civetweb/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/civetweb/template b/srcpkgs/civetweb/template
index bddae7480510..81b652654bf8 100644
--- a/srcpkgs/civetweb/template
+++ b/srcpkgs/civetweb/template
@@ -26,8 +26,8 @@ civetweb-devel_package() {
short_desc+=' - development files'
pkg_install() {
vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
}
}
From ec0b5a92fece9a0e88378e8bb91424f998199710 Mon Sep 17 00:00:00 2001
From: bingulo <gcarlos@disroot.org>
Date: Tue, 2 Aug 2022 13:54:02 -0300
Subject: [PATCH 6/6] Removed doc subpkg
---
srcpkgs/civetweb-doc | 1 -
srcpkgs/civetweb/template | 8 --------
2 files changed, 9 deletions(-)
delete mode 120000 srcpkgs/civetweb-doc
diff --git a/srcpkgs/civetweb-doc b/srcpkgs/civetweb-doc
deleted file mode 120000
index f740b5313316..000000000000
--- a/srcpkgs/civetweb-doc
+++ /dev/null
@@ -1 +0,0 @@
-civetweb
\ No newline at end of file
diff --git a/srcpkgs/civetweb/template b/srcpkgs/civetweb/template
index 81b652654bf8..f7bb31412467 100644
--- a/srcpkgs/civetweb/template
+++ b/srcpkgs/civetweb/template
@@ -30,11 +30,3 @@ civetweb-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-civetweb-doc_package() {
- depends="civetweb-${version}_${revision}"
- short_desc+=' - documentation'
- pkg_install() {
- vmove usr/share/doc
- }
-}
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR REVIEW] New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (8 preceding siblings ...)
2022-08-02 16:54 ` [PR PATCH] [Updated] " bingulo
@ 2022-08-02 16:55 ` classabbyamp
2022-08-02 16:58 ` [PR PATCH] [Updated] " bingulo
` (29 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: classabbyamp @ 2022-08-02 16:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 297 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38419#discussion_r935823567
Comment:
```suggestion
short_desc+=' - development files'
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
}
```
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR PATCH] [Updated] New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (9 preceding siblings ...)
2022-08-02 16:55 ` [PR REVIEW] " classabbyamp
@ 2022-08-02 16:58 ` bingulo
2022-08-02 17:02 ` classabbyamp
` (28 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: bingulo @ 2022-08-02 16:58 UTC (permalink / raw)
To: ml
[-- 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: 7956 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/7] 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/7] 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/7] 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
From 0f8220d0194769c12839bf52c333603069d13bf0 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Gallo Filho <gcarlos@disroot.org>
Date: Tue, 2 Aug 2022 13:46:58 -0300
Subject: [PATCH 4/7] 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 54b70cbe0bdf..bddae7480510 100644
--- a/srcpkgs/civetweb/template
+++ b/srcpkgs/civetweb/template
@@ -28,7 +28,6 @@ civetweb-devel_package() {
vmove usr/include
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
- vmove "usr/lib/*.so.1"
}
}
From e3bfe11bb73c3eb74cec8ae00b05d092df197263 Mon Sep 17 00:00:00 2001
From: bingulo <gcarlos@disroot.org>
Date: Tue, 2 Aug 2022 13:53:10 -0300
Subject: [PATCH 5/7] adjusted indentation
---
srcpkgs/civetweb/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/civetweb/template b/srcpkgs/civetweb/template
index bddae7480510..81b652654bf8 100644
--- a/srcpkgs/civetweb/template
+++ b/srcpkgs/civetweb/template
@@ -26,8 +26,8 @@ civetweb-devel_package() {
short_desc+=' - development files'
pkg_install() {
vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
}
}
From ec0b5a92fece9a0e88378e8bb91424f998199710 Mon Sep 17 00:00:00 2001
From: bingulo <gcarlos@disroot.org>
Date: Tue, 2 Aug 2022 13:54:02 -0300
Subject: [PATCH 6/7] Removed doc subpkg
---
srcpkgs/civetweb-doc | 1 -
srcpkgs/civetweb/template | 8 --------
2 files changed, 9 deletions(-)
delete mode 120000 srcpkgs/civetweb-doc
diff --git a/srcpkgs/civetweb-doc b/srcpkgs/civetweb-doc
deleted file mode 120000
index f740b5313316..000000000000
--- a/srcpkgs/civetweb-doc
+++ /dev/null
@@ -1 +0,0 @@
-civetweb
\ No newline at end of file
diff --git a/srcpkgs/civetweb/template b/srcpkgs/civetweb/template
index 81b652654bf8..f7bb31412467 100644
--- a/srcpkgs/civetweb/template
+++ b/srcpkgs/civetweb/template
@@ -30,11 +30,3 @@ civetweb-devel_package() {
vmove "usr/lib/*.so"
}
}
-
-civetweb-doc_package() {
- depends="civetweb-${version}_${revision}"
- short_desc+=' - documentation'
- pkg_install() {
- vmove usr/share/doc
- }
-}
From 8290bfd70705f273d2d1d9cf026299643150da16 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Gallo Filho <gcarlos@disroot.org>
Date: Tue, 2 Aug 2022 13:58:09 -0300
Subject: [PATCH 7/7] Update srcpkgs/civetweb/template
Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
---
srcpkgs/civetweb/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/civetweb/template b/srcpkgs/civetweb/template
index f7bb31412467..873db9fadc2a 100644
--- a/srcpkgs/civetweb/template
+++ b/srcpkgs/civetweb/template
@@ -23,10 +23,10 @@ post_install() {
civetweb-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
- short_desc+=' - development files'
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- }
+ short_desc+=' - development files'
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ }
}
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (10 preceding siblings ...)
2022-08-02 16:58 ` [PR PATCH] [Updated] " bingulo
@ 2022-08-02 17:02 ` classabbyamp
2022-08-02 17:07 ` bingulo
` (27 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: classabbyamp @ 2022-08-02 17:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 202 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38419#issuecomment-1202993127
Comment:
you'll need to squash this into 1 commit and force-push
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (11 preceding siblings ...)
2022-08-02 17:02 ` classabbyamp
@ 2022-08-02 17:07 ` bingulo
2022-08-02 17:13 ` classabbyamp
` (26 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: bingulo @ 2022-08-02 17:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 194 bytes --]
New comment by bingulo on void-packages repository
https://github.com/void-linux/void-packages/pull/38419#issuecomment-1202997521
Comment:
Did I need to add libcivetweb.so.1 to common/shlibs?
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (12 preceding siblings ...)
2022-08-02 17:07 ` bingulo
@ 2022-08-02 17:13 ` classabbyamp
2022-08-02 17:36 ` [PR PATCH] [Updated] " bingulo
` (25 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: classabbyamp @ 2022-08-02 17:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 325 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38419#issuecomment-1203003217
Comment:
yes, and I think there should be a `libcivetweb` subpackage too
```sh
libcivetweb_package() {
short_desc+=" - library"
pkg_install() {
vmove usr/lib/*.so.*
}
}
```
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR PATCH] [Updated] New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (13 preceding siblings ...)
2022-08-02 17:13 ` classabbyamp
@ 2022-08-02 17:36 ` bingulo
2022-08-02 17:40 ` bingulo
` (24 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: bingulo @ 2022-08-02 17:36 UTC (permalink / raw)
To: ml
[-- 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: 5208 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/2] 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 0f3590bb34969b407b8c8e99180ea2c40140e26d 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/2] Update srcpkgs/civetweb/template
Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
Update srcpkgs/civetweb/template
Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
Update srcpkgs/civetweb/template
Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
adjusted indentation
Removed doc subpkg
Update srcpkgs/civetweb/template
Co-authored-by: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
---
srcpkgs/civetweb-doc | 1 -
srcpkgs/civetweb/template | 24 +++++++-----------------
2 files changed, 7 insertions(+), 18 deletions(-)
delete mode 120000 srcpkgs/civetweb-doc
diff --git a/srcpkgs/civetweb-doc b/srcpkgs/civetweb-doc
deleted file mode 120000
index f740b5313316..000000000000
--- a/srcpkgs/civetweb-doc
+++ /dev/null
@@ -1 +0,0 @@
-civetweb
\ No newline at end of file
diff --git a/srcpkgs/civetweb/template b/srcpkgs/civetweb/template
index 540808c22aca..873db9fadc2a 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>"
@@ -23,20 +22,11 @@ post_install() {
}
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
- }
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=' - development files'
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ }
}
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR PATCH] [Updated] New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (14 preceding siblings ...)
2022-08-02 17:36 ` [PR PATCH] [Updated] " bingulo
@ 2022-08-02 17:40 ` bingulo
2022-08-02 18:01 ` bingulo
` (23 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: bingulo @ 2022-08-02 17:40 UTC (permalink / raw)
To: ml
[-- 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: 4762 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/2] 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 b2329ef6dd87834110510cc2c1cd34f2dd72c022 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/2] civetweb: adequated accordingly PR review
---
srcpkgs/civetweb-doc | 1 -
srcpkgs/civetweb/template | 24 +++++++-----------------
2 files changed, 7 insertions(+), 18 deletions(-)
delete mode 120000 srcpkgs/civetweb-doc
diff --git a/srcpkgs/civetweb-doc b/srcpkgs/civetweb-doc
deleted file mode 120000
index f740b5313316..000000000000
--- a/srcpkgs/civetweb-doc
+++ /dev/null
@@ -1 +0,0 @@
-civetweb
\ No newline at end of file
diff --git a/srcpkgs/civetweb/template b/srcpkgs/civetweb/template
index 540808c22aca..873db9fadc2a 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>"
@@ -23,20 +22,11 @@ post_install() {
}
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
- }
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=' - development files'
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ }
}
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (15 preceding siblings ...)
2022-08-02 17:40 ` bingulo
@ 2022-08-02 18:01 ` bingulo
2022-08-02 18:04 ` classabbyamp
` (22 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: bingulo @ 2022-08-02 18:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 454 bytes --]
New comment by bingulo on void-packages repository
https://github.com/void-linux/void-packages/pull/38419#issuecomment-1203047691
Comment:
> yes, and I think there should be a `libcivetweb` subpackage too
>
> ```shell
> libcivetweb_package() {
> short_desc+=" - library"
> pkg_install() {
> vmove usr/lib/*.so.*
> }
> }
> ```
Should I add this subpackage as dependency for main package? I tested and didn't find any issue without it.
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (16 preceding siblings ...)
2022-08-02 18:01 ` bingulo
@ 2022-08-02 18:04 ` classabbyamp
2022-08-02 18:08 ` [PR PATCH] [Updated] " bingulo
` (21 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: classabbyamp @ 2022-08-02 18:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 187 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38419#issuecomment-1203051839
Comment:
no, it should be automatically detected
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR PATCH] [Updated] New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (17 preceding siblings ...)
2022-08-02 18:04 ` classabbyamp
@ 2022-08-02 18:08 ` bingulo
2022-08-02 18:10 ` classabbyamp
` (20 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: bingulo @ 2022-08-02 18:08 UTC (permalink / raw)
To: ml
[-- 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: 6265 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/4] 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 b2329ef6dd87834110510cc2c1cd34f2dd72c022 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/4] civetweb: adequated accordingly PR review
---
srcpkgs/civetweb-doc | 1 -
srcpkgs/civetweb/template | 24 +++++++-----------------
2 files changed, 7 insertions(+), 18 deletions(-)
delete mode 120000 srcpkgs/civetweb-doc
diff --git a/srcpkgs/civetweb-doc b/srcpkgs/civetweb-doc
deleted file mode 120000
index f740b5313316..000000000000
--- a/srcpkgs/civetweb-doc
+++ /dev/null
@@ -1 +0,0 @@
-civetweb
\ No newline at end of file
diff --git a/srcpkgs/civetweb/template b/srcpkgs/civetweb/template
index 540808c22aca..873db9fadc2a 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>"
@@ -23,20 +22,11 @@ post_install() {
}
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
- }
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=' - development files'
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ }
}
From 4f43cf6adeb1d7d5fa297d12021a4cc81650a375 Mon Sep 17 00:00:00 2001
From: bingulo <gcarlos@disroot.org>
Date: Tue, 2 Aug 2022 15:06:28 -0300
Subject: [PATCH 3/4] civetweb: new libcivetweb subpackage.
---
srcpkgs/civetweb/template | 7 +++++++
srcpkgs/libcivetweb | 1 +
2 files changed, 8 insertions(+)
create mode 120000 srcpkgs/libcivetweb
diff --git a/srcpkgs/civetweb/template b/srcpkgs/civetweb/template
index 873db9fadc2a..a53d9a3c6812 100644
--- a/srcpkgs/civetweb/template
+++ b/srcpkgs/civetweb/template
@@ -30,3 +30,10 @@ civetweb-devel_package() {
vmove "usr/lib/*.so"
}
}
+
+libcivetweb_package() {
+ short_desc+=' - library'
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
diff --git a/srcpkgs/libcivetweb b/srcpkgs/libcivetweb
new file mode 120000
index 000000000000..f740b5313316
--- /dev/null
+++ b/srcpkgs/libcivetweb
@@ -0,0 +1 @@
+civetweb
\ No newline at end of file
From c504e14d4ab2c62cfba0c59967feefd3a46c5ad4 Mon Sep 17 00:00:00 2001
From: bingulo <gcarlos@disroot.org>
Date: Tue, 2 Aug 2022 15:07:17 -0300
Subject: [PATCH 4/4] common/shlibs: libcivetweb
---
common/shlibs | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/shlibs b/common/shlibs
index 651900c9edf8..8d0eaeeae9e4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4185,3 +4185,4 @@ libnvidia-container-go.so.1 libnvidia-container-1.10.0_1
libqtspell-qt5.so.1 qtspell-1.0.1_1
libopensmtpd.so.0 libopensmtpd-0.7_1
libiio.so.0 libiio-0.23_1
+libcivetweb.so.1 libcivetweb-1.15_1
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (18 preceding siblings ...)
2022-08-02 18:08 ` [PR PATCH] [Updated] " bingulo
@ 2022-08-02 18:10 ` classabbyamp
2022-08-02 18:13 ` [PR PATCH] [Updated] " bingulo
` (19 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: classabbyamp @ 2022-08-02 18:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 203 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38419#issuecomment-1203057891
Comment:
the devel package should be called libcivetweb-devel now
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR PATCH] [Updated] New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (19 preceding siblings ...)
2022-08-02 18:10 ` classabbyamp
@ 2022-08-02 18:13 ` bingulo
2022-08-02 18:15 ` classabbyamp
` (18 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: bingulo @ 2022-08-02 18:13 UTC (permalink / raw)
To: ml
[-- 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: 7271 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/5] 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 b2329ef6dd87834110510cc2c1cd34f2dd72c022 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/5] civetweb: adequated accordingly PR review
---
srcpkgs/civetweb-doc | 1 -
srcpkgs/civetweb/template | 24 +++++++-----------------
2 files changed, 7 insertions(+), 18 deletions(-)
delete mode 120000 srcpkgs/civetweb-doc
diff --git a/srcpkgs/civetweb-doc b/srcpkgs/civetweb-doc
deleted file mode 120000
index f740b5313316..000000000000
--- a/srcpkgs/civetweb-doc
+++ /dev/null
@@ -1 +0,0 @@
-civetweb
\ No newline at end of file
diff --git a/srcpkgs/civetweb/template b/srcpkgs/civetweb/template
index 540808c22aca..873db9fadc2a 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>"
@@ -23,20 +22,11 @@ post_install() {
}
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
- }
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=' - development files'
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ }
}
From 4f43cf6adeb1d7d5fa297d12021a4cc81650a375 Mon Sep 17 00:00:00 2001
From: bingulo <gcarlos@disroot.org>
Date: Tue, 2 Aug 2022 15:06:28 -0300
Subject: [PATCH 3/5] civetweb: new libcivetweb subpackage.
---
srcpkgs/civetweb/template | 7 +++++++
srcpkgs/libcivetweb | 1 +
2 files changed, 8 insertions(+)
create mode 120000 srcpkgs/libcivetweb
diff --git a/srcpkgs/civetweb/template b/srcpkgs/civetweb/template
index 873db9fadc2a..a53d9a3c6812 100644
--- a/srcpkgs/civetweb/template
+++ b/srcpkgs/civetweb/template
@@ -30,3 +30,10 @@ civetweb-devel_package() {
vmove "usr/lib/*.so"
}
}
+
+libcivetweb_package() {
+ short_desc+=' - library'
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
diff --git a/srcpkgs/libcivetweb b/srcpkgs/libcivetweb
new file mode 120000
index 000000000000..f740b5313316
--- /dev/null
+++ b/srcpkgs/libcivetweb
@@ -0,0 +1 @@
+civetweb
\ No newline at end of file
From c504e14d4ab2c62cfba0c59967feefd3a46c5ad4 Mon Sep 17 00:00:00 2001
From: bingulo <gcarlos@disroot.org>
Date: Tue, 2 Aug 2022 15:07:17 -0300
Subject: [PATCH 4/5] common/shlibs: libcivetweb
---
common/shlibs | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/shlibs b/common/shlibs
index 651900c9edf8..8d0eaeeae9e4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4185,3 +4185,4 @@ libnvidia-container-go.so.1 libnvidia-container-1.10.0_1
libqtspell-qt5.so.1 qtspell-1.0.1_1
libopensmtpd.so.0 libopensmtpd-0.7_1
libiio.so.0 libiio-0.23_1
+libcivetweb.so.1 libcivetweb-1.15_1
From 8a4dbf75f8fcbbe27d02c6245a0a586874965aaf Mon Sep 17 00:00:00 2001
From: bingulo <gcarlos@disroot.org>
Date: Tue, 2 Aug 2022 15:12:45 -0300
Subject: [PATCH 5/5] civetweb: renamed civetweb-devel subpackage to
libcivetweb-devel.
---
srcpkgs/civetweb/template | 2 +-
srcpkgs/{civetweb-devel => libcivetweb-devel} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename srcpkgs/{civetweb-devel => libcivetweb-devel} (100%)
diff --git a/srcpkgs/civetweb/template b/srcpkgs/civetweb/template
index a53d9a3c6812..cbbb95c5c51c 100644
--- a/srcpkgs/civetweb/template
+++ b/srcpkgs/civetweb/template
@@ -21,7 +21,7 @@ post_install() {
vlicense LICENSE.md
}
-civetweb-devel_package() {
+libcivetweb-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=' - development files'
pkg_install() {
diff --git a/srcpkgs/civetweb-devel b/srcpkgs/libcivetweb-devel
similarity index 100%
rename from srcpkgs/civetweb-devel
rename to srcpkgs/libcivetweb-devel
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (20 preceding siblings ...)
2022-08-02 18:13 ` [PR PATCH] [Updated] " bingulo
@ 2022-08-02 18:15 ` classabbyamp
2022-08-02 18:19 ` bingulo
` (17 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: classabbyamp @ 2022-08-02 18:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 208 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38419#issuecomment-1203062890
Comment:
looks decent now, can you squash your commits and force-push?
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (21 preceding siblings ...)
2022-08-02 18:15 ` classabbyamp
@ 2022-08-02 18:19 ` bingulo
2022-08-02 18:21 ` classabbyamp
` (16 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: bingulo @ 2022-08-02 18:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 273 bytes --]
New comment by bingulo on void-packages repository
https://github.com/void-linux/void-packages/pull/38419#issuecomment-1203066104
Comment:
> looks decent now, can you squash your commits and force-push?
I need to squash all commits from "New package" to now into one?
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (22 preceding siblings ...)
2022-08-02 18:19 ` bingulo
@ 2022-08-02 18:21 ` classabbyamp
2022-08-02 18:23 ` [PR PATCH] [Updated] " bingulo
` (15 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: classabbyamp @ 2022-08-02 18:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 223 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38419#issuecomment-1203067399
Comment:
yes, it should all be in a single commit called `New package: civetweb-1.15`
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR PATCH] [Updated] New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (23 preceding siblings ...)
2022-08-02 18:21 ` classabbyamp
@ 2022-08-02 18:23 ` bingulo
2022-08-02 20:07 ` bingulo
` (14 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: bingulo @ 2022-08-02 18:23 UTC (permalink / raw)
To: ml
[-- 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: 3552 bytes --]
From 67e8b7b4b1037cef7a007d5fa208099c7a6c1ffb Mon Sep 17 00:00:00 2001
From: bingulo <gcarlos@disroot.org>
Date: Tue, 2 Aug 2022 00:16:13 -0300
Subject: [PATCH] New package: civetweb-1.15
New package: civetweb-1.15
civetweb: adequated accordingly PR review
civetweb: new libcivetweb subpackage.
common/shlibs: libcivetweb
civetweb: renamed civetweb-devel subpackage to libcivetweb-devel.
---
common/shlibs | 1 +
srcpkgs/civetweb/patches/install-fix.patch | 16 +++++++++
srcpkgs/civetweb/template | 39 ++++++++++++++++++++++
srcpkgs/libcivetweb | 1 +
srcpkgs/libcivetweb-devel | 1 +
5 files changed, 58 insertions(+)
create mode 100644 srcpkgs/civetweb/patches/install-fix.patch
create mode 100644 srcpkgs/civetweb/template
create mode 120000 srcpkgs/libcivetweb
create mode 120000 srcpkgs/libcivetweb-devel
diff --git a/common/shlibs b/common/shlibs
index 651900c9edf8..8d0eaeeae9e4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4185,3 +4185,4 @@ libnvidia-container-go.so.1 libnvidia-container-1.10.0_1
libqtspell-qt5.so.1 qtspell-1.0.1_1
libopensmtpd.so.0 libopensmtpd-0.7_1
libiio.so.0 libiio-0.23_1
+libcivetweb.so.1 libcivetweb-1.15_1
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..cbbb95c5c51c
--- /dev/null
+++ b/srcpkgs/civetweb/template
@@ -0,0 +1,39 @@
+# 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
+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
+}
+
+libcivetweb-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=' - development files'
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ }
+}
+
+libcivetweb_package() {
+ short_desc+=' - library'
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
diff --git a/srcpkgs/libcivetweb b/srcpkgs/libcivetweb
new file mode 120000
index 000000000000..f740b5313316
--- /dev/null
+++ b/srcpkgs/libcivetweb
@@ -0,0 +1 @@
+civetweb
\ No newline at end of file
diff --git a/srcpkgs/libcivetweb-devel b/srcpkgs/libcivetweb-devel
new file mode 120000
index 000000000000..f740b5313316
--- /dev/null
+++ b/srcpkgs/libcivetweb-devel
@@ -0,0 +1 @@
+civetweb
\ No newline at end of file
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR PATCH] [Updated] New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (24 preceding siblings ...)
2022-08-02 18:23 ` [PR PATCH] [Updated] " bingulo
@ 2022-08-02 20:07 ` bingulo
2022-08-02 20:08 ` classabbyamp
` (13 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: bingulo @ 2022-08-02 20:07 UTC (permalink / raw)
To: ml
[-- 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: 5067 bytes --]
From aaaff33eceb2847acf4ddd17fe275ddb73bfd6aa Mon Sep 17 00:00:00 2001
From: bingulo <gcarlos@disroot.org>
Date: Tue, 2 Aug 2022 00:16:13 -0300
Subject: [PATCH] New package: civetweb-1.15
New package: civetweb-1.15
civetweb: adequated accordingly PR review
civetweb: new libcivetweb subpackage.
common/shlibs: libcivetweb
civetweb: renamed civetweb-devel subpackage to libcivetweb-devel.
---
common/shlibs | 1 +
.../var/db/xbps/pkgdb-0.38.plist | 5 +++
srcpkgs/civetweb/patches/install-fix.patch | 16 ++++++++
srcpkgs/civetweb/template | 39 +++++++++++++++++++
srcpkgs/dcmtk/template | 14 +++++++
srcpkgs/libcivetweb | 1 +
srcpkgs/libcivetweb-devel | 1 +
7 files changed, 77 insertions(+)
create mode 100644 libcivetweb-devel/var/db/xbps/pkgdb-0.38.plist
create mode 100644 srcpkgs/civetweb/patches/install-fix.patch
create mode 100644 srcpkgs/civetweb/template
create mode 100644 srcpkgs/dcmtk/template
create mode 120000 srcpkgs/libcivetweb
create mode 120000 srcpkgs/libcivetweb-devel
diff --git a/common/shlibs b/common/shlibs
index 651900c9edf8..8d0eaeeae9e4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4185,3 +4185,4 @@ libnvidia-container-go.so.1 libnvidia-container-1.10.0_1
libqtspell-qt5.so.1 qtspell-1.0.1_1
libopensmtpd.so.0 libopensmtpd-0.7_1
libiio.so.0 libiio-0.23_1
+libcivetweb.so.1 libcivetweb-1.15_1
diff --git a/libcivetweb-devel/var/db/xbps/pkgdb-0.38.plist b/libcivetweb-devel/var/db/xbps/pkgdb-0.38.plist
new file mode 100644
index 000000000000..7685bd649954
--- /dev/null
+++ b/libcivetweb-devel/var/db/xbps/pkgdb-0.38.plist
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>
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..4ea276049b4e
--- /dev/null
+++ b/srcpkgs/civetweb/template
@@ -0,0 +1,39 @@
+# 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
+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
+}
+
+libcivetweb_package() {
+ short_desc+=' - library'
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+
+libcivetweb-devel_package() {
+ depends="lib${sourcepkg}>=${version}_${revision}"
+ short_desc+=' - development files'
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/dcmtk/template b/srcpkgs/dcmtk/template
new file mode 100644
index 000000000000..dd6923eca554
--- /dev/null
+++ b/srcpkgs/dcmtk/template
@@ -0,0 +1,14 @@
+# Template file for 'dcmtk'
+pkgname=dcmtk
+version=3.6.7
+revision=1
+build_style=cmake
+configure_args="-DDCMTK_ENABLE_CXX11=ON -DBUILD_SHARED_LIBS=ON -DDCMTK_WITH_DOXYGEN=ON"
+makehostdepends="doxygen"
+makedepends="openssl-devel zlib-devel tiff-devel libpng-devel libxml2-devel icu-devel"
+short_desc=="Set of libraries and applications that implements DICOM standard"
+maintainer="Carlos E. Gallo F. <gcarlos@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://dcmtk.org/dcmtk.php.en"
+distfiles="https://dicom.offis.de/download/dcmtk/dcmtk367/dcmtk-${version}.tar.gz"
+checksum=7c58298e3e8d60232ee6fc8408cfadd14463cc11a3c4ca4c59af5988c7e9710a
diff --git a/srcpkgs/libcivetweb b/srcpkgs/libcivetweb
new file mode 120000
index 000000000000..f740b5313316
--- /dev/null
+++ b/srcpkgs/libcivetweb
@@ -0,0 +1 @@
+civetweb
\ No newline at end of file
diff --git a/srcpkgs/libcivetweb-devel b/srcpkgs/libcivetweb-devel
new file mode 120000
index 000000000000..f740b5313316
--- /dev/null
+++ b/srcpkgs/libcivetweb-devel
@@ -0,0 +1 @@
+civetweb
\ No newline at end of file
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (25 preceding siblings ...)
2022-08-02 20:07 ` bingulo
@ 2022-08-02 20:08 ` classabbyamp
2022-08-02 20:09 ` [PR PATCH] [Updated] " bingulo
` (12 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: classabbyamp @ 2022-08-02 20:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 187 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38419#issuecomment-1203165435
Comment:
hm I think something got messed up there
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR PATCH] [Updated] New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (26 preceding siblings ...)
2022-08-02 20:08 ` classabbyamp
@ 2022-08-02 20:09 ` bingulo
2022-08-02 20:13 ` classabbyamp
` (11 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: bingulo @ 2022-08-02 20:09 UTC (permalink / raw)
To: ml
[-- 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: 4130 bytes --]
From 3c2af111f33bcef7296fa0f7a6e657e79cb719b6 Mon Sep 17 00:00:00 2001
From: bingulo <gcarlos@disroot.org>
Date: Tue, 2 Aug 2022 00:16:13 -0300
Subject: [PATCH] New package: civetweb-1.15
New package: civetweb-1.15
civetweb: adequated accordingly PR review
civetweb: new libcivetweb subpackage.
common/shlibs: libcivetweb
civetweb: renamed civetweb-devel subpackage to libcivetweb-devel.
---
common/shlibs | 1 +
.../var/db/xbps/pkgdb-0.38.plist | 5 +++
srcpkgs/civetweb/patches/install-fix.patch | 16 ++++++++
srcpkgs/civetweb/template | 39 +++++++++++++++++++
srcpkgs/libcivetweb | 1 +
srcpkgs/libcivetweb-devel | 1 +
6 files changed, 63 insertions(+)
create mode 100644 libcivetweb-devel/var/db/xbps/pkgdb-0.38.plist
create mode 100644 srcpkgs/civetweb/patches/install-fix.patch
create mode 100644 srcpkgs/civetweb/template
create mode 120000 srcpkgs/libcivetweb
create mode 120000 srcpkgs/libcivetweb-devel
diff --git a/common/shlibs b/common/shlibs
index 651900c9edf8..8d0eaeeae9e4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4185,3 +4185,4 @@ libnvidia-container-go.so.1 libnvidia-container-1.10.0_1
libqtspell-qt5.so.1 qtspell-1.0.1_1
libopensmtpd.so.0 libopensmtpd-0.7_1
libiio.so.0 libiio-0.23_1
+libcivetweb.so.1 libcivetweb-1.15_1
diff --git a/libcivetweb-devel/var/db/xbps/pkgdb-0.38.plist b/libcivetweb-devel/var/db/xbps/pkgdb-0.38.plist
new file mode 100644
index 000000000000..7685bd649954
--- /dev/null
+++ b/libcivetweb-devel/var/db/xbps/pkgdb-0.38.plist
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>
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..4ea276049b4e
--- /dev/null
+++ b/srcpkgs/civetweb/template
@@ -0,0 +1,39 @@
+# 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
+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
+}
+
+libcivetweb_package() {
+ short_desc+=' - library'
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+
+libcivetweb-devel_package() {
+ depends="lib${sourcepkg}>=${version}_${revision}"
+ short_desc+=' - development files'
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/libcivetweb b/srcpkgs/libcivetweb
new file mode 120000
index 000000000000..f740b5313316
--- /dev/null
+++ b/srcpkgs/libcivetweb
@@ -0,0 +1 @@
+civetweb
\ No newline at end of file
diff --git a/srcpkgs/libcivetweb-devel b/srcpkgs/libcivetweb-devel
new file mode 120000
index 000000000000..f740b5313316
--- /dev/null
+++ b/srcpkgs/libcivetweb-devel
@@ -0,0 +1 @@
+civetweb
\ No newline at end of file
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (27 preceding siblings ...)
2022-08-02 20:09 ` [PR PATCH] [Updated] " bingulo
@ 2022-08-02 20:13 ` classabbyamp
2022-08-02 20:14 ` bingulo
` (10 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: classabbyamp @ 2022-08-02 20:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 220 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/38419#issuecomment-1203169220
Comment:
there's still a `libcivetweb-devel/var/db/xbps/pkgdb-0.38.plist` in there
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (28 preceding siblings ...)
2022-08-02 20:13 ` classabbyamp
@ 2022-08-02 20:14 ` bingulo
2022-08-02 20:16 ` [PR PATCH] [Updated] " bingulo
` (9 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: bingulo @ 2022-08-02 20:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 326 bytes --]
New comment by bingulo on void-packages repository
https://github.com/void-linux/void-packages/pull/38419#issuecomment-1203170465
Comment:
> hm I think something got messed up there
My bad, I ran `git add srcpkgs` and added garbage.
I fixed depency of libcivetweb on libcivetweb-devel, where was wrong (was civetweb).
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR PATCH] [Updated] New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (29 preceding siblings ...)
2022-08-02 20:14 ` bingulo
@ 2022-08-02 20:16 ` bingulo
2022-08-02 20:21 ` bingulo
` (8 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: bingulo @ 2022-08-02 20:16 UTC (permalink / raw)
To: ml
[-- 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: 4130 bytes --]
From 3c666d60b4e74e85d60ed0944ea8054e56a18006 Mon Sep 17 00:00:00 2001
From: bingulo <gcarlos@disroot.org>
Date: Tue, 2 Aug 2022 00:16:13 -0300
Subject: [PATCH] New package: civetweb-1.15
New package: civetweb-1.15
civetweb: adequated accordingly PR review
civetweb: new libcivetweb subpackage.
common/shlibs: libcivetweb
civetweb: renamed civetweb-devel subpackage to libcivetweb-devel.
---
common/shlibs | 1 +
.../var/db/xbps/pkgdb-0.38.plist | 5 +++
srcpkgs/civetweb/patches/install-fix.patch | 16 ++++++++
srcpkgs/civetweb/template | 39 +++++++++++++++++++
srcpkgs/libcivetweb | 1 +
srcpkgs/libcivetweb-devel | 1 +
6 files changed, 63 insertions(+)
create mode 100644 libcivetweb-devel/var/db/xbps/pkgdb-0.38.plist
create mode 100644 srcpkgs/civetweb/patches/install-fix.patch
create mode 100644 srcpkgs/civetweb/template
create mode 120000 srcpkgs/libcivetweb
create mode 120000 srcpkgs/libcivetweb-devel
diff --git a/common/shlibs b/common/shlibs
index 651900c9edf8..8d0eaeeae9e4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4185,3 +4185,4 @@ libnvidia-container-go.so.1 libnvidia-container-1.10.0_1
libqtspell-qt5.so.1 qtspell-1.0.1_1
libopensmtpd.so.0 libopensmtpd-0.7_1
libiio.so.0 libiio-0.23_1
+libcivetweb.so.1 libcivetweb-1.15_1
diff --git a/libcivetweb-devel/var/db/xbps/pkgdb-0.38.plist b/libcivetweb-devel/var/db/xbps/pkgdb-0.38.plist
new file mode 100644
index 000000000000..7685bd649954
--- /dev/null
+++ b/libcivetweb-devel/var/db/xbps/pkgdb-0.38.plist
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>
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..4ea276049b4e
--- /dev/null
+++ b/srcpkgs/civetweb/template
@@ -0,0 +1,39 @@
+# 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
+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
+}
+
+libcivetweb_package() {
+ short_desc+=' - library'
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+
+libcivetweb-devel_package() {
+ depends="lib${sourcepkg}>=${version}_${revision}"
+ short_desc+=' - development files'
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/libcivetweb b/srcpkgs/libcivetweb
new file mode 120000
index 000000000000..f740b5313316
--- /dev/null
+++ b/srcpkgs/libcivetweb
@@ -0,0 +1 @@
+civetweb
\ No newline at end of file
diff --git a/srcpkgs/libcivetweb-devel b/srcpkgs/libcivetweb-devel
new file mode 120000
index 000000000000..f740b5313316
--- /dev/null
+++ b/srcpkgs/libcivetweb-devel
@@ -0,0 +1 @@
+civetweb
\ No newline at end of file
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR PATCH] [Updated] New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (30 preceding siblings ...)
2022-08-02 20:16 ` [PR PATCH] [Updated] " bingulo
@ 2022-08-02 20:21 ` bingulo
2022-08-02 20:23 ` bingulo
` (7 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: bingulo @ 2022-08-02 20:21 UTC (permalink / raw)
To: ml
[-- 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: 3555 bytes --]
From a97e47e0fad170f9cbe0c3e40c25f712f91cea82 Mon Sep 17 00:00:00 2001
From: bingulo <gcarlos@disroot.org>
Date: Tue, 2 Aug 2022 00:16:13 -0300
Subject: [PATCH] New package: civetweb-1.15
New package: civetweb-1.15
civetweb: adequated accordingly PR review
civetweb: new libcivetweb subpackage.
common/shlibs: libcivetweb
civetweb: renamed civetweb-devel subpackage to libcivetweb-devel.
---
common/shlibs | 1 +
srcpkgs/civetweb/patches/install-fix.patch | 16 +++++++++
srcpkgs/civetweb/template | 39 ++++++++++++++++++++++
srcpkgs/libcivetweb | 1 +
srcpkgs/libcivetweb-devel | 1 +
5 files changed, 58 insertions(+)
create mode 100644 srcpkgs/civetweb/patches/install-fix.patch
create mode 100644 srcpkgs/civetweb/template
create mode 120000 srcpkgs/libcivetweb
create mode 120000 srcpkgs/libcivetweb-devel
diff --git a/common/shlibs b/common/shlibs
index 651900c9edf8..8d0eaeeae9e4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4185,3 +4185,4 @@ libnvidia-container-go.so.1 libnvidia-container-1.10.0_1
libqtspell-qt5.so.1 qtspell-1.0.1_1
libopensmtpd.so.0 libopensmtpd-0.7_1
libiio.so.0 libiio-0.23_1
+libcivetweb.so.1 libcivetweb-1.15_1
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..4ea276049b4e
--- /dev/null
+++ b/srcpkgs/civetweb/template
@@ -0,0 +1,39 @@
+# 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
+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
+}
+
+libcivetweb_package() {
+ short_desc+=' - library'
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+
+libcivetweb-devel_package() {
+ depends="lib${sourcepkg}>=${version}_${revision}"
+ short_desc+=' - development files'
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/libcivetweb b/srcpkgs/libcivetweb
new file mode 120000
index 000000000000..f740b5313316
--- /dev/null
+++ b/srcpkgs/libcivetweb
@@ -0,0 +1 @@
+civetweb
\ No newline at end of file
diff --git a/srcpkgs/libcivetweb-devel b/srcpkgs/libcivetweb-devel
new file mode 120000
index 000000000000..f740b5313316
--- /dev/null
+++ b/srcpkgs/libcivetweb-devel
@@ -0,0 +1 @@
+civetweb
\ No newline at end of file
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (31 preceding siblings ...)
2022-08-02 20:21 ` bingulo
@ 2022-08-02 20:23 ` bingulo
2022-08-03 15:30 ` paper42
` (6 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: bingulo @ 2022-08-02 20:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 170 bytes --]
New comment by bingulo on void-packages repository
https://github.com/void-linux/void-packages/pull/38419#issuecomment-1203178175
Comment:
Now everything should be ok.
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (32 preceding siblings ...)
2022-08-02 20:23 ` bingulo
@ 2022-08-03 15:30 ` paper42
2022-08-03 16:39 ` [PR PATCH] [Updated] " bingulo
` (5 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: paper42 @ 2022-08-03 15:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 179 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/38419#issuecomment-1204111062
Comment:
please remove the commit message body
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR PATCH] [Updated] New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (33 preceding siblings ...)
2022-08-03 15:30 ` paper42
@ 2022-08-03 16:39 ` bingulo
2022-08-03 16:40 ` bingulo
` (4 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: bingulo @ 2022-08-03 16:39 UTC (permalink / raw)
To: ml
[-- 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: 3351 bytes --]
From 978c3b556ca6d6190ce17aac0b0b53023db31866 Mon Sep 17 00:00:00 2001
From: bingulo <gcarlos@disroot.org>
Date: Tue, 2 Aug 2022 00:16:13 -0300
Subject: [PATCH] New package: civetweb-1.15
---
common/shlibs | 1 +
srcpkgs/civetweb/patches/install-fix.patch | 16 +++++++++
srcpkgs/civetweb/template | 39 ++++++++++++++++++++++
srcpkgs/libcivetweb | 1 +
srcpkgs/libcivetweb-devel | 1 +
5 files changed, 58 insertions(+)
create mode 100644 srcpkgs/civetweb/patches/install-fix.patch
create mode 100644 srcpkgs/civetweb/template
create mode 120000 srcpkgs/libcivetweb
create mode 120000 srcpkgs/libcivetweb-devel
diff --git a/common/shlibs b/common/shlibs
index 651900c9edf8..8d0eaeeae9e4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4185,3 +4185,4 @@ libnvidia-container-go.so.1 libnvidia-container-1.10.0_1
libqtspell-qt5.so.1 qtspell-1.0.1_1
libopensmtpd.so.0 libopensmtpd-0.7_1
libiio.so.0 libiio-0.23_1
+libcivetweb.so.1 libcivetweb-1.15_1
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..4ea276049b4e
--- /dev/null
+++ b/srcpkgs/civetweb/template
@@ -0,0 +1,39 @@
+# 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
+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
+}
+
+libcivetweb_package() {
+ short_desc+=' - library'
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+
+libcivetweb-devel_package() {
+ depends="lib${sourcepkg}>=${version}_${revision}"
+ short_desc+=' - development files'
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/libcivetweb b/srcpkgs/libcivetweb
new file mode 120000
index 000000000000..f740b5313316
--- /dev/null
+++ b/srcpkgs/libcivetweb
@@ -0,0 +1 @@
+civetweb
\ No newline at end of file
diff --git a/srcpkgs/libcivetweb-devel b/srcpkgs/libcivetweb-devel
new file mode 120000
index 000000000000..f740b5313316
--- /dev/null
+++ b/srcpkgs/libcivetweb-devel
@@ -0,0 +1 @@
+civetweb
\ No newline at end of file
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR PATCH] [Updated] New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (34 preceding siblings ...)
2022-08-03 16:39 ` [PR PATCH] [Updated] " bingulo
@ 2022-08-03 16:40 ` bingulo
2022-08-03 16:42 ` bingulo
` (3 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: bingulo @ 2022-08-03 16:40 UTC (permalink / raw)
To: ml
[-- 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: 3351 bytes --]
From ad683a8af49e1d85d5c2e7d56fef29e63d9ffb33 Mon Sep 17 00:00:00 2001
From: bingulo <gcarlos@disroot.org>
Date: Tue, 2 Aug 2022 00:16:13 -0300
Subject: [PATCH] New package: civetweb-1.15
---
common/shlibs | 1 +
srcpkgs/civetweb/patches/install-fix.patch | 16 +++++++++
srcpkgs/civetweb/template | 39 ++++++++++++++++++++++
srcpkgs/libcivetweb | 1 +
srcpkgs/libcivetweb-devel | 1 +
5 files changed, 58 insertions(+)
create mode 100644 srcpkgs/civetweb/patches/install-fix.patch
create mode 100644 srcpkgs/civetweb/template
create mode 120000 srcpkgs/libcivetweb
create mode 120000 srcpkgs/libcivetweb-devel
diff --git a/common/shlibs b/common/shlibs
index 651900c9edf8..8d0eaeeae9e4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4185,3 +4185,4 @@ libnvidia-container-go.so.1 libnvidia-container-1.10.0_1
libqtspell-qt5.so.1 qtspell-1.0.1_1
libopensmtpd.so.0 libopensmtpd-0.7_1
libiio.so.0 libiio-0.23_1
+libcivetweb.so.1 libcivetweb-1.15_1
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..4ea276049b4e
--- /dev/null
+++ b/srcpkgs/civetweb/template
@@ -0,0 +1,39 @@
+# 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
+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
+}
+
+libcivetweb_package() {
+ short_desc+=' - library'
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+
+libcivetweb-devel_package() {
+ depends="lib${sourcepkg}>=${version}_${revision}"
+ short_desc+=' - development files'
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/libcivetweb b/srcpkgs/libcivetweb
new file mode 120000
index 000000000000..f740b5313316
--- /dev/null
+++ b/srcpkgs/libcivetweb
@@ -0,0 +1 @@
+civetweb
\ No newline at end of file
diff --git a/srcpkgs/libcivetweb-devel b/srcpkgs/libcivetweb-devel
new file mode 120000
index 000000000000..f740b5313316
--- /dev/null
+++ b/srcpkgs/libcivetweb-devel
@@ -0,0 +1 @@
+civetweb
\ No newline at end of file
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (35 preceding siblings ...)
2022-08-03 16:40 ` bingulo
@ 2022-08-03 16:42 ` bingulo
2022-08-07 2:28 ` [PR PATCH] [Updated] " bingulo
` (2 subsequent siblings)
39 siblings, 0 replies; 41+ messages in thread
From: bingulo @ 2022-08-03 16:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
New comment by bingulo on void-packages repository
https://github.com/void-linux/void-packages/pull/38419#issuecomment-1204212122
Comment:
> please remove the commit message body
done
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR PATCH] [Updated] New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (36 preceding siblings ...)
2022-08-03 16:42 ` bingulo
@ 2022-08-07 2:28 ` bingulo
2022-08-08 17:34 ` bingulo
2022-08-08 17:34 ` [PR PATCH] [Closed]: " bingulo
39 siblings, 0 replies; 41+ messages in thread
From: bingulo @ 2022-08-07 2:28 UTC (permalink / raw)
To: ml
[-- 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: 3351 bytes --]
From ad683a8af49e1d85d5c2e7d56fef29e63d9ffb33 Mon Sep 17 00:00:00 2001
From: bingulo <gcarlos@disroot.org>
Date: Tue, 2 Aug 2022 00:16:13 -0300
Subject: [PATCH] New package: civetweb-1.15
---
common/shlibs | 1 +
srcpkgs/civetweb/patches/install-fix.patch | 16 +++++++++
srcpkgs/civetweb/template | 39 ++++++++++++++++++++++
srcpkgs/libcivetweb | 1 +
srcpkgs/libcivetweb-devel | 1 +
5 files changed, 58 insertions(+)
create mode 100644 srcpkgs/civetweb/patches/install-fix.patch
create mode 100644 srcpkgs/civetweb/template
create mode 120000 srcpkgs/libcivetweb
create mode 120000 srcpkgs/libcivetweb-devel
diff --git a/common/shlibs b/common/shlibs
index 651900c9edf8..8d0eaeeae9e4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4185,3 +4185,4 @@ libnvidia-container-go.so.1 libnvidia-container-1.10.0_1
libqtspell-qt5.so.1 qtspell-1.0.1_1
libopensmtpd.so.0 libopensmtpd-0.7_1
libiio.so.0 libiio-0.23_1
+libcivetweb.so.1 libcivetweb-1.15_1
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..4ea276049b4e
--- /dev/null
+++ b/srcpkgs/civetweb/template
@@ -0,0 +1,39 @@
+# 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
+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
+}
+
+libcivetweb_package() {
+ short_desc+=' - library'
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+
+libcivetweb-devel_package() {
+ depends="lib${sourcepkg}>=${version}_${revision}"
+ short_desc+=' - development files'
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/libcivetweb b/srcpkgs/libcivetweb
new file mode 120000
index 000000000000..f740b5313316
--- /dev/null
+++ b/srcpkgs/libcivetweb
@@ -0,0 +1 @@
+civetweb
\ No newline at end of file
diff --git a/srcpkgs/libcivetweb-devel b/srcpkgs/libcivetweb-devel
new file mode 120000
index 000000000000..f740b5313316
--- /dev/null
+++ b/srcpkgs/libcivetweb-devel
@@ -0,0 +1 @@
+civetweb
\ No newline at end of file
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (37 preceding siblings ...)
2022-08-07 2:28 ` [PR PATCH] [Updated] " bingulo
@ 2022-08-08 17:34 ` bingulo
2022-08-08 17:34 ` [PR PATCH] [Closed]: " bingulo
39 siblings, 0 replies; 41+ messages in thread
From: bingulo @ 2022-08-08 17:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 250 bytes --]
New comment by bingulo on void-packages repository
https://github.com/void-linux/void-packages/pull/38419#issuecomment-1208410328
Comment:
I'll close this PR cause It's a dependency of another package I built, and it'll be referenced there #38537
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR PATCH] [Closed]: New package: civetweb-1.15
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
` (38 preceding siblings ...)
2022-08-08 17:34 ` bingulo
@ 2022-08-08 17:34 ` bingulo
39 siblings, 0 replies; 41+ messages in thread
From: bingulo @ 2022-08-08 17:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 929 bytes --]
There's a closed pull request on the void-packages repository
New package: civetweb-1.15
https://github.com/void-linux/void-packages/pull/38419
Description:
<!-- 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)
^ permalink raw reply [flat|nested] 41+ messages in thread
end of thread, other threads:[~2022-08-08 17:34 UTC | newest]
Thread overview: 41+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-02 3:27 [PR PATCH] New package: civetweb-1.15 bingulo
2022-08-02 3:41 ` [PR REVIEW] " classabbyamp
2022-08-02 3:41 ` classabbyamp
2022-08-02 3:41 ` classabbyamp
2022-08-02 3:41 ` classabbyamp
2022-08-02 16:46 ` [PR PATCH] [Updated] " bingulo
2022-08-02 16:46 ` bingulo
2022-08-02 16:47 ` bingulo
2022-08-02 16:47 ` [PR REVIEW] " bingulo
2022-08-02 16:54 ` [PR PATCH] [Updated] " bingulo
2022-08-02 16:55 ` [PR REVIEW] " classabbyamp
2022-08-02 16:58 ` [PR PATCH] [Updated] " bingulo
2022-08-02 17:02 ` classabbyamp
2022-08-02 17:07 ` bingulo
2022-08-02 17:13 ` classabbyamp
2022-08-02 17:36 ` [PR PATCH] [Updated] " bingulo
2022-08-02 17:40 ` bingulo
2022-08-02 18:01 ` bingulo
2022-08-02 18:04 ` classabbyamp
2022-08-02 18:08 ` [PR PATCH] [Updated] " bingulo
2022-08-02 18:10 ` classabbyamp
2022-08-02 18:13 ` [PR PATCH] [Updated] " bingulo
2022-08-02 18:15 ` classabbyamp
2022-08-02 18:19 ` bingulo
2022-08-02 18:21 ` classabbyamp
2022-08-02 18:23 ` [PR PATCH] [Updated] " bingulo
2022-08-02 20:07 ` bingulo
2022-08-02 20:08 ` classabbyamp
2022-08-02 20:09 ` [PR PATCH] [Updated] " bingulo
2022-08-02 20:13 ` classabbyamp
2022-08-02 20:14 ` bingulo
2022-08-02 20:16 ` [PR PATCH] [Updated] " bingulo
2022-08-02 20:21 ` bingulo
2022-08-02 20:23 ` bingulo
2022-08-03 15:30 ` paper42
2022-08-03 16:39 ` [PR PATCH] [Updated] " bingulo
2022-08-03 16:40 ` bingulo
2022-08-03 16:42 ` bingulo
2022-08-07 2:28 ` [PR PATCH] [Updated] " bingulo
2022-08-08 17:34 ` bingulo
2022-08-08 17:34 ` [PR PATCH] [Closed]: " bingulo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).