Attachment #43485 for bug #67510




#

PORTNAME=	clients
PORTVERSION=	4.4.0
PORTREVISION=	8
CATEGORIES=	x11
MASTER_SITES=	${MASTER_SITE_XFREE}
MASTER_SITE_SUBDIR= ${PORTVERSION}
PKGNAMEPREFIX=	XFree86-
DISTFILES=	XFree86-4.4.0-src-1.tgz \
		XFree86-4.4.0-src-2.tgz \
		XFree86-4.4.0-src-3.tgz \
		XFree86-4.4.0-src-4.tgz

MAINTAINER=	x11@FreeBSD.org
COMMENT=	XFree86-4 client programs and related files

XINSTALL_MAN_DIRS=	programs

.for pf in patch-bdftruncate.pl patch-ucs2any.pl \
	   patch-programs::fonttosfnt::read.c \
	   patch-programs::xdm::Imakefile \
	   patch-programs::xdm::session.c \
	   patch-programs::xdm::socket.c
EXTRA_PATCHES+=		${FILESDIR}/${pf}
.endfor


post-install:
	${CHOWN} root:wheel ${PREFIX}/bin/luit
	${CHMOD} 04711 ${PREFIX}/bin/luit
	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.else
post-install:
	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.endif

.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"

Lines 1-8 Link Here

(-)distinfo (-8 / +8 lines)
1	MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af	1	MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469
2	SIZE (xc/X430src-1.tgz) = 10993622	2	SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814
3	MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4	3	MD5 (xc/XFree86-4.4.0-src-2.tgz) = b9b6c74a03e314569e01d5fd4ff59523
4	SIZE (xc/X430src-2.tgz) = 7962239	4	SIZE (xc/XFree86-4.4.0-src-2.tgz) = 5745538
5	MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6	5	MD5 (xc/XFree86-4.4.0-src-3.tgz) = 703404f48d3a15f58389a879d47c769d
6	SIZE (xc/X430src-3.tgz) = 12366363	6	SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253
7	MD5 (xc/X430src-4.tgz) = 567903747018f2534965ab6cb3976b38	7	MD5 (xc/XFree86-4.4.0-src-4.tgz) = 5d1792f5c154c7462c6aef39c7853b3b
8	SIZE (xc/X430src-4.tgz) = 12906091	8	SIZE (xc/XFree86-4.4.0-src-4.tgz) = 13057535




#!/bin/sh

if [ "$2" != "POST-INSTALL" ]; then
	exit 0
fi

PKG_PREFIX=${PKG_PREFIX:=/usr/X11R6}
XDMCONFDIR=${PKG_PREFIX}/lib/X11/xdm
XDMCONFFILES="GiveConsole TakeConsole Xaccess Xresources Xservers Xsession \
	Xsetup_0 Xwilling xdm-config"

for file in $XDMCONFFILES; do
	if [ ! -f ${XDMCONFDIR}/$file ]; then
		cp ${XDMCONFDIR}/default/$file ${XDMCONFDIR}/$file
	fi
done




@unexec if cmp -s %D/lib/X11/xdm/GiveConsole %D/lib/X11/xdm/default/GiveConsole; then rm -f %D/lib/X11/xdm/GiveConsole; fi
@unexec if cmp -s %D/lib/X11/xdm/TakeConsole %D/lib/X11/xdm/default/TakeConsole; then rm -f %D/lib/X11/xdm/TakeConsole; fi
@unexec if cmp -s %D/lib/X11/xdm/Xaccess %D/lib/X11/xdm/default/Xaccess; then rm -f %D/lib/X11/xdm/Xaccess; fi
@unexec if cmp -s %D/lib/X11/xdm/Xresources %D/lib/X11/xdm/default/Xresources; then rm -f %D/lib/X11/xdm/Xresources; fi
@unexec if cmp -s %D/lib/X11/xdm/Xservers %D/lib/X11/xdm/default/Xservers; then rm -f %D/lib/X11/xdm/Xservers; fi
@unexec if cmp -s %D/lib/X11/xdm/Xsession %D/lib/X11/xdm/default/Xsession; then rm -f %D/lib/X11/xdm/Xsession; fi
@unexec if cmp -s %D/lib/X11/xdm/Xsetup_0 %D/lib/X11/xdm/default/Xsetup_0; then rm -f %D/lib/X11/xdm/Xsetup_0; fi
@unexec if cmp -s %D/lib/X11/xdm/Xwilling %D/lib/X11/xdm/default/Xwilling; then rm -f %D/lib/X11/xdm/Xwilling; fi
@unexec if cmp -s %D/lib/X11/xdm/xdm-config %D/lib/X11/xdm/default/xdm-config; then rm -f %D/lib/X11/xdm/xdm-config; fi
bin/Xmark
bin/appres
bin/atobm

bin/dpsexec
bin/dpsinfo
bin/editres
bin/fonttosfnt
bin/fslsfonts
bin/fstobdf
bin/glxgears

lib/X11/app-defaults/XCalc-color
lib/X11/app-defaults/XClipboard
lib/X11/app-defaults/XClock
lib/X11/app-defaults/XClock-color
lib/X11/app-defaults/XConsole
lib/X11/app-defaults/XFontSel
lib/X11/app-defaults/XLoad

