From 396eb1d3a1afdc07ee3fe2a37b5ee53493b96683 Mon Sep 17 00:00:00 2001
From: Justin Gassner <justin.gassner@mailbox.org>
Date: Fri, 10 Jul 2020 01:52:30 +0200
Subject: suckless: build config moved to the respective repos

---
 dmenu/PKGBUILD | 14 +++++++-------
 dwm/PKGBUILD   |  9 +++------
 slock/PKGBUILD |  9 +++------
 st/PKGBUILD    |  9 +++------
 4 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/dmenu/PKGBUILD b/dmenu/PKGBUILD
index 5e082c0..24e1167 100644
--- a/dmenu/PKGBUILD
+++ b/dmenu/PKGBUILD
@@ -2,13 +2,13 @@
 
 _pkgname=dmenu
 pkgname=$_pkgname-jxir
-pkgver=4.9.r5.gdb6093f
+pkgver=4.9.r7.ga4173dd
 pkgrel=1
 pkgdesc='Generic menu for X'
 arch=('x86_64')
 url="https://tools.suckless.org/$_pkgname"
 license=('MIT')
-depends=('libxft' 'libxinerama')
+depends=('bash' 'libxft' 'libxinerama')
 makedepends=('git')
 provides=("$_pkgname")
 conflicts=("$_pkgname")
@@ -22,19 +22,19 @@ pkgver(){
 
 prepare() {
   cd "$_pkgname"
-  echo "CPPFLAGS+=${CPPFLAGS}" >> config.mk
-  echo "CFLAGS+=${CFLAGS}" >> config.mk
-  echo "LDFLAGS+=${LDFLAGS}" >> config.mk
+  for branch in config; do
+    git merge --no-edit origin/$branch
+  done
 }
 
 build() {
   cd "$_pkgname"
-  make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 FREETYPEINC=/usr/include/freetype2
+  make
 }
 
 package() {
   cd "$_pkgname"
-  make PREFIX=/usr DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install
   install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
   install -Dm644 README -t "$pkgdir/usr/share/doc/$_pkgname"
 }
diff --git a/dwm/PKGBUILD b/dwm/PKGBUILD
index 8357406..6dff4e7 100644
--- a/dwm/PKGBUILD
+++ b/dwm/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=dwm
 pkgname=$_pkgname-jxir
-pkgver=6.2.r18.g4f1db8b
+pkgver=6.2.r28.g9900688
 pkgrel=1
 pkgdesc='A dynamic window manager for X'
 arch=('x86_64')
@@ -25,19 +25,16 @@ prepare() {
   for branch in noborder pertag fancybar config; do
     git merge --no-edit origin/$branch
   done
-  echo "CPPFLAGS+=${CPPFLAGS}" >> config.mk
-  echo "CFLAGS+=${CFLAGS}" >> config.mk
-  echo "LDFLAGS+=${LDFLAGS}" >> config.mk
 }
 
 build() {
   cd "$_pkgname"
-  make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 FREETYPEINC=/usr/include/freetype2
+  make
 }
 
 package() {
   cd "$_pkgname"
-  make PREFIX=/usr DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install
   install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
   install -Dm644 README -t "$pkgdir/usr/share/doc/$_pkgname"
 }
diff --git a/slock/PKGBUILD b/slock/PKGBUILD
index 7260e69..7ab9a69 100644
--- a/slock/PKGBUILD
+++ b/slock/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=slock
 pkgname=$_pkgname-jxir
-pkgver=1.4.r6.g2aa4369
+pkgver=1.4.r7.gdb7c62e
 pkgrel=1
 pkgdesc='A simple screen locker for X'
 arch=('x86_64')
@@ -25,19 +25,16 @@ prepare() {
   for branch in config; do
     git merge --no-edit origin/$branch
   done
-  echo "CPPFLAGS+=${CPPFLAGS}" >> config.mk
-  echo "CFLAGS+=${CFLAGS}" >> config.mk
-  echo "LDFLAGS+=${LDFLAGS}" >> config.mk
 }
 
 build() {
   cd "$_pkgname"
-  make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11
+  make
 }
 
 package() {
   cd "$_pkgname"
-  make PREFIX=/usr DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install
   install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
   install -Dm644 README -t "$pkgdir/usr/share/doc/$_pkgname"
 }
diff --git a/st/PKGBUILD b/st/PKGBUILD
index a4c6840..b51766b 100644
--- a/st/PKGBUILD
+++ b/st/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=st
 pkgname=$_pkgname-jxir
-pkgver=0.8.2.r24.g7e5b23e
+pkgver=0.8.4.r10.ge290ec4
 pkgrel=1
 pkgdesc='A simple virtual terminal emulator for X'
 arch=('x86_64')
@@ -25,19 +25,16 @@ prepare() {
   for branch in no-bold-colors solarized-dark scrollback config; do
     git merge --no-edit origin/$branch
   done
-  echo "CPPFLAGS+=${CPPFLAGS}" >> config.mk
-  echo "CFLAGS+=${CFLAGS}" >> config.mk
-  echo "LDFLAGS+=${LDFLAGS}" >> config.mk
 }
 
 build() {
   cd "$_pkgname"
-  make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11
+  make
 }
 
 package() {
   cd "$_pkgname"
-  make PREFIX=/usr DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install
   install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
   install -Dm644 README -t "$pkgdir/usr/share/doc/$_pkgname"
 }
-- 
cgit v1.2.3-54-g00ecf