upgpkg: polipo-git 1.1.1.r41.g4d42ca1-2

2 files changed, 19 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 34908867ca6c..d1c6e48fbd0a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = polipo-git
 	pkgdesc = A caching web proxy
 	pkgver = 1.1.1.r41.g4d42ca1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.irif.fr/~jch/software/polipo/
 	arch = i686
 	arch = x86_64
@@ -11,13 +11,12 @@ pkgbase = polipo-git
 	provides = polipo
 	conflicts = polipo
 	source = git+https://github.com/jech/polipo.git
-	source = polipo.service::https://git.archlinux.org/svntogit/community.git/plain/trunk/polipo.service?h=packages/polipo
-	source = polipo.sysusers::https://git.archlinux.org/svntogit/community.git/plain/trunk/polipo.sysusers?h=packages/polipo
-	source = polipo.tmpfiles::https://git.archlinux.org/svntogit/community.git/plain/trunk/polipo.tmpfiles?h=packages/polipo
+	source = polipo.service::https://aur.archlinux.org/cgit/aur.git/plain/polipo.service?h=polipo
+	source = polipo.sysusers::https://aur.archlinux.org/cgit/aur.git/plain/polipo.sysusers?h=polipo
+	source = polipo.tmpfiles::https://aur.archlinux.org/cgit/aur.git/plain/polipo.tmpfiles?h=polipo
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 
 pkgname = polipo-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 6e13564f8b86..7e290ac8edeb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=polipo-git
 pkgver=1.1.1.r41.g4d42ca1
-pkgrel=1
+pkgrel=2
 pkgdesc="A caching web proxy"
 arch=('i686' 'x86_64')
 url="https://www.irif.fr/~jch/software/polipo/"
@@ -12,9 +12,9 @@ makedepends=('git')
 provides=('polipo')
 conflicts=('polipo')
 source=("git+https://github.com/jech/polipo.git"
-        "polipo.service::https://git.archlinux.org/svntogit/community.git/plain/trunk/polipo.service?h=packages/polipo"
-        "polipo.sysusers::https://git.archlinux.org/svntogit/community.git/plain/trunk/polipo.sysusers?h=packages/polipo"
-        "polipo.tmpfiles::https://git.archlinux.org/svntogit/community.git/plain/trunk/polipo.tmpfiles?h=packages/polipo")
+        "polipo.service::https://aur.archlinux.org/cgit/aur.git/plain/polipo.service?h=polipo"
+        "polipo.sysusers::https://aur.archlinux.org/cgit/aur.git/plain/polipo.sysusers?h=polipo"
+        "polipo.tmpfiles::https://aur.archlinux.org/cgit/aur.git/plain/polipo.tmpfiles?h=polipo")
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
@@ -24,7 +24,7 @@ sha256sums=('SKIP'
 prepare() {
   cd "polipo"
 
-  sed -i 's/-Os/-O2/g' Makefile
+  sed -i 's/-Os/-O2/g' "Makefile"
 }
 
 pkgver() {
@@ -42,21 +42,21 @@ build() {
 package() {
   cd "polipo"
 
-  make PREFIX="$pkgdir/usr" \
-       MANDIR="$pkgdir/usr/share/man" \
-       INFODIR="$pkgdir/usr/share/info" \
-       LOCAL_ROOT="$pkgdir/usr/share/polipo/www" \
-       DISK_CACHE_ROOT="$pkgdir/var/cache/polipo" \
-       install
+  make \
+    PREFIX="$pkgdir/usr" \
+    MANDIR="$pkgdir/usr/share/man" \
+    INFODIR="$pkgdir/usr/share/info" \
+    LOCAL_ROOT="$pkgdir/usr/share/polipo/www" \
+    DISK_CACHE_ROOT="$pkgdir/var/cache/polipo" \
+    install
 
-  install -Dm644 "COPYING" "$pkgdir/usr/share/licenses/polipo/COPYING"
+  install -Dm644 "COPYING" -t "$pkgdir/usr/share/licenses/polipo"
 
   # install config files
-  install -Dm644 "config.sample" "$pkgdir/etc/polipo/config.sample"
-  install -Dm644 "forbidden.sample" "$pkgdir/etc/polipo/forbidden.sample"
+  install -Dm644 {config,forbidden}.sample -t "$pkgdir/etc/polipo"
 
   # install systemd service
-  install -Dm644 "$srcdir/polipo.service" "$pkgdir/usr/lib/systemd/system/polipo.service"
+  install -Dm644 "$srcdir/polipo.service" -t "$pkgdir/usr/lib/systemd/system"
 
   # install system user
   install -Dm644 "$srcdir/polipo.sysusers" "$pkgdir/usr/lib/sysusers.d/polipo.conf"