lib/X11/x11perfcomp/fillblnk
lib/X11/x11perfcomp/perfboth
lib/X11/x11perfcomp/perfratio
lib/X11/xdm/default/GiveConsole
lib/X11/xdm/default/TakeConsole
lib/X11/xdm/default/Xaccess
lib/X11/xdm/default/Xresources
lib/X11/xdm/default/Xservers
lib/X11/xdm/default/Xsession
lib/X11/xdm/default/Xsetup_0
lib/X11/xdm/default/Xwilling
lib/X11/xdm/chooser
lib/X11/xdm/pixmaps/XFree86.xpm
lib/X11/xdm/pixmaps/XFree86bw.xpm
lib/X11/xdm/default/xdm-config
lib/X11/xedit/lisp/indent.lsp
lib/X11/xedit/lisp/lisp.lsp
lib/X11/xedit/lisp/progmodes/c.lsp

lib/X11/xedit/lisp/progmodes/lisp.lsp
lib/X11/xedit/lisp/progmodes/make.lsp
lib/X11/xedit/lisp/progmodes/man.lsp
lib/X11/xedit/lisp/progmodes/patch.lsp
lib/X11/xedit/lisp/progmodes/rpm.lsp
lib/X11/xedit/lisp/progmodes/sgml.lsp
lib/X11/xedit/lisp/progmodes/sh.lsp

lib/X11/xkb/geometry/README
lib/X11/xkb/geometry/amiga
lib/X11/xkb/geometry/ataritt
lib/X11/xkb/geometry/chicony
lib/X11/xkb/geometry/dell
lib/X11/xkb/geometry/digital/lk
lib/X11/xkb/geometry/digital/pc

lib/X11/xkb/geometry/everex
lib/X11/xkb/geometry/fujitsu
lib/X11/xkb/geometry/hp
lib/X11/xkb/geometry/ibm/thinkpad
lib/X11/xkb/geometry/keytronic
lib/X11/xkb/geometry/kinesis
lib/X11/xkb/geometry/macintosh

lib/X11/xkb/symbols/al
lib/X11/xkb/symbols/altwin
lib/X11/xkb/symbols/am
lib/X11/xkb/symbols/apple
lib/X11/xkb/symbols/ar
lib/X11/xkb/symbols/az
lib/X11/xkb/symbols/be

lib/X11/xkb/symbols/gur
lib/X11/xkb/symbols/hp/us
lib/X11/xkb/symbols/hr
lib/X11/xkb/symbols/hr_US
lib/X11/xkb/symbols/hu
lib/X11/xkb/symbols/hu_US
lib/X11/xkb/symbols/hu_qwerty

lib/X11/xkb/symbols/pc/dev
lib/X11/xkb/symbols/pc/dk
lib/X11/xkb/symbols/pc/dvorak
lib/X11/xkb/symbols/pc/dz
lib/X11/xkb/symbols/pc/ee
lib/X11/xkb/symbols/pc/el
lib/X11/xkb/symbols/pc/en_US

lib/X11/xkb/symbols/pc/ru
lib/X11/xkb/symbols/pc/sapmi
lib/X11/xkb/symbols/pc/se
lib/X11/xkb/symbols/pc/se_FI
lib/X11/xkb/symbols/pc/se_NO
lib/X11/xkb/symbols/pc/se_SE
lib/X11/xkb/symbols/pc/si
lib/X11/xkb/symbols/pc/sk
lib/X11/xkb/symbols/pc/sk_qwerty

lib/X11/xkb/symbols/pc/syr_phonetic
lib/X11/xkb/symbols/pc/tel
lib/X11/xkb/symbols/pc/th
lib/X11/xkb/symbols/pc/th_pat
lib/X11/xkb/symbols/pc/th_tis
lib/X11/xkb/symbols/pc/tj
lib/X11/xkb/symbols/pc/tml
lib/X11/xkb/symbols/pc/tr
lib/X11/xkb/symbols/pc/ua
lib/X11/xkb/symbols/pc/us
lib/X11/xkb/symbols/pc/us_intl
lib/X11/xkb/symbols/pc/uz
lib/X11/xkb/symbols/pc/yu
lib/X11/xkb/symbols/pc104
lib/X11/xkb/symbols/pl

lib/X11/xkb/symbols/pt
lib/X11/xkb/symbols/ralt
lib/X11/xkb/symbols/ro
lib/X11/xkb/symbols/ro2
lib/X11/xkb/symbols/ru
lib/X11/xkb/symbols/ru_yawerty
lib/X11/xkb/symbols/sapmi
lib/X11/xkb/symbols/se
lib/X11/xkb/symbols/se_FI

lib/X11/xkb/symbols/srvr_ctrl
lib/X11/xkb/symbols/sun/se
lib/X11/xkb/symbols/sun/us
lib/X11/xkb/symbols/sun/usb
lib/X11/xkb/symbols/syr
lib/X11/xkb/symbols/syr_phonetic
lib/X11/xkb/symbols/tel
lib/X11/xkb/symbols/th
lib/X11/xkb/symbols/th_pat
lib/X11/xkb/symbols/th_tis
lib/X11/xkb/symbols/tj
lib/X11/xkb/symbols/tml
lib/X11/xkb/symbols/tr

