UPDATE: x11/st

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

UPDATE: x11/st

Ingo Feinerer-2
Hi,

update x11/st to 0.8.2.

- patches/patch-st_1 and patches/patch-st_c are now upstream
- patches/patch-config_mk is simpler as upstream has now an OpenBSD
  section which just needs to be uncommented
- patches/patch-config_def_h is also shorter as iso14755 is gone
  upstream as well

Works fine for me on amd64.

OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/st/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile 2 Nov 2018 07:32:13 -0000 1.18
+++ Makefile 10 Feb 2019 08:05:48 -0000
@@ -2,9 +2,8 @@
 
 COMMENT= simple X terminal
 
-V= 0.8.1
+V= 0.8.2
 DISTNAME= st-${V}
-REVISION= 0
 
 CATEGORIES= x11
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/st/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo 29 Mar 2018 21:09:09 -0000 1.11
+++ distinfo 10 Feb 2019 08:05:48 -0000
@@ -1,2 +1,2 @@
-SHA256 (st-0.8.1.tar.gz) = xPsP4rjS071ecnY+gKiuBbfUTbrI+OO7GO8BYccmaSY=
-SIZE (st-0.8.1.tar.gz) = 45423
+SHA256 (st-0.8.2.tar.gz) = rrdOEKoR7TZOG8xjWoGlIxGQk+Y779LyMfiwcFsVvzU=
+SIZE (st-0.8.2.tar.gz) = 44788
Index: patches/patch-config_def_h
===================================================================
RCS file: /cvs/ports/x11/st/patches/patch-config_def_h,v
retrieving revision 1.10
diff -u -p -r1.10 patch-config_def_h
--- patches/patch-config_def_h 2 Nov 2018 07:32:13 -0000 1.10
+++ patches/patch-config_def_h 10 Feb 2019 08:05:48 -0000
@@ -11,11 +11,3 @@ Index: config.def.h
 
  /* 8 bright colors */
  "gray50",
