From d1c8514699947f1c6dc0c14cb2bc46ce4044b798 Mon Sep 17 00:00:00 2001 From: bingulo 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 " +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 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 " From 0642bbc47d66df9846fc6585b7d0151e69811ff0 Mon Sep 17 00:00:00 2001 From: Carlos Eduardo Gallo Filho 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 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 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 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 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" + } }