lib/X11/xkb/symbols/us_group2
lib/X11/xkb/symbols/us_group3
lib/X11/xkb/symbols/us_intl
lib/X11/xkb/symbols/uz
lib/X11/xkb/symbols/vn
lib/X11/xkb/symbols/xfree68/amiga
lib/X11/xkb/symbols/xfree68/ataritt

lib/X11/xkb/types/extra
lib/X11/xkb/types/iso9995
lib/X11/xkb/types/mousekeys
lib/X11/xkb/types/numpad
lib/X11/xkb/types/pc
lib/X11/xkb/xkbcomp
lib/X11/xman.help

Lines 10-15 Link Here

(-)files/manpages (+1 lines)
10	dpsexec.1 \	10	dpsexec.1 \
11	dpsinfo.1 \	11	dpsinfo.1 \
12	editres.1 \	12	editres.1 \
		13	fonttosfnt.1 \
13	fslsfonts.1 \	14	fslsfonts.1 \
14	fstobdf.1 \	15	fstobdf.1 \
15	glxgears.1 \	16	glxgears.1 \

Removed Link Here

(-)files/patch-Imake.rules (-16 lines)
1	--- config/cf/Imake.rules.orig Sat Jan 3 16:16:06 2004
2	+++ config/cf/Imake.rules Sat Jan 3 16:18:47 2004
3	@@ -3148,7 +3148,12 @@
4	* Also delete line numbers from the cpp output (-P is not portable, I guess).
5	*/
6	#ifndef CppSedMagic
7	-#define CppSedMagic sed -e '/^# [0-9][0-9] .$$/d' -e '/^XCOMM$$/s//#/' -e '/^XCOMM[^a-zA-Z0-9_]/s/^XCOMM/#/'
8	+#define CppSedMagic sed -e '/^# [0-9][0-9] .$$/d' \
9	+ -e '/^#line [0-9][0-9] .$$/d' \
10	+ -e '/^[ ]*XCOMM$$/s/XCOMM/#/' \
11	+ -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/#/' \
12	+ -e '/^[ ]*XHASH/s/XHASH/#/' \
13	+ -e '/\@\@$$/s/\@\@$$/\\/'
14	#endif /* CppSedMagic */
15
16	#ifndef CppFileTarget




--- programs/xdm/config/Xres.cpp.orig	Sat Jan  3 15:50:37 2004
+++ programs/xdm/config/Xres.cpp	Sat Jan  3 15:53:22 2004
@@ -28,7 +28,7 @@
 #endif /* XPM */
 xlogin*fail: Login incorrect
 #ifdef XPM
-/**/#if WIDTH > 800
+XHASHif WIDTH > 800
 xlogin*greetFont: -adobe-helvetica-bold-o-normal--24-240-75-75-p-138-iso8859-1
 xlogin*font: -adobe-helvetica-medium-r-normal--18-180-75-75-p-98-iso8859-1
 xlogin*promptFont: -adobe-helvetica-bold-r-normal--18-180-75-75-p-103-iso8859-1
@@ -38,9 +38,9 @@
 xlogin*font: -adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1
 xlogin*promptFont: -adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1
 xlogin*failFont: -adobe-helvetica-bold-o-normal--14-140-75-75-p-82-iso8859-1
-/**/#endif
+XHASHendif
 #endif /* XPM */
-/**/#ifdef COLOR
+XHASHifdef COLOR
 #ifndef XPM
 xlogin*greetColor: CadetBlue
 #else
@@ -56,7 +56,7 @@
 xlogin*failColor: red
 *Foreground: black
 *Background: #fffff0
-/**/#else
+XHASHelse
 #ifdef XPM
 xlogin*borderWidth: 3
 xlogin*frameWidth: 0
@@ -68,13 +68,13 @@
 xlogin*Foreground: black
 xlogin*Background: white
 #endif /* XPM */
-/**/#endif
+XHASHendif
 #ifdef XPM
-/**/#if PLANES >= 8
+XHASHif PLANES >= 8
 xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
-/**/#else
+XHASHelse
 xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
-/**/#endif
+XHASHendif
 xlogin*useShape: true
 xlogin*logoPadding: 10
 #endif /* XPM */




--- programs/mkfontscale/mkfontscale.c.orig	Wed Mar 17 07:01:52 2004
+++ programs/mkfontscale/mkfontscale.c	Wed Mar 17 07:03:10 2004
@@ -29,7 +29,8 @@
 #include <dirent.h>
 
 #include <X11/fonts/fontenc.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
 #include <freetype/ftsnames.h>
 #include <freetype/tttables.h>
 #include <freetype/ttnameid.h>

Added Link Here

(-)files/patch-programs::fonttosfnt::read.c (+11 lines)
1	--- programs/fonttosfnt/read.c.orig Fri Apr 9 22:31:49 2004
2	+++ programs/fonttosfnt/read.c Fri Apr 9 22:32:24 2004
3	@@ -28,7 +28,7 @@
4	#include FT_BDF_H
5	#include "X11/Xos.h"
6	#include "fonttosfnt.h"
7	-#include "fontenc.h"
8	+#include "X11/fonts/fontenc.h"
9
10	#define FLOOR2(x, y) ((x) >= 0 ? (x) / (y) : -(((-(x)) + (y) - 1) / (y)))
11	#define CEIL2(x, y) (FLOOR2((x) + (y) - 1, (y)))




