From d1c8514699947f1c6dc0c14cb2bc46ce4044b798 Mon Sep 17 00:00:00 2001 From: bingulo 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 " +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 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 " @@ -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 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 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 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