st: unbreak build (#1779)

srcpkgs/st/patches/bug_1779.patch

@@ -0,0 +1,24 @@
+--- config.mk.orig
++++ config.mk
+@@ -11,17 +11,17 @@
+ X11LIB = /usr/X11R6/lib
+ 
+ # includes and libs
+-INCS = -I. -I/usr/include -I${X11INC} \
++INCS = -I. \
+        `pkg-config --cflags fontconfig` \
+        `pkg-config --cflags freetype2`
+-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil -lXext -lXft \
++LIBS = -lc -L${X11LIB} -lX11 -lutil -lXext -lXft \
+        `pkg-config --libs fontconfig`  \
+        `pkg-config --libs freetype2`
+ 
+ # flags
+ CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE -D_XOPEN_SOURCE=600
+-CFLAGS += -g -std=c99 -pedantic -Wall -Wvariadic-macros -Os ${INCS} ${CPPFLAGS}
+-LDFLAGS += -g ${LIBS}
++override CFLAGS += -std=c99 -Wall -Wvariadic-macros ${INCS} ${CPPFLAGS}
++override LDFLAGS += ${LIBS}
+ 
+ # compiler and linker
+ CC ?= cc

srcpkgs/st/template

@@ -1,7 +1,7 @@
 # Template file for 'st'
 pkgname=st
 version=0.5
-revision=4
+revision=5
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="fontconfig-devel libX11-devel libXft-devel terminus-font"
@@ -15,10 +15,6 @@ checksum=ae80ddfaf8146f7665772efc9b85e05e08be5087682a689ecdf71aa4d4bfdd4e
 
 pre_build() {
 	sed -i 's|Liberation Mono|Terminus|g' config.def.h
-	sed -i 's|-I/usr/include||g' config.mk
-	sed -i 's|-L/usr/lib||g' config.mk
-	# Remove BSD_SOURCE warning
-	sed -i 's|-D_BSD_SOURCE|-D_DEFAULT_SOURCE|g' config.mk
 	# We will use tic after install. See INSTALL.
 	sed -i 's|@tic -s st.info||g' Makefile
 }