--- programs/xdm/Imakefile.old	Wed Jun 30 22:11:46 2004
+++ programs/xdm/Imakefile	Wed Jun 30 22:12:12 2004
@@ -31,7 +31,11 @@
 #endif
 
 #if HasSecureRPC
+#if defined(FreeBSDArchitecture) && (OSMajorVersion < 5)
+RPC_DEFINES = -DSECURE_RPC -DFREEBSD_OLD_RPC
+#else
 RPC_DEFINES = -DSECURE_RPC
+#endif
 RPCOBJS = rpcauth.o
 RPCSRCS = rpcauth.c
 RPCLIB = -lrpcsvc




--- programs/xdm/session.c.old	Wed Jun 30 22:12:02 2004
+++ programs/xdm/session.c	Wed Jun 30 22:12:21 2004
@@ -54,8 +54,12 @@
 #ifdef SECURE_RPC
 # include <rpc/rpc.h>
 # include <rpc/key_prot.h>
+#ifdef FREEBSD_OLD_RPC
+extern int key_setnet(struct netstarg *arg);
+#else
 extern int key_setnet(struct key_netstarg *arg);
 #endif
+#endif
 #ifdef K5AUTH
 # include <krb5/krb5.h>
 #endif
@@ -643,7 +647,11 @@
 	    char    netname[MAXNETNAMELEN+1], secretkey[HEXKEYBYTES+1];
 	    int	    nameret, keyret;
 	    int	    len;
+#ifdef FREEBSD_OLD_RPC
+	    struct  netstarg netst;
+#else
 	    struct  key_netstarg netst;
+#endif
 	    int     key_set_ok = 0;
 
 	    nameret = getnetname (netname);




--- programs/xdm/socket.c.orig	Thu Jun  3 05:38:29 2004
+++ programs/xdm/socket.c	Thu Jun  3 05:40:54 2004
@@ -66,6 +66,9 @@
     char *name = localHostname ();
     registerHostname (name, strlen (name));
 
+    if (request_port == 0)
+	return;
+
 #if defined(IPv6) && defined(AF_INET6)
     chooserFd = socket (AF_INET6, SOCK_STREAM, 0);
 #else

Return to bug 67510

Lines 6-21 Link Here

(-)Makefile (-8 / +14 lines)
6	#	6	#
7		7
8	PORTNAME= clients	8	PORTNAME= clients
9	PORTVERSION= 4.3.0	9	PORTVERSION= 4.4.0
10	PORTREVISION= 8
11	CATEGORIES= x11	10	CATEGORIES= x11
12	MASTER_SITES= ${MASTER_SITE_XFREE}	11	MASTER_SITES= ${MASTER_SITE_XFREE}
13	MASTER_SITE_SUBDIR= 4.3.0	12	MASTER_SITE_SUBDIR= ${PORTVERSION}
14	PKGNAMEPREFIX= XFree86-	13	PKGNAMEPREFIX= XFree86-
15	DISTFILES= X430src-1.tgz \	14	DISTFILES= XFree86-4.4.0-src-1.tgz \
16	X430src-2.tgz \	15	XFree86-4.4.0-src-2.tgz \
17	X430src-3.tgz \	16	XFree86-4.4.0-src-3.tgz \
18	X430src-4.tgz	17	XFree86-4.4.0-src-4.tgz
19		18
20	MAINTAINER= x11@FreeBSD.org	19	MAINTAINER= x11@FreeBSD.org
21	COMMENT= XFree86-4 client programs and related files	20	COMMENT= XFree86-4 client programs and related files
Lines 40-46 Link Here
40	XINSTALL_MAN_DIRS= programs	39	XINSTALL_MAN_DIRS= programs
41		40
42	.for pf in patch-bdftruncate.pl patch-ucs2any.pl \	41	.for pf in patch-bdftruncate.pl patch-ucs2any.pl \
43	patch-Xres.cpp patch-Imake.rules patch-mkfontscale.c	42	patch-programs::fonttosfnt::read.c \
		43	patch-programs::xdm::Imakefile \
		44	patch-programs::xdm::session.c \
		45	patch-programs::xdm::socket.c
44	EXTRA_PATCHES+= ${FILESDIR}/${pf}	46	EXTRA_PATCHES+= ${FILESDIR}/${pf}
45	.endfor	47	.endfor
46		48
Lines 70-75 Link Here
70	post-install:	72	post-install:
71	${CHOWN} root:wheel ${PREFIX}/bin/luit	73	${CHOWN} root:wheel ${PREFIX}/bin/luit
72	${CHMOD} 04711 ${PREFIX}/bin/luit	74	${CHMOD} 04711 ${PREFIX}/bin/luit
		75	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
		76	.else
		77	post-install:
		78	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
73	.endif	79	.endif
74		80
75	.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"	81	.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"

Added Link Here

(-)pkg-install (+16 lines)
1	#!/bin/sh
2
3	if [ "$2" != "POST-INSTALL" ]; then
4	exit 0
5	fi
6
7	PKG_PREFIX=${PKG_PREFIX:=/usr/X11R6}
8	XDMCONFDIR=${PKG_PREFIX}/lib/X11/xdm
9	XDMCONFFILES="GiveConsole TakeConsole Xaccess Xresources Xservers Xsession \
10	Xsetup_0 Xwilling xdm-config"
11
12	for file in $XDMCONFFILES; do
13	if [ ! -f ${XDMCONFDIR}/$file ]; then
14	cp ${XDMCONFDIR}/default/$file ${XDMCONFDIR}/$file
15	fi
16	done