-@@ -177,7 +177,6 @@ static Shortcut shortcuts[] = {
- { TERMMOD,              XK_V,           clippaste,      {.i =  0} },
- { TERMMOD,              XK_Y,           selpaste,       {.i =  0} },
- { TERMMOD,              XK_Num_Lock,    numlock,        {.i =  0} },
-- { TERMMOD,              XK_I,           iso14755,       {.i =  0} },
- };
-
- /*
Index: patches/patch-config_mk
===================================================================
RCS file: /cvs/ports/x11/st/patches/patch-config_mk,v
retrieving revision 1.10
diff -u -p -r1.10 patch-config_mk
--- patches/patch-config_mk 17 Mar 2018 13:28:39 -0000 1.10
+++ patches/patch-config_mk 10 Feb 2019 08:05:48 -0000
@@ -2,27 +2,18 @@ $OpenBSD: patch-config_mk,v 1.10 2018/03
 Index: config.mk
 --- config.mk.orig
 +++ config.mk
-@@ -11,17 +11,14 @@ X11INC = /usr/X11R6/include
- X11LIB = /usr/X11R6/lib
+@@ -26,10 +26,10 @@ STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS)
+ STLDFLAGS = $(LIBS) $(LDFLAGS)
 
- # includes and libs
--INCS = -I$(X11INC) \
--       `pkg-config --cflags fontconfig` \
--       `pkg-config --cflags freetype2`
--LIBS = -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
--STCFLAGS = $(INCS) $(CPPFLAGS) $(CFLAGS)
--STLDFLAGS = $(LIBS) $(LDFLAGS)
-+CPPFLAGS = -DVERSION=\"${VERSION}\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
-+STCFLAGS += -std=c99 ${INCS} ${CPPFLAGS} ${CFLAGS}
-+STLDFLAGS += ${LIBS} ${LDFLAGS}
+ # OpenBSD:
+-#CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
+-#LIBS = -L$(X11LIB) -lm -lX11 -lutil -lXft \
+-#       `pkg-config --libs fontconfig` \
+-#       `pkg-config --libs freetype2`
++CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
++LIBS = -L$(X11LIB) -lm -lX11 -lutil -lXft \
++       `pkg-config --libs fontconfig` \
++       `pkg-config --libs freetype2`
 
  # compiler and linker
  # CC = c99
Index: patches/patch-st_1
===================================================================
RCS file: patches/patch-st_1
diff -N patches/patch-st_1
--- patches/patch-st_1 2 Nov 2018 07:32:13 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-st_1,v 1.1 2018/11/02 07:32:13 mestre Exp $
-
-Index: st.1
---- st.1.orig
-+++ st.1
-@@ -159,10 +159,6 @@ Copy the selected text to the clipboard selection.
- .TP
- .B Ctrl-Shift-v
- Paste from the clipboard selection.
--.TP
--.B Ctrl-Shift-i
--Launch dmenu to enter a unicode codepoint and send the corresponding glyph
--to st.
- .SH CUSTOMIZATION
- .B st
- can be customized by creating a custom config.h and (re)compiling the source
Index: patches/patch-st_c
===================================================================
RCS file: patches/patch-st_c
diff -N patches/patch-st_c
--- patches/patch-st_c 29 Mar 2018 21:09:09 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-st_c,v 1.6 2018/03/29 21:09:09 kn Exp $
-Index: st.c
---- st.c.orig
-+++ st.c
-@@ -805,9 +805,13 @@ ttynew(char *line, char *cmd, char *out, char **args)
- die("ioctl TIOCSCTTY failed: %s\n", strerror(errno));
- close(s);
- close(m);
-+ if (pledge("stdio getpw proc exec", NULL) == -1)
-+ die("pledge\n");
- execsh(cmd, args);
- break;
- default:
-+ if (pledge("stdio rpath tty proc", NULL) == -1)
-+ die("pledge\n");
- close(s);
- cmdfd = m;
- signal(SIGCHLD, sigchld);

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: x11/st

Klemens Nanni-2
OK kn

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: x11/st

Joerg Jung
In reply to this post by Ingo Feinerer-2
On Sun, Feb 10, 2019 at 09:17:27AM +0100, Ingo Feinerer wrote:

> Hi,
>
> update x11/st to 0.8.2.
>
> - patches/patch-st_1 and patches/patch-st_c are now upstream
> - patches/patch-config_mk is simpler as upstream has now an OpenBSD
>   section which just needs to be uncommented
> - patches/patch-config_def_h is also shorter as iso14755 is gone
>   upstream as well
>
> Works fine for me on amd64.
>
> OK?

ok jung@
 

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/st/Makefile,v
> retrieving revision 1.18
> diff -u -p -r1.18 Makefile
> --- Makefile 2 Nov 2018 07:32:13 -0000 1.18
> +++ Makefile 10 Feb 2019 08:05:48 -0000
> @@ -2,9 +2,8 @@
>  
>  COMMENT= simple X terminal
>  
> -V= 0.8.1
> +V= 0.8.2
>  DISTNAME= st-${V}
> -REVISION= 0
>  
>  CATEGORIES= x11
>  
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/x11/st/distinfo,v
> retrieving revision 1.11
> diff -u -p -r1.11 distinfo
> --- distinfo 29 Mar 2018 21:09:09 -0000 1.11
> +++ distinfo 10 Feb 2019 08:05:48 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (st-0.8.1.tar.gz) = xPsP4rjS071ecnY+gKiuBbfUTbrI+OO7GO8BYccmaSY=
> -SIZE (st-0.8.1.tar.gz) = 45423
> +SHA256 (st-0.8.2.tar.gz) = rrdOEKoR7TZOG8xjWoGlIxGQk+Y779LyMfiwcFsVvzU=
> +SIZE (st-0.8.2.tar.gz) = 44788
> Index: patches/patch-config_def_h
> ===================================================================
> RCS file: /cvs/ports/x11/st/patches/patch-config_def_h,v
> retrieving revision 1.10
> diff -u -p -r1.10 patch-config_def_h
> --- patches/patch-config_def_h 2 Nov 2018 07:32:13 -0000 1.10
> +++ patches/patch-config_def_h 10 Feb 2019 08:05:48 -0000
> @@ -11,11 +11,3 @@ Index: config.def.h
>  
>   /* 8 bright colors */
>   "gray50",
> -@@ -177,7 +177,6 @@ static Shortcut shortcuts[] = {
> - { TERMMOD,              XK_V,           clippaste,      {.i =  0} },
> - { TERMMOD,              XK_Y,           selpaste,       {.i =  0} },
> - { TERMMOD,              XK_Num_Lock,    numlock,        {.i =  0} },
> -- { TERMMOD,              XK_I,           iso14755,       {.i =  0} },
> - };
> -
> - /*
> Index: patches/patch-config_mk
> ===================================================================
> RCS file: /cvs/ports/x11/st/patches/patch-config_mk,v
> retrieving revision 1.10
> diff -u -p -r1.10 patch-config_mk
> --- patches/patch-config_mk 17 Mar 2018 13:28:39 -0000 1.10
> +++ patches/patch-config_mk 10 Feb 2019 08:05:48 -0000
> @@ -2,27 +2,18 @@ $OpenBSD: patch-config_mk,v 1.10 2018/03
>  Index: config.mk
>  --- config.mk.orig
>  +++ config.mk
> -@@ -11,17 +11,14 @@ X11INC = /usr/X11R6/include
> - X11LIB = /usr/X11R6/lib
> +@@ -26,10 +26,10 @@ STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS)
> + STLDFLAGS = $(LIBS) $(LDFLAGS)
>  
> - # includes and libs
> --INCS = -I$(X11INC) \
> --       `pkg-config --cflags fontconfig` \
> --       `pkg-config --cflags freetype2`
> --LIBS = -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
> --STCFLAGS = $(INCS) $(CPPFLAGS) $(CFLAGS)
> --STLDFLAGS = $(LIBS) $(LDFLAGS)
> -+CPPFLAGS = -DVERSION=\"${VERSION}\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
> -+STCFLAGS += -std=c99 ${INCS} ${CPPFLAGS} ${CFLAGS}
> -+STLDFLAGS += ${LIBS} ${LDFLAGS}
> + # OpenBSD:
> +-#CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
> +-#LIBS = -L$(X11LIB) -lm -lX11 -lutil -lXft \
> +-#       `pkg-config --libs fontconfig` \
> +-#       `pkg-config --libs freetype2`
> ++CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
> ++LIBS = -L$(X11LIB) -lm -lX11 -lutil -lXft \
> ++       `pkg-config --libs fontconfig` \
> ++       `pkg-config --libs freetype2`
>  
>   # compiler and linker
>   # CC = c99
> Index: patches/patch-st_1
> ===================================================================
> RCS file: patches/patch-st_1
> diff -N patches/patch-st_1
> --- patches/patch-st_1 2 Nov 2018 07:32:13 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,16 +0,0 @@
> -$OpenBSD: patch-st_1,v 1.1 2018/11/02 07:32:13 mestre Exp $
> -
> -Index: st.1
> ---- st.1.orig
> -+++ st.1
> -@@ -159,10 +159,6 @@ Copy the selected text to the clipboard selection.
> - .TP
> - .B Ctrl-Shift-v
> - Paste from the clipboard selection.
> --.TP
> --.B Ctrl-Shift-i
> --Launch dmenu to enter a unicode codepoint and send the corresponding glyph
> --to st.
> - .SH CUSTOMIZATION
> - .B st
> - can be customized by creating a custom config.h and (re)compiling the source
> Index: patches/patch-st_c
> ===================================================================
> RCS file: patches/patch-st_c
> diff -N patches/patch-st_c
> --- patches/patch-st_c 29 Mar 2018 21:09:09 -0000 1.6
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,18 +0,0 @@
> -$OpenBSD: patch-st_c,v 1.6 2018/03/29 21:09:09 kn Exp $
> -Index: st.c
> ---- st.c.orig
> -+++ st.c
> -@@ -805,9 +805,13 @@ ttynew(char *line, char *cmd, char *out, char **args)
> - die("ioctl TIOCSCTTY failed: %s\n", strerror(errno));
> - close(s);
> - close(m);
> -+ if (pledge("stdio getpw proc exec", NULL) == -1)
> -+ die("pledge\n");
> - execsh(cmd, args);
> - break;
> - default:
> -+ if (pledge("stdio rpath tty proc", NULL) == -1)
> -+ die("pledge\n");
> - close(s);
> - cmdfd = m;
> - signal(SIGCHLD, sigchld);
>