BSD make based build infrastructure for xterm. The autoconf based

one was too painful to get working on landisk (static only).

4 files changed, 271 insertions, 14 deletions

diff --git a/app/xterm/Makefile b/app/xterm/Makefile
new file mode 100644
index 000000000..116dcd2e5
--- /dev/null
+++ b/app/xterm/Makefile
@@ -0,0 +1,53 @@
+# $OpenBSD: Makefile,v 1.1 2007/04/09 19:11:43 matthieu Exp $
+
+SUBDIR=	resize
+
+PROG=	xterm
+MAN=	xterm.1
+
+BINGRP=		utmp
+BINMODE=	2755
+
+CPPFLAGS+=	-I${.CURDIR} -I${X11BASE}/include \
+		-I${X11BASE}/include/freetype2 \
+		-DHAVE_CONFIG_H -DCSRG_BASED \
+		-DFUNCPROTO=15 -DNARROWPROTO -DXFREE86_FT2 -DUTMP
+LDADD+=		-L${X11BASE}/lib -lXaw -lXt -lSM -lICE \
+		-lXmu -lXft -lXrender -lX11 -lXext -lXau -lXdmcp \
+		-lfontconfig -lexpat -lfreetype -lutil -ltermcap -lz
+
+SRCS=	TekPrsTbl.c  charproc.c	  fontutils.c  precompose.c scrollbar.c \
+	Tekproc.c    charsets.c	  input.c      print.c	    tabs.c \
+	VTPrsTbl.c   cursor.c	  main.c       ptydata.c    util.c \
+	button.c     data.c	  menu.c       wcwidth.c \
+	charclass.c  doublechr.c  misc.c       screen.c	    xstrings.c
+
+X11BASE?=	/usr/X11R6
+MANDIR=		${X11BASE}/man/cat
+XETC?=		/etc/X11
+
+xterm.1: xterm.man
+	sed -e 's#__vendorversion__#"X Window System"#g' \
+	    -e 's#__miscmansuffix__#1#g' \
+            -e 's#__apploaddir__#${X11ETC}/app-defaults#g' \
+	< ${.CURDIR}/xterm.man > $@
+
+CLEANFILES+=	xterm.1
+
+afterinstall:
+	${INSTALL} ${INSTALL_COPY} -m 755 ${.CURDIR}/uxterm \
+		${DESTDIR}${BINDIR}
+	${INSTALL} ${INSTALL_COPY} -m 644 ${.CURDIR}/XTerm.ad \
+		${DESTDIR}${XETC}/app-defaults/XTerm
+	${INSTALL} ${INSTALL_COPY} -m 644 ${.CURDIR}/XTerm-col.ad \
+		${DESTDIR}${XETC}/app-defaults/XTerm-color
+	${INSTALL} ${INSTALL_COPY} -m 644 ${.CURDIR}/UXTerm.ad \
+		${DESTDIR}${XETC}/app-defaults/UXTerm
+
+obj: _xenocara_obj
+
+.include <bsd.prog.mk>
+.include <bsd.xorg.mk>
+
+
+
diff --git a/app/xterm/Makefile.bsd-wrapper b/app/xterm/Makefile.bsd-wrapper
deleted file mode 100644
index 9a3cd9db9..000000000
--- a/app/xterm/Makefile.bsd-wrapper
+++ /dev/null
@@ -1,14 +0,0 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.4 2006/12/17 14:34:07 matthieu Exp $
-
-config.status:
-	AUTOMAKE_VERSION="$(AUTOMAKE_VERSION)" \
-	AUTOCONF_VERSION="$(AUTOCONF_VERSION)" \
-	ACLOCAL="aclocal -I ${X11BASE}/share/aclocal" \
-	PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" \
-		sh ${.CURDIR}/configure --prefix=${X11BASE} \
-		--with-app-defaults=/etc/X11/app-defaults \
-		--enable-luit \
-		--with-utmp-setgid=utmp \
-		--mandir=${X11BASE}/man
-
-.include <bsd.xorg.mk>
diff --git a/app/xterm/resize/Makefile b/app/xterm/resize/Makefile
new file mode 100644
index 000000000..a64d123f9
--- /dev/null
+++ b/app/xterm/resize/Makefile
@@ -0,0 +1,32 @@
+# $OpenBSD: Makefile,v 1.1 2007/04/09 19:11:43 matthieu Exp $
+
+PROG=	resize
+MAN=	resize.1
+
+VPATH=	${.CURDIR}/..
+
+CPPFLAGS+=	-I${.CURDIR}/.. -I${X11BASE}/include \
+		-I${X11BASE}/include/freetype2 \
+		-DHAVE_CONFIG_H -DCSRG_BASED \
+		-DFUNCPROTO=15 -DNARROWPROTO -DXFREE86_FT2 -DUTMP
+LDADD+=		-L${X11BASE}/lib -lXaw -lXt -lSM -lICE \
+		-lXmu -lXft -lXrender -lX11 -lXext -lXau -lXdmcp \
+		-lfontconfig -lexpat -lfreetype -lutil -ltermcap -lz
+
+X11BASE?=	/usr/X11R6
+MANDIR=		${X11BASE}/man/cat
+
+SRCS=		resize.c xstrings.c
+
+resize.1: resize.man
+	sed -e 's#__vendorversion__#"X Window System"#g' \
+	    -e 's#__miscmansuffix__#1#g' \
+            -e 's#__apploaddir__#${X11ETC}/app-defaults#g' \
+	< ${.CURDIR}/../resize.man > $@
+
+CLEANFILES+=	resize.1
+
+obj: _xenocara_obj
+
+.include <bsd.prog.mk>
+.include <bsd.xorg.mk>
diff --git a/app/xterm/xtermcfg.h b/app/xterm/xtermcfg.h
new file mode 100644
index 000000000..2b1edcdf8
--- /dev/null
+++ b/app/xterm/xtermcfg.h
@@ -0,0 +1,186 @@
+/* xtermcfg.h.  Generated automatically by configure.  */
+/* $XTermId: xtermcfg.hin,v 1.154 2006/07/15 12:10:03 tom Exp $ */
+
+/*
+ * $XFree86: xc/programs/xterm/xtermcfg.hin,v 3.61 2006/06/19 00:36:52 dickey Exp $
+ */
+
+/************************************************************
+
+Copyright 1997-2005,2006 by Thomas E. Dickey
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of the above listed
+copyright holder(s) not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior
+permission.
+
+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE
+LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifndef included_xtermcfg_h
+#define included_xtermcfg_h 1
+
+/* This is a template for <xtermcfg.h> */
+
+/* #undef ALLOWLOGFILEEXEC */		/* CF_ARG_ENABLE(enable-logfile-exec) */
+/* #undef ALLOWLOGGING */		/* CF_ARG_ENABLE(enable-logging) */
+#define CC_HAS_PROTOS 1		/* CF_ANSI_CC */
+/* #undef DECL_ERRNO */		/* CF_ERRNO */
+/* #undef DFT_COLORMODE */		/* AC_ARG_WITH(default-color-mode) */
+#define DFT_DECID "100"		/* AC_ARG_WITH(default-terminal-id) */
+#define DFT_TERMTYPE "xterm"		/* AC_ARG_WITH(default-term-type) */
+/* #undef DISABLE_SETUID */		/* CF_ARG_DISABLE(setuid) */
+#define HAVE_GETHOSTNAME 1		/* AC_CHECK_FUNCS(gethostname) */
+#define HAVE_GETLOGIN 1		/* AC_CHECK_FUNCS(getlogin) */
+#define HAVE_LANGINFO_CODESET 1	/* AM_LANGINFO_CODESET */
+/* #undef HAVE_LASTLOG_H */		/* CF_LASTLOG */
+/* #undef HAVE_LIB_NEXTAW */		/* CF_X_ATHENA(--with-neXtaw) */
+/* #undef HAVE_LIB_PCRE */		/* CF_WITH_PCRE */
+#define HAVE_LIB_XAW 1		/* CF_X_ATHENA */
+/* #undef HAVE_LIB_XAW3D */		/* CF_X_ATHENA(--with-Xaw3d) */
+/* #undef HAVE_LIB_XAWPLUS */		/* CF_X_ATHENA(--with-XawPlus) */
+/* #undef HAVE_NCURSES_TERM_H */	/* AC_CHECK_HEADERS(ncurses/term.h) */
+#define HAVE_PATHS_H 1		/* CF_LASTLOG */
+/* #undef HAVE_PCREPOSIX_H */		/* CF_WITH_PCRE */
+#define HAVE_POSIX_SAVED_IDS 1	/* CF_POSIX_SAVED_IDS */
+#define HAVE_PUTENV 1		/* AC_CHECK_FUNCS(putenv) */
+#define HAVE_SCHED_YIELD 1		/* AC_CHECK_FUNCS(sched_yield) */
+#define HAVE_STDLIB_H 1		/* AC_CHECK_HEADERS(stdlib.h) */
+#define HAVE_STRERROR 1		/* AC_CHECK_FUNCS(strerror) */
+#define HAVE_STRFTIME 1		/* AC_CHECK_FUNCS(strftime) */
+/* #undef HAVE_SYS_TIME_H */		/* AC_HEADER_TIME */
+#define HAVE_SYS_WAIT_H 1		/* AC_HEADER_SYS_WAIT */
+#define HAVE_TCGETATTR 1		/* AC_CHECK_FUNCS(tcgetattr) */
+#define HAVE_TERMCAP_H 1		/* AC_CHECK_HEADERS(termcap.h) */
+#define HAVE_TERMIOS_H 1		/* AC_CHECK_HEADERS(termios.h) */
+/* #undef HAVE_TERMIO_C_ISPEED */	/* CF_TERMIO_C_ISPEED */
+#define HAVE_UNISTD_H 1		/* AC_CHECK_HEADERS(unistd.h) */
+#define HAVE_UTMP 1		/* CF_UTMP */
+#define HAVE_UTMP_UT_HOST 1	/* CF_UTMP_UT_HOST */
+/* #undef HAVE_UTMP_UT_SESSION */	/* CF_UTMP_UT_SESSION */
+/* #undef HAVE_UTMP_UT_XSTATUS */	/* CF_UTMP_UT_XSTATUS */
+/* #undef HAVE_UTMP_UT_XTIME */	/* CF_UTMP_UT_XTIME */
+#define HAVE_WAITPID 1		/* AC_CHECK_FUNCS(waitpid) */
+#define HAVE_WCHAR_H 1		/* AC_CHECK_HEADERS(wchar.h) */
+#define HAVE_WCSWIDTH 1		/* AC_CHECK_FUNCS(wcswidth) */
+#define HAVE_WCWIDTH 1		/* AC_CHECK_FUNCS(wcwidth) */
+#define HAVE_X11_DECKEYSYM_H 1	/* AC_CHECK_HEADERS(X11/DECkeysym.h) */
+#define HAVE_X11_SUNKEYSYM_H 1	/* AC_CHECK_HEADERS(X11/Sunkeysym.h) */
+#define HAVE_X11_XPOLL_H 1		/* AC_CHECK_HEADERS(X11/Xpoll.h) */
+#define HAVE_XKB_BELL_EXT 1	/* CF_XKB_BELL_EXT */
+#define LUIT_PATH "/usr/X11R6/bin/luit"		/* CF_ARG_ENABLE(luit) */
+/* #undef NO_ACTIVE_ICON */		/* CF_ARG_DISABLE(active-icon) */
+/* #undef NO_LEAKS */			/* CF_ARG_DISABLE(leaks) */
+/* #undef OPT_256_COLORS */		/* CF_ARG_ENABLE(256-color) */
+/* #undef OPT_88_COLORS */		/* CF_ARG_ENABLE(88-color) */
+/* #undef OPT_AIX_COLORS */		/* CF_ARG_DISABLE(16-color) */
+/* #undef OPT_BLINK_CURS */		/* CF_ARG_DISABLE(blink-cursor) */
+/* #undef OPT_BLINK_TEXT */		/* CF_ARG_DISABLE(blink-text) */
+/* #undef OPT_BOX_CHARS */		/* CF_ARG_DISABLE(boxchars) */
+#define OPT_BROKEN_OSC 0		/* CF_ARG_ENABLE(broken-osc) */
+#define OPT_BROKEN_ST 0		/* CF_ARG_DISABLE(broken-st) */
+/* #undef OPT_C1_PRINT */		/* CF_ARG_DISABLE(c1-print) */
+/* #undef OPT_COLOR_CLASS */		/* CF_ARG_DISABLE(color-class) */
+/* #undef OPT_DABBREV */		/* CF_ARG_ENABLE(dabbrev) */
+/* #undef OPT_DEC_CHRSET */		/* CF_ARG_DISABLE(doublechars) */
+/* #undef OPT_DEC_LOCATOR */		/* CF_ARG_ENABLE(dec-locator) */
+/* #undef OPT_HIGHLIGHT_COLOR */	/* CF_ARG_DISABLE(highlighting) */
+/* #undef OPT_HP_FUNC_KEYS */		/* CF_ARG_ENABLE(hp-fkeys) */
+/* #undef OPT_I18N_SUPPORT */		/* CF_ARG_DISABLE(i18n) */
+/* #undef OPT_INITIAL_ERASE */	/* CF_ARG_DISABLE(initial-erase) */
+/* #undef OPT_INPUT_METHOD */		/* CF_ARG_DISABLE(input-method) */
+/* #undef OPT_ISO_COLORS */		/* CF_ARG_DISABLE(ansi-color) */
+/* #undef OPT_LOAD_VTFONTS */		/* CF_ARG_ENABLE(load-vt-fonts) */
+#define OPT_LUIT_PROG 1		/* CF_ARG_ENABLE(luit) */
+/* #undef OPT_MAXIMIZE */		/* CF_ARG_DISABLE(maximize) */
+/* #undef OPT_MINI_LUIT */		/* CF_ARG_ENABLE(mini-luit) */
+/* #undef OPT_NUM_LOCK */		/* CF_ARG_DISABLE(num-lock) */
+#define OPT_PASTE64 0		/* CF_ARG_ENABLE(past64) */
+/* #undef OPT_PC_COLORS */		/* CF_ARG_DISABLE(pc-color) */
+#define OPT_PTY_HANDSHAKE 1	/* CF_ARG_ENABLE(pty-handshake) */
+/* #undef OPT_SAME_NAME */		/* CF_ARG_DISABLE(samename) */
+/* #undef OPT_SCO_FUNC_KEYS */	/* CF_ARG_ENABLE(sco-fkeys) */
+#define OPT_SELECT_REGEX 1		/* CF_ARG_DISABLE(regex) */
+/* #undef OPT_SESSION_MGT */		/* CF_ARG_DISABLE(session-mgt) */
+/* #undef OPT_SUN_FUNC_KEYS */	/* CF_ARG_ENABLE(sun-fkeys) */
+/* #undef OPT_TCAP_QUERY */		/* CF_ARG_ENABLE(tcap-query) */
+/* #undef OPT_TEK4014 */		/* CF_ARG_DISABLE(tek4014) */
+/* #undef OPT_TOOLBAR */		/* CF_ARG_ENABLE(toolbar) */
+/* #undef OPT_TRACE */		/* CF_ARG_ENABLE(trace) */
+/* #undef OPT_VT52_MODE */		/* CF_ARG_DISABLE(vt52) */
+#define OPT_WIDE_CHARS 1		/* CF_ARG_OPTION(wide-chars) */
+/* #undef OPT_XMC_GLITCH */		/* CF_ARG_ENABLE(xmc-glitch) */
+/* #undef OPT_ZICONBEEP */		/* CF_ARG_DISABLE(ziconbeep) */
+/* #undef OWN_TERMINFO_DIR */		/* AC_ARG_WITH(own-terminfo) */
+#define SCROLLBAR_RIGHT 1		/* CF_ARG_ENABLE(rightbar) */
+#define SIG_ATOMIC_T volatile sig_atomic_t		/* CF_SIG_ATOMIC_T */
+/* #undef SVR4 */			/* CF_SVR4, imake */
+/* #undef SYSV */			/* CF_SYSV, imake */
+#define TIME_WITH_SYS_TIME 1	/* AC_HEADER_TIME */
+#define TTY_GROUP_NAME "tty"		/* CF_TTY_GROUP */
+/* #undef USE_LASTLOG */		/* CF_LASTLOG */
+/* #undef USE_MY_MEMMOVE */		/* CF_FUNC_MEMMOVE */
+/* #undef USE_OK_BCOPY */		/* CF_FUNC_MEMMOVE */
+#define USE_POSIX_WAIT 1		/* CF_POSIX_WAIT */
+/* #undef USE_STRUCT_LASTLOG */	/* CF_STRUCT_LASTLOG */
+/* #undef USE_SYSV_UTMP */		/* CF_UTMP */
+/* #undef USE_SYS_SELECT_H */		/* CF_TYPE_FD_SET */
+/* #undef USE_TERMCAP */		/* CF_FUNC_TGETENT */
+#define USE_TERMINFO 1		/* CF_FUNC_TGETENT */
+#define USE_TTY_GROUP 1		/* CF_TTY_GROUP */
+/* #undef USE_UTEMPTER */		/* CF_UTEMPTER */
+#define USE_UTMP_SETGID 1		/* AC_ARG_WITH(utmp-setgid) */
+/* #undef UTMPX_FOR_UTMP */		/* CF_UTMP */
+#define XRENDERFONT 1		/* CF_X_FREETYPE */
+/* #undef const */			/* AC_CONST */
+/* #undef gid_t */			/* AC_TYPE_UID_T */
+/* #undef mode_t */			/* AC_TYPE_MODE_T */
+/* #undef off_t */			/* AC_TYPE_OFF_T */
+/* #undef pid_t */			/* AC_TYPE_PID_T */
+/* #undef size_t */			/* AC_TYPE_SIZE_T */
+/* #undef time_t */			/* AC_CHECK_TYPE(time_t, long) */
+/* #undef uid_t */			/* AC_TYPE_UID_T */
+/* #undef ut_name */			/* CF_UTMP */
+/* #undef ut_xstatus */		/* CF_UTMP_UT_XSTATUS */
+/* #undef ut_xtime */			/* CF_UTMP_UT_XTIME */
+
+/*
+ * g++ support for __attribute__() is haphazard.
+ */
+#ifndef __cplusplus
+/* #undef GCC_PRINTF */
+/* #undef GCC_UNUSED */
+#endif
+
+#ifdef USE_OK_BCOPY
+#define memmove(d,s,n) bcopy(s,d,n)
+#endif
+
+#ifdef USE_MY_MEMMOVE
+#define memmove(d,s,n) my_memmove(d,s,n)
+extern char * my_memmove(char * s1, char * s2, size_t n);
+#endif
+
+#ifndef HAVE_STRERROR
+#define strerror(n) my_strerror(n)
+extern char *my_strerror(int n);
+#endif
+
+#ifndef HAVE_X11_XPOLL_H
+#define NO_XPOLL_H	/* X11R6.1 & up use Xpoll.h for select() definitions */
+#endif
+
+#endif /* included_xtermcfg_h */