Lines 1-3 Link Here

(-)pkg-plist (-10 / +39 lines)
		1	@unexec if cmp -s %D/lib/X11/xdm/GiveConsole %D/lib/X11/xdm/default/GiveConsole; then rm -f %D/lib/X11/xdm/GiveConsole; fi
		2	@unexec if cmp -s %D/lib/X11/xdm/TakeConsole %D/lib/X11/xdm/default/TakeConsole; then rm -f %D/lib/X11/xdm/TakeConsole; fi
		3	@unexec if cmp -s %D/lib/X11/xdm/Xaccess %D/lib/X11/xdm/default/Xaccess; then rm -f %D/lib/X11/xdm/Xaccess; fi
		4	@unexec if cmp -s %D/lib/X11/xdm/Xresources %D/lib/X11/xdm/default/Xresources; then rm -f %D/lib/X11/xdm/Xresources; fi
		5	@unexec if cmp -s %D/lib/X11/xdm/Xservers %D/lib/X11/xdm/default/Xservers; then rm -f %D/lib/X11/xdm/Xservers; fi
		6	@unexec if cmp -s %D/lib/X11/xdm/Xsession %D/lib/X11/xdm/default/Xsession; then rm -f %D/lib/X11/xdm/Xsession; fi
		7	@unexec if cmp -s %D/lib/X11/xdm/Xsetup_0 %D/lib/X11/xdm/default/Xsetup_0; then rm -f %D/lib/X11/xdm/Xsetup_0; fi
		8	@unexec if cmp -s %D/lib/X11/xdm/Xwilling %D/lib/X11/xdm/default/Xwilling; then rm -f %D/lib/X11/xdm/Xwilling; fi
		9	@unexec if cmp -s %D/lib/X11/xdm/xdm-config %D/lib/X11/xdm/default/xdm-config; then rm -f %D/lib/X11/xdm/xdm-config; fi
1	bin/Xmark	10	bin/Xmark
2	bin/appres	11	bin/appres
3	bin/atobm	12	bin/atobm
Lines 11-16 Link Here
11	bin/dpsexec	20	bin/dpsexec
12	bin/dpsinfo	21	bin/dpsinfo
13	bin/editres	22	bin/editres
		23	bin/fonttosfnt
14	bin/fslsfonts	24	bin/fslsfonts
15	bin/fstobdf	25	bin/fstobdf
16	bin/glxgears	26	bin/glxgears
Lines 138-143 Link Here
138	lib/X11/app-defaults/XCalc-color	148	lib/X11/app-defaults/XCalc-color
139	lib/X11/app-defaults/XClipboard	149	lib/X11/app-defaults/XClipboard
140	lib/X11/app-defaults/XClock	150	lib/X11/app-defaults/XClock
		151	lib/X11/app-defaults/XClock-color
141	lib/X11/app-defaults/XConsole	152	lib/X11/app-defaults/XConsole
142	lib/X11/app-defaults/XFontSel	153	lib/X11/app-defaults/XFontSel
143	lib/X11/app-defaults/XLoad	154	lib/X11/app-defaults/XLoad
Lines 351-368 Link Here
351	lib/X11/x11perfcomp/fillblnk	362	lib/X11/x11perfcomp/fillblnk
352	lib/X11/x11perfcomp/perfboth	363	lib/X11/x11perfcomp/perfboth
353	lib/X11/x11perfcomp/perfratio	364	lib/X11/x11perfcomp/perfratio
354	lib/X11/xdm/GiveConsole	365	lib/X11/xdm/default/GiveConsole
355	lib/X11/xdm/TakeConsole	366	lib/X11/xdm/default/TakeConsole
356	lib/X11/xdm/Xaccess	367	lib/X11/xdm/default/Xaccess
357	lib/X11/xdm/Xresources	368	lib/X11/xdm/default/Xresources
358	lib/X11/xdm/Xservers	369	lib/X11/xdm/default/Xservers
359	lib/X11/xdm/Xsession	370	lib/X11/xdm/default/Xsession
360	lib/X11/xdm/Xsetup_0	371	lib/X11/xdm/default/Xsetup_0
361	lib/X11/xdm/Xwilling	372	lib/X11/xdm/default/Xwilling
362	lib/X11/xdm/chooser	373	lib/X11/xdm/chooser
363	lib/X11/xdm/pixmaps/XFree86.xpm	374	lib/X11/xdm/pixmaps/XFree86.xpm
364	lib/X11/xdm/pixmaps/XFree86bw.xpm	375	lib/X11/xdm/pixmaps/XFree86bw.xpm
365	lib/X11/xdm/xdm-config	376	lib/X11/xdm/default/xdm-config
366	lib/X11/xedit/lisp/indent.lsp	377	lib/X11/xedit/lisp/indent.lsp
367	lib/X11/xedit/lisp/lisp.lsp	378	lib/X11/xedit/lisp/lisp.lsp
368	lib/X11/xedit/lisp/progmodes/c.lsp	379	lib/X11/xedit/lisp/progmodes/c.lsp
Lines 371-376 Link Here
371	lib/X11/xedit/lisp/progmodes/lisp.lsp	382	lib/X11/xedit/lisp/progmodes/lisp.lsp
372	lib/X11/xedit/lisp/progmodes/make.lsp	383	lib/X11/xedit/lisp/progmodes/make.lsp
373	lib/X11/xedit/lisp/progmodes/man.lsp	384	lib/X11/xedit/lisp/progmodes/man.lsp
		385	lib/X11/xedit/lisp/progmodes/patch.lsp
