~jasonwryan/shiv commit

2 files changed, 15 insertions(+), 16 deletions(-)

M Build/dmenu/PKGBUILD
M Build/slock/PKGBUILD

M Build/dmenu/PKGBUILD +8 -7

@@ 8,19 8,20 @@ 
 
 pkgname=dmenu
 pkgver=5.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Generic menu for X'
 url='https://tools.suckless.org/dmenu/'
 arch=('x86_64')
 license=('MIT')
+makedepends=('git')
 groups=('modified')
 depends=('sh' 'glibc' 'coreutils' 'libx11' 'libxinerama' 'libxft' 'freetype2' 'fontconfig' 'libfontconfig.so')
-source=(https://dl.suckless.org/tools/dmenu-${pkgver}.tar.gz)
-sha512sums=('60f758134063ad7f304fbb0785c66dddc21461e5e5014f8735cf6d5c95dc22a177f069d48101e633ddffe5bbefc1118a2bf8b31daaf7b6438fdf6fe1bcb5d61c')
-b2sums=('fd76b0b11a153f98dd58ec888820bc8a0ebc67f814cdf2d13a35ea3addcc3ad423bb9b2f4f73897cf6293e61a507900e7b7fec65e4f0acd15cc8e425f5506faa')
+source=("git+https://git.suckless.org/dmenu#tag=${pkgver}")
+sha512sums=('781f4aab2bb32c39e79a2269b62fdb8cacdcebc162f73844e0ff86f8d084fd151eb63811e0f4de906ae5b3ca3a02f12c82fbf4d9f5f3e4a9b5d847de787aefd4')
+b2sums=('6da7112a8975c152038f7694f1a658674f92c2d5a9340f97e8b64430a2fce612c87effd361078b66ce77510d6bb6478c47ea3b1d6ee0adfafa1e8c0d62f1adb5')
 
 prepare() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}
   echo "CPPFLAGS+=${CPPFLAGS}" >> config.mk
   echo "CFLAGS+=${CFLAGS}" >> config.mk
   echo "LDFLAGS+=${LDFLAGS}" >> config.mk

          
@@ 29,7 30,7 @@ prepare() {
 }
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}
   make \
 	  X11INC=/usr/include/X11 \
 	  X11LIB=/usr/lib/X11 \

          
@@ 37,7 38,7 @@ build() {
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}
   make PREFIX=/usr DESTDIR="${pkgdir}" install
   install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }

M Build/slock/PKGBUILD +7 -9

@@ 4,31 4,29 @@ 
 
 pkgname=slock
 pkgver=1.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple screen locker for X"
 arch=('x86_64')
 url="https://tools.suckless.org/slock"
 license=('MIT')
-groups=('modified')
+makedepends=('git')
 depends=('libxext' 'libxrandr')
-source=("https://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz")
-sha256sums=('aee1e3fbf6a277fb625a3838073b979b6483e7baca4ce82f56de1ff192db0e4d')
+source=("git+https://git.suckless.org/slock#tag=${pkgver}")
+sha256sums=('b5517afa598992f0d90e6847a2aec2837679f3b41468298e56235528c8baf934')
 
 prepare() {
-  cd "$srcdir/slock-$pkgver"
+  cd $pkgname
   sed -i 's|static const char \*group = "nogroup";|static const char *group = "nobody";|' config.def.h
   sed -ri 's/((CPP|C|LD)FLAGS) =/\1 +=/g' config.mk
-  # use your customisations
-  [[ -f $SRCDEST/config.h ]] && cp "$SRCDEST"/config.h .
 }
 
 build() {
-  cd "$srcdir/slock-$pkgver"
+  cd $pkgname
   make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11
 }
 
 package() {
-  cd "$srcdir/slock-$pkgver"
+  cd $pkgname
   make PREFIX=/usr DESTDIR="$pkgdir" install
   install -m644 -D LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }