Attachment 150417 Details for Bug 195840 – x11/xvt [new port]

x11/xvt [new port]

xvt.shar (text/plain), 14.02 KB, created by Chris Hutchinson on 2014-12-10 01:18:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Hutchinson

Created: 2014-12-10 01:18:38 UTC

Size: 14.02 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	xvt
>#	xvt/files
>#	xvt/files/patch-src__command.c
>#	xvt/files/patch-doc__Makefile.in
>#	xvt/files/patch-src__screen.c
>#	xvt/files/utmp_patch-src::logging.c
>#	xvt/files/patch-src__init.c
>#	xvt/files/patch-autoconf__config.h.in
>#	xvt/files/utmpx_patch-src::logging.c
>#	xvt/files/patch-Makefile.in
>#	xvt/files/patch-src__xvt.h
>#	xvt/Makefile
>#	xvt/distinfo
>#	xvt/pkg-descr
>#	xvt/pkg-plist
>#
>echo c - xvt
>mkdir -p xvt > /dev/null 2>&1
>echo c - xvt/files
>mkdir -p xvt/files > /dev/null 2>&1
>echo x - xvt/files/patch-src__command.c
>sed 's/^X//' >xvt/files/patch-src__command.c << 'd401b44a6062b5a229bf97f2f3f5f1bb'
>X--- src/command.c.orig	2014-12-09 12:06:57.000000000 -0800
>X+++ src/command.c	2014-12-09 12:07:41.000000000 -0800
>X@@ -3098,7 +3098,7 @@
>X     unsigned char   buf[256];
>X 
>X     va_start(arg_ptr, fmt);
>X-    vsprintf((char *)buf, fmt, arg_ptr);
>X+    vsnprintf((char *)buf, sizeof(buf), fmt, arg_ptr);
>X     va_end(arg_ptr);
>X     xvt_tt_write(r, buf, (unsigned int)STRLEN(buf));
>X }
>d401b44a6062b5a229bf97f2f3f5f1bb
>echo x - xvt/files/patch-doc__Makefile.in
>sed 's/^X//' >xvt/files/patch-doc__Makefile.in << '7303151b4d0881100b9e67e179fcd4e8'
>X--- doc/Makefile.in.orig	2014-12-09 14:08:52.000000000 -0800
>X+++ doc/Makefile.in	2014-12-09 14:08:56.000000000 -0800
>X@@ -40,9 +40,6 @@
>X 
>X all:	xvt.1
>X 
>X-xvt.1: xvt.tbl Makefile
>X-	@if test x$(TBL) = x; then : ; else echo "$(TBL) $(srcdir)/xvt.tbl | grep -v '^.lf' > xvt.1"; $(TBL) $(srcdir)/xvt.tbl | grep -v '^.lf' > xvt.1 ; fi
>X-
>X SEDREPLACE = -e 's%@XVT_VERSION@%$(VERSION)%g;'\
>X 	     -e 's%@XVT_LSMDATE@%$(LSMDATE)%g;'\
>X 	     -e 's%@XVT_DATE@%$(DATE)%g;'\
>7303151b4d0881100b9e67e179fcd4e8
>echo x - xvt/files/patch-src__screen.c
>sed 's/^X//' >xvt/files/patch-src__screen.c << '1fe6f2c7112054755b94158e746582a6'
>X--- src/screen.c.orig	2014-12-09 13:14:46.000000000 -0800
>X+++ src/screen.c	2014-12-09 13:14:57.000000000 -0800
>X@@ -3520,6 +3520,7 @@
>X     Atom32          target_list[3];
>X #endif
>X     Atom            target;
>X+    Atom            property;
>X     XTextProperty   ct;
>X     XICCEncodingStyle style;
>X     char           *cl[2], dummy[1];
>X@@ -3532,6 +3533,15 @@
>X     ev.target = rq->target;
>X     ev.time = rq->time;
>X 
>X+	/* ICCCM: 2.2. Responsibilities of the Selection Owner
>X+	 * SelectionRequest:
>X+	 * If the specified property is None , the requestor
>X+	 * an obsolete client. Owners are encouraged
>X+	 * to support these clients by using the specified
>X+	 * target atom as the property name to be used for
>X+	 * the reply.
>X+	 */
>X+	property = (rq->property == 0) ? rq->target : rq->property;
>X     if (rq->target == r->h->xa[XA_TARGETS]) {
>X 	target_list[0] = (Atom32) r->h->xa[XA_TARGETS];
>X 	target_list[1] = (Atom32) XA_STRING;
>X@@ -3539,7 +3549,7 @@
>X #ifdef USE_XIM
>X 	target_list[3] = (Atom32) r->h->xa[XA_COMPOUND_TEXT];
>X #endif
>X-	XChangeProperty(r->Xdisplay, rq->requestor, rq->property, XA_ATOM,
>X+	XChangeProperty(r->Xdisplay, rq->requestor, property, XA_ATOM,
>X 			(8 * sizeof(target_list[0])), PropModeReplace,
>X 			(unsigned char *)target_list,
>X 			(sizeof(target_list) / sizeof(target_list[0])));
>X@@ -3547,10 +3557,10 @@
>X     } else if (rq->target == r->h->xa[XA_MULTIPLE]) {
>X 	/* TODO: Handle MULTIPLE */
>X     } else if (rq->target == r->h->xa[XA_TIMESTAMP] && r->selection.text) {
>X-	XChangeProperty(r->Xdisplay, rq->requestor, rq->property, XA_INTEGER,
>X-			(8 * sizeof(Time)), PropModeReplace,
>X+	XChangeProperty(r->Xdisplay, rq->requestor, property, XA_INTEGER,
>X+			32, PropModeReplace,
>X 			(unsigned char *)&r->h->selection_time, 1);
>X-	ev.property = rq->property;
>X+	ev.property = property;
>X     } else if (rq->target == XA_STRING
>X 	       || rq->target == r->h->xa[XA_COMPOUND_TEXT]
>X 	       || rq->target == r->h->xa[XA_TEXT]) {
>X@@ -3588,10 +3598,10 @@
>X 	    ct.value = (unsigned char *)cl[0];
>X 	    ct.nitems = selectlen;
>X 	}
>X-	XChangeProperty(r->Xdisplay, rq->requestor, rq->property,
>X+	XChangeProperty(r->Xdisplay, rq->requestor, property,
>X 			target, 8, PropModeReplace,
>X 			ct.value, (int)ct.nitems);
>X-	ev.property = rq->property;
>X+	ev.property = property;
>X #ifdef USE_XIM
>X 	if (freect)
>X 	    XFree(ct.value);
>1fe6f2c7112054755b94158e746582a6
>echo x - xvt/files/utmp_patch-src::logging.c
>sed 's/^X//' >xvt/files/utmp_patch-src::logging.c << '6512ebc65e83db7a283b49ca04ae402a'
>X--- src/logging.c.orig	2014-12-09 13:29:03.000000000 -0800
>X+++ src/logging.c	2014-12-09 13:29:08.000000000 -0800
>X@@ -82,7 +82,8 @@
>X     else if (sscanf(pty, "pts/%d", &i) == 1)
>X 	sprintf(ut_id, "vt%02x", (i & 0xff));	/* sysv naming */
>X #endif
>X-    else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3)) {
>X+    else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3) &&
>X+		STRNCMP(pty, "pts/", 4)) {
>X 	xvt_print_error("can't parse tty name \"%s\"", pty);
>X 	return;
>X     }
>6512ebc65e83db7a283b49ca04ae402a
>echo x - xvt/files/patch-src__init.c
>sed 's/^X//' >xvt/files/patch-src__init.c << '709ad36a2783b3d53ea32ed0ea8617b8'
>X--- src/init.c.orig	2014-12-09 12:50:59.000000000 -0800
>X+++ src/init.c	2014-12-09 12:54:55.000000000 -0800
>X@@ -1531,6 +1531,9 @@
>X # ifdef VEOL2
>X     tio->c_cc[VEOL2] = VDISABLE;
>X # endif
>X+# ifdef VERASE2
>X+    tio->c_cc[VERASE2] = CERASE2;
>X+# endif
>X # ifdef VSWTC
>X     tio->c_cc[VSWTC] = VDISABLE;
>X # endif
>X@@ -1651,6 +1654,9 @@
>X # ifdef VEOL2
>X     FOO(VEOL2, "VEOL2");
>X # endif
>X+# ifdef VERASE2
>X+    FOO(VERASE2, "VERASE2");
>X+# endif
>X # ifdef VSWTC
>X     FOO(VSWTC, "VSWTC");
>X # endif
>709ad36a2783b3d53ea32ed0ea8617b8
>echo x - xvt/files/patch-autoconf__config.h.in
>sed 's/^X//' >xvt/files/patch-autoconf__config.h.in << '1e12011006d4fc7f69de4d0c4e30eb8d'
>X--- autoconf/config.h.in.orig	2014-12-09 14:01:13.000000000 -0800
>X+++ autoconf/config.h.in	2014-12-09 14:01:19.000000000 -0800
>X@@ -313,13 +313,13 @@
>X #undef XVT_UTMPX_FILE
>X 
>X /* Define location of utmp */
>X-#undef XVT_UTMP_FILE
>X+#define XVT_UTMP_FILE "/var/run/utmp"
>X 
>X /* Define location of wtmpx */
>X #undef XVT_WTMPX_FILE
>X 
>X /* Define location of wtmp */
>X-#undef XVT_WTMP_FILE
>X+#define XVT_WTMP_FILE "/var/log/wtmp"
>X 
>X /* The size of a `char', as computed by sizeof. */
>X #undef SIZEOF_CHAR
>1e12011006d4fc7f69de4d0c4e30eb8d
>echo x - xvt/files/utmpx_patch-src::logging.c
>sed 's/^X//' >xvt/files/utmpx_patch-src::logging.c << 'c82169d5014aa37690de1f09d00384c5'
>X--- src/logging.c.orig	2014-12-09 13:47:18.000000000 -0800
>X+++ src/logging.c	2014-12-09 13:47:35.000000000 -0800
>X@@ -82,7 +82,8 @@
>X     else if (sscanf(pty, "pts/%d", &i) == 1)
>X 	sprintf(ut_id, "vt%02x", (i & 0xff));	/* sysv naming */
>X #endif
>X-    else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3)) {
>X+    else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3) &&
>X+		STRNCMP(pty, "pts/", 4)) {
>X 	xvt_print_error("can't parse tty name \"%s\"", pty);
>X 	return;
>X     }
>X@@ -137,7 +138,9 @@
>X     STRNCPY(utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?",
>X 	    sizeof(utx->ut_user));
>X     STRNCPY(utx->ut_id, ut_id, sizeof(utx->ut_id));
>X+#if 0
>X     utx->ut_session = getsid(0);
>X+#endif
>X     utx->ut_tv.tv_sec = time(NULL);
>X     utx->ut_tv.tv_usec = 0;
>X     utx->ut_pid = r->h->cmd_pid;
>X@@ -202,7 +205,7 @@
>X 	xvt_update_wtmp(XVT_WTMP_FILE, ut);
>X #  endif
>X # endif
>X-# ifdef HAVE_STRUCT_UTMPX
>X+# if 0
>X 	updwtmpx(XVT_WTMPX_FILE, utx);
>X # endif
>X     }
>X@@ -254,7 +257,9 @@
>X     if ((tmputx = getutxid(utx)))	/* position to entry in utmp file */
>X 	utx = tmputx;
>X     utx->ut_type = DEAD_PROCESS;
>X+#if 0
>X     utx->ut_session = getsid(0);
>X+#endif
>X     utx->ut_tv.tv_sec = time(NULL);
>X     utx->ut_tv.tv_usec = 0;
>X #endif
>X@@ -274,7 +279,7 @@
>X 	xvt_update_wtmp(XVT_WTMP_FILE, ut);
>X #  endif
>X # endif
>X-# ifdef HAVE_STRUCT_UTMPX
>X+# if 0
>X 	updwtmpx(XVT_WTMPX_FILE, utx);
>X # endif
>X     }
>c82169d5014aa37690de1f09d00384c5
>echo x - xvt/files/patch-Makefile.in
>sed 's/^X//' >xvt/files/patch-Makefile.in << '5a56181d2ea2521e44a80344030ca5d7'
>X*** Makefile.in.orig	Sat Aug  9 15:44:33 2003
>X--- Makefile.in	Sat Aug  9 15:44:39 2003
>X***************
>X*** 9,15 ****
>X  first_rule: all
>X  dummy:
>X  
>X! subdirs = src doc rclock src/graphics src/test
>X  allsubdirs = W11 $(subdirs)
>X  
>X  DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
>X--- 9,15 ----
>X  first_rule: all
>X  dummy:
>X  
>X! subdirs = src doc #rclock src/graphics src/test
>X  allsubdirs = W11 $(subdirs)
>X  
>X  DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
>5a56181d2ea2521e44a80344030ca5d7
>echo x - xvt/files/patch-src__xvt.h
>sed 's/^X//' >xvt/files/patch-src__xvt.h << '179b1d3cd58a1699b0390a687d198253'
>X--- src/xvt.h.orig	2014-12-09 12:59:35.000000000 -0800
>X+++ src/xvt.h	2014-12-09 12:59:39.000000000 -0800
>X@@ -804,7 +804,7 @@
>X #define xvt_Gr_ButtonRelease(x,y)	xvt_Gr_ButtonReport (r, 'R',(x),(y))
>X 
>X #ifdef UTMP_SUPPORT
>X-# if !defined(XVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
>X+# if !defined(HAVE_STRUCT_UTMPX)
>X #  undef HAVE_UTMPX_H
>X #  undef HAVE_STRUCT_UTMPX
>X # endif
>179b1d3cd58a1699b0390a687d198253
>echo x - xvt/Makefile
>sed 's/^X//' >xvt/Makefile << 'c98b59a13fe0de337d1b2649f5a7b558'
>X# Created by: Chris Hutchinson <portmaster@BSDforge.com>
>X# $FreeBSD$
>X
>XPORTNAME=	xvt
>XPORTVERSION=	3.0.0
>XCATEGORIES+=	x11
>XMASTER_SITES=	http://BSDforge.com/projects/source/x11/xvt/
>X
>XMAINTAINER=	portmaster@bsdforge.com
>XCOMMENT=	Xterm replacement supporting color, transparency, and more, with less
>X
>XLICENSE=	BSD2CLAUSE GPLv2
>XLICENSE_COMB=	multi
>X
>XUSES=		libtool perl5 tar:xz
>XUSE_LDCONFIG=	yes
>XUSE_PERL5=	build patch
>XUSE_XORG=	xpm
>XGNU_CONFIGURE=	yes
>X
>XDESKTOP_ENTRIES=	"xvt" "xvt terminal emulator" \
>X			"${PREFIX}/share/pixmaps/xvt.png" \
>X			"xvt" "GNOME;X-XFCE;X-Xfce-Toplevel;System;Utility;TerminalEmulator;" \
>X			false
>X
>XOPTIONS_DEFINE=	256_COLOR BIG5 EUCJ GB GREEK KR LINESPACE MENUBAR NEXT XVT \
>X		SJIS SMART TRANSPARENCY XIM XTERM
>X
>X256_COLOR_DESC=		Build with 256-color support
>XBIG5_DESC=		Build with BIG5 support
>XEUCJ_DESC=		Build with EUC Japanese support
>XGB_DESC=		Build with GB support
>XGREEK_DESC=		Build with greek keyboard support
>XKR_DESC=		Build with EUC Korean support
>XLINESPACE_DESC=		Build with linespace support
>XMENUBAR_DESC=		Build with menubar support
>XNEXT_DESC=		Build with NeXT scrollbar
>XXVT_DESC=		Build with xvt scrollbar
>XSJIS_DESC=		Build with Shift JIS support
>XSMART_DESC=		Build with smart resize support
>XTRANSPARENCY_DESC=	Build with transparency support
>XXIM_DESC=		Build with XIM support
>XXTERM_DESC=		Build with Xterm scrollbar
>X
>XOPTIONS_DEFAULT=256_COLOR GB LINESPACE MENUBAR NEXT XVT SMART TRANSPARENCY \
>X		XIM XTERM
>X
>XCONFIGURE_ARGS=	--enable-utmp --enable-lastlog \
>X		--with-xpm --enable-xpm-background --enable-shared \
>X		--enable-mousewheel --disable-languages
>XLIBS+=		-lutil
>X
>X.include <bsd.port.pre.mk>
>X
>X.if ${OSVERSION} >= 900007
>XCONFIGURE_ARGS+=	--disable-wtmp
>XEXTRA_PATCHES+=	${FILESDIR}/utmpx_patch-src::logging.c
>X.else
>XCONFIGURE_ARGS+=	--enable-wtmp
>XEXTRA_PATCHES+=	${FILESDIR}/utmp_patch-src::logging.c
>X.endif
>X
>X# enable 256 color
>X.if ${PORT_OPTIONS:M256_COLOR}
>XCONFIGURE_ARGS+=	--enable-256-color
>X.endif
>X
>X# enable big5 support
>X.if ${PORT_OPTIONS:MBIG5}
>XCONFIGURE_ARGS+=	--with-encoding=big5 --enable-languages
>X.endif
>X
>X# enable euc japanese support
>X.if ${PORT_OPTIONS:MEUCJ}
>XCONFIGURE_ARGS+=	--with-encoding=eucj --enable-languages
>X.endif
>X
>X# enable gb support
>X.if ${PORT_OPTIONS:MGB}
>XCONFIGURE_ARGS+=	--with-encoding=gb --enable-languages
>X.endif
>X
>X# enable greek keyboard support
>X.if ${PORT_OPTIONS:MGREEK}
>XCONFIGURE_ARGS+=	--enable-greek
>X.endif
>X
>X# enable euc korean support
>X.if ${PORT_OPTIONS:MKR}
>XCONFIGURE_ARGS+=	--with-encoding=kr --enable-languages
>X.endif
>X
>X# enable line-spacing
>X.if ${PORT_OPTIONS:MLINESPACE}
>XCONFIGURE_ARGS+=	--enable-linespace
>X.endif
>X
>X# enable menubar
>X.if ${PORT_OPTIONS:MMENUBAR}
>XCONFIGURE_ARGS+=	--enable-menubar
>X.endif
>X
>X# enable NeXT style scrollbar
>X.if ${PORT_OPTIONS:MNEXT}
>XCONFIGURE_ARGS+=	--enable-next-scroll
>X.endif
>X
>X# enable xvt style scrollbar
>X.if ${PORT_OPTIONS:MXVT}
>XCONFIGURE_ARGS+=	--enable-xvt-scroll
>X.endif
>X
>X# enable shift jis support
>X.if ${PORT_OPTIONS:MSJIS}
>XCONFIGURE_ARGS+=	--with-encoding=sjis --enable-languages
>X.endif
>X
>X# enable smart resize
>X.if ${PORT_OPTIONS:MSMART}
>XCONFIGURE_ARGS+=	--enable-smart-resize
>X.endif
>X
>X# enable transparency support
>X.if ${PORT_OPTIONS:MTRANSPARENCY}
>XCONFIGURE_ARGS+=	--enable-transparency
>X.endif
>X
>X# XIM (X Input Method) protocol support
>X.if ${PORT_OPTIONS:MXIM}
>XCONFIGURE_ARGS+=	--enable-xim
>X.endif
>X
>X# enable Xterm style scrollbar
>X.if ${PORT_OPTIONS:MXTERM}
>XCONFIGURE_ARGS+=	--enable-xterm-scroll
>X.endif
>X
>Xpost-patch:
>X	@${PERL} -pi -e 's|(PTYCHAR2\s+"[^"]+)"|\1ghijklmnopqrstuv"|' \
>X		${WRKSRC}/src/ptytty.c
>X
>Xpost-install:
>X	${CHMOD} 4711 ${STAGEDIR}${PREFIX}/bin/xvt ;\
>X	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libxvt.so.1.0.0 ;\
>X	${CP} ${WRKSRC}/W11/wrap/xvt.png ${STAGEDIR}${PREFIX}/share/pixmaps/xvt.png
>X
>X.include <bsd.port.post.mk>
>c98b59a13fe0de337d1b2649f5a7b558
>echo x - xvt/distinfo
>sed 's/^X//' >xvt/distinfo << 'bd397e4a7e7e72641d76f86a8fad54b1'
>XSHA256 (xvt-3.0.0.tar.xz) = 9a6c760dd9b6f0ffa6a43016030c0e4f9a3210d25a1127411010edce79f63707
>XSIZE (xvt-3.0.0.tar.xz) = 430904
>bd397e4a7e7e72641d76f86a8fad54b1
>echo x - xvt/pkg-descr
>sed 's/^X//' >xvt/pkg-descr << 'a9f2643f13f9aa25f22aac5830c5ec44'
>Xxvt - an xterm replacement supporting color, transparency, and more, with less!
>X
>Xxvt, simply continues on the original authors work -- John Bovey, University
>Xof Kent at Canterbury. With few exceptions, it does everything Xterm does.
>XBut also does a great deal more, with less overhead. This version will also
>Xleverage vt(4), FreeBSD's new console driver. Which replaces syscons(4).
>X
>XWWW: http://BSDforge.com/projects/x11/xvt/
>a9f2643f13f9aa25f22aac5830c5ec44
>echo x - xvt/pkg-plist
>sed 's/^X//' >xvt/pkg-plist << 'e67eb60fdd947da43ac400d0bfae0ffb'
>Xbin/xvt
>Xbin/xvt-3.0.0
>Xshare/pixmaps/xvt.png
>Xinclude/xvtlib.h
>Xlib/libxvt.a
>Xlib/libxvt.so
>Xlib/libxvt.so.1
>Xlib/libxvt.so.1.0.0
>Xman/man1/xvt.1.gz
>e67eb60fdd947da43ac400d0bfae0ffb
>exit
>

Actions: View

Attachments on bug 195840: 150417 | 150419