374	lib/X11/xedit/lisp/progmodes/rpm.lsp	386	lib/X11/xedit/lisp/progmodes/rpm.lsp
375	lib/X11/xedit/lisp/progmodes/sgml.lsp	387	lib/X11/xedit/lisp/progmodes/sgml.lsp
376	lib/X11/xedit/lisp/progmodes/sh.lsp	388	lib/X11/xedit/lisp/progmodes/sh.lsp
Lines 406-411 Link Here
406	lib/X11/xkb/geometry/README	418	lib/X11/xkb/geometry/README
407	lib/X11/xkb/geometry/amiga	419	lib/X11/xkb/geometry/amiga
408	lib/X11/xkb/geometry/ataritt	420	lib/X11/xkb/geometry/ataritt
		421	lib/X11/xkb/geometry/chicony
409	lib/X11/xkb/geometry/dell	422	lib/X11/xkb/geometry/dell
410	lib/X11/xkb/geometry/digital/lk	423	lib/X11/xkb/geometry/digital/lk
411	lib/X11/xkb/geometry/digital/pc	424	lib/X11/xkb/geometry/digital/pc
Lines 413-418 Link Here
413	lib/X11/xkb/geometry/everex	426	lib/X11/xkb/geometry/everex
414	lib/X11/xkb/geometry/fujitsu	427	lib/X11/xkb/geometry/fujitsu
415	lib/X11/xkb/geometry/hp	428	lib/X11/xkb/geometry/hp
		429	lib/X11/xkb/geometry/ibm/thinkpad
416	lib/X11/xkb/geometry/keytronic	430	lib/X11/xkb/geometry/keytronic
417	lib/X11/xkb/geometry/kinesis	431	lib/X11/xkb/geometry/kinesis
418	lib/X11/xkb/geometry/macintosh	432	lib/X11/xkb/geometry/macintosh
Lines 509-514 Link Here
509	lib/X11/xkb/symbols/al	523	lib/X11/xkb/symbols/al
510	lib/X11/xkb/symbols/altwin	524	lib/X11/xkb/symbols/altwin
511	lib/X11/xkb/symbols/am	525	lib/X11/xkb/symbols/am
		526	lib/X11/xkb/symbols/apple
512	lib/X11/xkb/symbols/ar	527	lib/X11/xkb/symbols/ar
513	lib/X11/xkb/symbols/az	528	lib/X11/xkb/symbols/az
514	lib/X11/xkb/symbols/be	529	lib/X11/xkb/symbols/be
Lines 550-555 Link Here
550	lib/X11/xkb/symbols/gur	565	lib/X11/xkb/symbols/gur
551	lib/X11/xkb/symbols/hp/us	566	lib/X11/xkb/symbols/hp/us
552	lib/X11/xkb/symbols/hr	567	lib/X11/xkb/symbols/hr
		568	lib/X11/xkb/symbols/hr_US
553	lib/X11/xkb/symbols/hu	569	lib/X11/xkb/symbols/hu
554	lib/X11/xkb/symbols/hu_US	570	lib/X11/xkb/symbols/hu_US
555	lib/X11/xkb/symbols/hu_qwerty	571	lib/X11/xkb/symbols/hu_qwerty
Lines 610-615 Link Here
610	lib/X11/xkb/symbols/pc/dev	626	lib/X11/xkb/symbols/pc/dev
611	lib/X11/xkb/symbols/pc/dk	627	lib/X11/xkb/symbols/pc/dk
612	lib/X11/xkb/symbols/pc/dvorak	628	lib/X11/xkb/symbols/pc/dvorak
		629	lib/X11/xkb/symbols/pc/dz
613	lib/X11/xkb/symbols/pc/ee	630	lib/X11/xkb/symbols/pc/ee
614	lib/X11/xkb/symbols/pc/el	631	lib/X11/xkb/symbols/pc/el
615	lib/X11/xkb/symbols/pc/en_US	632	lib/X11/xkb/symbols/pc/en_US
Lines 653-658 Link Here
653	lib/X11/xkb/symbols/pc/ru	670	lib/X11/xkb/symbols/pc/ru
654	lib/X11/xkb/symbols/pc/sapmi	671	lib/X11/xkb/symbols/pc/sapmi
655	lib/X11/xkb/symbols/pc/se	672	lib/X11/xkb/symbols/pc/se
		673	lib/X11/xkb/symbols/pc/se_FI
		674	lib/X11/xkb/symbols/pc/se_NO
		675	lib/X11/xkb/symbols/pc/se_SE
