From 77b42af55c86cdf3d99828a8a9cbbcea78cd1fb7 Mon Sep 17 00:00:00 2001 From: czarkoff Date: Sun, 9 Oct 2016 18:47:49 +0000 Subject: [PATCH] Update to st-0.7 from Rafael Sadowski OK jung@ --- x11/st/Makefile | 7 +++---- x11/st/distinfo | 4 ++-- x11/st/patches/patch-config_def_h | 14 +++++++------- x11/st/patches/patch-config_mk | 24 +++++++++++++----------- x11/st/patches/patch-st_c | 12 ------------ 5 files changed, 25 insertions(+), 36 deletions(-) delete mode 100644 x11/st/patches/patch-st_c diff --git a/x11/st/Makefile b/x11/st/Makefile index 52f19d8a9e3..783f6821d60 100644 --- a/x11/st/Makefile +++ b/x11/st/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.12 2015/07/24 15:39:23 czarkoff Exp $ +# $OpenBSD: Makefile,v 1.13 2016/10/09 18:47:49 czarkoff Exp $ COMMENT= simple X terminal -DISTNAME= st-0.6 -REVISION= 0 +DISTNAME= st-0.7 CATEGORIES= x11 @@ -14,7 +13,7 @@ MAINTAINER= Joerg Jung # MIT/X Consortium License PERMIT_PACKAGE_CDROM= Yes -WANTLIB= c m util X11 Xext Xft fontconfig freetype z +WANTLIB= c m util X11 Xft fontconfig freetype z MASTER_SITES= http://dl.suckless.org/st/ diff --git a/x11/st/distinfo b/x11/st/distinfo index ca999f1c7cd..4e72acea503 100644 --- a/x11/st/distinfo +++ b/x11/st/distinfo @@ -1,2 +1,2 @@ -SHA256 (st-0.6.tar.gz) = hTEMCMOBTgmbXkWIj4rHVIZA5p6Zc+k01PujiwNzeis= -SIZE (st-0.6.tar.gz) = 40271 +SHA256 (st-0.7.tar.gz) = 94cNkGzMmIkm7vLMmJUKmcx4cltoXpNMQiwDwSNOYAA= +SIZE (st-0.7.tar.gz) = 42418 diff --git a/x11/st/patches/patch-config_def_h b/x11/st/patches/patch-config_def_h index 64e8babeb93..3691d250612 100644 --- a/x11/st/patches/patch-config_def_h +++ b/x11/st/patches/patch-config_def_h @@ -1,16 +1,16 @@ -$OpenBSD: patch-config_def_h,v 1.7 2015/07/09 22:07:23 czarkoff Exp $ ---- config.def.h.orig Thu Jul 9 00:02:12 2015 -+++ config.def.h Thu Jul 9 00:05:19 2015 +$OpenBSD: patch-config_def_h,v 1.8 2016/10/09 18:47:49 czarkoff Exp $ +--- config.def.h.orig Sat Oct 8 21:48:13 2016 ++++ config.def.h Sat Oct 8 21:48:37 2016 @@ -5,7 +5,7 @@ * * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html */ --static char font[] = "Liberation Mono:pixelsize=12:antialias=false:autohint=false"; +-static char font[] = "Liberation Mono:pixelsize=12:antialias=true:autohint=true"; +static char font[] = "DejaVu Sans Mono:pixelsize=12:antialias=true:autohint=false"; static int borderpx = 2; - static char shell[] = "/bin/sh"; - static char *utmp = NULL; -@@ -69,7 +69,7 @@ static const char *colorname[] = { + + /* +@@ -92,7 +92,7 @@ static const char *colorname[] = { "blue2", "magenta3", "cyan3", diff --git a/x11/st/patches/patch-config_mk b/x11/st/patches/patch-config_mk index dc37ee28f6c..c0c5766d9eb 100644 --- a/x11/st/patches/patch-config_mk +++ b/x11/st/patches/patch-config_mk @@ -1,7 +1,7 @@ -$OpenBSD: patch-config_mk,v 1.7 2015/07/09 22:07:23 czarkoff Exp $ ---- config.mk.orig Wed Jul 8 23:58:38 2015 -+++ config.mk Thu Jul 9 00:01:41 2015 -@@ -4,24 +4,24 @@ VERSION = 0.6 +$OpenBSD: patch-config_mk,v 1.8 2016/10/09 18:47:49 czarkoff Exp $ +--- config.mk.orig Sat Oct 8 21:48:48 2016 ++++ config.mk Sat Oct 8 21:50:30 2016 +@@ -4,24 +4,21 @@ VERSION = 0.7 # Customize below to fit your system # paths @@ -16,13 +16,15 @@ $OpenBSD: patch-config_mk,v 1.7 2015/07/09 22:07:23 czarkoff Exp $ +X11LIB = ${X11BASE}/lib # includes and libs - INCS = -I. -I/usr/include -I${X11INC} \ - `pkg-config --cflags fontconfig` \ - `pkg-config --cflags freetype2` --LIBS = -L/usr/lib -lc -L${X11LIB} -lm -lrt -lX11 -lutil -lXext -lXft \ -+LIBS = -L/usr/lib -lc -L${X11LIB} -lm -lX11 -lutil -lXext -lXft \ - `pkg-config --libs fontconfig` \ - `pkg-config --libs freetype2` +-INCS = -I. -I/usr/include -I${X11INC} \ +- `pkg-config --cflags fontconfig` \ +- `pkg-config --cflags freetype2` +-LIBS = -L/usr/lib -lc -L${X11LIB} -lm -lrt -lX11 -lutil -lXft \ +- `pkg-config --libs fontconfig` \ +- `pkg-config --libs freetype2` ++INCS != pkg-config --cflags fontconfig ++LIBS = -lm -lX11 -lutil -lXft ++LIBS +!= pkg-config --libs fontconfig # flags CPPFLAGS = -DVERSION=\"${VERSION}\" -D_XOPEN_SOURCE=600 diff --git a/x11/st/patches/patch-st_c b/x11/st/patches/patch-st_c deleted file mode 100644 index 1802a459058..00000000000 --- a/x11/st/patches/patch-st_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-st_c,v 1.1 2015/07/24 15:39:23 czarkoff Exp $ ---- st.c.orig Fri Jul 24 13:33:47 2015 -+++ st.c Fri Jul 24 13:34:30 2015 -@@ -4052,7 +4052,7 @@ main(int argc, char *argv[]) { - case 'l': - opt_line = EARGF(usage()); - break; -- case 't': -+ case 't': case 'T': - opt_title = EARGF(usage()); - break; - case 'w':