[Midnightbsd-cvs] mports [24910] trunk/x11/rxvt: cleanup
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Feb 3 10:52:13 EST 2019
Revision: 24910
http://svnweb.midnightbsd.org/mports/?rev=24910
Author: laffer1
Date: 2019-02-03 10:52:12 -0500 (Sun, 03 Feb 2019)
Log Message:
-----------
cleanup
Modified Paths:
--------------
trunk/x11/rxvt/Makefile
Added Paths:
-----------
trunk/x11/rxvt/files/patch-Makefile.in
trunk/x11/rxvt/files/patch-autoconf__config.h.in
trunk/x11/rxvt/files/patch-doc__Makefile.in
trunk/x11/rxvt/files/patch-src__command.c
trunk/x11/rxvt/files/patch-src__grkelot.c
trunk/x11/rxvt/files/patch-src__logging.c
trunk/x11/rxvt/files/patch-src__screen.c
Removed Paths:
-------------
trunk/x11/rxvt/files/patch-aa
trunk/x11/rxvt/files/patch-ab
trunk/x11/rxvt/files/patch-ac
trunk/x11/rxvt/files/patch-ad
trunk/x11/rxvt/files/patch-grkelot.c
trunk/x11/rxvt/files/patch-logging.c
trunk/x11/rxvt/files/patch-screen.c
Modified: trunk/x11/rxvt/Makefile
===================================================================
--- trunk/x11/rxvt/Makefile 2019-02-03 15:48:17 UTC (rev 24909)
+++ trunk/x11/rxvt/Makefile 2019-02-03 15:52:12 UTC (rev 24910)
@@ -32,7 +32,8 @@
CONFIGURE_ARGS= --enable-ttygid \
--with-xpm --enable-xpm-background \
--with-xpm-includes=${LOCALBASE}/include/X11 \
- --with-xpm-library=${LOCALBASE}/lib
+ --with-xpm-library=${LOCALBASE}/lib \
+ --disable-utmp --disable-wtmp
PLIST_FILES= bin/rxvt man/man1/${PORTNAME}.1.gz
BIG5_CONFIGURE_ON= --enable-big5
@@ -52,13 +53,6 @@
.include <bsd.port.pre.mk>
-# fails to build with new utmpx
-.if ${OSVERSION} > 4015
-CONFIGURE_ARGS+= --disable-utmp --disable-wtmp
-.else
-CONFIGURE_ARGS+= --enable-utmp --enable-wtmp
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|getpt()|posix_openpt(0)|' ${WRKSRC}/configure
Copied: trunk/x11/rxvt/files/patch-Makefile.in (from rev 24903, trunk/x11/rxvt/files/patch-aa)
===================================================================
--- trunk/x11/rxvt/files/patch-Makefile.in (rev 0)
+++ trunk/x11/rxvt/files/patch-Makefile.in 2019-02-03 15:52:12 UTC (rev 24910)
@@ -0,0 +1,11 @@
+--- Makefile.in.orig Mon Aug 21 23:31:36 2000
++++ Makefile.in Mon Aug 21 23:31:51 2000
+@@ -9,7 +9,7 @@
+ first_rule: all
+ dummy:
+
+-subdirs = src doc rclock src/graphics
++subdirs = src doc
+
+ DIST = INSTALL README.configure configure Makefile Makefile.in ChangeLog
+
Deleted: trunk/x11/rxvt/files/patch-aa
===================================================================
--- trunk/x11/rxvt/files/patch-aa 2019-02-03 15:48:17 UTC (rev 24909)
+++ trunk/x11/rxvt/files/patch-aa 2019-02-03 15:52:12 UTC (rev 24910)
@@ -1,11 +0,0 @@
---- Makefile.in.orig Mon Aug 21 23:31:36 2000
-+++ Makefile.in Mon Aug 21 23:31:51 2000
-@@ -9,7 +9,7 @@
- first_rule: all
- dummy:
-
--subdirs = src doc rclock src/graphics
-+subdirs = src doc
-
- DIST = INSTALL README.configure configure Makefile Makefile.in ChangeLog
-
Deleted: trunk/x11/rxvt/files/patch-ab
===================================================================
--- trunk/x11/rxvt/files/patch-ab 2019-02-03 15:48:17 UTC (rev 24909)
+++ trunk/x11/rxvt/files/patch-ab 2019-02-03 15:52:12 UTC (rev 24910)
@@ -1,12 +0,0 @@
---- doc/Makefile.in.orig Mon Aug 21 23:32:21 2000
-+++ doc/Makefile.in Mon Aug 21 23:32:44 2000
-@@ -41,9 +41,6 @@
-
- all: rxvt.1
-
--rxvt.1: Makefile
-- @if test x$(TBL) = x; then : ; else echo "$(TBL) $(srcdir)/rxvt.tbl | grep -v '^.lf' > rxvt.1"; $(TBL) $(srcdir)/rxvt.tbl | grep -v '^.lf' > rxvt.1 ; fi
--
- SEDREPLACE = -e 's%@RXVT_VERSION@%$(VERSION)%g;'\
- -e 's%@RXVT_LSMDATE@%$(LSMDATE)%g;'\
- -e 's%@RXVT_DATE@%$(DATE)%g;'\
Deleted: trunk/x11/rxvt/files/patch-ac
===================================================================
--- trunk/x11/rxvt/files/patch-ac 2019-02-03 15:48:17 UTC (rev 24909)
+++ trunk/x11/rxvt/files/patch-ac 2019-02-03 15:52:12 UTC (rev 24910)
@@ -1,20 +0,0 @@
---- autoconf/config.h.in.orig Mon Aug 21 23:33:43 2000
-+++ autoconf/config.h.in Mon Aug 21 23:34:39 2000
-@@ -161,7 +161,7 @@
- #undef HAVE_UTMP_HOST
-
- /* Define location of utmp */
--#undef RXVT_UTMP_FILE
-+#define RXVT_UTMP_FILE "/var/run/utmp"
-
- /* Define in utmpx.h has struct utmpx */
- #undef HAVE_STRUCT_UTMPX
-@@ -173,7 +173,7 @@
- #undef RXVT_UTMPX_FILE
-
- /* Define location of wtmp */
--#undef RXVT_WTMP_FILE
-+#define RXVT_WTMP_FILE "/var/log/wtmp"
-
- /* Define location of wtmpx */
- #undef RXVT_WTMPX_FILE
Deleted: trunk/x11/rxvt/files/patch-ad
===================================================================
--- trunk/x11/rxvt/files/patch-ad 2019-02-03 15:48:17 UTC (rev 24909)
+++ trunk/x11/rxvt/files/patch-ad 2019-02-03 15:52:12 UTC (rev 24910)
@@ -1,40 +0,0 @@
---- src/command.c.orig Thu Nov 1 22:18:35 2001
-+++ src/command.c Mon Oct 10 00:29:07 2005
-@@ -254,7 +254,7 @@
- extern char *ptsname();
-
- # ifdef PTYS_ARE_GETPT
-- if ((fd = getpt()) >= 0) {
-+ if ((fd = posix_openpt(O_RDWR)) >= 0) {
- # else
- if ((fd = open("/dev/ptmx", O_RDWR)) >= 0) {
- # endif
-@@ -519,6 +519,9 @@
- # ifdef VEOL2
- FOO(VEOL2, "VEOL2");
- # endif
-+# ifdef VERASE2
-+ FOO(VERASE2, "VERASE2");
-+# endif
- # ifdef VSWTC
- FOO(VSWTC, "VSWTC");
- # endif
-@@ -596,6 +599,9 @@
- # ifdef VSWTCH
- tio->c_cc[VSWTCH] = VDISABLE;
- # endif
-+# ifdef VERASE2
-+ tio->c_cc[VERASE2] = CERASE2;
-+# endif
- # if VMIN != VEOF
- tio->c_cc[VMIN] = 1;
- # endif
-@@ -2376,7 +2382,7 @@
- unsigned char buf[256];
-
- va_start(arg_ptr, fmt);
-- vsprintf(buf, fmt, arg_ptr);
-+ vsnprintf(buf, sizeof(buf), fmt, arg_ptr);
- va_end(arg_ptr);
- tt_write(buf, strlen(buf));
- }
Copied: trunk/x11/rxvt/files/patch-autoconf__config.h.in (from rev 24903, trunk/x11/rxvt/files/patch-ac)
===================================================================
--- trunk/x11/rxvt/files/patch-autoconf__config.h.in (rev 0)
+++ trunk/x11/rxvt/files/patch-autoconf__config.h.in 2019-02-03 15:52:12 UTC (rev 24910)
@@ -0,0 +1,20 @@
+--- autoconf/config.h.in.orig Mon Aug 21 23:33:43 2000
++++ autoconf/config.h.in Mon Aug 21 23:34:39 2000
+@@ -161,7 +161,7 @@
+ #undef HAVE_UTMP_HOST
+
+ /* Define location of utmp */
+-#undef RXVT_UTMP_FILE
++#define RXVT_UTMP_FILE "/var/run/utmp"
+
+ /* Define in utmpx.h has struct utmpx */
+ #undef HAVE_STRUCT_UTMPX
+@@ -173,7 +173,7 @@
+ #undef RXVT_UTMPX_FILE
+
+ /* Define location of wtmp */
+-#undef RXVT_WTMP_FILE
++#define RXVT_WTMP_FILE "/var/log/wtmp"
+
+ /* Define location of wtmpx */
+ #undef RXVT_WTMPX_FILE
Copied: trunk/x11/rxvt/files/patch-doc__Makefile.in (from rev 24903, trunk/x11/rxvt/files/patch-ab)
===================================================================
--- trunk/x11/rxvt/files/patch-doc__Makefile.in (rev 0)
+++ trunk/x11/rxvt/files/patch-doc__Makefile.in 2019-02-03 15:52:12 UTC (rev 24910)
@@ -0,0 +1,12 @@
+--- doc/Makefile.in.orig Mon Aug 21 23:32:21 2000
++++ doc/Makefile.in Mon Aug 21 23:32:44 2000
+@@ -41,9 +41,6 @@
+
+ all: rxvt.1
+
+-rxvt.1: Makefile
+- @if test x$(TBL) = x; then : ; else echo "$(TBL) $(srcdir)/rxvt.tbl | grep -v '^.lf' > rxvt.1"; $(TBL) $(srcdir)/rxvt.tbl | grep -v '^.lf' > rxvt.1 ; fi
+-
+ SEDREPLACE = -e 's%@RXVT_VERSION@%$(VERSION)%g;'\
+ -e 's%@RXVT_LSMDATE@%$(LSMDATE)%g;'\
+ -e 's%@RXVT_DATE@%$(DATE)%g;'\
Deleted: trunk/x11/rxvt/files/patch-grkelot.c
===================================================================
--- trunk/x11/rxvt/files/patch-grkelot.c 2019-02-03 15:48:17 UTC (rev 24909)
+++ trunk/x11/rxvt/files/patch-grkelot.c 2019-02-03 15:52:12 UTC (rev 24910)
@@ -1,26 +0,0 @@
---- src/grkelot.c
-+++ src/grkelot.c
-@@ -80,10 +80,6 @@
- #define MAX_SWITCHER 2U /* per state */
- #define MAX_VAL 256 /* for temp allocation */
-
--typedef unsigned char u_char;
--typedef unsigned int u_int;
--typedef unsigned long u_long;
--
- typedef struct s_xlat {
- u_int first, last;
- u_int *pval; /* array of translated values */
-@@ -158,9 +154,9 @@
-
- #define NUM_XLAT_TYPES (sizeof(xlat_type) / sizeof(xlat_type[0]))
-
--static void kstate_add_xlat(char *str);
--static void kstate_add_switcher(char *str);
--static void kstate_set_life(char *str);
-+void kstate_add_xlat(char *str);
-+void kstate_add_switcher(char *str);
-+void kstate_set_life(char *str);
-
- /* --- Functions ------------- */
- /* INTPROTO */
Deleted: trunk/x11/rxvt/files/patch-logging.c
===================================================================
--- trunk/x11/rxvt/files/patch-logging.c 2019-02-03 15:48:17 UTC (rev 24909)
+++ trunk/x11/rxvt/files/patch-logging.c 2019-02-03 15:52:12 UTC (rev 24910)
@@ -1,12 +0,0 @@
---- src/logging.c
-+++ src/logging.c
-@@ -131,6 +131,9 @@
- STRNCPY(ut_id, (pty + 3), sizeof(ut_id));
- else
- #ifndef USE_SYSV_UTMP
-+ if (!strncmp(pty, "pts/", 4))
-+ STRNCPY(ut_id, (pty + 4), sizeof(ut_id));
-+ else
- {
- print_error("can't parse tty name \"%s\"", pty);
- ut_id[0] = '\0'; /* entry not made */
Deleted: trunk/x11/rxvt/files/patch-screen.c
===================================================================
--- trunk/x11/rxvt/files/patch-screen.c 2019-02-03 15:48:17 UTC (rev 24909)
+++ trunk/x11/rxvt/files/patch-screen.c 2019-02-03 15:52:12 UTC (rev 24910)
@@ -1,52 +0,0 @@
---- src/screen.c.orig 2011-04-21 08:56:56.000000000 +0200
-+++ src/screen.c 2011-04-21 08:59:19.000000000 +0200
-@@ -3359,6 +3359,7 @@
- XEvent ev;
- Atom32 target_list[4];
- Atom target;
-+ Atom property;
- static Atom xa_targets = None;
- static Atom xa_compound_text = None;
- static Atom xa_text = None;
-@@ -3381,16 +3382,26 @@
- ev.xselection.target = rq->target;
- ev.xselection.time = rq->time;
-
-+ /* ICCCM: 2.2. Responsibilities of the Selection Owner
-+ * SelectionRequest:
-+ * If the specified property is None , the requestor
-+ * an obsolete client. Owners are encouraged
-+ * to support these clients by using the specified
-+ * target atom as the property name to be used for
-+ * the reply.
-+ */
-+ property = (rq->property == 0) ? rq->target : rq->property;
-+
- if (rq->target == xa_targets) {
- target_list[0] = (Atom32) xa_targets;
- target_list[1] = (Atom32) XA_STRING;
- target_list[2] = (Atom32) xa_text;
- target_list[3] = (Atom32) xa_compound_text;
-- XChangeProperty(Xdisplay, rq->requestor, rq->property, rq->target,
-+ XChangeProperty(Xdisplay, rq->requestor, property, rq->target,
- (8 * sizeof(target_list[0])), PropModeReplace,
- (unsigned char *)target_list,
- (sizeof(target_list) / sizeof(target_list[0])));
-- ev.xselection.property = rq->property;
-+ ev.xselection.property = property;
- } else if (rq->target == XA_STRING
- || rq->target == xa_compound_text
- || rq->target == xa_text) {
-@@ -3404,10 +3415,10 @@
- }
- cl[0] = selection.text;
- XmbTextListToTextProperty(Xdisplay, cl, 1, style, &ct);
-- XChangeProperty(Xdisplay, rq->requestor, rq->property,
-+ XChangeProperty(Xdisplay, rq->requestor, property,
- target, 8, PropModeReplace,
- ct.value, ct.nitems);
-- ev.xselection.property = rq->property;
-+ ev.xselection.property = property;
- }
- XSendEvent(Xdisplay, rq->requestor, False, 0, &ev);
- }
Copied: trunk/x11/rxvt/files/patch-src__command.c (from rev 24903, trunk/x11/rxvt/files/patch-ad)
===================================================================
--- trunk/x11/rxvt/files/patch-src__command.c (rev 0)
+++ trunk/x11/rxvt/files/patch-src__command.c 2019-02-03 15:52:12 UTC (rev 24910)
@@ -0,0 +1,40 @@
+--- src/command.c.orig Thu Nov 1 22:18:35 2001
++++ src/command.c Mon Oct 10 00:29:07 2005
+@@ -254,7 +254,7 @@
+ extern char *ptsname();
+
+ # ifdef PTYS_ARE_GETPT
+- if ((fd = getpt()) >= 0) {
++ if ((fd = posix_openpt(O_RDWR)) >= 0) {
+ # else
+ if ((fd = open("/dev/ptmx", O_RDWR)) >= 0) {
+ # endif
+@@ -519,6 +519,9 @@
+ # ifdef VEOL2
+ FOO(VEOL2, "VEOL2");
+ # endif
++# ifdef VERASE2
++ FOO(VERASE2, "VERASE2");
++# endif
+ # ifdef VSWTC
+ FOO(VSWTC, "VSWTC");
+ # endif
+@@ -596,6 +599,9 @@
+ # ifdef VSWTCH
+ tio->c_cc[VSWTCH] = VDISABLE;
+ # endif
++# ifdef VERASE2
++ tio->c_cc[VERASE2] = CERASE2;
++# endif
+ # if VMIN != VEOF
+ tio->c_cc[VMIN] = 1;
+ # endif
+@@ -2376,7 +2382,7 @@
+ unsigned char buf[256];
+
+ va_start(arg_ptr, fmt);
+- vsprintf(buf, fmt, arg_ptr);
++ vsnprintf(buf, sizeof(buf), fmt, arg_ptr);
+ va_end(arg_ptr);
+ tt_write(buf, strlen(buf));
+ }
Copied: trunk/x11/rxvt/files/patch-src__grkelot.c (from rev 24903, trunk/x11/rxvt/files/patch-grkelot.c)
===================================================================
--- trunk/x11/rxvt/files/patch-src__grkelot.c (rev 0)
+++ trunk/x11/rxvt/files/patch-src__grkelot.c 2019-02-03 15:52:12 UTC (rev 24910)
@@ -0,0 +1,26 @@
+--- src/grkelot.c
++++ src/grkelot.c
+@@ -80,10 +80,6 @@
+ #define MAX_SWITCHER 2U /* per state */
+ #define MAX_VAL 256 /* for temp allocation */
+
+-typedef unsigned char u_char;
+-typedef unsigned int u_int;
+-typedef unsigned long u_long;
+-
+ typedef struct s_xlat {
+ u_int first, last;
+ u_int *pval; /* array of translated values */
+@@ -158,9 +154,9 @@
+
+ #define NUM_XLAT_TYPES (sizeof(xlat_type) / sizeof(xlat_type[0]))
+
+-static void kstate_add_xlat(char *str);
+-static void kstate_add_switcher(char *str);
+-static void kstate_set_life(char *str);
++void kstate_add_xlat(char *str);
++void kstate_add_switcher(char *str);
++void kstate_set_life(char *str);
+
+ /* --- Functions ------------- */
+ /* INTPROTO */
Copied: trunk/x11/rxvt/files/patch-src__logging.c (from rev 24903, trunk/x11/rxvt/files/patch-logging.c)
===================================================================
--- trunk/x11/rxvt/files/patch-src__logging.c (rev 0)
+++ trunk/x11/rxvt/files/patch-src__logging.c 2019-02-03 15:52:12 UTC (rev 24910)
@@ -0,0 +1,12 @@
+--- src/logging.c
++++ src/logging.c
+@@ -131,6 +131,9 @@
+ STRNCPY(ut_id, (pty + 3), sizeof(ut_id));
+ else
+ #ifndef USE_SYSV_UTMP
++ if (!strncmp(pty, "pts/", 4))
++ STRNCPY(ut_id, (pty + 4), sizeof(ut_id));
++ else
+ {
+ print_error("can't parse tty name \"%s\"", pty);
+ ut_id[0] = '\0'; /* entry not made */
Copied: trunk/x11/rxvt/files/patch-src__screen.c (from rev 24903, trunk/x11/rxvt/files/patch-screen.c)
===================================================================
--- trunk/x11/rxvt/files/patch-src__screen.c (rev 0)
+++ trunk/x11/rxvt/files/patch-src__screen.c 2019-02-03 15:52:12 UTC (rev 24910)
@@ -0,0 +1,52 @@
+--- src/screen.c.orig 2011-04-21 08:56:56.000000000 +0200
++++ src/screen.c 2011-04-21 08:59:19.000000000 +0200
+@@ -3359,6 +3359,7 @@
+ XEvent ev;
+ Atom32 target_list[4];
+ Atom target;
++ Atom property;
+ static Atom xa_targets = None;
+ static Atom xa_compound_text = None;
+ static Atom xa_text = None;
+@@ -3381,16 +3382,26 @@
+ ev.xselection.target = rq->target;
+ ev.xselection.time = rq->time;
+
++ /* ICCCM: 2.2. Responsibilities of the Selection Owner
++ * SelectionRequest:
++ * If the specified property is None , the requestor
++ * an obsolete client. Owners are encouraged
++ * to support these clients by using the specified
++ * target atom as the property name to be used for
++ * the reply.
++ */
++ property = (rq->property == 0) ? rq->target : rq->property;
++
+ if (rq->target == xa_targets) {
+ target_list[0] = (Atom32) xa_targets;
+ target_list[1] = (Atom32) XA_STRING;
+ target_list[2] = (Atom32) xa_text;
+ target_list[3] = (Atom32) xa_compound_text;
+- XChangeProperty(Xdisplay, rq->requestor, rq->property, rq->target,
++ XChangeProperty(Xdisplay, rq->requestor, property, rq->target,
+ (8 * sizeof(target_list[0])), PropModeReplace,
+ (unsigned char *)target_list,
+ (sizeof(target_list) / sizeof(target_list[0])));
+- ev.xselection.property = rq->property;
++ ev.xselection.property = property;
+ } else if (rq->target == XA_STRING
+ || rq->target == xa_compound_text
+ || rq->target == xa_text) {
+@@ -3404,10 +3415,10 @@
+ }
+ cl[0] = selection.text;
+ XmbTextListToTextProperty(Xdisplay, cl, 1, style, &ct);
+- XChangeProperty(Xdisplay, rq->requestor, rq->property,
++ XChangeProperty(Xdisplay, rq->requestor, property,
+ target, 8, PropModeReplace,
+ ct.value, ct.nitems);
+- ev.xselection.property = rq->property;
++ ev.xselection.property = property;
+ }
+ XSendEvent(Xdisplay, rq->requestor, False, 0, &ev);
+ }
More information about the Midnightbsd-cvs
mailing list