656	lib/X11/xkb/symbols/pc/si	676	lib/X11/xkb/symbols/pc/si
657	lib/X11/xkb/symbols/pc/sk	677	lib/X11/xkb/symbols/pc/sk
658	lib/X11/xkb/symbols/pc/sk_qwerty	678	lib/X11/xkb/symbols/pc/sk_qwerty
Lines 661-671 Link Here
661	lib/X11/xkb/symbols/pc/syr_phonetic	681	lib/X11/xkb/symbols/pc/syr_phonetic
662	lib/X11/xkb/symbols/pc/tel	682	lib/X11/xkb/symbols/pc/tel
663	lib/X11/xkb/symbols/pc/th	683	lib/X11/xkb/symbols/pc/th
		684	lib/X11/xkb/symbols/pc/th_pat
		685	lib/X11/xkb/symbols/pc/th_tis
664	lib/X11/xkb/symbols/pc/tj	686	lib/X11/xkb/symbols/pc/tj
665	lib/X11/xkb/symbols/pc/tml	687	lib/X11/xkb/symbols/pc/tml
666	lib/X11/xkb/symbols/pc/tr	688	lib/X11/xkb/symbols/pc/tr
667	lib/X11/xkb/symbols/pc/ua	689	lib/X11/xkb/symbols/pc/ua
668	lib/X11/xkb/symbols/pc/us	690	lib/X11/xkb/symbols/pc/us
		691	lib/X11/xkb/symbols/pc/us_intl
		692	lib/X11/xkb/symbols/pc/uz
669	lib/X11/xkb/symbols/pc/yu	693	lib/X11/xkb/symbols/pc/yu
670	lib/X11/xkb/symbols/pc104	694	lib/X11/xkb/symbols/pc104
671	lib/X11/xkb/symbols/pl	695	lib/X11/xkb/symbols/pl
Lines 673-680 Link Here
673	lib/X11/xkb/symbols/pt	697	lib/X11/xkb/symbols/pt
674	lib/X11/xkb/symbols/ralt	698	lib/X11/xkb/symbols/ralt
675	lib/X11/xkb/symbols/ro	699	lib/X11/xkb/symbols/ro
		700	lib/X11/xkb/symbols/ro2
676	lib/X11/xkb/symbols/ru	701	lib/X11/xkb/symbols/ru
677	lib/X11/xkb/symbols/ru_yawerty
678	lib/X11/xkb/symbols/sapmi	702	lib/X11/xkb/symbols/sapmi
679	lib/X11/xkb/symbols/se	703	lib/X11/xkb/symbols/se
680	lib/X11/xkb/symbols/se_FI	704	lib/X11/xkb/symbols/se_FI
Lines 689-698 Link Here
689	lib/X11/xkb/symbols/srvr_ctrl	713	lib/X11/xkb/symbols/srvr_ctrl
690	lib/X11/xkb/symbols/sun/se	714	lib/X11/xkb/symbols/sun/se
691	lib/X11/xkb/symbols/sun/us	715	lib/X11/xkb/symbols/sun/us
		716	lib/X11/xkb/symbols/sun/usb
692	lib/X11/xkb/symbols/syr	717	lib/X11/xkb/symbols/syr
693	lib/X11/xkb/symbols/syr_phonetic	718	lib/X11/xkb/symbols/syr_phonetic
694	lib/X11/xkb/symbols/tel	719	lib/X11/xkb/symbols/tel
695	lib/X11/xkb/symbols/th	720	lib/X11/xkb/symbols/th
		721	lib/X11/xkb/symbols/th_pat
		722	lib/X11/xkb/symbols/th_tis
696	lib/X11/xkb/symbols/tj	723	lib/X11/xkb/symbols/tj
697	lib/X11/xkb/symbols/tml	724	lib/X11/xkb/symbols/tml
698	lib/X11/xkb/symbols/tr	725	lib/X11/xkb/symbols/tr
Lines 702-707 Link Here
702	lib/X11/xkb/symbols/us_group2	729	lib/X11/xkb/symbols/us_group2
703	lib/X11/xkb/symbols/us_group3	730	lib/X11/xkb/symbols/us_group3
704	lib/X11/xkb/symbols/us_intl	731	lib/X11/xkb/symbols/us_intl
		732	lib/X11/xkb/symbols/uz
705	lib/X11/xkb/symbols/vn	733	lib/X11/xkb/symbols/vn
706	lib/X11/xkb/symbols/xfree68/amiga	734	lib/X11/xkb/symbols/xfree68/amiga
707	lib/X11/xkb/symbols/xfree68/ataritt	735	lib/X11/xkb/symbols/xfree68/ataritt
Lines 715-720 Link Here
715	lib/X11/xkb/types/extra	743	lib/X11/xkb/types/extra
716	lib/X11/xkb/types/iso9995	744	lib/X11/xkb/types/iso9995
717	lib/X11/xkb/types/mousekeys	745	lib/X11/xkb/types/mousekeys
		746	lib/X11/xkb/types/numpad
718	lib/X11/xkb/types/pc	747	lib/X11/xkb/types/pc
719	lib/X11/xkb/xkbcomp	748	lib/X11/xkb/xkbcomp
720	lib/X11/xman.help	749	lib/X11/xman.help

Removed Link Here

