aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2021-08-29 12:27:31 -0300
committerLeo <thinkabit.ukim@gmail.com>2021-09-04 16:18:21 +0000
commit43fae2013db7d89b4c635cef7567959f72fa7145 (patch)
tree1e56405953da388f52c8573e7d9328115712fbd5
parent5fffda56e8191acd1e1a6c95e61be2103a786f1f (diff)
downloadaports-43fae2013db7d89b4c635cef7567959f72fa7145.tar.gz
aports-43fae2013db7d89b4c635cef7567959f72fa7145.tar.bz2
aports-43fae2013db7d89b4c635cef7567959f72fa7145.tar.xz
main/cvs: really apply cvs_1.12.13+real-26
-rw-r--r--main/cvs/APKBUILD24
-rw-r--r--main/cvs/add-libbsd.patch12
-rw-r--r--main/cvs/cvs_1.12.13+real-26.patch (renamed from main/cvs/cvs_1.12.13+real-26.diff)0
3 files changed, 30 insertions, 6 deletions
diff --git a/main/cvs/APKBUILD b/main/cvs/APKBUILD
index 43925f68f5..108fadb6bb 100644
--- a/main/cvs/APKBUILD
+++ b/main/cvs/APKBUILD
@@ -2,19 +2,27 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cvs
pkgver=1.12.13
-pkgrel=0
+pkgrel=1
pkgdesc="Concurrent Versions System"
url="https://www.nongnu.org/cvs/"
arch="all"
license="GPL-2.0-or-later"
options="!check" # Tests fail - src/lib/test-getdate.sh
-makedepends="zlib-dev"
+makedepends="
+ autoconf
+ automake
+ gettext-dev
+ libbsd-dev
+ texinfo
+ zlib-dev
+"
subpackages="$pkgname-doc"
source="https://ftp.gnu.org/non-gnu/cvs/source/feature/$pkgver/cvs-$pkgver.tar.gz
- cvs_1.12.13+real-26.diff
+ cvs_1.12.13+real-26.patch
install-sh.patch
mktime-configure.patch
getcwd.patch
+ add-libbsd.patch
"
# secfixes:
@@ -25,6 +33,7 @@ source="https://ftp.gnu.org/non-gnu/cvs/source/feature/$pkgver/cvs-$pkgver.tar.g
prepare() {
default_prepare
update_config_sub
+ autoreconf -fi
}
build() {
@@ -48,8 +57,11 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="acd658b7ffa29a67e33f294073a0f80a27aa4e19dc2185cfa43f862d34e511bcf9802012b8e6957f82c7532fdabbb058b33686e0e6046cdd1f1aa9af619e92e9 cvs-1.12.13.tar.gz
-510a8a3ed392108f360f3477af45f863ea3603b8c3f90504dfc018e3ef5ed79e69fcd3e38c82b46061cc82a53859d8ab209ae6f8ee07134f7db98bc3f1e38f06 cvs_1.12.13+real-26.diff
+sha512sums="
+acd658b7ffa29a67e33f294073a0f80a27aa4e19dc2185cfa43f862d34e511bcf9802012b8e6957f82c7532fdabbb058b33686e0e6046cdd1f1aa9af619e92e9 cvs-1.12.13.tar.gz
+510a8a3ed392108f360f3477af45f863ea3603b8c3f90504dfc018e3ef5ed79e69fcd3e38c82b46061cc82a53859d8ab209ae6f8ee07134f7db98bc3f1e38f06 cvs_1.12.13+real-26.patch
44e0b683f8178804d029957e78af046197142181564bfb0209da2682f9817e6c661a9e0dd390d236c9ebdc937df920269e708bb7d7c84ca942341fd413a1b265 install-sh.patch
a430f2659e1f96bc4ba2205567662eb5863c0c73b2e0c43eba86b23734b3874663e389e74e6011c6a0e9f4074d676adfd6c88fbe20f11ca33ba3223a93dad02c mktime-configure.patch
-99a9107603a933c164070787a3e270f8b1d82fb6930763061f019a42c0d88e4ac981941ccc0851ae051df757caef5d6c9a9e9b87d3378e7361cc78f48460f4a1 getcwd.patch"
+99a9107603a933c164070787a3e270f8b1d82fb6930763061f019a42c0d88e4ac981941ccc0851ae051df757caef5d6c9a9e9b87d3378e7361cc78f48460f4a1 getcwd.patch
+eecdd7f8a31ae63901e6b7336c7aac5827dd33ce2c80bb7d629ffb3dc65927eae75f59f6a949e290471982f22265f02eaa17febd6e6ea5f799edcfcbccd3b511 add-libbsd.patch
+"
diff --git a/main/cvs/add-libbsd.patch b/main/cvs/add-libbsd.patch
new file mode 100644
index 0000000000..1b018a7a12
--- /dev/null
+++ b/main/cvs/add-libbsd.patch
@@ -0,0 +1,12 @@
+--- old/src/Makefile.am
++++ new/src/Makefile.am
+@@ -117,7 +117,8 @@
+ $(ZLIB_LIBS) \
+ $(LIB_CLOCK_GETTIME) \
+ $(LIB_NANOSLEEP) \
+- $(LIBINTL)
++ $(LIBINTL) \
++ -lbsd
+
+ # General
+ EXTRA_DIST = \
diff --git a/main/cvs/cvs_1.12.13+real-26.diff b/main/cvs/cvs_1.12.13+real-26.patch
index 756fbdbd46..756fbdbd46 100644
--- a/main/cvs/cvs_1.12.13+real-26.diff
+++ b/main/cvs/cvs_1.12.13+real-26.patch