From 6b205e32ce7f219c28a1b7f8cc6ec8de1aa1fb72 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.eu>
Date: Wed, 2 Sep 2015 09:27:18 +0200
Subject: [PATCH] Revert "urbanterror: fix musl"
This reverts commit 7be15332c69d3f51b66fd488cf5771916e558851.
---
srcpkgs/steam-fonts/template | 1 +
srcpkgs/xterm/template | 14 +-------------
2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/srcpkgs/steam-fonts/template b/srcpkgs/steam-fonts/template
index af3b3ac4e92..f93df76d730 100644
--- a/srcpkgs/steam-fonts/template
+++ b/srcpkgs/steam-fonts/template
@@ -11,6 +11,7 @@ license="proprietary"
homepage="https://support.steampowered.com/kb_article.php?ref=1974-YFKL-4947"
distfiles="https://support.steampowered.com/downloads/1974-YFKL-4947/SteamFonts.zip"
checksum=a03bcc9581f2896cac39967633fc43546af5ed9d73d505a10cae4016797dfeb1
+restricted=yes
create_wrksrc=yes
do_install() {
diff --git a/srcpkgs/xterm/template b/srcpkgs/xterm/template
index 13357dc8517..1f2daab746e 100644
--- a/srcpkgs/xterm/template
+++ b/srcpkgs/xterm/template
@@ -11,7 +11,7 @@ configure_args="--enable-wide-chars --enable-88-color --enable-broken-osc
--with-app-defaults=/usr/share/X11/app-defaults --enable-i18n
--disable-full-tgetent --disable-imake --enable-doublechars
--enable-freetype --enable-tcap-query --enable-logging --enable-dabbrev
- --with-pkg-config=yes --enable-exec-xterm --with-utempter --enable-warnings"
+ --with-pkg-config=yes --enable-exec-xterm --with-utempter"
hostmakedepends="pkg-config"
makedepends="libXft-devel libXaw-devel ncurses-devel fontconfig-devel libX11-devel
libXmu-devel libXt-devel libICE-devel libutempter-devel libxkbfile-devel"
@@ -22,18 +22,6 @@ license="MIT"
distfiles="ftp://invisible-island.net/xterm/$pkgname-$version.tgz"
checksum=a60dbb574334c081425fa30f011cd9f571e3be7a91e2a84e252461798bce24a7
-case "$XBPS_TARGET_MACHINE" in
- *-musl)
- CFLAGS="-DUSE_USG_PTYS=1"
- #CFLAGS="-include termcap.h -g -D__GNU__ -D__GLIBC__=2 -D__GLIBC_MINOR__=10 -D_POSIX_SOURCE -D_GNU_SOURCE"
- #post_configure() {
- # msg_normal "Patching for MUSL"
- # echo 'static inline int getpt() { return open("/dev/ptmx", O_RDWR|O_NOCTTY); }' >> ptyx.h
- # touch curses.h
- #}
- ;;
-esac
-
post_install() {
for f in {u,}xterm.desktop; do
vinstall $f 644 usr/share/applications