(-)files/patch-Xres.cpp (-50 lines)
1	--- programs/xdm/config/Xres.cpp.orig Sat Jan 3 15:50:37 2004
2	+++ programs/xdm/config/Xres.cpp Sat Jan 3 15:53:22 2004
3	@@ -28,7 +28,7 @@
4	#endif /* XPM */
5	xlogin*fail: Login incorrect
6	#ifdef XPM
7	-/**/#if WIDTH > 800
8	+XHASHif WIDTH > 800
9	xlogin*greetFont: -adobe-helvetica-bold-o-normal--24-240-75-75-p-138-iso8859-1
10	xlogin*font: -adobe-helvetica-medium-r-normal--18-180-75-75-p-98-iso8859-1
11	xlogin*promptFont: -adobe-helvetica-bold-r-normal--18-180-75-75-p-103-iso8859-1
12	@@ -38,9 +38,9 @@
13	xlogin*font: -adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1
14	xlogin*promptFont: -adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1
15	xlogin*failFont: -adobe-helvetica-bold-o-normal--14-140-75-75-p-82-iso8859-1
16	-/**/#endif
17	+XHASHendif
18	#endif /* XPM */
19	-/**/#ifdef COLOR
20	+XHASHifdef COLOR
21	#ifndef XPM
22	xlogin*greetColor: CadetBlue
23	#else
24	@@ -56,7 +56,7 @@
25	xlogin*failColor: red
26	*Foreground: black
27	*Background: #fffff0
28	-/**/#else
29	+XHASHelse
30	#ifdef XPM
31	xlogin*borderWidth: 3
32	xlogin*frameWidth: 0
33	@@ -68,13 +68,13 @@
34	xlogin*Foreground: black
35	xlogin*Background: white
36	#endif /* XPM */
37	-/**/#endif
38	+XHASHendif
39	#ifdef XPM
40	-/**/#if PLANES >= 8
41	+XHASHif PLANES >= 8
42	xloginlogoFileName: BITMAPDIR/*//XDM_PIXMAP
43	-/**/#else
44	+XHASHelse
45	xloginlogoFileName: BITMAPDIR/*//XDM_BWPIXMAP
46	-/**/#endif
47	+XHASHendif
48	xlogin*useShape: true
49	xlogin*logoPadding: 10
50	#endif /* XPM */

Removed Link Here

(-)files/patch-mkfontscale.c (-12 lines)
1	--- programs/mkfontscale/mkfontscale.c.orig Wed Mar 17 07:01:52 2004
2	+++ programs/mkfontscale/mkfontscale.c Wed Mar 17 07:03:10 2004
3	@@ -29,7 +29,8 @@
4	#include <dirent.h>
5
6	#include <X11/fonts/fontenc.h>
7	-#include <freetype/freetype.h>
8	+#include <ft2build.h>
9	+#include FT_FREETYPE_H
10	#include <freetype/ftsnames.h>
11	#include <freetype/tttables.h>
12	#include <freetype/ttnameid.h>

Added Link Here

(-)files/patch-programs::xdm::Imakefile (+14 lines)
1	--- programs/xdm/Imakefile.old Wed Jun 30 22:11:46 2004
2	+++ programs/xdm/Imakefile Wed Jun 30 22:12:12 2004
3	@@ -31,7 +31,11 @@
4	#endif
5
6	#if HasSecureRPC
7	+#if defined(FreeBSDArchitecture) && (OSMajorVersion < 5)
8	+RPC_DEFINES = -DSECURE_RPC -DFREEBSD_OLD_RPC
9	+#else
10	RPC_DEFINES = -DSECURE_RPC
11	+#endif
12	RPCOBJS = rpcauth.o
13	RPCSRCS = rpcauth.c
14	RPCLIB = -lrpcsvc

Added Link Here

(-)files/patch-programs::xdm::session.c (+27 lines)
1	--- programs/xdm/session.c.old Wed Jun 30 22:12:02 2004
2	+++ programs/xdm/session.c Wed Jun 30 22:12:21 2004
3	@@ -54,8 +54,12 @@
4	#ifdef SECURE_RPC
5	# include <rpc/rpc.h>
6	# include <rpc/key_prot.h>
7	+#ifdef FREEBSD_OLD_RPC
8	+extern int key_setnet(struct netstarg *arg);
9	+#else
10	extern int key_setnet(struct key_netstarg *arg);
11	#endif
12	+#endif
13	#ifdef K5AUTH
14	# include <krb5/krb5.h>
15	#endif
16	@@ -643,7 +647,11 @@
17	char netname[MAXNETNAMELEN+1], secretkey[HEXKEYBYTES+1];
18	int nameret, keyret;
19	int len;
20	+#ifdef FREEBSD_OLD_RPC
21	+ struct netstarg netst;
22	+#else
23	struct key_netstarg netst;
24	+#endif
25	int key_set_ok = 0;
26
27	nameret = getnetname (netname);

Added Link Here

(-)files/patch-programs::xdm::socket.c (+12 lines)
1	--- programs/xdm/socket.c.orig Thu Jun 3 05:38:29 2004
2	+++ programs/xdm/socket.c Thu Jun 3 05:40:54 2004
3	@@ -66,6 +66,9 @@
4	char *name = localHostname ();
5	registerHostname (name, strlen (name));
6
7	+ if (request_port == 0)
8	+ return;
9	+
10	#if defined(IPv6) && defined(AF_INET6)
11	chooserFd = socket (AF_INET6, SOCK_STREAM, 0);
12	#else