upgpkg: libcs50 8.1.2-1

upstream release

4 files changed, 38 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 179dbe8603f7..ae54a9870eaf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libcs50
 	pkgdesc = Harvard's cs50 C library
-	pkgver = 8.1.0
+	pkgver = 8.1.2
 	pkgrel = 1
 	url = https://cs50.harvard.edu/
 	arch = i686
@@ -8,10 +8,10 @@ pkgbase = libcs50
 	groups = cs50
 	license = unknown
 	makedepends = asciidoctor
-	provides = libcs50
-	conflicts = libcs50
-	source = libcs50-8.1.0.tar.gz::https://github.com/cs50/libcs50/archive/v8.1.0.tar.gz
-	sha256sums = f48b6e7e152df523cb0812874ed64a68d9f0f665a609a6601462bde226f66cd4
+	source = libcs50-8.1.2.tar.gz::https://github.com/cs50/libcs50/archive/v8.1.2.tar.gz
+	source = Makefile.patch
+	sha256sums = 886e1aade1ef985c566ed9001f90c378c7ebe8d5b5b67932eac7e94c1a83abbb
+	sha256sums = 43e487367882c54cb258dac3cfc98227918cff59ebc6a2965e18cf3a186b9f10
 
 pkgname = libcs50
 
diff --git a/.gitignore b/.gitignore
index 191dc79c0217..6a93745a0f69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 *
 
 # Whitelist:
+!.SRCINFO
 !.gitignore
 !PKGBUILD
-!.SRCINFO
+!Makefile.patch
diff --git a/Makefile.patch b/Makefile.patch
new file mode 100644
index 000000000000..ff5ddf91a876
--- /dev/null
+++ b/Makefile.patch
@@ -0,0 +1,15 @@
+diff --git a/Makefile b/Makefile
+index aa36a77..bd3735d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -46,10 +46,6 @@ install: all
+ 	cp -r $(filter-out deb, $(wildcard build/*)) $(DESTDIR)
+ 	cp -r $(MANS) $(DESTDIR)/$(MANDIR)
+ 
+-ifeq ($(OS),Linux)
+-	ldconfig
+-endif
+-
+ .PHONY: clean
+ clean:
+ 	rm -rf build
diff --git a/PKGBUILD b/PKGBUILD
index 8c6a93458a51..c7b9ed97c6a8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,7 @@
 # Maintainer: Dan Beste <dan.ray.beste@gmail.com>
 
-# TODO: manpages?
-
 pkgname='libcs50'
-pkgver=8.1.0
+pkgver=8.1.2
 pkgrel=1
 pkgdesc="Harvard's cs50 C library"
 arch=('i686' 'x86_64')
@@ -11,41 +9,37 @@ url='https://cs50.harvard.edu/'
 license=('unknown')
 groups=('cs50')
 makedepends=('asciidoctor')
-conflicts=('libcs50')
-provides=('libcs50')
 source=(
   "${pkgname}-${pkgver}.tar.gz::https://github.com/cs50/${pkgname}/archive/v${pkgver}.tar.gz"
-)
+  'Makefile.patch')
 sha256sums=(
-  'f48b6e7e152df523cb0812874ed64a68d9f0f665a609a6601462bde226f66cd4'
+  '886e1aade1ef985c566ed9001f90c378c7ebe8d5b5b67932eac7e94c1a83abbb'
+  '43e487367882c54cb258dac3cfc98227918cff59ebc6a2965e18cf3a186b9f10'
 )
 
-_query_jobs() {
-  echo "${MAKEFLAGS}" \
-    | grep -Eo "\-j.?[0-9]+"
-}
+prepare() {
+  cd "${pkgname}-${pkgver}"
 
-_set_jobs() {
-  echo $MAKEFLAGS \
-    | sed "s/$(_query_jobs)/-j 1/"
+  patch < "${srcdir}/Makefile.patch"
 }
 
 build() {
   cd "${pkgname}-${pkgver}"
-  
-  # Override makeflags:
-  local MAKEFLAGS=$(_set_jobs)
 
-  make
+  # TODO: Get this fixed upstream. We should not have to unset our $CFLAGS and
+  #       $MAKEFLAGS.
+  CFLAGS= MAKEFLAGS= make
 }
 
 package() {
   cd "${pkgname}-${pkgver}"
 
- install -d "${pkgdir}/usr"
- install -d "${pkgdir}/usr/share/man/man3"
- cp -rp build/* "${pkgdir}/usr/"
- cp -rp debian/docs/* "${pkgdir}/usr/share/man/man3/"
+  # TODO: Get this fixed upstream. We should not have to unset our $CFLAGS and
+  #       $MAKEFLAGS.
+  CFLAGS= MAKEFLAGS= DESTDIR="${pkgdir}/usr" make install
+  rm "${pkgdir}/usr/src/cs50.c"
+  install -d -m 755 "${pkgdir}/usr/src/libcs50"
+  install -m 644 src/cs50.c src/cs50.h -t "${pkgdir}/usr/src/libcs50"
 }
 
 # vim: ts=2 sw=2 et: