Update st to version 0.3

From the suckless announcement, the biggest changes are:
        * New drawing code, which is way more faster and comparable to the
          other terminals out there.
        * Many new escape sequences are supported:
                * setting the title
                * LNM, KAM, SI, SO, SUB, CAN, DA, DECID. OSC, DSC, PM, APC,
                  CHT, HTS, CBT, SM, RM, standout mode ???  (See st.info.)
        * Linedrawing is now supported
        * Xft and Fontcache is now used to draw fonts.
        * support for italic and bold italic font drawing
        * Some more commandline parameters are available. (See manpage.)
                * easy debugging with: st -o - | cat -v
        * nyancat(1) works.
        * external support of utmp entries by using utmp(1)

ok gonzalo@
This commit is contained in:
zinke 2012-11-05 13:24:39 +00:00
parent 6d88816f71
commit bdf69da526
5 changed files with 36 additions and 35 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.4 2012/07/09 16:37:00 zinke Exp $
# $OpenBSD: Makefile,v 1.5 2012/11/05 13:24:39 zinke Exp $
COMMENT= simple X terminal
DISTNAME= 0.2.1
DISTNAME= 0.3
PKGNAME= st-${DISTNAME}
DIST_SUBDIR= st
@ -18,10 +18,12 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 c util
WANTLIB= c util X11 Xext Xft fontconfig
MASTER_SITES= http://hg.suckless.org/st/archive/
RUN_DEPENDS= fonts/liberation-fonts
MAKE_ENV= LDFLAGS="${LDFLAGS}"
FAKE_FLAGS= DESTDIR=""
WRKDIST= ${WRKDIR}/st-${DISTNAME}

View File

@ -1,5 +1,2 @@
MD5 (st/0.2.1.tar.gz) = HjJJ2hxOUolM+ksPEeNVmQ==
RMD160 (st/0.2.1.tar.gz) = VY7amX7T1L39C/2UUsFat6/u6dY=
SHA1 (st/0.2.1.tar.gz) = D5On8EnNegpyssh3RVpoqj7IadY=
SHA256 (st/0.2.1.tar.gz) = S/WBdIPTJ0+umiBeaSswil/Qz8tV7Z83YdLFZLT32Jc=
SIZE (st/0.2.1.tar.gz) = 19804
SHA256 (st/0.3.tar.gz) = lKW+bGh57GvLRBxHbMDfjE/8OJlavq/htgPrK2Wj14s=
SIZE (st/0.3.tar.gz) = 25637

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2011/09/23 14:41:31 zinke Exp $
--- Makefile.orig Sun Apr 3 21:04:45 2011
+++ Makefile Wed Sep 21 12:08:22 2011
$OpenBSD: patch-Makefile,v 1.2 2012/11/05 13:24:39 zinke Exp $
--- Makefile.orig Fri Nov 2 20:08:27 2012
+++ Makefile Sun Nov 4 16:32:45 2012
@@ -18,14 +18,12 @@ config.h:
cp config.def.h config.h
@ -18,7 +18,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2011/09/23 14:41:31 zinke Exp $
clean:
@echo cleaning
@@ -40,15 +38,13 @@ dist: clean
@@ -40,17 +38,13 @@ dist: clean
@rm -rf st-${VERSION}
install: all
@ -30,6 +30,8 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2011/09/23 14:41:31 zinke Exp $
- @mkdir -p ${DESTDIR}${MANPREFIX}/man1
- @sed "s/VERSION/${VERSION}/g" < st.1 > ${DESTDIR}${MANPREFIX}/man1/st.1
- @chmod 644 ${DESTDIR}${MANPREFIX}/man1/st.1
- @echo If things do not seem to work, be sure that there is no \
- floating st terminfo in the .terminfo directory in your home dir.
- @tic -s st.info
+ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
+ ${BSD_INSTALL_PROGRAM} st ${DESTDIR}${PREFIX}/bin

View File

@ -1,7 +1,16 @@
$OpenBSD: patch-config_def_h,v 1.2 2012/07/09 16:37:00 zinke Exp $
--- config.def.h.orig Thu Feb 16 01:05:14 2012
+++ config.def.h Mon Jul 9 11:44:48 2012
@@ -18,7 +18,7 @@ static const char *colorname[] = {
$OpenBSD: patch-config_def_h,v 1.3 2012/11/05 13:24:39 zinke Exp $
--- config.def.h.orig Fri Nov 2 20:08:27 2012
+++ config.def.h Sun Nov 4 17:33:01 2012
@@ -1,7 +1,7 @@
/* See LICENSE file for copyright and license details. */
/* appearance */
-static char font[] = "Liberation Mono:pixelsize=12:antialias=false:autohint=false";
+static char font[] = "Liberation Mono:pixelsize=12:antialias=true:autohint=false";
static unsigned int borderpx = 2;
static char shell[] = "/bin/sh";
@@ -25,7 +25,7 @@ static const char *colorname[] = {
"blue2",
"magenta3",
"cyan3",
@ -10,12 +19,3 @@ $OpenBSD: patch-config_def_h,v 1.2 2012/07/09 16:37:00 zinke Exp $
/* 8 bright colors */
"gray50",
@@ -41,7 +41,7 @@ static const char *colorname[] = {
foreground, background, cursor, unfocused cursor */
#define DefaultFG 7
#define DefaultBG 0
-#define DefaultCS 256
+#define DefaultCS 12
#define DefaultUCS 257
/* Special keys (change & recompile st.info accordingly)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-config_mk,v 1.2 2012/07/09 16:37:00 zinke Exp $
--- config.mk.orig Thu Feb 16 01:05:14 2012
+++ config.mk Mon Jul 9 11:43:16 2012
@@ -4,20 +4,20 @@ VERSION = 0.2.1
$OpenBSD: patch-config_mk,v 1.3 2012/11/05 13:24:39 zinke Exp $
--- config.mk.orig Fri Nov 2 20:08:27 2012
+++ config.mk Sun Nov 4 17:17:13 2012
@@ -4,20 +4,20 @@ VERSION = 0.3
# Customize below to fit your system
# paths
@ -16,15 +16,15 @@ $OpenBSD: patch-config_mk,v 1.2 2012/07/09 16:37:00 zinke Exp $
+X11LIB = ${X11BASE}/lib
# includes and libs
-INCS = -I. -I/usr/include -I${X11INC}
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil
+INCS = -I${X11INC}
+LIBS = -L${X11LIB} -lX11 -lutil
-INCS = -I. -I/usr/include -I${X11INC} -I/usr/include/freetype2
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil -lXext -lXft -lfontconfig
+INCS = -I${X11INC} -I${X11INC}/freetype2
+LIBS = -L${X11LIB} -lX11 -lutil -lXext -lXft -lfontconfig
# flags
-CPPFLAGS = -DVERSION=\"${VERSION}\"
-CFLAGS += -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-LDFLAGS += -s ${LIBS}
-CFLAGS += -g -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-LDFLAGS += -g ${LIBS}
+CPPFLAGS += -DVERSION=\"${VERSION}\"
+CFLAGS += -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
+LDFLAGS += ${LIBS}