[Midnightbsd-cvs] mports [16764] screen 4.2.1
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Sep 4 23:26:57 EDT 2014
Revision: 16764
http://svnweb.midnightbsd.org/mports/?rev=16764
Author: laffer1
Date: 2014-09-04 23:26:56 -0400 (Thu, 04 Sep 2014)
Log Message:
-----------
screen 4.2.1
Modified Paths:
--------------
trunk/sysutils/screen/Makefile
trunk/sysutils/screen/distinfo
trunk/sysutils/screen/files/patch-Makefile.in
trunk/sysutils/screen/files/patch-ansi.c
trunk/sysutils/screen/files/patch-os.h
trunk/sysutils/screen/files/patch-screen.c
trunk/sysutils/screen/files/patch-utmp.c
trunk/sysutils/screen/pkg-plist
Added Paths:
-----------
trunk/sysutils/screen/files/patch-configure
trunk/sysutils/screen/files/patch-doc__Makefile.in
trunk/sysutils/screen/files/patch-termcap.c
trunk/sysutils/screen/files/patch-terminfo__checktc.c
Removed Paths:
-------------
trunk/sysutils/screen/files/opt-cjkwidth
trunk/sysutils/screen/files/opt-hostinlocked
trunk/sysutils/screen/files/patch-aa
trunk/sysutils/screen/files/patch-ab
trunk/sysutils/screen/files/patch-ad
trunk/sysutils/screen/files/patch-af
trunk/sysutils/screen/files/patch-display.h
trunk/sysutils/screen/files/patch-doc_Makefile.in
trunk/sysutils/screen/files/patch-process.c
trunk/sysutils/screen/files/patch-pty.c
trunk/sysutils/screen/files/patch-screen.h
trunk/sysutils/screen/files/patch-terminfo::checktc.c
trunk/sysutils/screen/files/patch-tty.sh
Property Changed:
----------------
trunk/sysutils/screen/files/opt-showencoding
trunk/sysutils/screen/files/patch-Makefile.in
trunk/sysutils/screen/files/patch-ansi.c
trunk/sysutils/screen/files/patch-attacher.c
trunk/sysutils/screen/files/patch-os.h
trunk/sysutils/screen/files/patch-osdef.h.in
trunk/sysutils/screen/files/patch-resize.c
trunk/sysutils/screen/files/patch-screen.c
trunk/sysutils/screen/files/patch-utmp.c
trunk/sysutils/screen/pkg-descr
Modified: trunk/sysutils/screen/Makefile
===================================================================
--- trunk/sysutils/screen/Makefile 2014-09-05 03:22:14 UTC (rev 16763)
+++ trunk/sysutils/screen/Makefile 2014-09-05 03:26:56 UTC (rev 16764)
@@ -1,65 +1,70 @@
# $MidnightBSD$
PORTNAME= screen
-PORTVERSION= 4.0.3
-PORTREVISION= 2
+PORTVERSION= 4.2.1
CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \
+MASTER_SITES= http://ftp.gnu.org/gnu/screen/ \
+ ftp://ftp.gnu.org/gnu/screen/ \
+ ftp://gnu.mirror.iweb.com/screen/ \
+ http://gnu.mirror.iweb.com/screen/ \
+ http://mirror.sdunix.com/gnu/ \
+ ftp://mirrors.kernel.org/gnu/screen/ \
http://komquats.com/distfiles/ \
http://people.freebsd.org/~cy/distfiles/ \
- ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= screen
+ GNU
-MAINTAINER= ports at MidnightBSD.org
-COMMENT= A multi-screen window manager
-LICENSE= gpl2
+MAINTAINER= cy at FreeBSD.org
+COMMENT= Multi-screen window manager
-OPTIONS= CJK "Treat CJK ambiguous characters as full width" OFF \
- INFO "Build and install info documentation" ON \
- NETHACK "Enable nethack-style messages" ON \
- XTERM_256 "Enable support for 256 colour xterm" ON \
- HOSTINLOCKED "Print user at host in locked message" OFF \
- SHOWENC "Show encoding on the status line" OFF
+LICENSE= gpl3
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE= INFO MAN NETHACK XTERM_256 SHOWENC
+OPTIONS_DEFAULT= INFO MAN NETHACK XTERM_256 SOCKETS
+OPTIONS_SINGLE= IPC
+OPTIONS_SINGLE_IPC= SOCKETS NAMED_PIPES
+INFO_DESC= Build and install info documentation
+MAN_DESC= Build and install man pages
+NETHACK_DESC= Enable nethack-style messages
+XTERM_256_DESC= Enable support for 256 colour xterm
+SHOWENC_DESC= Show encoding on the status line
+SOCKETS_DESC= Use new (4.2.1+) sockets for IPC (default)
+NAMED_PIPES_DESC= Use legacy (4.0.3) named pipes for IPC (override)
+OPTIONS_SUB=
+
+USES= gmake
+
+.include <bsd.mport.options.mk>
+
GNU_CONFIGURE= yes
-MAKE_ARGS+= -DWITH_MAN
-.if defined(WITH_INFO)
+.if ${PORT_OPTIONS:MMAN}
+MAKE_ARGS+= WITH_MAN=1
+PLIST_SUB+= MAN=""
+.else
+PLIST_SUB+= MAN="@comment"
+.endif
+.if ${PORT_OPTIONS:MINFO}
.if !exists(/usr/bin/install-info)
RUN_DEPENDS+= install-info:${PORTSDIR}/print/texinfo
.endif
INFO= screen
-MAKE_ARGS+= -DWITH_INFO
+MAKE_ARGS+= WITH_INFO=1
.endif
-.if ${ARCH} == "alpha"
-CFLAGS+= -O0
-.endif
-
# Enables support for 256 colour xterm. Note that you may need to
# set up a custom termcap entry or .screenrc which modifies termcap
# to contain the following: Co#256:AB=\E[48;5;%dm:AF=\E[38;5;%dm
#
-.if defined(WITH_XTERM_256)
+.if ${PORT_OPTIONS:MXTERM_256}
CFLAGS+= -DCOLORS256
.endif
-.if !defined(WITH_NETHACK)
+.if ! ${PORT_OPTIONS:MNETHACK}
CFLAGS+= -DNONETHACK
.endif
-# treat CJK ambiguous characters as full width via option "cjkwidth"
-.if defined(WITH_CJK)
-EXTRA_PATCHES+= ${FILESDIR}/opt-cjkwidth
-.endif
-
-.if defined(WITH_HOSTINLOCKED)
-EXTRA_PATCHES+= ${FILESDIR}/opt-hostinlocked
-.endif
-
# show encoding on the status line via option "showenc"
-.if defined(WITH_SHOWENC)
+.if ${PORT_OPTIONS:MSHOWENC}
EXTRA_PATCHES+= ${FILESDIR}/opt-showencoding
.endif
@@ -67,11 +72,20 @@
@${RM} ${WRKSRC}/doc/screen.info*
@${REINPLACE_CMD} -e 's|/dev/ptmx|/nonexistent|' ${WRKSRC}/configure
+# Bug 191029: Users can choose whether to use sockets or named pipes.
+# Choose sockets if you don't know what the difference is.
+# Choose named pipes if your environment is heterogeneous,
+# using both screen 4.0.3 and 4.2.1.
+.if ${PORT_OPTIONS:MNAMED_PIPES}
+# Bug 191017
+post-configure:
+ @${ECHO_CMD} '#define NAMEDPIPE 1' >> ${WRKSRC}/config.h
+ @${ECHO_CMD} User selected named pipes override set.
+.endif
+
post-install:
- @${MKDIR} ${EXAMPLESDIR}
- @${CP} ${WRKSRC}/etc/etcscreenrc ${EXAMPLESDIR}/screenrc
- @if [ ! -f ${PREFIX}/etc/screenrc ]; then \
- ${CP} ${EXAMPLESDIR}/screenrc ${PREFIX}/etc/screenrc ; \
- fi
+ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+ ${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc \
+ ${STAGEDIR}${EXAMPLESDIR}/screenrc
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: trunk/sysutils/screen/distinfo
===================================================================
--- trunk/sysutils/screen/distinfo 2014-09-05 03:22:14 UTC (rev 16763)
+++ trunk/sysutils/screen/distinfo 2014-09-05 03:26:56 UTC (rev 16764)
@@ -1,2 +1,2 @@
-SHA256 (screen-4.0.3.tar.gz) = 78f0d5b1496084a5902586304d4a73954b2bfe33ea13edceecf21615c39e6c77
-SIZE (screen-4.0.3.tar.gz) = 840602
+SHA256 (screen-4.2.1.tar.gz) = 5468545047e301d2b3579f9d9ce00466d14a7eec95ce806e3834a3d6b0b9b080
+SIZE (screen-4.2.1.tar.gz) = 1062485
Deleted: trunk/sysutils/screen/files/opt-cjkwidth
===================================================================
--- trunk/sysutils/screen/files/opt-cjkwidth 2014-09-05 03:22:14 UTC (rev 16763)
+++ trunk/sysutils/screen/files/opt-cjkwidth 2014-09-05 03:26:56 UTC (rev 16764)
@@ -1,227 +0,0 @@
---- ansi.c.orig Tue Jun 17 08:00:47 2003
-+++ ansi.c Wed Jun 18 00:55:21 2003
-@@ -701,7 +701,7 @@
- curr->w_rend.font = 0;
- }
- # ifdef DW_CHARS
-- if (curr->w_encoding == UTF8 && c >= 0x1100 && utf8_isdouble(c))
-+ if (curr->w_encoding == UTF8 && utf8_isdouble(c))
- curr->w_mbcs = 0xff;
- # endif
- if (curr->w_encoding == UTF8 && c >= 0x0300 && utf8_iscomb(c))
---- comm.c.orig Mon Sep 8 22:25:08 2003
-+++ comm.c Fri May 6 19:06:12 2005
-@@ -112,6 +112,9 @@
- #endif
- { "charset", NEED_FORE|ARGS_1 },
- { "chdir", ARGS_01 },
-+#ifdef DW_CHARS
-+ { "cjkwidth", ARGS_01 },
-+#endif
- { "clear", NEED_FORE|ARGS_0 },
- { "colon", NEED_LAYER|ARGS_01 },
- { "command", NEED_DISPLAY|ARGS_02 },
---- encoding.c.orig Mon Sep 8 22:25:23 2003
-+++ encoding.c Fri May 6 20:05:24 2005
-@@ -35,6 +35,10 @@
-
- extern char *screenencodings;
-
-+#ifdef DW_CHARS
-+extern int cjkwidth;
-+#endif
-+
- static int encmatch __P((char *, char *));
- # ifdef UTF8
- static int recode_char __P((int, int, int));
-@@ -845,22 +849,107 @@
- }
-
- #ifdef DW_CHARS
-+struct interval {
-+ int first;
-+ int last;
-+};
-+
-+/* auxiliary function for binary search in interval table */
-+static int bisearch(int ucs, const struct interval *table, int max) {
-+ int min = 0;
-+ int mid;
-+
-+ if (ucs < table[0].first || ucs > table[max].last)
-+ return 0;
-+ while (max >= min) {
-+ mid = (min + max) / 2;
-+ if (ucs > table[mid].last)
-+ min = mid + 1;
-+ else if (ucs < table[mid].first)
-+ max = mid - 1;
-+ else
-+ return 1;
-+ }
-+
-+ return 0;
-+}
-+
- int
- utf8_isdouble(c)
- int c;
- {
-- return
-- (c >= 0x1100 &&
-- (c <= 0x115f || /* Hangul Jamo init. consonants */
-- (c >= 0x2e80 && c <= 0xa4cf && (c & ~0x0011) != 0x300a &&
-- c != 0x303f) || /* CJK ... Yi */
-- (c >= 0xac00 && c <= 0xd7a3) || /* Hangul Syllables */
-- (c >= 0xdf00 && c <= 0xdfff) || /* dw combining sequence */
-- (c >= 0xf900 && c <= 0xfaff) || /* CJK Compatibility Ideographs */
-- (c >= 0xfe30 && c <= 0xfe6f) || /* CJK Compatibility Forms */
-- (c >= 0xff00 && c <= 0xff5f) || /* Fullwidth Forms */
-- (c >= 0xffe0 && c <= 0xffe6) ||
-- (c >= 0x20000 && c <= 0x2ffff)));
-+ /* sorted list of non-overlapping intervals of East Asian Ambiguous
-+ * characters, generated by "uniset +WIDTH-A -cat=Me -cat=Mn -cat=Cf c" */
-+ static const struct interval ambiguous[] = {
-+ { 0x00A1, 0x00A1 }, { 0x00A4, 0x00A4 }, { 0x00A7, 0x00A8 },
-+ { 0x00AA, 0x00AA }, { 0x00AE, 0x00AE }, { 0x00B0, 0x00B4 },
-+ { 0x00B6, 0x00BA }, { 0x00BC, 0x00BF }, { 0x00C6, 0x00C6 },
-+ { 0x00D0, 0x00D0 }, { 0x00D7, 0x00D8 }, { 0x00DE, 0x00E1 },
-+ { 0x00E6, 0x00E6 }, { 0x00E8, 0x00EA }, { 0x00EC, 0x00ED },
-+ { 0x00F0, 0x00F0 }, { 0x00F2, 0x00F3 }, { 0x00F7, 0x00FA },
-+ { 0x00FC, 0x00FC }, { 0x00FE, 0x00FE }, { 0x0101, 0x0101 },
-+ { 0x0111, 0x0111 }, { 0x0113, 0x0113 }, { 0x011B, 0x011B },
-+ { 0x0126, 0x0127 }, { 0x012B, 0x012B }, { 0x0131, 0x0133 },
-+ { 0x0138, 0x0138 }, { 0x013F, 0x0142 }, { 0x0144, 0x0144 },
-+ { 0x0148, 0x014B }, { 0x014D, 0x014D }, { 0x0152, 0x0153 },
-+ { 0x0166, 0x0167 }, { 0x016B, 0x016B }, { 0x01CE, 0x01CE },
-+ { 0x01D0, 0x01D0 }, { 0x01D2, 0x01D2 }, { 0x01D4, 0x01D4 },
-+ { 0x01D6, 0x01D6 }, { 0x01D8, 0x01D8 }, { 0x01DA, 0x01DA },
-+ { 0x01DC, 0x01DC }, { 0x0251, 0x0251 }, { 0x0261, 0x0261 },
-+ { 0x02C4, 0x02C4 }, { 0x02C7, 0x02C7 }, { 0x02C9, 0x02CB },
-+ { 0x02CD, 0x02CD }, { 0x02D0, 0x02D0 }, { 0x02D8, 0x02DB },
-+ { 0x02DD, 0x02DD }, { 0x02DF, 0x02DF }, { 0x0391, 0x03A1 },
-+ { 0x03A3, 0x03A9 }, { 0x03B1, 0x03C1 }, { 0x03C3, 0x03C9 },
-+ { 0x0401, 0x0401 }, { 0x0410, 0x044F }, { 0x0451, 0x0451 },
-+ { 0x2010, 0x2010 }, { 0x2013, 0x2016 }, { 0x2018, 0x2019 },
-+ { 0x201C, 0x201D }, { 0x2020, 0x2022 }, { 0x2024, 0x2027 },
-+ { 0x2030, 0x2030 }, { 0x2032, 0x2033 }, { 0x2035, 0x2035 },
-+ { 0x203B, 0x203B }, { 0x203E, 0x203E }, { 0x2074, 0x2074 },
-+ { 0x207F, 0x207F }, { 0x2081, 0x2084 }, { 0x20AC, 0x20AC },
-+ { 0x2103, 0x2103 }, { 0x2105, 0x2105 }, { 0x2109, 0x2109 },
-+ { 0x2113, 0x2113 }, { 0x2116, 0x2116 }, { 0x2121, 0x2122 },
-+ { 0x2126, 0x2126 }, { 0x212B, 0x212B }, { 0x2153, 0x2154 },
-+ { 0x215B, 0x215E }, { 0x2160, 0x216B }, { 0x2170, 0x2179 },
-+ { 0x2190, 0x2199 }, { 0x21B8, 0x21B9 }, { 0x21D2, 0x21D2 },
-+ { 0x21D4, 0x21D4 }, { 0x21E7, 0x21E7 }, { 0x2200, 0x2200 },
-+ { 0x2202, 0x2203 }, { 0x2207, 0x2208 }, { 0x220B, 0x220B },
-+ { 0x220F, 0x220F }, { 0x2211, 0x2211 }, { 0x2215, 0x2215 },
-+ { 0x221A, 0x221A }, { 0x221D, 0x2220 }, { 0x2223, 0x2223 },
-+ { 0x2225, 0x2225 }, { 0x2227, 0x222C }, { 0x222E, 0x222E },
-+ { 0x2234, 0x2237 }, { 0x223C, 0x223D }, { 0x2248, 0x2248 },
-+ { 0x224C, 0x224C }, { 0x2252, 0x2252 }, { 0x2260, 0x2261 },
-+ { 0x2264, 0x2267 }, { 0x226A, 0x226B }, { 0x226E, 0x226F },
-+ { 0x2282, 0x2283 }, { 0x2286, 0x2287 }, { 0x2295, 0x2295 },
-+ { 0x2299, 0x2299 }, { 0x22A5, 0x22A5 }, { 0x22BF, 0x22BF },
-+ { 0x2312, 0x2312 }, { 0x2460, 0x24E9 }, { 0x24EB, 0x254B },
-+ { 0x2550, 0x2573 }, { 0x2580, 0x258F }, { 0x2592, 0x2595 },
-+ { 0x25A0, 0x25A1 }, { 0x25A3, 0x25A9 }, { 0x25B2, 0x25B3 },
-+ { 0x25B6, 0x25B7 }, { 0x25BC, 0x25BD }, { 0x25C0, 0x25C1 },
-+ { 0x25C6, 0x25C8 }, { 0x25CB, 0x25CB }, { 0x25CE, 0x25D1 },
-+ { 0x25E2, 0x25E5 }, { 0x25EF, 0x25EF }, { 0x2605, 0x2606 },
-+ { 0x2609, 0x2609 }, { 0x260E, 0x260F }, { 0x2614, 0x2615 },
-+ { 0x261C, 0x261C }, { 0x261E, 0x261E }, { 0x2640, 0x2640 },
-+ { 0x2642, 0x2642 }, { 0x2660, 0x2661 }, { 0x2663, 0x2665 },
-+ { 0x2667, 0x266A }, { 0x266C, 0x266D }, { 0x266F, 0x266F },
-+ { 0x273D, 0x273D }, { 0x2776, 0x277F }, { 0xE000, 0xF8FF },
-+ { 0xFFFD, 0xFFFD }, { 0xF0000, 0xFFFFD }, { 0x100000, 0x10FFFD }
-+ };
-+
-+ return ((c >= 0x1100 &&
-+ (c <= 0x115f || /* Hangul Jamo init. consonants */
-+ c == 0x2329 || c == 0x232a ||
-+ (c >= 0x2e80 && c <= 0xa4cf &&
-+ c != 0x303f) || /* CJK ... Yi */
-+ (c >= 0xac00 && c <= 0xd7a3) || /* Hangul Syllables */
-+ (c >= 0xf900 && c <= 0xfaff) || /* CJK Compatibility Ideographs */
-+ (c >= 0xfe30 && c <= 0xfe6f) || /* CJK Compatibility Forms */
-+ (c >= 0xff00 && c <= 0xff60) || /* Fullwidth Forms */
-+ (c >= 0xffe0 && c <= 0xffe6) ||
-+ (c >= 0x20000 && c <= 0x2fffd) ||
-+ (c >= 0x30000 && c <= 0x3fffd))) ||
-+ (cjkwidth &&
-+ bisearch(c, ambiguous,
-+ sizeof(ambiguous) / sizeof(struct interval) - 1)));
- }
- #endif
-
---- process.c.orig Thu Sep 18 20:53:54 2003
-+++ process.c Fri May 6 19:43:53 2005
-@@ -103,6 +103,9 @@
- #ifdef UTF8
- extern char *screenencodings;
- #endif
-+#ifdef DW_CHARS
-+extern int cjkwidth;
-+#endif
-
- static int CheckArgNum __P((int, char **));
- static void ClearAction __P((struct action *));
-@@ -3821,6 +3824,15 @@
- Msg(0, "idle off");
- }
- break;
-+#ifdef DW_CHARS
-+ case RC_CJKWIDTH:
-+ if(ParseSwitch(act, &cjkwidth) == 0)
-+ {
-+ if(msgok)
-+ Msg(0, "Treat ambiguous width characters as %s width", cjkwidth ? "full" : "half");
-+ }
-+ break;
-+#endif
- default:
- #ifdef HAVE_BRAILLE
- /* key == -2: input from braille keybord, msgok always 0 */
---- screen.c.orig Mon Sep 8 22:26:41 2003
-+++ screen.c Sat May 7 05:16:38 2005
-@@ -221,6 +221,10 @@
- char *screenencodings;
- #endif
-
-+#ifdef DW_CHARS
-+int cjkwidth;
-+#endif
-+
- #ifdef NETHACK
- int nethackflag = 0;
- #endif
-@@ -468,6 +472,9 @@
- InitBuiltinTabs();
- screenencodings = SaveStr(SCREENENCODINGS);
- #endif
-+#ifdef DW_CHARS
-+ cjkwidth = 0;
-+#endif
- nwin = nwin_undef;
- nwin_options = nwin_undef;
- strcpy(screenterm, "screen");
-@@ -762,6 +769,19 @@
- debug1("environment says encoding=%d\n", nwin_options.encoding);
- #endif
- }
-+# ifdef DW_CHARS
-+ {
-+ char *s;
-+ if((s = getenv("LC_ALL")) || (s = getenv("LC_CTYPE")) ||
-+ (s = getenv("LANG")))
-+ {
-+ if(!strncmp(s, "zh_", 3) || !strncmp(s, "ja_", 3) || !strncmp(s, "ko_", 3))
-+ {
-+ cjkwidth = 1;
-+ }
-+ }
-+ }
-+#endif
- #endif
- if (SockMatch && strlen(SockMatch) >= MAXSTR)
- Panic(0, "Ridiculously long socketname - try again.");
Deleted: trunk/sysutils/screen/files/opt-hostinlocked
===================================================================
--- trunk/sysutils/screen/files/opt-hostinlocked 2014-09-05 03:22:14 UTC (rev 16763)
+++ trunk/sysutils/screen/files/opt-hostinlocked 2014-09-05 03:26:56 UTC (rev 16764)
@@ -1,21 +0,0 @@
---- attacher.c Sun Oct 2 10:29:36 2005
-+++ attacher.c Sun Oct 2 10:30:18 2005
-@@ -809,6 +809,7 @@
- #else
- char *pass, mypass[16 + 1], salt[3];
- #endif
-+ extern char HostName[];
-
- #ifndef USE_PAM
- pass = ppp->pw_passwd;
-@@ -859,8 +860,8 @@
- *cp1 -= 'a' - 'A';
- }
-
-- sprintf(message, "Screen used by %s <%s>.\nPassword:\007",
-- fullname, ppp->pw_name);
-+ sprintf(message, "Screen used by %s <%s@%s>.\nPassword:\007",
-+ fullname, ppp->pw_name, HostName);
-
- /* loop here to wait for correct password */
- for (;;)
Index: trunk/sysutils/screen/files/opt-showencoding
===================================================================
--- trunk/sysutils/screen/files/opt-showencoding 2014-09-05 03:22:14 UTC (rev 16763)
+++ trunk/sysutils/screen/files/opt-showencoding 2014-09-05 03:26:56 UTC (rev 16764)
Property changes on: trunk/sysutils/screen/files/opt-showencoding
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/sysutils/screen/files/patch-Makefile.in
===================================================================
--- trunk/sysutils/screen/files/patch-Makefile.in 2014-09-05 03:22:14 UTC (rev 16763)
+++ trunk/sysutils/screen/files/patch-Makefile.in 2014-09-05 03:26:56 UTC (rev 16764)
@@ -1,7 +1,21 @@
---- Makefile.in.orig 2007-07-30 12:38:38.000000000 +0200
-+++ Makefile.in 2007-07-30 12:39:34.000000000 +0200
-@@ -77,7 +77,7 @@
+--- Makefile.in.orig 2014-04-26 03:58:35.000000000 -0700
++++ Makefile.in 2014-04-29 18:55:12.050906602 -0700
+@@ -83,19 +83,13 @@
+ $(OPTIONS) $(CFLAGS) $<
+ install_bin: .version screen
+- -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \
+- then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi
+- $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
+- -chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN)
+-# This doesn't work if $(bindir)/screen is a symlink
+- -if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi
+- rm -f $(DESTDIR)$(bindir)/screen
+- (cd $(DESTDIR)$(bindir) && ln -f -s $(SCREEN) screen)
++ $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/screen
++ -chown root:wheel $(DESTDIR)$(bindir)/screen && chmod 4755 $(DESTDIR)$(bindir)/screen
+ cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS)
+
###############################################################################
install: installdirs install_bin
- cd doc ; $(MAKE) install
@@ -9,7 +23,7 @@
-if [ -d /usr/lib/terminfo ]; then \
PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \
chmod 644 /usr/lib/terminfo/s/screen*; \
-@@ -90,7 +90,7 @@
+@@ -108,7 +102,7 @@
installdirs:
# Path leading to ETCSCREENRC and Socketdirectory not checked.
$(srcdir)/etc/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(SCREENENCODINGS)
Property changes on: trunk/sysutils/screen/files/patch-Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/sysutils/screen/files/patch-aa
===================================================================
--- trunk/sysutils/screen/files/patch-aa 2014-09-05 03:22:14 UTC (rev 16763)
+++ trunk/sysutils/screen/files/patch-aa 2014-09-05 03:26:56 UTC (rev 16764)
@@ -1,19 +0,0 @@
---- Makefile.in.orig Thu Feb 14 22:36:33 2002
-+++ Makefile.in Tue Feb 19 13:18:38 2002
-@@ -71,14 +71,8 @@
- $(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $<
-
- install_bin: .version screen
-- -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \
-- then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi
-- $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
-- -chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN)
--# This doesn't work if $(bindir)/screen is a symlink
-- -if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi
-- rm -f $(DESTDIR)$(bindir)/screen
-- (cd $(DESTDIR)$(bindir) && ln -sf $(SCREEN) screen)
-+ $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/screen
-+ -chown root:wheel $(DESTDIR)$(bindir)/screen && chmod 4755 $(DESTDIR)$(bindir)/screen
- cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS)
-
- ###############################################################################
Deleted: trunk/sysutils/screen/files/patch-ab
===================================================================
--- trunk/sysutils/screen/files/patch-ab 2014-09-05 03:22:14 UTC (rev 16763)
+++ trunk/sysutils/screen/files/patch-ab 2014-09-05 03:26:56 UTC (rev 16764)
@@ -1,20 +0,0 @@
---- doc/Makefile.in.orig Fri May 25 18:50:55 2001
-+++ doc/Makefile.in Mon Jun 25 08:42:08 2001
-@@ -27,7 +27,7 @@
-
- info screen.info: screen.texinfo
- @rm -f screen.info*
-- $(MAKEINFO) $(srcdir)/screen.texinfo -o screen.info
-+ $(MAKEINFO) --no-split $(srcdir)/screen.texinfo -o screen.info
-
- install: installdirs
- $(INSTALL_DATA) $(srcdir)/screen.1 $(DESTDIR)$(mandir)/man1/screen.1
-@@ -36,7 +36,7 @@
- if test -f $$d/screen.info; then \
- for f in $$d/screen.info*; do $(INSTALL_DATA) $$f $(DESTDIR)$(infodir);done; \
- if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-- install-info --info-dir=$(DESTDIR)$(infodir) $$d/screen.info; \
-+ install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/screen.info; \
- else true; fi; \
- fi
-
Deleted: trunk/sysutils/screen/files/patch-ad
===================================================================
--- trunk/sysutils/screen/files/patch-ad 2014-09-05 03:22:14 UTC (rev 16763)
+++ trunk/sysutils/screen/files/patch-ad 2014-09-05 03:26:56 UTC (rev 16764)
@@ -1,121 +0,0 @@
---- configure.orig Fri Dec 5 15:46:53 2003
-+++ configure Sat Mar 4 10:18:24 2006
-@@ -4746,48 +4746,6 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- olibs="$LIBS"
--LIBS="-lcurses $olibs"
--{ echo "$as_me:$LINENO: checking libcurses..." >&5
--echo "$as_me: checking libcurses..." >&6;}
--cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--
--#ifdef __hpux
--__sorry_hpux_libcurses_is_totally_broken_in_10_10();
--#else
--tgetent((char *)0, (char *)0);
--#endif
--
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- :
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
- LIBS="-ltermcap $olibs"
- { echo "$as_me:$LINENO: checking libtermcap..." >&5
- echo "$as_me: checking libtermcap..." >&6;}
-@@ -4907,8 +4865,6 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-
- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-@@ -4927,7 +4883,8 @@
-
- main()
- {
-- exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
-+ char *tgoto(const char *, int, int);
-+ exit(strcmp(tgoto("%d%d", 0, 1), "1") ? 0 : 1);
- }
- _ACEOF
- rm -f conftest$ac_exeext
-@@ -5314,19 +5271,16 @@
- fi
- rm -f conftest*
-
--if test "$ptys" != "$pdir/pty??" ; then
--p0=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'`
--p1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\012'`
-+# XXX: hardcoded, since port must be devfs and various setups independent
-+
- cat >>confdefs.h <<_ACEOF
--#define PTYRANGE0 "$p0"
-+#define PTYRANGE0 "pqrsPQRSlmnoLMNO"
- _ACEOF
-
- cat >>confdefs.h <<_ACEOF
--#define PTYRANGE1 "$p1"
-+#define PTYRANGE1 "0123456789abcdefghijklmnopqrstuv"
- _ACEOF
-
--fi
--
-
- # Check whether --with-pty-mode or --without-pty-mode was given.
- if test "${with_pty_mode+set}" = set; then
-@@ -5575,6 +5529,8 @@
- #if defined(SVR4) && !defined(DGUX)
- #include <utmpx.h>
- #define utmp utmpx
-+#define pututline pututxline
-+#define getutent getutxent
- #else
- #include <utmp.h>
- #endif
-@@ -5627,6 +5583,8 @@
- #if defined(SVR4) && !defined(DGUX)
- #include <utmpx.h>
- #define utmp utmpx
-+#define pututline pututxline
-+#define getutent getutxent
- #else
- #include <utmp.h>
- #endif
-@@ -5683,6 +5641,8 @@
- #if defined(SVR4) && !defined(DGUX)
- #include <utmpx.h>
- #define utmp utmpx
-+#define pututline pututxline
-+#define getutent getutxent
- #else
- #include <utmp.h>
- #endif
Deleted: trunk/sysutils/screen/files/patch-af
===================================================================
--- trunk/sysutils/screen/files/patch-af 2014-09-05 03:22:14 UTC (rev 16763)
+++ trunk/sysutils/screen/files/patch-af 2014-09-05 03:26:56 UTC (rev 16764)
@@ -1,15 +0,0 @@
---- termcap.c.orig Wed Jul 5 16:33:30 2000
-+++ termcap.c Wed Oct 11 05:40:12 2000
-@@ -355,11 +355,7 @@
- if (D_CG0)
- {
- if (D_CS0 == 0)
--#ifdef TERMINFO
-- D_CS0 = "\033(%p1%c";
--#else
-- D_CS0 = "\033(%.";
--#endif
-+ D_CS0 = "\033(%p1%c"; /* Old ncurses can't handle %. */
- if (D_CE0 == 0)
- D_CE0 = "\033(B";
- D_AC = 0;
Modified: trunk/sysutils/screen/files/patch-ansi.c
===================================================================
--- trunk/sysutils/screen/files/patch-ansi.c 2014-09-05 03:22:14 UTC (rev 16763)
+++ trunk/sysutils/screen/files/patch-ansi.c 2014-09-05 03:26:56 UTC (rev 16764)
@@ -1,11 +1,10 @@
---- ansi.c.orig Mon Sep 8 07:24:44 2003
-+++ ansi.c Mon Dec 1 17:17:17 2003
-@@ -559,7 +559,7 @@
- {
- case '0': case '1': case '2': case '3': case '4':
- case '5': case '6': case '7': case '8': case '9':
-- if (curr->w_NumArgs < MAXARGS)
-+ if (curr->w_NumArgs >= 0 && curr->w_NumArgs < MAXARGS)
- {
- if (curr->w_args[curr->w_NumArgs] < 100000000)
- curr->w_args[curr->w_NumArgs] =
+--- ansi.c.orig 2014-04-26 04:32:54.000000000 -0700
++++ ansi.c 2014-04-29 19:08:26.631287189 -0700
+@@ -569,6 +569,7 @@
+ case '0': case '1': case '2': case '3': case '4':
+ case '5': case '6': case '7': case '8': case '9':
+ if (curr->w_NumArgs < MAXARGS)
++ if (curr->w_NumArgs >= 0 && curr->w_NumArgs < MAXARGS)
+ {
+ if (curr->w_args[curr->w_NumArgs] < 100000000)
+ curr->w_args[curr->w_NumArgs] =
Property changes on: trunk/sysutils/screen/files/patch-ansi.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/sysutils/screen/files/patch-attacher.c
===================================================================
--- trunk/sysutils/screen/files/patch-attacher.c 2014-09-05 03:22:14 UTC (rev 16763)
+++ trunk/sysutils/screen/files/patch-attacher.c 2014-09-05 03:26:56 UTC (rev 16764)
Property changes on: trunk/sysutils/screen/files/patch-attacher.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/sysutils/screen/files/patch-configure
===================================================================
--- trunk/sysutils/screen/files/patch-configure (rev 0)
+++ trunk/sysutils/screen/files/patch-configure 2014-09-05 03:26:56 UTC (rev 16764)
@@ -0,0 +1,125 @@
+--- configure.orig 2014-04-26 03:58:46.000000000 -0700
++++ configure 2014-04-29 19:47:03.900706999 -0700
+@@ -4857,46 +4857,6 @@
+
+ else
+ olibs="$LIBS"
+-LIBS="-lcurses $olibs"
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libcurses..." >&5
+-$as_echo "$as_me: checking libcurses..." >&6;}
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+-
+-#ifdef __hpux
+-__sorry_hpux_libcurses_is_totally_broken_in_10_10();
+-#else
+-tgetent((char *)0, (char *)0);
+-#endif
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-
+-else
+- LIBS="-ltermcap $olibs"
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libtermcap..." >&5
+-$as_echo "$as_me: checking libtermcap..." >&6;}
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+-tgetent((char *)0, (char *)0);
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-
+-else
+ LIBS="-ltermlib $olibs"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking libtermlib..." >&5
+ $as_echo "$as_me: checking libtermlib..." >&6;}
+@@ -5001,12 +4961,6 @@
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+
+ if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+@@ -5019,7 +4973,8 @@
+
+ main()
+ {
+- exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
++ char *tgoto(const char *, int, int);
++ exit(strcmp(tgoto("%d%d", 0, 1), "1") ? 0 : 1);
+ }
+ _ACEOF
+ if ac_fn_c_try_run "$LINENO"; then :
+@@ -5066,7 +5021,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SVR4 ptys..." >&5
+ $as_echo "$as_me: checking for SVR4 ptys..." >&6;}
+ sysvr4ptys=
+-if test -c /dev/ptmx ; then
++if test -c /nonexistent ; then
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+@@ -5177,19 +5132,16 @@
+ fi
+ rm -f conftest*
+
+-if test "$ptys" != "$pdir/pty??" ; then
+-p0=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'`
+-p1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\012'`
++# XXX: hardcoded, since port must be devfs and various setups independent
++
+ cat >>confdefs.h <<_ACEOF
+-#define PTYRANGE0 "$p0"
++#define PTYRANGE0 "pqrsPQRSlmnoLMNO"
+ _ACEOF
+
+ cat >>confdefs.h <<_ACEOF
+-#define PTYRANGE1 "$p1"
++#define PTYRANGE1 "0123456789abcdefghijklmnopqrstuv"
+ _ACEOF
+
+-fi
+-
+
+ # Check whether --with-pty-mode was given.
+ if test "${with_pty_mode+set}" = set; then :
+@@ -5416,6 +5368,8 @@
+ #if defined(SVR4) && !defined(DGUX)
+ #include <utmpx.h>
+ #define utmp utmpx
++#define pututline pututxline
++#define getutent getutxent
+ #else
+ #include <utmp.h>
+ #endif
+@@ -5484,6 +5438,10 @@
+ #if defined(SVR4) && !defined(DGUX)
+ #include <utmpx.h>
+ #define utmp utmpx
++#define pututline pututxline
++#define getutent getutxent
++#define pututline pututxline
++#define getutent getutxent
+ #else
+ #include <utmp.h>
+ #endif
Deleted: trunk/sysutils/screen/files/patch-display.h
===================================================================
--- trunk/sysutils/screen/files/patch-display.h 2014-09-05 03:22:14 UTC (rev 16763)
+++ trunk/sysutils/screen/files/patch-display.h 2014-09-05 03:26:56 UTC (rev 16764)
@@ -1,11 +0,0 @@
---- display.h.orig 2003-07-01 07:01:42.000000000 -0700
-+++ display.h 2011-11-07 11:54:32.842183150 -0800
-@@ -85,7 +85,7 @@
- struct win *d_other; /* pointer to other window */
- int d_nonblock; /* -1 don't block if obufmax reached */
- /* >0: block after nonblock secs */
-- char d_termname[20 + 1]; /* $TERM */
-+ char d_termname[63 + 1]; /* $TERM */
- char *d_tentry; /* buffer for tgetstr */
- char d_tcinited; /* termcap inited flag */
- int d_width, d_height; /* width/height of the screen */
Deleted: trunk/sysutils/screen/files/patch-doc_Makefile.in
===================================================================
--- trunk/sysutils/screen/files/patch-doc_Makefile.in 2014-09-05 03:22:14 UTC (rev 16763)
+++ trunk/sysutils/screen/files/patch-doc_Makefile.in 2014-09-05 03:26:56 UTC (rev 16764)
@@ -1,34 +0,0 @@
---- doc/Makefile.in.orig 2007-10-29 13:08:52.000000000 -0700
-+++ doc/Makefile.in 2007-10-29 13:11:09.000000000 -0700
-@@ -30,7 +30,10 @@
- $(MAKEINFO) --no-split $(srcdir)/screen.texinfo -o screen.info
-
- install: installdirs
-+.if defined(WITH_MAN)
- $(INSTALL_DATA) $(srcdir)/screen.1 $(DESTDIR)$(mandir)/man1/screen.1
-+.endif
-+.if defined(WITH_INFO)
- -$(MAKE) screen.info
- -if test -f screen.info; then d=.; else d=$(srcdir); fi; \
- if test -f $$d/screen.info; then \
-@@ -39,13 +42,19 @@
- install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/screen.info; \
- else true; fi; \
- fi
-+.endif
-
- uninstall:
- rm -f $(DESTDIR)$(mandir)/man1/screen.1
- rm -f $(DESTDIR)$(infodir)/screen.info*
-
- installdirs:
-- $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(infodir)
-+.if defined(WITH_MAN)
-+ $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(mandir)/man1
-+.endif
-+.if defined(WITH_INFO)
-+ $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(infodir)
-+.endif
-
- mostlyclean:
- -rm -f *.cp *.cps *.fn *.fns *.ky *.kys *.pg *.tp *.vr
Added: trunk/sysutils/screen/files/patch-doc__Makefile.in
===================================================================
--- trunk/sysutils/screen/files/patch-doc__Makefile.in (rev 0)
+++ trunk/sysutils/screen/files/patch-doc__Makefile.in 2014-09-05 03:26:56 UTC (rev 16764)
@@ -0,0 +1,34 @@
+--- doc/Makefile.in.orig 2014-04-29 20:26:42.618832001 -0700
++++ doc/Makefile.in 2014-04-29 20:29:26.379384101 -0700
+@@ -31,7 +31,10 @@
+ $(MAKEINFO) --no-split $(srcdir)/screen.texinfo -o screen.info
+
+ install: installdirs
++ifeq (${WITH_MAN},1)
+ $(INSTALL_DATA) $(srcdir)/screen.1 $(DESTDIR)$(mandir)/man1/screen.1
++endif
++ifeq (${WITH_INFO},1)
+ -$(MAKE) screen.info
+ -if test -f screen.info; then d=.; else d=$(srcdir); fi; \
+ if test -f $$d/screen.info; then \
+@@ -40,13 +43,19 @@
+ install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/screen.info; \
+ else true; fi; \
+ fi
++endif
+
+ uninstall:
+ rm -f $(DESTDIR)$(mandir)/man1/screen.1
+ rm -f $(DESTDIR)$(infodir)/screen.info*
+
+ installdirs:
+- $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(infodir)
++ifeq (${WITH_MAN},1)
++ $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(mandir)/man1
++endif
++ifeq (${WITH_INFO},1)
++ $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(infodir)
++endif
+
+ mostlyclean:
+ -rm -f *.cp *.cps *.fn *.fns *.ky *.kys *.pg *.tp *.vr
Modified: trunk/sysutils/screen/files/patch-os.h
===================================================================
--- trunk/sysutils/screen/files/patch-os.h 2014-09-05 03:22:14 UTC (rev 16763)
+++ trunk/sysutils/screen/files/patch-os.h 2014-09-05 03:26:56 UTC (rev 16764)
@@ -1,15 +1,6 @@
---- os.h.orig Tue Jan 8 07:42:33 2002
-+++ os.h Tue Sep 9 17:39:58 2003
-@@ -161,7 +161,7 @@
- # define setregid(rgid, egid) setresgid(rgid, egid, -1)
- #endif
-
--#if defined(HAVE_SETEUID) || defined(HAVE_SETREUID)
-+#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && __FreeBSD_version < 500000
- # define USE_SETEUID
- #endif
-
-@@ -262,7 +262,11 @@
+--- os.h.orig 2014-04-26 03:58:35.000000000 -0700
++++ os.h 2014-04-29 19:16:31.730773575 -0700
+@@ -252,7 +252,11 @@
#if defined(UTMPOK) || defined(BUGGYGETLOGIN)
# if defined(SVR4) && !defined(DGUX) && !defined(__hpux) && !defined(linux)
# include <utmpx.h>
@@ -22,7 +13,7 @@
# define utmp utmpx
# define getutent getutxent
# define getutid getutxid
-@@ -270,7 +274,7 @@
+@@ -260,7 +264,7 @@
# define pututline pututxline
# define setutent setutxent
# define endutent endutxent
@@ -31,3 +22,11 @@
# else /* SVR4 */
# include <utmp.h>
# endif /* SVR4 */
+@@ -524,6 +528,6 @@
+ /* Changing those you won't be able to attach to your old sessions
+ * when changing those values in official tree don't forget to bump
+ * MSG_VERSION */
+-#define MAXTERMLEN 32
++#define MAXTERMLEN 63
+ #define MAXLOGINLEN 256
+
Property changes on: trunk/sysutils/screen/files/patch-os.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/sysutils/screen/files/patch-osdef.h.in
===================================================================
--- trunk/sysutils/screen/files/patch-osdef.h.in 2014-09-05 03:22:14 UTC (rev 16763)
+++ trunk/sysutils/screen/files/patch-osdef.h.in 2014-09-05 03:26:56 UTC (rev 16764)
Property changes on: trunk/sysutils/screen/files/patch-osdef.h.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/sysutils/screen/files/patch-process.c
===================================================================
--- trunk/sysutils/screen/files/patch-process.c 2014-09-05 03:22:14 UTC (rev 16763)
+++ trunk/sysutils/screen/files/patch-process.c 2014-09-05 03:26:56 UTC (rev 16764)
@@ -1,11 +0,0 @@
---- process.c
-+++ process.c
-@@ -37,7 +37,7 @@
- #include "config.h"
-
- /* for solaris 2.1, Unixware (SVR4.2) and possibly others: */
--#ifdef SVR4
-+#if defined(SVR4) && !defined(__FreeBSD__)
- # include <sys/stropts.h>
- #endif
-
Deleted: trunk/sysutils/screen/files/patch-pty.c
===================================================================
--- trunk/sysutils/screen/files/patch-pty.c 2014-09-05 03:22:14 UTC (rev 16763)
+++ trunk/sysutils/screen/files/patch-pty.c 2014-09-05 03:26:56 UTC (rev 16764)
@@ -1,15 +0,0 @@
---- pty.c.orig Mon Feb 6 18:54:37 2006
-+++ pty.c Mon Feb 6 18:56:50 2006
-@@ -33,10 +33,12 @@
- # include <sys/ioctl.h>
- #endif
-
-+#ifndef __FreeBSD__
- /* for solaris 2.1, Unixware (SVR4.2) and possibly others */
- #ifdef HAVE_SVR4_PTYS
- # include <sys/stropts.h>
- #endif
-+#endif
-
- #if defined(sun) && defined(LOCKPTY) && !defined(TIOCEXCL)
- # include <sys/ttold.h>
Index: trunk/sysutils/screen/files/patch-resize.c
===================================================================
--- trunk/sysutils/screen/files/patch-resize.c 2014-09-05 03:22:14 UTC (rev 16763)
+++ trunk/sysutils/screen/files/patch-resize.c 2014-09-05 03:26:56 UTC (rev 16764)
Property changes on: trunk/sysutils/screen/files/patch-resize.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/sysutils/screen/files/patch-screen.c
===================================================================
--- trunk/sysutils/screen/files/patch-screen.c 2014-09-05 03:22:14 UTC (rev 16763)
+++ trunk/sysutils/screen/files/patch-screen.c 2014-09-05 03:26:56 UTC (rev 16764)
@@ -1,11 +1,20 @@
---- screen.c
-+++ screen.c
-@@ -50,7 +50,7 @@
-
- #include "config.h"
-
--#ifdef SVR4
-+#if defined(SVR4) && !defined(__FreeBSD__)
- # include <sys/stropts.h>
- #endif
-
+--- screen.c.orig 2014-04-26 09:22:09.000000000 -0700
++++ screen.c 2014-04-30 23:34:47.613803805 -0700
+@@ -2257,7 +2257,7 @@
+ r = winmsg_numrend;
+ while (p >= buf)
+ {
+- if (r && *p != 127 && p - buf == winmsg_rendpos[r - 1])
++ if (r && p - buf == winmsg_rendpos[r - 1])
+ {
+ winmsg_rendpos[--r] = pn - buf;
+ continue;
+@@ -2271,8 +2271,6 @@
+ while (i-- > 0)
+ *pn-- = ' ';
+ numpad--;
+- if (r && p - buf == winmsg_rendpos[r - 1])
+- winmsg_rendpos[--r] = pn - buf;
+ }
+ }
+ return pn2;
Property changes on: trunk/sysutils/screen/files/patch-screen.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/sysutils/screen/files/patch-screen.h
===================================================================
--- trunk/sysutils/screen/files/patch-screen.h 2014-09-05 03:22:14 UTC (rev 16763)
+++ trunk/sysutils/screen/files/patch-screen.h 2014-09-05 03:26:56 UTC (rev 16764)
@@ -1,20 +0,0 @@
---- screen.h.orig 2003-08-22 05:28:43.000000000 -0700
-+++ screen.h 2011-11-07 11:53:41.739890820 -0800
-@@ -22,6 +22,8 @@
- * $Id: patch-screen.h,v 1.1 2013-02-24 01:00:43 laffer1 Exp $ FAU
- */
-
-+#include <string.h>
-+
- #include "os.h"
-
- #if defined(__STDC__)
-@@ -202,7 +204,7 @@
- char preselect[20];
- int esc; /* his new escape character unless -1 */
- int meta_esc; /* his new meta esc character unless -1 */
-- char envterm[20 + 1]; /* terminal type */
-+ char envterm[63 + 1]; /* terminal type */
- int encoding; /* encoding of display */
- }
- attach;
Added: trunk/sysutils/screen/files/patch-termcap.c
===================================================================
--- trunk/sysutils/screen/files/patch-termcap.c (rev 0)
+++ trunk/sysutils/screen/files/patch-termcap.c 2014-09-05 03:26:56 UTC (rev 16764)
@@ -0,0 +1,15 @@
+--- termcap.c.orig Wed Jul 5 16:33:30 2000
++++ termcap.c Wed Oct 11 05:40:12 2000
+@@ -355,11 +355,7 @@
+ if (D_CG0)
+ {
+ if (D_CS0 == 0)
+-#ifdef TERMINFO
+- D_CS0 = "\033(%p1%c";
+-#else
+- D_CS0 = "\033(%.";
+-#endif
++ D_CS0 = "\033(%p1%c"; /* Old ncurses can't handle %. */
+ if (D_CE0 == 0)
+ D_CE0 = "\033(B";
+ D_AC = 0;
Deleted: trunk/sysutils/screen/files/patch-terminfo::checktc.c
===================================================================
--- trunk/sysutils/screen/files/patch-terminfo::checktc.c 2014-09-05 03:22:14 UTC (rev 16763)
+++ trunk/sysutils/screen/files/patch-terminfo::checktc.c 2014-09-05 03:26:56 UTC (rev 16764)
@@ -1,18 +0,0 @@
---- terminfo/checktc.c.orig Fri Sep 29 09:13:22 1995
-+++ terminfo/checktc.c Tue Apr 22 20:37:18 2003
-@@ -171,6 +171,7 @@
- fflush(stdout);
- }
-
-+#ifndef __FreeBSD__
- void CPutStr(s, c)
- char *s;
- int c;
-@@ -178,6 +179,7 @@
- tputs(tgoto(s, 0, c), 1, putcha);
- fflush(stdout);
- }
-+#endif /* __FreeBSD__ */
-
- void CCPutStr(s, x, y)
- char *s;
Added: trunk/sysutils/screen/files/patch-terminfo__checktc.c
===================================================================
--- trunk/sysutils/screen/files/patch-terminfo__checktc.c (rev 0)
+++ trunk/sysutils/screen/files/patch-terminfo__checktc.c 2014-09-05 03:26:56 UTC (rev 16764)
@@ -0,0 +1,18 @@
+--- terminfo/checktc.c.orig Fri Sep 29 09:13:22 1995
++++ terminfo/checktc.c Tue Apr 22 20:37:18 2003
+@@ -171,6 +171,7 @@
+ fflush(stdout);
+ }
+
++#ifndef __FreeBSD__
+ void CPutStr(s, c)
+ char *s;
+ int c;
+@@ -178,6 +179,7 @@
+ tputs(tgoto(s, 0, c), 1, putcha);
+ fflush(stdout);
+ }
++#endif /* __FreeBSD__ */
+
+ void CCPutStr(s, x, y)
+ char *s;
Deleted: trunk/sysutils/screen/files/patch-tty.sh
===================================================================
--- trunk/sysutils/screen/files/patch-tty.sh 2014-09-05 03:22:14 UTC (rev 16763)
+++ trunk/sysutils/screen/files/patch-tty.sh 2014-09-05 03:26:56 UTC (rev 16764)
@@ -1,22 +0,0 @@
---- tty.sh
-+++ tty.sh
-@@ -76,7 +76,7 @@
- #endif
-
- #include "config.h"
--#ifdef SVR4
-+#if defined(SVR4) && !defined(__FreeBSD__)
- #include <sys/stropts.h> /* for I_POP */
- #endif
-
-@@ -562,7 +562,9 @@
- XIF{VLNEXT} np->tio.c_cc[VLNEXT] = VDISABLE;
- XIF{VSTATUS} np->tio.c_cc[VSTATUS] = VDISABLE;
- XIF{VSUSP} np->tio.c_cc[VSUSP] = VDISABLE;
--XIF{VERASE} np->tio.c_cc[VERASE] = VDISABLE;
-+ /* Set VERASE to DEL, rather than VDISABLE, to avoid libvte
-+ "autodetect" issues. */
-+XIF{VERASE} np->tio.c_cc[VERASE] = 0x7f;
- XIF{VKILL} np->tio.c_cc[VKILL] = VDISABLE;
- # ifdef HPUX_LTCHARS_HACK
- np->m_ltchars.t_suspc = VDISABLE;
Modified: trunk/sysutils/screen/files/patch-utmp.c
===================================================================
--- trunk/sysutils/screen/files/patch-utmp.c 2014-09-05 03:22:14 UTC (rev 16763)
+++ trunk/sysutils/screen/files/patch-utmp.c 2014-09-05 03:26:56 UTC (rev 16764)
@@ -1,6 +1,6 @@
---- utmp.c
-+++ utmp.c
-@@ -404,12 +404,6 @@
+--- utmp.c.orig 2014-04-26 09:22:09.000000000 -0700
++++ utmp.c 2014-04-29 19:42:22.660642853 -0700
+@@ -409,12 +409,6 @@
register slot_t slot;
struct utmp u;
int saved_ut;
@@ -13,7 +13,7 @@
wi->w_slot = (slot_t)0;
if (!utmpok || wi->w_type != W_TYPE_PTY)
-@@ -430,51 +424,12 @@
+@@ -435,51 +429,12 @@
makeuser(&u, stripdev(wi->w_tty), LoginName, wi->w_pid);
#ifdef UTHOST
@@ -67,21 +67,12 @@
{
Msg(errno,"Could not write %s", UtmpName);
UT_CLOSE;
-@@ -589,7 +544,7 @@
+@@ -598,7 +553,7 @@
struct utmp *u;
{
u->ut_type = DEAD_PROCESS;
--#if !defined(linux) || defined(EMPTY)
-+#if (!defined(linux) || defined(EMPTY)) && !defined(__FreeBSD__)
+-#if (!defined(linux) || defined(EMPTY)) && !defined(__CYGWIN__)
++#if (!defined(linux) || defined(EMPTY)) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
u->ut_exit.e_termination = 0;
u->ut_exit.e_exit = 0;
#endif
-@@ -728,7 +683,7 @@
- {
- strncpy(u->ut_line, line, sizeof(u->ut_line));
- strncpy(u->ut_name, user, sizeof(u->ut_name));
-- (void)time((time_t *)&u->ut_time);
-+ u->ut_time = time(NULL);
- }
-
- static slot_t
Property changes on: trunk/sysutils/screen/files/patch-utmp.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/sysutils/screen/pkg-descr
===================================================================
--- trunk/sysutils/screen/pkg-descr 2014-09-05 03:22:14 UTC (rev 16763)
+++ trunk/sysutils/screen/pkg-descr 2014-09-05 03:26:56 UTC (rev 16764)
Property changes on: trunk/sysutils/screen/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/sysutils/screen/pkg-plist
===================================================================
--- trunk/sysutils/screen/pkg-plist 2014-09-05 03:22:14 UTC (rev 16763)
+++ trunk/sysutils/screen/pkg-plist 2014-09-05 03:26:56 UTC (rev 16764)
@@ -1,5 +1,8 @@
-man/man1/screen.1.gz
bin/screen
+%%MAN%%man/man1/screen.1.gz
+ at unexec if cmp -s %D/etc/screenrc %D/%%EXAMPLESDIR%%/screenrc; then rm -f %D/etc/screenrc; else echo If permanently deleting this package, %%PREFIX%%/etc/screenrc must be removed manually; fi
+%%EXAMPLESDIR%%/screenrc
+ at exec [ -f %D/etc/screenrc ] || cp %B/%f %D/etc/screenrc
%%DATADIR%%/utf8encodings/01
%%DATADIR%%/utf8encodings/02
%%DATADIR%%/utf8encodings/03
@@ -17,9 +20,6 @@
%%DATADIR%%/utf8encodings/cc
%%DATADIR%%/utf8encodings/cd
%%DATADIR%%/utf8encodings/d6
- at unexec if cmp -s %D/etc/screenrc %D/%%EXAMPLESDIR%%/screenrc; then rm -f %D/etc/screenrc; else echo If permanently deleting this package, %%PREFIX%%/etc/screenrc must be removed manually; fi
-%%EXAMPLESDIR%%/screenrc
- at exec [ -f %D/etc/screenrc ] || cp %B/%f %D/etc/screenrc
- at dirrm %%EXAMPLESDIR%%
@dirrm %%DATADIR%%/utf8encodings
@dirrm %%DATADIR%%
+ at dirrm %%EXAMPLESDIR%%
More information about the Midnightbsd-cvs
mailing list