Hi, please find below an update for x11/st to version 0.4.1, which alllows us to drop some patch lines committed to upstream.
Please test and comment. Any objections? OKs? Regards, Joerg Index: Makefile =================================================================== RCS file: /cvs/ports/x11/st/Makefile,v retrieving revision 1.8 diff -u -p -r1.8 Makefile --- Makefile 19 Apr 2013 19:54:34 -0000 1.8 +++ Makefile 27 May 2013 16:33:52 -0000 @@ -2,7 +2,7 @@ COMMENT= simple X terminal -DISTNAME= st-0.4 +DISTNAME= st-0.4.1 CATEGORIES= x11 Index: distinfo =================================================================== RCS file: /cvs/ports/x11/st/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo 19 Apr 2013 19:54:34 -0000 1.5 +++ distinfo 27 May 2013 16:33:52 -0000 @@ -1,2 +1,2 @@ -SHA256 (st-0.4.tar.gz) = MHrvAdDeBBFDm/MtVcI6kw53nv0AOjGsqg3c+LRaOv4= -SIZE (st-0.4.tar.gz) = 32396 +SHA256 (st-0.4.1.tar.gz) = 7i+TxtjNlaWrR0I+7r3kpHS+RwMJzu4z+jx3V+rivzE= +SIZE (st-0.4.1.tar.gz) = 32947 Index: patches/patch-config_def_h =================================================================== RCS file: /cvs/ports/x11/st/patches/patch-config_def_h,v retrieving revision 1.4 diff -u -p -r1.4 patch-config_def_h --- patches/patch-config_def_h 19 Apr 2013 19:54:34 -0000 1.4 +++ patches/patch-config_def_h 27 May 2013 16:33:52 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-config_def_h,v 1.4 2013/04/19 19:54:34 bentley Exp $ ---- config.def.h.orig Fri Mar 29 12:59:39 2013 -+++ config.def.h Fri Mar 29 13:00:16 2013 +--- config.def.h.orig Sat Apr 20 15:29:39 2013 ++++ config.def.h Mon May 27 18:18:29 2013 @@ -5,7 +5,7 @@ * * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html @@ -10,7 +10,7 @@ $OpenBSD: patch-config_def_h,v 1.4 2013/ static int borderpx = 2; static char shell[] = "/bin/sh"; -@@ -33,7 +33,7 @@ static const char *colorname[] = { +@@ -36,7 +36,7 @@ static const char *colorname[] = { "blue2", "magenta3", "cyan3", Index: patches/patch-config_mk =================================================================== RCS file: /cvs/ports/x11/st/patches/patch-config_mk,v retrieving revision 1.4 diff -u -p -r1.4 patch-config_mk --- patches/patch-config_mk 19 Apr 2013 19:54:34 -0000 1.4 +++ patches/patch-config_mk 27 May 2013 16:33:52 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-config_mk,v 1.4 2013/04/19 19:54:34 bentley Exp $ ---- config.mk.orig Fri Mar 29 12:13:26 2013 -+++ config.mk Thu Apr 4 22:18:33 2013 -@@ -4,24 +4,24 @@ VERSION = 0.4 +--- config.mk.orig Sat Apr 20 15:29:39 2013 ++++ config.mk Mon May 27 18:32:07 2013 +@@ -4,11 +4,11 @@ VERSION = 0.4.1 # Customize below to fit your system # paths @@ -17,15 +17,8 @@ $OpenBSD: patch-config_mk,v 1.4 2013/04/ # includes and libs INCS = -I. -I/usr/include -I${X11INC} \ -- $(shell pkg-config --cflags fontconfig) \ -- $(shell pkg-config --cflags freetype2) -+ `pkg-config --cflags fontconfig` \ -+ `pkg-config --cflags freetype2` - LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil -lXext -lXft \ -- $(shell pkg-config --libs fontconfig) \ -- $(shell pkg-config --libs freetype2) -+ `pkg-config --libs fontconfig` \ -+ `pkg-config --libs freetype2` +@@ -19,9 +19,9 @@ LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil -lXext + `pkg-config --libs freetype2` # flags -CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE -D_XOPEN_SOURCE=600
