summaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/XFree86-4-clients/Makefile36
-rw-r--r--x11/XFree86-4-clients/distinfo7
-rw-r--r--x11/XFree86-4-clients/files/manpages17
-rw-r--r--x11/XFree86-4-clients/pkg-plist351
-rw-r--r--x11/XFree86-4-clients/scripts/configure104
-rw-r--r--x11/XFree86-4-documents/Makefile20
-rw-r--r--x11/XFree86-4-documents/distinfo6
-rw-r--r--x11/XFree86-4-documents/files/patch-0114
-rw-r--r--x11/XFree86-4-documents/files/patch-044
-rw-r--r--x11/XFree86-4-documents/pkg-plist4
-rw-r--r--x11/XFree86-4-libraries/Makefile64
-rw-r--r--x11/XFree86-4-libraries/Makefile.inc7
-rw-r--r--x11/XFree86-4-libraries/distinfo5
-rw-r--r--x11/XFree86-4-libraries/files/patch-235
-rw-r--r--x11/XFree86-4-libraries/files/patch-DRI50
-rw-r--r--x11/XFree86-4-libraries/files/patch-FreeBSD.cf77
-rw-r--r--x11/XFree86-4-libraries/files/patch-Imake.cf16
-rw-r--r--x11/XFree86-4-libraries/files/patch-Imake.rules48
-rw-r--r--x11/XFree86-4-libraries/files/patch-Imake.tmpl (renamed from x11/XFree86-4-libraries/files/patch-c)33
-rw-r--r--x11/XFree86-4-libraries/files/patch-UIThrStubs.c32
-rw-r--r--x11/XFree86-4-libraries/files/patch-X11.tmpl38
-rw-r--r--x11/XFree86-4-libraries/files/patch-XTT48
-rw-r--r--x11/XFree86-4-libraries/files/patch-XlcDL.c15
-rw-r--r--x11/XFree86-4-libraries/files/patch-bsdLib.rules37
-rw-r--r--x11/XFree86-4-libraries/files/patch-common_x86.c32
-rw-r--r--x11/XFree86-4-libraries/files/patch-d142
-rw-r--r--x11/XFree86-4-libraries/files/patch-decode.c35
-rw-r--r--x11/XFree86-4-libraries/files/patch-do_text.c17
-rw-r--r--x11/XFree86-4-libraries/files/patch-dps24
-rw-r--r--x11/XFree86-4-libraries/files/patch-dri-Imakefile11
-rw-r--r--x11/XFree86-4-libraries/files/patch-drilx1199
-rw-r--r--x11/XFree86-4-libraries/files/patch-drmclean17
-rw-r--r--x11/XFree86-4-libraries/files/patch-f97
-rw-r--r--x11/XFree86-4-libraries/files/patch-freetype26
-rw-r--r--x11/XFree86-4-libraries/files/patch-h74
-rw-r--r--x11/XFree86-4-libraries/files/patch-imLcPrs.c18
-rw-r--r--x11/XFree86-4-libraries/files/patch-imake.c22
-rw-r--r--x11/XFree86-4-libraries/files/patch-ioctl12
-rw-r--r--x11/XFree86-4-libraries/files/patch-joycal.c11
-rw-r--r--x11/XFree86-4-libraries/files/patch-lib-Imakefile11
-rw-r--r--x11/XFree86-4-libraries/files/patch-luit61
-rw-r--r--x11/XFree86-4-libraries/files/patch-mouse.c13
-rw-r--r--x11/XFree86-4-libraries/files/patch-programs-Imakefile11
-rw-r--r--x11/XFree86-4-libraries/files/patch-programs::Xserver::hw::xfree86::drivers::s3::s3_driver.c25
-rw-r--r--x11/XFree86-4-libraries/files/patch-s0211
-rw-r--r--x11/XFree86-4-libraries/files/patch-sysvipc34
-rw-r--r--x11/XFree86-4-libraries/files/patch-t0134
-rw-r--r--x11/XFree86-4-libraries/files/patch-ttcalc.c11
-rw-r--r--x11/XFree86-4-libraries/files/patch-x11perf-Imakefile11
-rw-r--r--x11/XFree86-4-libraries/files/patch-xdm-config11
-rw-r--r--x11/XFree86-4-libraries/files/patch-xdm_session.c27
-rw-r--r--x11/XFree86-4-libraries/files/patch-xf86.tmpl19
-rw-r--r--x11/XFree86-4-libraries/files/patch-xfree86.cf11
-rw-r--r--x11/XFree86-4-libraries/files/patch-z0611
-rw-r--r--x11/XFree86-4-libraries/files/patch-z1610
-rw-r--r--x11/XFree86-4-libraries/files/patch-z3711
-rw-r--r--x11/XFree86-4-libraries/files/patch-z3912
-rw-r--r--x11/XFree86-4-libraries/files/patch-z4015
-rw-r--r--x11/XFree86-4-libraries/files/patch-z4211
-rw-r--r--x11/XFree86-4-libraries/files/patch-z4316
-rw-r--r--x11/XFree86-4-libraries/files/patch-z4511
-rw-r--r--x11/XFree86-4-libraries/files/patch-z4611
-rw-r--r--x11/XFree86-4-libraries/pkg-plist75
-rw-r--r--x11/XFree86-4-libraries/scripts/configure95
-rw-r--r--x11/XFree86-4-manuals/Makefile2
-rw-r--r--x11/XFree86-4-manuals/distinfo2
-rw-r--r--x11/XFree86-4-manuals/files/manpages2
-rw-r--r--x11/XFree86-4/Makefile5
-rw-r--r--x11/gnome-fifth-toe/Makefile4
-rw-r--r--x11/kdelibs3/Makefile2
-rw-r--r--x11/kdelibs4/Makefile2
71 files changed, 839 insertions, 1453 deletions
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index 93e7077..bf8844a 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -6,24 +6,22 @@
#
PORTNAME= clients
-PORTVERSION= 4.2.1
-PORTREVISION= 3
+PORTVERSION= 4.3.0
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR= 4.2.0
+MASTER_SITE_SUBDIR= 4.3.0
PKGNAMEPREFIX= XFree86-
-DISTFILES= X420src-1.tgz X420src-2.tgz
-EXTRACT_ONLY= X420src-1.tgz
-
-PATCH_SITES= ${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR= anholt/patches-4.2.0/
-PATCHFILES= 4.2.0-4.2.1-1-freebsd.patch.gz
+DISTFILES= X430src-1.tgz \
+ X430src-2.tgz \
+ X430src-3.tgz \
+ X430src-4.tgz
MAINTAINER= anholt@freebsd.org
-COMMENT= XFree86-4 Client environments
+COMMENT= XFree86-4 client programs and related files
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
- GLU.1:${PORTSDIR}/x11/XFree86-4-libraries \
+ Xcursor.1:${PORTSDIR}/x11/XFree86-4-libraries \
+ png.5:${PORTSDIR}/graphics/png \
Xft.2:${PORTSDIR}/x11-fonts/Xft
XFREE86_VERSION= 4
@@ -34,8 +32,6 @@ PATCHDIR= ${.CURDIR}/../XFree86-4-libraries/files
SCRIPTS_ENV= InstallXdmConfig=${InstallXdmConfig} \
InstallXinitConfig=${InstallXinitConfig} \
InstallAppDefFiles=${InstallAppDefFiles} \
- HasSecureRPC=${HasSecureRPC} \
- HasPam=${HasPam} \
CC="${CC}" \
CXX="${CXX}" \
CFLAGS="${CFLAGS}"
@@ -61,20 +57,6 @@ XINSTALL_MAN_DIRS= programs
InstallXdmConfig?= DEFAULT
InstallXinitConfig?= DEFAULT
InstallAppDefFiles?= DEFAULT
-HasSecureRPC?= DEFAULT
-HasPam?= DEFAULT
-
-post-extract:
- ( cd ${WRKDIR} && \
- ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
- ${DISTDIR}/${DIST_SUBDIR}/X420src-2.tgz \
- | ${TAR} -xf - xc/fonts/util )
-
-post-patch:
- cd ${WRKSRC}/nls; \
- for i in Compose XI18N_OBJS XLC_LOCALE; do \
- ${LN} -s zh_TW.big5 $$i/zh_TW.Big5; \
- done
.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
.include <bsd.port.pre.mk>
diff --git a/x11/XFree86-4-clients/distinfo b/x11/XFree86-4-clients/distinfo
index 82d6aaf..ce75fce 100644
--- a/x11/XFree86-4-clients/distinfo
+++ b/x11/XFree86-4-clients/distinfo
@@ -1,3 +1,4 @@
-MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
-MD5 (xc/X420src-2.tgz) = dae33268a9f2735b9678a81fb23e8d3e
-MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274
+MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af
+MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4
+MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6
+MD5 (xc/X430src-4.tgz) = 567903747018f2534965ab6cb3976b38
diff --git a/x11/XFree86-4-clients/files/manpages b/x11/XFree86-4-clients/files/manpages
index c7b83b3..11b2398 100644
--- a/x11/XFree86-4-clients/files/manpages
+++ b/x11/XFree86-4-clients/files/manpages
@@ -22,6 +22,7 @@ MAN1= Xmark.1 \
makepsres.1 \
mkcfm.1 \
mkfontdir.1 \
+ mkfontscale.1 \
oclock.1 \
proxymngr.1 \
resize.1 \
@@ -46,6 +47,7 @@ MAN1= Xmark.1 \
xclock.1 \
xcmsdb.1 \
xconsole.1 \
+ xcursorgen.1 \
xcutsel.1 \
xditview.1 \
xdm.1 \
@@ -61,7 +63,6 @@ MAN1= Xmark.1 \
xgamma.1 \
xgc.1 \
xhost.1 \
- xieperf.1 \
xinit.1 \
xkbcomp.1 \
xkbevd.1 \
@@ -79,6 +80,7 @@ MAN1= Xmark.1 \
xmodmap.1 \
xon.1 \
xprop.1 \
+ xrandr.1 \
xrdb.1 \
xrefresh.1 \
xset.1 \
@@ -88,12 +90,6 @@ MAN1= Xmark.1 \
xsm.1 \
xstdcmap.1 \
xterm.1 \
- xvidtune.1 \
- xvinfo.1 \
- xwd.1 \
- xwininfo.1 \
- xwud.1 \
- xrandr.1 \
xtrap.1 \
xtrapchar.1 \
xtrapin.1 \
@@ -101,4 +97,9 @@ MAN1= Xmark.1 \
xtrapout.1 \
xtrapproto.1 \
xtrapreset.1 \
- xtrapstats.1
+ xtrapstats.1 \
+ xvidtune.1 \
+ xvinfo.1 \
+ xwd.1 \
+ xwininfo.1 \
+ xwud.1
diff --git a/x11/XFree86-4-clients/pkg-plist b/x11/XFree86-4-clients/pkg-plist
index 70ce68d..7c9a0cd 100644
--- a/x11/XFree86-4-clients/pkg-plist
+++ b/x11/XFree86-4-clients/pkg-plist
@@ -2,7 +2,7 @@ bin/Xmark
bin/appres
bin/atobm
bin/bdftopcf
-bin/bdftruncate.pl
+bin/bdftruncate
bin/beforelight
bin/bitmap
bin/bmtoa
@@ -23,6 +23,7 @@ bin/luit
bin/makepsres
bin/mkcfm
bin/mkfontdir
+bin/mkfontscale
bin/oclock
bin/proxymngr
bin/resize
@@ -37,7 +38,7 @@ bin/startx
bin/sxpm
bin/texteroids
bin/twm
-bin/ucs2any.pl
+bin/ucs2any
bin/uxterm
bin/viewres
bin/x11perf
@@ -49,6 +50,7 @@ bin/xclipboard
bin/xclock
bin/xcmsdb
bin/xconsole
+bin/xcursorgen
bin/xcutsel
bin/xditview
bin/xdm
@@ -64,7 +66,6 @@ bin/xfwp
bin/xgamma
bin/xgc
bin/xhost
-bin/xieperf
bin/xinit
bin/xkbbell
bin/xkbcomp
@@ -154,11 +155,18 @@ lib/X11/app-defaults/Xgc
lib/X11/app-defaults/Xmag
lib/X11/app-defaults/Xman
lib/X11/app-defaults/Xmessage
+lib/X11/app-defaults/Xmessage-color
lib/X11/app-defaults/Xmh
lib/X11/app-defaults/Xvidtune
lib/X11/etc/xterm.termcap
lib/X11/etc/xterm.terminfo
lib/X11/fonts/util/map-ISO8859-1
+lib/X11/fonts/util/map-ISO8859-10
+lib/X11/fonts/util/map-ISO8859-11
+lib/X11/fonts/util/map-ISO8859-13
+lib/X11/fonts/util/map-ISO8859-14
+lib/X11/fonts/util/map-ISO8859-15
+lib/X11/fonts/util/map-ISO8859-16
lib/X11/fonts/util/map-ISO8859-2
lib/X11/fonts/util/map-ISO8859-3
lib/X11/fonts/util/map-ISO8859-4
@@ -166,18 +174,169 @@ lib/X11/fonts/util/map-ISO8859-5
lib/X11/fonts/util/map-ISO8859-7
lib/X11/fonts/util/map-ISO8859-8
lib/X11/fonts/util/map-ISO8859-9
-lib/X11/fonts/util/map-ISO8859-10
-lib/X11/fonts/util/map-ISO8859-13
-lib/X11/fonts/util/map-ISO8859-14
-lib/X11/fonts/util/map-ISO8859-15
lib/X11/fonts/util/map-JISX0201.1976-0
lib/X11/fonts/util/map-KOI8-R
+lib/X11/icons/default/index.theme
+lib/X11/icons/handhelds/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
+lib/X11/icons/handhelds/cursors/X_cursor
+lib/X11/icons/handhelds/cursors/arrow
+lib/X11/icons/handhelds/cursors/based_arrow_down
+lib/X11/icons/handhelds/cursors/based_arrow_up
+lib/X11/icons/handhelds/cursors/bottom_left_corner
+lib/X11/icons/handhelds/cursors/bottom_right_corner
+lib/X11/icons/handhelds/cursors/bottom_side
+lib/X11/icons/handhelds/cursors/bottom_tee
+lib/X11/icons/handhelds/cursors/center_ptr
+lib/X11/icons/handhelds/cursors/circle
+lib/X11/icons/handhelds/cursors/cross
+lib/X11/icons/handhelds/cursors/cross_reverse
+lib/X11/icons/handhelds/cursors/crosshair
+lib/X11/icons/handhelds/cursors/dot
+lib/X11/icons/handhelds/cursors/dotbox
+lib/X11/icons/handhelds/cursors/double_arrow
+lib/X11/icons/handhelds/cursors/draft_large
+lib/X11/icons/handhelds/cursors/draft_small
+lib/X11/icons/handhelds/cursors/draped_box
+lib/X11/icons/handhelds/cursors/fleur
+lib/X11/icons/handhelds/cursors/gumby
+lib/X11/icons/handhelds/cursors/hand2
+lib/X11/icons/handhelds/cursors/left_ptr
+lib/X11/icons/handhelds/cursors/left_ptr_watch
+lib/X11/icons/handhelds/cursors/left_side
+lib/X11/icons/handhelds/cursors/left_tee
+lib/X11/icons/handhelds/cursors/ll_angle
+lib/X11/icons/handhelds/cursors/pencil
+lib/X11/icons/handhelds/cursors/plus
+lib/X11/icons/handhelds/cursors/right_ptr
+lib/X11/icons/handhelds/cursors/right_side
+lib/X11/icons/handhelds/cursors/right_tee
+lib/X11/icons/handhelds/cursors/sb_h_double_arrow
+lib/X11/icons/handhelds/cursors/sb_right_arrow
+lib/X11/icons/handhelds/cursors/sb_up_arrow
+lib/X11/icons/handhelds/cursors/sb_v_double_arrow
+lib/X11/icons/handhelds/cursors/shuttle
+lib/X11/icons/handhelds/cursors/tcross
+lib/X11/icons/handhelds/cursors/top_left_arrow
+lib/X11/icons/handhelds/cursors/top_left_corner
+lib/X11/icons/handhelds/cursors/top_right_corner
+lib/X11/icons/handhelds/cursors/top_side
+lib/X11/icons/handhelds/cursors/top_tee
+lib/X11/icons/handhelds/cursors/watch
+lib/X11/icons/handhelds/cursors/xterm
+lib/X11/icons/redglass/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
+lib/X11/icons/redglass/cursors/X_cursor
+lib/X11/icons/redglass/cursors/arrow
+lib/X11/icons/redglass/cursors/based_arrow_down
+lib/X11/icons/redglass/cursors/based_arrow_up
+lib/X11/icons/redglass/cursors/bottom_left_corner
+lib/X11/icons/redglass/cursors/bottom_right_corner
+lib/X11/icons/redglass/cursors/bottom_side
+lib/X11/icons/redglass/cursors/bottom_tee
+lib/X11/icons/redglass/cursors/center_ptr
+lib/X11/icons/redglass/cursors/circle
+lib/X11/icons/redglass/cursors/cross
+lib/X11/icons/redglass/cursors/cross_reverse
+lib/X11/icons/redglass/cursors/crosshair
+lib/X11/icons/redglass/cursors/dot
+lib/X11/icons/redglass/cursors/dotbox
+lib/X11/icons/redglass/cursors/double_arrow
+lib/X11/icons/redglass/cursors/draft_large
+lib/X11/icons/redglass/cursors/draft_small
+lib/X11/icons/redglass/cursors/draped_box
+lib/X11/icons/redglass/cursors/fleur
+lib/X11/icons/redglass/cursors/gumby
+lib/X11/icons/redglass/cursors/hand2
+lib/X11/icons/redglass/cursors/left_ptr
+lib/X11/icons/redglass/cursors/left_ptr_watch
+lib/X11/icons/redglass/cursors/left_side
+lib/X11/icons/redglass/cursors/left_tee
+lib/X11/icons/redglass/cursors/ll_angle
+lib/X11/icons/redglass/cursors/pencil
+lib/X11/icons/redglass/cursors/plus
+lib/X11/icons/redglass/cursors/right_ptr
+lib/X11/icons/redglass/cursors/right_side
+lib/X11/icons/redglass/cursors/right_tee
+lib/X11/icons/redglass/cursors/sb_h_double_arrow
+lib/X11/icons/redglass/cursors/sb_right_arrow
+lib/X11/icons/redglass/cursors/sb_up_arrow
+lib/X11/icons/redglass/cursors/sb_v_double_arrow
+lib/X11/icons/redglass/cursors/shuttle
+lib/X11/icons/redglass/cursors/tcross
+lib/X11/icons/redglass/cursors/top_left_arrow
+lib/X11/icons/redglass/cursors/top_left_corner
+lib/X11/icons/redglass/cursors/top_right_corner
+lib/X11/icons/redglass/cursors/top_side
+lib/X11/icons/redglass/cursors/top_tee
+lib/X11/icons/redglass/cursors/watch
+lib/X11/icons/redglass/cursors/xterm
+lib/X11/icons/whiteglass/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
+lib/X11/icons/whiteglass/cursors/X_cursor
+lib/X11/icons/whiteglass/cursors/arrow
+lib/X11/icons/whiteglass/cursors/base_arrow_down
+lib/X11/icons/whiteglass/cursors/base_arrow_up
+lib/X11/icons/whiteglass/cursors/boat
+lib/X11/icons/whiteglass/cursors/bottom_left_corner
+lib/X11/icons/whiteglass/cursors/bottom_right_corner
+lib/X11/icons/whiteglass/cursors/bottom_side
+lib/X11/icons/whiteglass/cursors/bottom_tee
+lib/X11/icons/whiteglass/cursors/center_ptr
+lib/X11/icons/whiteglass/cursors/circle
+lib/X11/icons/whiteglass/cursors/cross
+lib/X11/icons/whiteglass/cursors/cross_reverse
+lib/X11/icons/whiteglass/cursors/crosshair
+lib/X11/icons/whiteglass/cursors/dot
+lib/X11/icons/whiteglass/cursors/dot_box_mask
+lib/X11/icons/whiteglass/cursors/double_arrow
+lib/X11/icons/whiteglass/cursors/draft_large
+lib/X11/icons/whiteglass/cursors/draft_small
+lib/X11/icons/whiteglass/cursors/draped_box
+lib/X11/icons/whiteglass/cursors/exchange
+lib/X11/icons/whiteglass/cursors/fleur
+lib/X11/icons/whiteglass/cursors/gumby
+lib/X11/icons/whiteglass/cursors/hand1
+lib/X11/icons/whiteglass/cursors/hand2
+lib/X11/icons/whiteglass/cursors/left_ptr
+lib/X11/icons/whiteglass/cursors/left_ptr_watch
+lib/X11/icons/whiteglass/cursors/left_side
+lib/X11/icons/whiteglass/cursors/left_tee
+lib/X11/icons/whiteglass/cursors/ll_angle
+lib/X11/icons/whiteglass/cursors/lr_angle
+lib/X11/icons/whiteglass/cursors/pencil
+lib/X11/icons/whiteglass/cursors/pirate
+lib/X11/icons/whiteglass/cursors/plus
+lib/X11/icons/whiteglass/cursors/question_arrow
+lib/X11/icons/whiteglass/cursors/right_ptr
+lib/X11/icons/whiteglass/cursors/right_side
+lib/X11/icons/whiteglass/cursors/right_tee
+lib/X11/icons/whiteglass/cursors/sailboat
+lib/X11/icons/whiteglass/cursors/sb_down_arrow
+lib/X11/icons/whiteglass/cursors/sb_h_double_arrow
+lib/X11/icons/whiteglass/cursors/sb_left_arrow
+lib/X11/icons/whiteglass/cursors/sb_right_arrow
+lib/X11/icons/whiteglass/cursors/sb_up_arrow
+lib/X11/icons/whiteglass/cursors/sb_v_double_arrow
+lib/X11/icons/whiteglass/cursors/shuttle
+lib/X11/icons/whiteglass/cursors/sizing
+lib/X11/icons/whiteglass/cursors/target
+lib/X11/icons/whiteglass/cursors/tcross
+lib/X11/icons/whiteglass/cursors/top_left_arrow
+lib/X11/icons/whiteglass/cursors/top_left_corner
+lib/X11/icons/whiteglass/cursors/top_right_corner
+lib/X11/icons/whiteglass/cursors/top_side
+lib/X11/icons/whiteglass/cursors/top_tee
+lib/X11/icons/whiteglass/cursors/trek
+lib/X11/icons/whiteglass/cursors/ul_angle
+lib/X11/icons/whiteglass/cursors/ur_angle
+lib/X11/icons/whiteglass/cursors/watch
+lib/X11/icons/whiteglass/cursors/xterm
lib/X11/lbxproxy/AtomControl
lib/X11/proxymngr/pmconfig
lib/X11/rgb.txt
lib/X11/rstart/commands/@List
lib/X11/rstart/commands/ListContexts
lib/X11/rstart/commands/ListGenericCommands
+lib/X11/rstart/commands/x
+lib/X11/rstart/commands/x11
lib/X11/rstart/commands/x11r6/@List
lib/X11/rstart/commands/x11r6/LoadMonitor
lib/X11/rstart/commands/x11r6/Terminal
@@ -204,9 +363,28 @@ lib/X11/xdm/chooser
lib/X11/xdm/pixmaps/XFree86.xpm
lib/X11/xdm/pixmaps/XFree86bw.xpm
lib/X11/xdm/xdm-config
-lib/X11/xedit/lisp/fun.lsp
+lib/X11/xedit/lisp/indent.lsp
+lib/X11/xedit/lisp/lisp.lsp
+lib/X11/xedit/lisp/progmodes/c.lsp
+lib/X11/xedit/lisp/progmodes/html.lsp
+lib/X11/xedit/lisp/progmodes/imake.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/rpm.lsp
+lib/X11/xedit/lisp/progmodes/sgml.lsp
+lib/X11/xedit/lisp/progmodes/sh.lsp
+lib/X11/xedit/lisp/progmodes/xconf.lsp
+lib/X11/xedit/lisp/progmodes/xlog.lsp
+lib/X11/xedit/lisp/progmodes/xrdb.lsp
+lib/X11/xedit/lisp/syntax.lsp
+lib/X11/xedit/lisp/xedit.lsp
lib/X11/xinit/xinitrc
+lib/X11/xkb/README
+lib/X11/xkb/README.config
+lib/X11/xkb/README.enhancing
lib/X11/xkb/compat.dir
+lib/X11/xkb/compat/README
lib/X11/xkb/compat/accessx
lib/X11/xkb/compat/basic
lib/X11/xkb/compat/complete
@@ -221,9 +399,11 @@ lib/X11/xkb/compat/mousekeys
lib/X11/xkb/compat/norepeat
lib/X11/xkb/compat/pc
lib/X11/xkb/compat/pc98
+lib/X11/xkb/compat/xfree86
lib/X11/xkb/compat/xtest
lib/X11/xkb/compiled/README
lib/X11/xkb/geometry.dir
+lib/X11/xkb/geometry/README
lib/X11/xkb/geometry/amiga
lib/X11/xkb/geometry/ataritt
lib/X11/xkb/geometry/dell
@@ -247,6 +427,8 @@ lib/X11/xkb/geometry/sony
lib/X11/xkb/geometry/sun
lib/X11/xkb/geometry/winbook
lib/X11/xkb/keycodes.dir
+lib/X11/xkb/keycodes/README
+lib/X11/xkb/keycodes/aliases
lib/X11/xkb/keycodes/amiga
lib/X11/xkb/keycodes/ataritt
lib/X11/xkb/keycodes/digital/lk
@@ -264,6 +446,7 @@ lib/X11/xkb/keycodes/sun
lib/X11/xkb/keycodes/xfree86
lib/X11/xkb/keycodes/xfree98
lib/X11/xkb/keymap.dir
+lib/X11/xkb/keymap/README
lib/X11/xkb/keymap/amiga
lib/X11/xkb/keymap/ataritt
lib/X11/xkb/keymap/digital/us
@@ -308,6 +491,7 @@ lib/X11/xkb/keymap/sun/uk
lib/X11/xkb/keymap/sun/us
lib/X11/xkb/keymap/xfree86
lib/X11/xkb/keymap/xfree98
+lib/X11/xkb/rules/README
lib/X11/xkb/rules/sgi
lib/X11/xkb/rules/sgi.lst
lib/X11/xkb/rules/sun
@@ -315,24 +499,34 @@ lib/X11/xkb/rules/sun.lst
lib/X11/xkb/rules/xfree86
lib/X11/xkb/rules/xfree86-it.lst
lib/X11/xkb/rules/xfree86.lst
+lib/X11/xkb/rules/xfree86.xml
lib/X11/xkb/semantics/basic
lib/X11/xkb/semantics/complete
lib/X11/xkb/semantics/default
lib/X11/xkb/semantics/xtest
lib/X11/xkb/symbols.dir
+lib/X11/xkb/symbols/README
+lib/X11/xkb/symbols/al
+lib/X11/xkb/symbols/altwin
lib/X11/xkb/symbols/am
+lib/X11/xkb/symbols/ar
lib/X11/xkb/symbols/az
lib/X11/xkb/symbols/be
+lib/X11/xkb/symbols/ben
lib/X11/xkb/symbols/bg
lib/X11/xkb/symbols/br
+lib/X11/xkb/symbols/bs
lib/X11/xkb/symbols/by
lib/X11/xkb/symbols/ca
lib/X11/xkb/symbols/ca_enhanced
+lib/X11/xkb/symbols/compose
lib/X11/xkb/symbols/ctrl
lib/X11/xkb/symbols/cz
lib/X11/xkb/symbols/cz_qwerty
+lib/X11/xkb/symbols/czsk
lib/X11/xkb/symbols/de
lib/X11/xkb/symbols/de_CH
+lib/X11/xkb/symbols/dev
lib/X11/xkb/symbols/digital/lk
lib/X11/xkb/symbols/digital/pc
lib/X11/xkb/symbols/digital/us
@@ -349,19 +543,31 @@ lib/X11/xkb/symbols/fr_CH
lib/X11/xkb/symbols/fujitsu/jp
lib/X11/xkb/symbols/fujitsu/us
lib/X11/xkb/symbols/gb
+lib/X11/xkb/symbols/ge_la
+lib/X11/xkb/symbols/ge_ru
lib/X11/xkb/symbols/group
+lib/X11/xkb/symbols/guj
+lib/X11/xkb/symbols/gur
lib/X11/xkb/symbols/hp/us
lib/X11/xkb/symbols/hr
lib/X11/xkb/symbols/hu
lib/X11/xkb/symbols/hu_US
+lib/X11/xkb/symbols/hu_qwerty
+lib/X11/xkb/symbols/ie
lib/X11/xkb/symbols/il
lib/X11/xkb/symbols/il_phonetic
lib/X11/xkb/symbols/inet
+lib/X11/xkb/symbols/ir
lib/X11/xkb/symbols/is
lib/X11/xkb/symbols/iso9995-3
lib/X11/xkb/symbols/it
+lib/X11/xkb/symbols/iu
lib/X11/xkb/symbols/jp
+lib/X11/xkb/symbols/kan
lib/X11/xkb/symbols/keypad
+lib/X11/xkb/symbols/la
+lib/X11/xkb/symbols/level3
+lib/X11/xkb/symbols/lo
lib/X11/xkb/symbols/lock
lib/X11/xkb/symbols/lt
lib/X11/xkb/symbols/lt_std
@@ -381,74 +587,135 @@ lib/X11/xkb/symbols/macintosh/pt
lib/X11/xkb/symbols/macintosh/se
lib/X11/xkb/symbols/macintosh/us
lib/X11/xkb/symbols/mk
+lib/X11/xkb/symbols/ml
+lib/X11/xkb/symbols/mm
+lib/X11/xkb/symbols/mt
+lib/X11/xkb/symbols/mt_us
lib/X11/xkb/symbols/nec/jp
+lib/X11/xkb/symbols/nl
lib/X11/xkb/symbols/no
+lib/X11/xkb/symbols/ogham
+lib/X11/xkb/symbols/ori
+lib/X11/xkb/symbols/pc/al
+lib/X11/xkb/symbols/pc/am
+lib/X11/xkb/symbols/pc/ar
+lib/X11/xkb/symbols/pc/be
+lib/X11/xkb/symbols/pc/ben
+lib/X11/xkb/symbols/pc/bg
+lib/X11/xkb/symbols/pc/br
+lib/X11/xkb/symbols/pc/by
+lib/X11/xkb/symbols/pc/cz
+lib/X11/xkb/symbols/pc/cz_qwerty
+lib/X11/xkb/symbols/pc/de
+lib/X11/xkb/symbols/pc/dev
+lib/X11/xkb/symbols/pc/dk
+lib/X11/xkb/symbols/pc/dvorak
+lib/X11/xkb/symbols/pc/ee
+lib/X11/xkb/symbols/pc/el
+lib/X11/xkb/symbols/pc/en_US
+lib/X11/xkb/symbols/pc/es
+lib/X11/xkb/symbols/pc/fi
+lib/X11/xkb/symbols/pc/fr
+lib/X11/xkb/symbols/pc/fr-latin9
+lib/X11/xkb/symbols/pc/gb
+lib/X11/xkb/symbols/pc/ge_la
+lib/X11/xkb/symbols/pc/ge_ru
+lib/X11/xkb/symbols/pc/guj
+lib/X11/xkb/symbols/pc/gur
+lib/X11/xkb/symbols/pc/hr
+lib/X11/xkb/symbols/pc/ie
+lib/X11/xkb/symbols/pc/il
+lib/X11/xkb/symbols/pc/il_phonetic
+lib/X11/xkb/symbols/pc/ir
+lib/X11/xkb/symbols/pc/is
+lib/X11/xkb/symbols/pc/it
+lib/X11/xkb/symbols/pc/iu
+lib/X11/xkb/symbols/pc/kan
+lib/X11/xkb/symbols/pc/la
+lib/X11/xkb/symbols/pc/latin
+lib/X11/xkb/symbols/pc/lo
+lib/X11/xkb/symbols/pc/lt
+lib/X11/xkb/symbols/pc/lv
+lib/X11/xkb/symbols/pc/mk
+lib/X11/xkb/symbols/pc/ml
+lib/X11/xkb/symbols/pc/mm
+lib/X11/xkb/symbols/pc/mt
+lib/X11/xkb/symbols/pc/mt_us
+lib/X11/xkb/symbols/pc/nl
+lib/X11/xkb/symbols/pc/no
+lib/X11/xkb/symbols/pc/ogham
+lib/X11/xkb/symbols/pc/ori
+lib/X11/xkb/symbols/pc/pc
+lib/X11/xkb/symbols/pc/pl
+lib/X11/xkb/symbols/pc/pl2
+lib/X11/xkb/symbols/pc/pt
+lib/X11/xkb/symbols/pc/ro
+lib/X11/xkb/symbols/pc/ru
+lib/X11/xkb/symbols/pc/sapmi
+lib/X11/xkb/symbols/pc/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/sr
+lib/X11/xkb/symbols/pc/syr
+lib/X11/xkb/symbols/pc/syr_phonetic
+lib/X11/xkb/symbols/pc/tel
+lib/X11/xkb/symbols/pc/th
+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/yu
lib/X11/xkb/symbols/pc104
lib/X11/xkb/symbols/pl
+lib/X11/xkb/symbols/pl2
lib/X11/xkb/symbols/pt
lib/X11/xkb/symbols/ralt
lib/X11/xkb/symbols/ro
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/se_NO
+lib/X11/xkb/symbols/se_SE
lib/X11/xkb/symbols/sgi/jp
lib/X11/xkb/symbols/si
lib/X11/xkb/symbols/sk
lib/X11/xkb/symbols/sk_qwerty
lib/X11/xkb/symbols/sony/us
lib/X11/xkb/symbols/sr
+lib/X11/xkb/symbols/srvr_ctrl
lib/X11/xkb/symbols/sun/se
lib/X11/xkb/symbols/sun/us
+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/tj
+lib/X11/xkb/symbols/tml
lib/X11/xkb/symbols/tr
+lib/X11/xkb/symbols/tr_f
lib/X11/xkb/symbols/ua
lib/X11/xkb/symbols/us
+lib/X11/xkb/symbols/us_group2
lib/X11/xkb/symbols/us_group3
lib/X11/xkb/symbols/us_intl
lib/X11/xkb/symbols/vn
lib/X11/xkb/symbols/xfree68/amiga
lib/X11/xkb/symbols/xfree68/ataritt
+lib/X11/xkb/symbols/yu
lib/X11/xkb/types.dir
+lib/X11/xkb/types/README
lib/X11/xkb/types/basic
-lib/X11/xkb/types/cancel
+lib/X11/xkb/types/caps
lib/X11/xkb/types/complete
lib/X11/xkb/types/default
lib/X11/xkb/types/extra
lib/X11/xkb/types/iso9995
lib/X11/xkb/types/mousekeys
-lib/X11/xkb/types/nocancel
lib/X11/xkb/types/pc
lib/X11/xkb/xkbcomp
lib/X11/xman.help
lib/X11/xsm/system.xsm
-@unexec rm -f %D/lib/X11/rstart/commands/x
-@unexec rm -f %D/lib/X11/rstart/commands/x11
-lib/X11/xkb/symbols/al
-lib/X11/xkb/symbols/altwin
-lib/X11/xkb/symbols/ar
-lib/X11/xkb/symbols/ben
-lib/X11/xkb/symbols/compose
-lib/X11/xkb/symbols/czsk
-lib/X11/xkb/symbols/dev
-lib/X11/xkb/symbols/ge_la
-lib/X11/xkb/symbols/ge_ru
-lib/X11/xkb/symbols/guj
-lib/X11/xkb/symbols/gur
-lib/X11/xkb/symbols/ir
-lib/X11/xkb/symbols/iu
-lib/X11/xkb/symbols/la
-lib/X11/xkb/symbols/level3
-lib/X11/xkb/symbols/mm
-lib/X11/xkb/symbols/mt
-lib/X11/xkb/symbols/mt_us
-lib/X11/xkb/symbols/nl
-lib/X11/xkb/symbols/pl2
-lib/X11/xkb/symbols/ru_yawerty
-lib/X11/xkb/symbols/sapmi
-lib/X11/xkb/symbols/se_FI
-lib/X11/xkb/symbols/se_NO
-lib/X11/xkb/symbols/se_SE
-lib/X11/xkb/symbols/tj
-lib/X11/xkb/symbols/tml
-lib/X11/xkb/symbols/tr_f
-lib/X11/xkb/symbols/us_group2
-lib/X11/xkb/symbols/yu
diff --git a/x11/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure
index 23b4aeb..6c95904 100644
--- a/x11/XFree86-4-clients/scripts/configure
+++ b/x11/XFree86-4-clients/scripts/configure
@@ -1,14 +1,11 @@
#!/bin/sh
# This script does the following:
-# (1) cp current xf86site.def (it is created by the imake-4 port)
+# (1) cp xf86site.def, installed by imake-4 port,
# to ${WRKDIR}/xc/config/cf.
-# this means this port uses imake-4's config for defaults.
-# (2) Generate temporal config for compiling.
-# Some configs, such as `ForceNormalLib', `FreeBSDBuildXprog', are
-# used locally for compiling this port, so these configs will be generated
-# by this script. These configs will be stored to the `host.def' file,
-# but this host.def will never be installed.
+# this provides settings for the ports system.
+# (2) Create a host.def for this specific port, using
+# host.def as a base.
ORIGDEF=$PREFIX/lib/X11/config/xf86site.def
DESTDEF=$WRKDIR/xc/config/cf/xf86site.def
@@ -16,38 +13,28 @@ ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def
LOCALDEF=$WRKDIR/.config
HOSTDEF=$WRKDIR/xc/config/cf/host.def
-configure () {
- # Use original host.def as initial config file
- rm -f $LOCALDEF
- grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF
- echo "#define ProjectRoot $PREFIX" >> $LOCALDEF
+# Use original host.def as initial config file
+rm -f $LOCALDEF
+grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF
+echo "#define ProjectRoot $PREFIX" >> $LOCALDEF
- # It's good for FreeBSD ports/packages system.
- echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF
- echo "#define InstallXserverSetUID NO" >> $LOCALDEF
+# This is also defined in xf86site.def, but doesn't get
+# picked up for some reason.
+echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF
- # User Config.
- if [ X$HasSecureRPC != XDEFAULT -a X$HasSecureRPC != X ]; then
- echo "#define HasSecureRPC $HasSecureRPC" >> $LOCALDEF
- fi
- if [ X$HasPam != XDEFAULT -a X$HasPam != X ]; then
- echo "#define HasPam $HasPam" >> $LOCALDEF
- fi
- if [ X$InstallXdmConfig != XDEFAULT -a X$InstallXdmConfig != X ]; then
- echo "#define InstallXdmConfig $InstallXdmConfig" >> $LOCALDEF
- fi
- if [ X$InstallXinitConfig != XDEFAULT -a X$InstallXinitConfig != X ]; then
- echo "#define InstallXinitConfig $InstallXinitConfig" >> $LOCALDEF
- fi
- if [ X$InstallAppDefFiles != XDEFAULT -a X$InstallAppDefFiles != X ]; then
- echo "#define InstallAppDefFiles $InstallAppDefFiles" >> $LOCALDEF
- fi
- if [ ! -d /sys -a ! -d /usr/src/sys ]; then
- echo "#define BuildXF86DRI NO" >> $LOCALDEF
- fi
+# User Config.
+if [ X$InstallXdmConfig != XDEFAULT -a X$InstallXdmConfig != X ]; then
+echo "#define InstallXdmConfig $InstallXdmConfig" >> $LOCALDEF
+fi
+if [ X$InstallXinitConfig != XDEFAULT -a X$InstallXinitConfig != X ]; then
+echo "#define InstallXinitConfig $InstallXinitConfig" >> $LOCALDEF
+fi
+if [ X$InstallAppDefFiles != XDEFAULT -a X$InstallAppDefFiles != X ]; then
+echo "#define InstallAppDefFiles $InstallAppDefFiles" >> $LOCALDEF
+fi
- # disable some configs: there are not used this ports
- for i in \
+# disable some options
+for i in \
InstallFSConfig \
BuildServer \
BuildFontServer \
@@ -59,34 +46,33 @@ configure () {
BuildCIDFonts \
BuildCyrillicFonts \
BuildLatin2Fonts \
+ BuildPlugin \
LibHeaders \
- LibInstall \
+ LibInstall \
ForceNormalLib \
ModInstall \
XTrueTypeInstallCConvHeaders
- do \
- echo "#define $i NO" >> $LOCALDEF
- done
- echo "#define LibInstallBuild YES" >> $LOCALDEF
- echo "#define FreeBSDBuildXlib NO" >> $LOCALDEF
- echo "#define FreeBSDBuildXbin YES" >> $LOCALDEF
- echo "#define StandardIncludes -I$PREFIX/include" >> $LOCALDEF
- echo "#define DontUseLibPathVar YES" >> $LOCALDEF
- echo "#define PreloadSetup" >> $LOCALDEF
- echo "#define BuildPlugin NO" >> $LOCALDEF
- echo "#define UseInstalledPrograms YES" >> $LOCALDEF
- echo "#define FreeBSDCC ${CC}" >> $LOCALDEF
- echo "#define FreeBSDCXX ${CXX}" >> $LOCALDEF
- echo "#define FreeBSDCFLAGS ${CFLAGS}" >> $LOCALDEF
+do \
+ echo "#define $i NO" >> $LOCALDEF
+done
- # Copy ORIGDEF to DESTDEF
- rm -f $DESTDEF
- cp -f $ORIGDEF $DESTDEF
+echo "#define FreeBSDCC ${CC}" >> $LOCALDEF
+echo "#define FreeBSDCXX ${CXX}" >> $LOCALDEF
+echo "#define FreeBSDCFLAGS ${CFLAGS}" >> $LOCALDEF
- # copy generated config to host.def
- cp -f $LOCALDEF $HOSTDEF
-}
+echo "#define LibInstallBuild YES" >> $LOCALDEF
+echo "#define FreeBSDBuildXlib NO" >> $LOCALDEF
+echo "#define FreeBSDBuildXbin YES" >> $LOCALDEF
+echo "#define StandardIncludes -I$PREFIX/include" >> $LOCALDEF
+echo "#define DontUseLibPathVar YES" >> $LOCALDEF
+echo "#define PreloadSetup" >> $LOCALDEF
+echo "#define UseInstalledPrograms YES" >> $LOCALDEF
+
+# Copy ORIGDEF to DESTDEF
+rm -f $DESTDEF
+cp -f $ORIGDEF $DESTDEF
+
+# copy generated config to host.def
+cp -f $LOCALDEF $HOSTDEF
-cp ${X11BASE}/lib/X11/config/version.def ${WRKSRC}/config/cf
-configure
exit 0
diff --git a/x11/XFree86-4-documents/Makefile b/x11/XFree86-4-documents/Makefile
index 0ac55f4..9f085a2 100644
--- a/x11/XFree86-4-documents/Makefile
+++ b/x11/XFree86-4-documents/Makefile
@@ -6,30 +6,22 @@
#
PORTNAME= documents
-PORTVERSION= 4.2.0
+PORTVERSION= 4.3.0
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XFREE}
MASTER_SITE_SUBDIR= ${PORTVERSION}
PKGNAMEPREFIX= XFree86-
-DISTFILES= X${PORTVERSION:S/.//g}src-1.tgz X${PORTVERSION:S/.//g}src-2.tgz X${PORTVERSION:S/.//g}src-3.tgz
-EXTRACT_ONLY= X${PORTVERSION:S/.//g}src-2.tgz X${PORTVERSION:S/.//g}src-3.tgz
+DISTFILES= X430src-1.tgz \
+ X430src-6.tgz
MAINTAINER= anholt@freebsd.org
-COMMENT= XFree86-4 Document Files
+COMMENT= XFree86-4 documentation
XFREE86_VERSION= 4
USE_IMAKE= YES
PROJECTROOT= -DProjectRoot=${PREFIX}
DIST_SUBDIR= xc
-WRKSRC= ${WRKDIR}/xc/doc
-DEFFILE= ${PREFIX}/lib/X11/config/FreeBSD.ports.def
-INSTALL_TARGET= install install.man
-
-post-extract:
- (cd ${WRKDIR} && \
- ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
- ${DISTDIR}/${DIST_SUBDIR}/X${PORTVERSION:S/.//g}src-1.tgz \
- ${EXTRACT_AFTER_ARGS} xc/doc)
+WRKSRC= ${WRKDIR}/xc/doc/specs
do-configure:
(cd ${WRKSRC} ; \
@@ -39,7 +31,7 @@ do-configure:
${ECHO_CMD} "#define InstallHardcopyDocs YES" >> host.def ; \
${ECHO_CMD} "#define FreeBSDBuildXdoc YES" >> host.def ; \
imake -DUseInstalled ${PROJECTROOT} -I. -I${PREFIX}/lib/X11/config \
- -DTOPDIR=.. -DCURDIR=.; \
+ -DTOPDIR=../.. -DCURDIR=.; \
${MAKE} Makefiles ; \
${MAKE} includes ; \
${MAKE} depend)
diff --git a/x11/XFree86-4-documents/distinfo b/x11/XFree86-4-documents/distinfo
index d7c5b11..14b5c53c 100644
--- a/x11/XFree86-4-documents/distinfo
+++ b/x11/XFree86-4-documents/distinfo
@@ -1,3 +1,3 @@
-MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
-MD5 (xc/X420src-2.tgz) = dae33268a9f2735b9678a81fb23e8d3e
-MD5 (xc/X420src-3.tgz) = 560899e175a02ab592185b69756f539e
+MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af
+MD5 (xc/X430src-6.tgz) = 163d9864e1353a4a9f992cb3843c240f
+MD5 (xc/X430src-7.tgz) = e002e70f24098ca4f62fabd1c2809ed1
diff --git a/x11/XFree86-4-documents/files/patch-01 b/x11/XFree86-4-documents/files/patch-01
deleted file mode 100644
index b79727b..0000000
--- a/x11/XFree86-4-documents/files/patch-01
+++ /dev/null
@@ -1,14 +0,0 @@
---- Imakefile.orig Fri Dec 15 04:24:23 2000
-+++ Imakefile Wed Dec 20 16:22:14 2000
-@@ -16,7 +16,11 @@
- HARDCOPYDIR = hardcopy
- #endif
-
-+#if defined(FreeBSDBuildXdoc) || FreeBSDBuildXdoc
-+SUBDIRS = $(MISCDIR) $(SPECSDIR) $(HARDCOPYDIR)
-+#else
- SUBDIRS = man $(MISCDIR) $(SPECSDIR) $(HARDCOPYDIR)
-+#endif
-
- all::
-
diff --git a/x11/XFree86-4-documents/files/patch-04 b/x11/XFree86-4-documents/files/patch-04
index 1617019..b945686 100644
--- a/x11/XFree86-4-documents/files/patch-04
+++ b/x11/XFree86-4-documents/files/patch-04
@@ -1,5 +1,5 @@
---- specs/Imakefile.orig Thu Jan 17 03:36:00 2002
-+++ specs/Imakefile Mon Jan 21 03:13:38 2002
+--- Imakefile.orig Wed Jan 16 10:36:00 2002
++++ Imakefile Mon Mar 3 17:35:16 2003
@@ -13,7 +13,7 @@
#else
SUBDIRS = BDF CTEXT FSProtocol GL ICCCM ICE /*PEX5*/ PM Render SM X11 XDMCP \
diff --git a/x11/XFree86-4-documents/pkg-plist b/x11/XFree86-4-documents/pkg-plist
index 049e2b8..b1c1379 100644
--- a/x11/XFree86-4-documents/pkg-plist
+++ b/x11/XFree86-4-documents/pkg-plist
@@ -1,15 +1,12 @@
lib/X11/doc/DPMS.TXT
lib/X11/doc/DPMSLib.TXT
lib/X11/doc/ICElib.TXT
-lib/X11/doc/INSTALL-X.org.TXT
lib/X11/doc/LocaleDB.TXT
lib/X11/doc/PM_spec.TXT
lib/X11/doc/PostScript/DPMS.PS
lib/X11/doc/PostScript/DPMSLib.PS
lib/X11/doc/PostScript/ICElib.PS
-lib/X11/doc/PostScript/INSTALL-X.org.PS
lib/X11/doc/PostScript/LocaleDB.PS
-lib/X11/doc/PostScript/RELNOTES-X.org.PS
lib/X11/doc/PostScript/SMlib.PS
lib/X11/doc/PostScript/XIMTransport.PS
lib/X11/doc/PostScript/XiLib.PS
@@ -49,7 +46,6 @@ lib/X11/doc/PostScript/xmu.PS
lib/X11/doc/PostScript/xsmp.PS
lib/X11/doc/PostScript/xtest.PS
lib/X11/doc/PostScript/xtestlib.PS
-lib/X11/doc/RELNOTES-X.org.TXT
lib/X11/doc/SMlib.TXT
lib/X11/doc/XIMTransport.TXT
lib/X11/doc/XiLib.TXT
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index b6929fe..ff16d20 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -6,27 +6,27 @@
#
PORTNAME= libraries
-PORTVERSION= 4.2.1
-PORTREVISION= 7
+PORTVERSION= 4.3.0
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \
${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR= 4.2.0/:x \
+MASTER_SITE_SUBDIR= ${PORTVERSION}/:x \
anholt/:local
PKGNAMEPREFIX= XFree86-
-DISTFILES= X420src-1.tgz:x \
+DISTFILES= X430src-1.tgz:x \
+ X430src-2.tgz:x \
+ X430src-3.tgz:x \
Wraphelp2.gz:local
-EXTRACT_ONLY= X420src-1.tgz
-
-PATCH_SITES= ${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR= anholt/patches-4.2.0/
-PATCHFILES= 4.2.0-4.2.1-1-freebsd.patch.gz
+EXTRACT_ONLY= X430src-1.tgz \
+ X430src-2.tgz \
+ X430src-3.tgz
MAINTAINER= anholt@freebsd.org
-COMMENT= XFree86-4 include/(shared) library kit
+COMMENT= XFree86-4 libraries and headers
-BUILD_DEPENDS= ${X11BASE}/lib/X11/config/version.def:${PORTSDIR}/devel/imake-4
+BUILD_DEPENDS= ${X11BASE}/lib/X11/config/date.def:${PORTSDIR}/devel/imake-4
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
RUN_DEPENDS= mkhtmlindex:${PORTSDIR}/devel/imake-4
XFREE86_VERSION= 4
@@ -37,51 +37,22 @@ MTREE_FILE= /etc/mtree/BSD.x11-4.dist
INSTALLS_SHLIB= yes
DIST_SUBDIR= xc
WRKSRC= ${WRKDIR}/xc
-SCRIPTS_ENV= HasSecureRPC=${HasSecureRPC} \
- BuildPexExt=${BuildPexExt} \
- BuildXinerama=${BuildXinerama} \
- BuildXIE=${BuildXIE} \
- BuildAoutLibraries=${BuildAoutLibraries} \
- ForceNormalLib=${ForceNormalLib} \
- DebuggableLibraries=${DebuggableLibraries} \
+SCRIPTS_ENV= DebuggableLibraries=${DebuggableLibraries} \
CC="${CC}" \
CXX="${CXX}" \
CFLAGS="${CFLAGS}"
-MAKE_ENV= PKGNAMEPREFIX=${PKGNAMEPREFIX} \
- PORTNAME=${PORTNAME} \
- PORTVERSION=${PORTVERSION}
-MAN1= libxrx.1
-MAN3= Xaw.3
+MAN3= Xaw.3 Xcursor.3 Xrandr.3
XBUILD_DIRS= lib nls programs/Xserver/include \
- programs/Xserver/hw/xfree86/parser \
- programs/xrx
+ programs/Xserver/hw/xfree86/parser
XINCLUDE_DIRS= programs/proxymngr
XINSTALL_DIRS= include lib nls programs/Xserver/include \
- programs/xrx/plugin \
programs/Xserver/hw/xfree86/parser
XINSTALL_MAN_DIRS= ${XINSTALL_DIRS}
# XFree86 User Config:
-# ---
-# Name Default Meaning
-# ----------------------------------------------------------------------------
-# HasSecureRPC YES build with SecureRPC (require FreeBSD-3 or later)
-# BuildPexExt YES build PEX extension
-# BuildXinerama YES build Xinerama extension
-# BuildXIE YES build XIE extension
-# BuildAoutLibraries NO build with old Aout libs.
-# ForceNormalLib YES build with static libs.
# DebuggableLibraries NO build with debug libs (require FreeBSD-4 or later)
# ----------------------------------------------------------------------------
-# DEFAULT means ports will use values which set by ${PORTSDIR}/devel/imake-4
-#
-HasSecureRPC?= DEFAULT
-BuildPexExt?= DEFAULT
-BuildXinerama?= DEFAULT
-BuildXIE?= DEFAULT
-BuildAoutLibraries?= DEFAULT
-ForceNormalLib?= DEFAULT
-DebuggableLibraries?= DEFAULT
+DebuggableLibraries?= NO
# End of XFree86 User Config
.ifdef USE_XLIB
@@ -110,17 +81,12 @@ post-extract:
post-patch:
${CP} ${MASTERDIR}/files/nls::Compose::microsoft-cp1251 ${WRKSRC}/nls/Compose/microsoft-cp1251
- cd ${WRKSRC}/nls; \
- for i in Compose XI18N_OBJS XLC_LOCALE; do \
- ${LN} -s zh_TW.big5 $$i/zh_TW.Big5; \
- done
post-install:
${INSTALL_DATA} ${WRKSRC}/programs/proxymngr/PM.h \
${PREFIX}/include/X11/PM
${INSTALL_DATA} ${WRKSRC}/programs/proxymngr/PMproto.h \
${PREFIX}/include/X11/PM
- @${MKHTMLINDEX} ${X11BASE}/lib/X11/doc/html
.include "Makefile.inc"
.include <bsd.port.post.mk>
diff --git a/x11/XFree86-4-libraries/Makefile.inc b/x11/XFree86-4-libraries/Makefile.inc
index 6db2803..5eb9f2e 100644
--- a/x11/XFree86-4-libraries/Makefile.inc
+++ b/x11/XFree86-4-libraries/Makefile.inc
@@ -13,9 +13,12 @@ MAKE_ENV+= FBSDCC="${CC}" FBSDCXX="${CXX}"
_XBUILD_DIRS= include ${XBUILD_DIRS}
XINSTALL_DIRS?= ${XBUILD_DIRS}
_XINCLUDE_DIRS= ${_XBUILD_DIRS} ${XINCLUDE_DIRS}
+XFREE86_HTML_MAN?= no
.if !target(do-configure)
do-configure:
+ @cp ${X11BASE}/lib/X11/config/version.def ${WRKSRC}/config/cf
+ @cp ${X11BASE}/lib/X11/config/date.def ${WRKSRC}/config/cf
@cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} Makefile.boot
@@ -50,3 +53,7 @@ do-install:
@cd ${WRKSRC}/${i} && ${SETENV} ${MAKE_ENV} ${MAKE} install.man
.endfor
.endif
+.if ${XFREE86_HTML_MAN:L} == yes
+ @${MKHTMLINDEX} ${PREFIX}/lib/X11/doc/html
+.endif
+
diff --git a/x11/XFree86-4-libraries/distinfo b/x11/XFree86-4-libraries/distinfo
index fde56e7..86966f9 100644
--- a/x11/XFree86-4-libraries/distinfo
+++ b/x11/XFree86-4-libraries/distinfo
@@ -1,3 +1,4 @@
-MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
+MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af
+MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4
+MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6
MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535
-MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274
diff --git a/x11/XFree86-4-libraries/files/patch-2 b/x11/XFree86-4-libraries/files/patch-2
deleted file mode 100644
index ea789dd..0000000
--- a/x11/XFree86-4-libraries/files/patch-2
+++ /dev/null
@@ -1,35 +0,0 @@
---- programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c.orig Sun Jul 26 01:56:34 1998
-+++ programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c Mon Apr 8 14:32:01 2002
-@@ -29,7 +29,7 @@
- #include <unistd.h>
- #include <string.h>
- #include <errno.h>
--#include <machine/joystick.h>
-+#include <sys/joystick.h>
- #include <fcntl.h>
-
- #ifdef XFree86LOADER
-@@ -56,6 +56,7 @@
- int changed = 0;
- int timeinmicros;
- struct joystick js;
-+ extern int errno;
-
- #ifdef DEBUG
- ErrorF("xf86JoystickOn: %s\n", name);
-@@ -96,7 +97,6 @@
- if (*centerY < 0) {
- *centerY = js.y;
- xf86Msg(X_PROBED, "Joystick: CenterY set to %d\n", *centerY);
-- }
- }
-
- return status;
-@@ -173,6 +173,7 @@
- }
-
- #ifdef XFree86LOADER
-+#define MAGIC_DONE 1
- /*
- * Entry point for XFree86 Loader
- */
diff --git a/x11/XFree86-4-libraries/files/patch-DRI b/x11/XFree86-4-libraries/files/patch-DRI
deleted file mode 100644
index 5d18c6e..0000000
--- a/x11/XFree86-4-libraries/files/patch-DRI
+++ /dev/null
@@ -1,50 +0,0 @@
---- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/tdfx/Makefile.orig Thu Dec 13 09:24:52 2001
-+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/tdfx/Makefile Sat Jan 19 21:35:22 2002
-@@ -5,6 +5,7 @@
- SRCS= tdfx_drv.c
- SRCS+= device_if.h bus_if.h pci_if.h opt_drm_linux.h
- CFLAGS+= ${DEBUG_FLAGS} -I. -I..
-+KMODDIR = ${X11BASE}/lib/X11/kernel
-
- @:
- ln -sf /sys @
---- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/gamma/Makefile.orig Thu Dec 13 09:24:49 2001
-+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/gamma/Makefile Sat Jan 19 21:37:05 2002
-@@ -5,6 +5,7 @@
- SRCS = gamma_drv.c gamma_dma.c
- SRCS += device_if.h bus_if.h pci_if.h opt_drm_linux.h
- CFLAGS += ${DEBUG_FLAGS} -I. -I..
-+KMODDIR= ${X11BASE}/lib/X11/kernel
-
- @:
- ln -sf /sys @
---- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/Makefile.orig Thu Dec 13 09:24:49 2001
-+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/Makefile Sat Jan 19 21:36:20 2002
-@@ -5,6 +5,7 @@
- SRCS= mga_drv.c mga_state.c mga_warp.c mga_dma.c
- SRCS+= device_if.h bus_if.h pci_if.h opt_drm_linux.h
- CFLAGS+= ${DEBUG_FLAGS} -I. -I..
-+KMODDIR= ${X11BASE}/lib/X11/kernel
-
- @:
- ln -sf /sys @
---- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/r128/Makefile.orig Thu Dec 13 09:24:50 2001
-+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/r128/Makefile Mon Jan 21 10:17:46 2002
-@@ -5,6 +5,7 @@
- SRCS = r128_cce.c r128_drv.c r128_state.c
- SRCS += device_if.h bus_if.h pci_if.h opt_drm_linux.h
- CFLAGS += ${DEBUG_FLAGS} -I. -I..
-+KMODDIR= ${X11BASE}/lib/X11/kernel
-
- @:
- ln -sf /sys @
---- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/radeon/Makefile.orig Thu Dec 13 09:24:51 2001
-+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/radeon/Makefile Mon Jan 21 10:17:21 2002
-@@ -5,6 +5,7 @@
- SRCS = radeon_cp.c radeon_drv.c radeon_state.c
- SRCS += device_if.h bus_if.h pci_if.h opt_drm_linux.h
- CFLAGS += ${DEBUG_FLAGS} -I. -I..
-+KMODDIR= ${X11BASE}/lib/X11/kernel
-
- @:
- ln -sf /sys @
diff --git a/x11/XFree86-4-libraries/files/patch-FreeBSD.cf b/x11/XFree86-4-libraries/files/patch-FreeBSD.cf
new file mode 100644
index 0000000..4e59a2d
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-FreeBSD.cf
@@ -0,0 +1,77 @@
+--- config/cf/FreeBSD.cf.orig Tue Jan 14 18:52:12 2003
++++ config/cf/FreeBSD.cf Tue Mar 4 16:36:20 2003
+@@ -162,11 +162,11 @@
+ * ld: warning: libXThrStub.so.6, needed by libX11.so, not found
+ */
+ #if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11)
+-# define CcCmd $(CLIENTENVSETUP) cc
+-# define CplusplusCmd $(CLIENTENVSETUP) c++
++# define CcCmd $(CLIENTENVSETUP) FreeBSDCC
++# define CplusplusCmd $(CLIENTENVSETUP) FreeBSDCXX
+ #else
+-# define CcCmd cc
+-# define CplusplusCmd c++
++# define CcCmd FreeBSDCC
++# define CplusplusCmd FreeBSDCXX
+ #endif
+
+ #define CppCmd /usr/bin/cpp
+@@ -177,7 +177,7 @@
+ #if defined(UseInstalled)
+ #define DefaultCCOptions /**/
+ #else
+-#define DefaultCCOptions -ansi -pedantic -Dasm=__asm GccWarningOptions
++#define DefaultCCOptions -ansi -Dasm=__asm GccWarningOptions
+ #endif
+ #endif
+ #ifndef ExtraLibraries
+@@ -228,13 +228,17 @@
+ #endif
+
+ /*
+- * 4.1/i386 and 5.0/i386 have the AGP driver.
++ * 4.1/i386 and 5.0/i386,alpha,ia64 have the AGP driver.
+ */
+ #ifndef HasAgpGart
+ #if defined(i386Architecture) && \
+ (OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 1))
+ #define HasAgpGart YES
+ #endif
++#if (defined(AlphaArchitecture) || defined(ia64Architecture)) && \
++ (OSMajorVersion >= 5)
++#define HasAgpGart YES
++#endif
+ #endif
+
+ /*
+@@ -461,6 +465,9 @@
+ #ifdef Sparc64Architecture
+ #define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
+ #endif
++#ifdef ia64Architecture
++#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
++#endif
+
+ #define StandardDefines -DCSRG_BASED
+
+@@ -482,18 +489,8 @@
+ #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
+ #endif
+
+-/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
+-#ifndef DefaultGcc2i386Opt
+-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
+-#define DefaultGcc2i386Opt -O2
+-#endif
+-#endif
+-
+-#ifdef i386Architecture
+-# define OptimizedCDebugFlags DefaultGcc2i386Opt
+-#else
+-# define OptimizedCDebugFlags -O
+-#endif
++#define DefaultGcc2i386Opt
++#define OptimizedCDebugFlags FreeBSDCFLAGS
+
+ #ifndef PreIncDir
+ # define PreIncDir /usr/include
diff --git a/x11/XFree86-4-libraries/files/patch-Imake.cf b/x11/XFree86-4-libraries/files/patch-Imake.cf
index 1942b79..e20e009 100644
--- a/x11/XFree86-4-libraries/files/patch-Imake.cf
+++ b/x11/XFree86-4-libraries/files/patch-Imake.cf
@@ -1,12 +1,12 @@
---- config/cf/Imake.cf.orig Wed Sep 18 18:17:14 2002
-+++ config/cf/Imake.cf Wed Sep 18 18:17:44 2002
-@@ -221,6 +221,10 @@
- # define AlphaArchitecture
- # undef __alpha__
+--- config/cf/Imake.cf.orig Tue Mar 4 16:38:16 2003
++++ config/cf/Imake.cf Tue Mar 4 16:38:18 2003
+@@ -232,6 +232,10 @@
+ # define Sparc64Architecture
+ # undef __sparc64__
# endif
-+# ifdef __sparc64__
-+# define Sparc64Architecture
-+# undef __sparc64__
++# ifdef __ia64__
++# define ia64Architecture
++# undef __ia64__
+# endif
#endif /* __FreeBSD__ */
diff --git a/x11/XFree86-4-libraries/files/patch-Imake.rules b/x11/XFree86-4-libraries/files/patch-Imake.rules
new file mode 100644
index 0000000..edd940a
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-Imake.rules
@@ -0,0 +1,48 @@
+--- config/cf/Imake.rules.orig Thu Jan 2 14:43:27 2003
++++ config/cf/Imake.rules Thu Jan 2 14:49:12 2003
+@@ -1406,7 +1406,7 @@
+ * this Imakefile is within the source tree.
+ */
+ #ifndef RmanDependency
+-#ifdef UseInstalled
++#if defined(UseInstalled) || defined(UseInstalledPrograms)
+ #define RmanDependency() /**/
+ #else
+ #define RmanDependency() @@\
+@@ -1421,7 +1421,7 @@
+ #endif /* RmanDependency */
+
+ #ifndef RmanCmdDependency
+-#ifdef UseInstalled
++#if defined(UseInstalled) || defined(UseInstalledPrograms)
+ #define RmanCmdDependency /**/
+ #else
+ #define RmanCmdDependency ProgramTargetName($(RMAN))
+@@ -1874,7 +1874,7 @@
+ * this Imakefile is within the source tree.
+ */
+ #ifndef DependDependency
+-#ifdef UseInstalled
++#if defined(UseInstalled) || defined(UseInstalledPrograms)
+ #define DependDependency() /**/
+ #else
+ #define DependDependency() @@\
+@@ -1969,7 +1969,7 @@
+ * within the source tree.
+ */
+ #ifndef ImakeDependency
+-#ifdef UseInstalled
++#if defined(UseInstalled) || defined(UseInstalledPrograms)
+ #define ImakeDependency(target) /**/
+ #else
+ #define ImakeDependency(target) @@\
+@@ -3126,6 +3126,9 @@
+
+ #ifdef UseInstalled
+ #define ImakeSubCmdHelper $(IMAKE_CMD)
++#elif defined(UseInstalledPrograms)
++#define ImakeSubCmdHelper $(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) \
++ $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
+ #else
+ #define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) \
+ $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
diff --git a/x11/XFree86-4-libraries/files/patch-c b/x11/XFree86-4-libraries/files/patch-Imake.tmpl
index 407ea77..526e2e5 100644
--- a/x11/XFree86-4-libraries/files/patch-c
+++ b/x11/XFree86-4-libraries/files/patch-Imake.tmpl
@@ -1,47 +1,52 @@
---- config/cf/Imake.tmpl.orig Wed Oct 16 20:56:39 2002
-+++ config/cf/Imake.tmpl Wed Oct 16 21:52:31 2002
-@@ -220,7 +220,7 @@
+--- config/cf/Imake.tmpl.orig Mon Dec 9 19:20:41 2002
++++ config/cf/Imake.tmpl Thu Jan 2 14:34:20 2003
+@@ -237,7 +237,8 @@
#ifndef RmanCmd
#if BuildRman
-#ifdef UseInstalled /* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms) /* assume BINDIR in path */
++#if defined(UseInstalled) || defined(UseInstalledPrograms)
++/* assume BINDIR in path */
#define RmanCmd rman
#else
#define RmanCmd $(TOP)/config/util/rman
-@@ -1282,7 +1282,7 @@
+@@ -1348,7 +1349,8 @@
#define LoaderLibPrefix /**/
#endif
#ifndef ImakeCmd
-#ifdef UseInstalled /* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms) /* assume BINDIR in path */
++#if defined(UseInstalled) || defined(UseInstalledPrograms)
++/* assume BINDIR in path */
#define ImakeCmd imake
#else
#define ImakeCmd $(IMAKESRC)/imake
-@@ -1290,19 +1290,19 @@
+@@ -1359,19 +1361,22 @@
#endif
#ifndef DependCmd
#if UseGccMakeDepend
-#ifdef UseInstalled /* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms) /* assume BINDIR in path */
++#if defined(UseInstalled) || defined(UseInstalledPrograms)
++/* assume BINDIR in path */
#define DependCmd gccmakedep
#else
#define DependCmd $(DEPENDSRC)/gccmakedep
#endif
#elif UseCCMakeDepend
-#ifdef UseInstalled /* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms) /* assume BINDIR in path */
++#if defined(UseInstalled) || defined(UseInstalledPrograms)
++/* assume BINDIR in path */
#define DependCmd ccmakedep
#else
#define DependCmd $(DEPENDSRC)/ccmakedep
#endif
#else
-#ifdef UseInstalled /* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms) /* assume BINDIR in path */
++#if defined(UseInstalled) || defined(UseInstalledPrograms)
++/* assume BINDIR in path */
#define DependCmd makedepend
#else
#define DependCmd $(DEPENDSRC)/makedepend
-@@ -1329,21 +1329,21 @@
+@@ -1398,21 +1403,23 @@
#ifndef ExportListCmd
# ifndef ExportListGenSource
# define ExportListCmd /**/
@@ -54,7 +59,8 @@
#endif
#ifndef MkdirHierCmd
-#ifdef UseInstalled /* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms) /* assume BINDIR in path */
++#if defined(UseInstalled) || defined(UseInstalledPrograms)
++/* assume BINDIR in path */
#define MkdirHierCmd mkdirhier
#else
#define MkdirHierCmd $(SHELL) $(CONFIGSRC)/util/mkdirhier.sh
@@ -62,7 +68,8 @@
#endif
#ifndef RevPathCmd
-#ifdef UseInstalled /* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms) /* assume BINDIR in path */
++#if defined(UseInstalled) || defined(UseInstalledPrograms)
++/* assume BINDIR in path */
#define RevPathCmd revpath
#else
#define RevPathCmd $(CONFIGSRC)/util/revpath
diff --git a/x11/XFree86-4-libraries/files/patch-UIThrStubs.c b/x11/XFree86-4-libraries/files/patch-UIThrStubs.c
deleted file mode 100644
index af9d011..0000000
--- a/x11/XFree86-4-libraries/files/patch-UIThrStubs.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- lib/XThrStub/UIThrStubs.c.old Mon Nov 19 06:13:26 2001
-+++ lib/XThrStub/UIThrStubs.c Tue Jun 4 11:39:19 2002
-@@ -99,6 +99,21 @@
- #else
- #include <pthread.h>
- typedef pthread_t xthread_t;
-+#if __GNUC__ >= 3
-+xthread_t pthread_self() __attribute__ ((weak, alias ("_Xthr_self_stub_")));
-+int pthread_mutex_init() __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-+int pthread_mutex_destroy() __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-+int pthread_mutex_lock() __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-+int pthread_mutex_unlock() __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-+int pthread_cond_init() __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-+int pthread_cond_destroy() __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-+int pthread_cond_wait() __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-+int pthread_cond_signal() __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-+int pthread_cond_broadcast() __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-+int pthread_key_create() __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-+void *pthread_getspecific() __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-+int pthread_setspecific() __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-+#else /* __GNUC__ */
- #pragma weak pthread_self = _Xthr_self_stub_
- #pragma weak pthread_mutex_init = _Xthr_zero_stub_
- #pragma weak pthread_mutex_destroy = _Xthr_zero_stub_
-@@ -113,6 +128,7 @@
- #pragma weak pthread_key_create = _Xthr_zero_stub_
- #pragma weak pthread_getspecific = _Xthr_zero_stub_
- #pragma weak pthread_setspecific = _Xthr_zero_stub_
-+#endif /* __GNUC__ */
- #if defined(_DECTHREADS_) || defined(linux)
- #pragma weak pthread_equal = _Xthr_equal_stub_ /* See Xthreads.h! */
- int
diff --git a/x11/XFree86-4-libraries/files/patch-X11.tmpl b/x11/XFree86-4-libraries/files/patch-X11.tmpl
new file mode 100644
index 0000000..dc4673d
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-X11.tmpl
@@ -0,0 +1,38 @@
+--- config/cf/X11.tmpl.orig Tue Feb 25 13:57:52 2003
++++ config/cf/X11.tmpl Sun Mar 2 21:13:31 2003
+@@ -575,7 +575,7 @@
+ #define BuildXft1Library BuildRenderLibrary
+ #endif
+ #ifndef UseFontconfig
+-#define UseFontconfig BuildXftLibrary
++#define UseFontconfig (BuildXftLibrary || BuildXft1Library)
+ #endif
+ #ifndef BuildFontconfigLibrary
+ #define BuildFontconfigLibrary (UseFontconfig && !HasFontconfig)
+@@ -1497,7 +1497,14 @@
+ #endif
+
+ #ifndef PsWrap
++#if defined(UseInstalled) || defined(UseInstalledPrograms)
++#define PsWrap pswrap
++#define PsWrapDependency /**/
++#else
+ #define PsWrap $(PSWRAPSRC)/pswrap
++#define PsWrapDependency HostProgramTargetName($(PSWRAP))
++#endif
++ PSWRAP = PsWrap
+ #endif
+
+ #ifndef ResourceConfigurationManagement
+@@ -3028,7 +3035,10 @@
+
+ #endif /* else BuildFreetype2Library */
+
+-#if BuildFreetype2Library || HasFreetype2
++#if HasFreetype2
++FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -I$(FREETYPE2DIR)/include
++FREETYPE2DEFINES = -DFREETYPE2
++#elif BuildFreetype2Library
+ FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)
+ FREETYPE2DEFINES = -DFREETYPE2
+ #endif
diff --git a/x11/XFree86-4-libraries/files/patch-XTT b/x11/XFree86-4-libraries/files/patch-XTT
deleted file mode 100644
index bea103f..0000000
--- a/x11/XFree86-4-libraries/files/patch-XTT
+++ /dev/null
@@ -1,48 +0,0 @@
---- extras/X-TrueType/xttfuncs.c.old 2000/09/26 15:56:41 1.8
-+++ extras/X-TrueType/xttfuncs.c 2001/02/18 04:08:33
-@@ -565,8 +565,9 @@
-
- /*
- * Check invalid char index.
-+ * c = 0 is the default glyph for undefined glyphs in TTF.
- */
-- if ( c <= 0 ) {
-+ if ( c < 0 ) {
- charInfo = &nocharinfo;
- goto next;
- }
-@@ -769,8 +770,9 @@
-
- /*
- * Check invalid char index.
-+ * c = 0 is the default glyph for undefined glyphs in TTF.
- */
-- if ( c <= 0 ) {
-+ if ( c < 0 ) {
- charInfo = &nocharinfo;
- goto next;
- }
-@@ -934,14 +936,19 @@
- c1 <= pFont->info.lastRow &&
- c2 >= pFont->info.firstCol &&
- c2 <= pFont->info.lastCol)) {
-- *glyphs++ = &nocharinfo;
-+ /*
-+ * &nocharinfo will show garbage, just set c1 to 0.
-+ * The default glyph for undefined glphy will be used.
-+ */
-+ /* *glyphs++ = &nocharinfo; */
- dprintf((stderr, "invalid code\n"));
-+ c1 = 0;
- } else {
- c1 = ft->codeConverterInfo.ptrCodeConverter(c1<<8|c2);
-+ }
- dprintf((stderr, "%04x\n", c1));
- *glyphs++ = get_glyph(ft, TT_Char_Index(ft->charmap, c1),
- spacing);
-- }
- }
- break;
- }
-
-
diff --git a/x11/XFree86-4-libraries/files/patch-XlcDL.c b/x11/XFree86-4-libraries/files/patch-XlcDL.c
deleted file mode 100644
index 5b1d428..0000000
--- a/x11/XFree86-4-libraries/files/patch-XlcDL.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- lib/X11/XlcDL.c.orig Sun Dec 1 23:17:32 2002
-+++ lib/X11/XlcDL.c Sun Dec 1 23:17:11 2002
-@@ -60,7 +60,12 @@
- #define _MACH64_NAME "sparcv9"
- #define _MACH64_NAME_LEN (sizeof (_MACH64_NAME) - 1)
- #else /* !defined(__sparcv9) */
-+#if defined(__ia64__)
-+#define _MACH64_NAME "ia64"
-+#define _MACH64_NAME_LEN (sizeof (_MACH64_NAME) - 1)
-+#else /* !defined(__ia64__) */
- #error "Unknown architecture"
-+#endif /* defined(__ia64__) */
- #endif /* defined(__sparcv9) */
- #endif /* _LP64 */
-
diff --git a/x11/XFree86-4-libraries/files/patch-bsdLib.rules b/x11/XFree86-4-libraries/files/patch-bsdLib.rules
deleted file mode 100644
index 6feea25..0000000
--- a/x11/XFree86-4-libraries/files/patch-bsdLib.rules
+++ /dev/null
@@ -1,37 +0,0 @@
---- config/cf/bsdLib.rules.orig Wed Jul 10 17:25:29 2002
-+++ config/cf/bsdLib.rules Wed Jul 10 17:25:32 2002
-@@ -306,6 +306,34 @@
-
- #endif /* SharedDepLibraryTarget */
-
-+/*
-+ * SharedDepCplusplusLibraryTarget - generate rules to create a shared library.
-+ */
-+#ifndef SharedDepCplusplusLibraryTarget
-+#define SharedDepCplusplusLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-+AllTarget(Concat(lib,libname.so.rev)) @@\
-+ @@\
-+Concat(lib,libname.so.rev): deplist @@\
-+ $(RM) $@~ @@\
-+ @SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \ @@\
-+ (cd down; $(CXX) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
-+ $(RM) $$SONAME; $(LN) $@ $$SONAME; \ @@\
-+ LinkBuildSonameLibrary($$SONAME) @@\
-+ $(RM) $@ @@\
-+ $(MV) $@~ $@ @@\
-+ $(RM) Concat(lib,libname.so) @@\
-+ $(LN) $@ Concat(lib,libname.so) @@\
-+ LinkBuildLibrary($@) @@\
-+ LinkBuildLibrary(Concat(lib,libname.so)) @@\
-+ @@\
-+clean:: @@\
-+ @SONAME=`echo Concat(lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`; \ @@\
-+ set -x; $(RM) $$SONAME @@\
-+ $(RM) Concat(lib,libname.so) @@\
-+ $(RM) Concat(lib,libname.so.rev)
-+
-+#endif /* SharedDepLibraryTarget */
-+
- #ifndef SharedDepModuleTarget
- #define SharedDepModuleTarget(name,deps,solist) @@\
- AllTarget(name) @@\
diff --git a/x11/XFree86-4-libraries/files/patch-common_x86.c b/x11/XFree86-4-libraries/files/patch-common_x86.c
deleted file mode 100644
index 9e584c2..0000000
--- a/x11/XFree86-4-libraries/files/patch-common_x86.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- extras/Mesa/src/X86/common_x86.c.orig Fri Aug 17 11:40:11 2001
-+++ extras/Mesa/src/X86/common_x86.c Tue Dec 3 21:51:31 2002
-@@ -38,6 +38,10 @@
- #if defined(USE_KATMAI_ASM) && defined(__linux__)
- #include <signal.h>
- #endif
-+#if defined(USE_KATMAI_ASM) && defined(__FreeBSD__)
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#endif
-
- #include "context.h"
- #include "common_x86_asm.h"
-@@ -213,8 +217,17 @@
- message( "Cannot test OS support for SSE, disabling to be safe.\n" );
- gl_x86_cpu_features &= ~(X86_FEATURE_XMM);
- #endif /* _POSIX_SOURCE && X86_FXSR_MAGIC */
-+#elif defined(__FreeBSD__)
-+ {
-+ int ret, enabled;
-+ size_t len;
-+ len = sizeof(enabled);
-+ ret = sysctlbyname("hw.instruction_sse", &enabled, &len, NULL, 0);
-+ if (ret || !enabled)
-+ gl_x86_cpu_features &= ~(X86_FEATURE_XMM);
-+ }
- #else
-- /* Do nothing on non-Linux platforms for now.
-+ /* Do nothing on other platforms for now.
- */
- message( "Not testing OS support for SSE, leaving enabled.\n" );
- #endif /* __linux__ */
diff --git a/x11/XFree86-4-libraries/files/patch-d b/x11/XFree86-4-libraries/files/patch-d
deleted file mode 100644
index fd2afa6..0000000
--- a/x11/XFree86-4-libraries/files/patch-d
+++ /dev/null
@@ -1,142 +0,0 @@
---- config/cf/FreeBSD.cf.orig Fri Nov 1 14:06:38 2002
-+++ config/cf/FreeBSD.cf Fri Nov 1 14:15:57 2002
-@@ -43,11 +43,15 @@
- #define GccUsesGas YES
- #define UseGas YES
- #define GnuCpp YES
-+#define HasPoll YES
- #define HasNdbm YES
- #define HasPutenv YES
- #define HasSnprintf YES
- #define HasBSD44Sockets YES
- #define HasDlopen YES
-+#if ((OSRelVersion >= 410002) && OSRelVersion < 500000) || (OSRelVersion >= 500012)
-+#define HasSetProcTitle YES
-+#endif
- #ifndef HasLibCrypt
- # define HasLibCrypt YES
- #endif
-@@ -74,18 +78,14 @@
- * Multi-thread safe libs
- */
- /* 2.2.7 and later has libc_r (POSIX threads) */
--#if OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion >= 7 || \
-- OSMajorVersion >= 3
-+#if (OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion >= 7) || \
-+ (OSMajorVersion >= 3) && !defined(Sparc64Architecture)
- # ifndef HasLibPthread
- # define HasLibPthread NO
- # endif
- # define HasPosixThreads YES
- # define ThreadedX YES
- /*
-- * math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
-- */
--# define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE
--/*
- * FreeBSD has tread-safe api but no getpwnam_r yet.
- */
- # define HasThreadSafeAPI YES
-@@ -93,10 +93,19 @@
- # if HasLibPthread
- # define ThreadsLibraries -lpthread
- # else
--# define BuildThreadStubLibrary YES
--# define NeedUIThrStubs YES
--# define ThreadsCompileFlags -pthread
--# define ThreadsLibraries -pthread
-+# if OSRelVersion >= 500043
-+# define BuildThreadStubLibrary NO
-+# define NeedUIThrStubs NO
-+# else
-+# define BuildThreadStubLibrary YES
-+# define NeedUIThrStubs YES
-+# endif
-+# define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE
-+# if (OSRelVersion >= 500016)
-+# define ThreadsLibraries -lc_r
-+# else
-+# define ThreadsLibraries -pthread
-+# endif
- # define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB)
- # define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
- # endif
-@@ -149,11 +158,11 @@
- * ld: warning: libXThrStub.so.6, needed by libX11.so, not found
- */
- #if BuildThreadStubLibrary && !UseInstalled
--# define CcCmd $(CLIENTENVSETUP) cc
--# define CplusplusCmd $(CLIENTENVSETUP) c++
-+# define CcCmd $(CLIENTENVSETUP) FreeBSDCC
-+# define CplusplusCmd $(CLIENTENVSETUP) FreeBSDCXX
- #else
--# define CcCmd cc
--# define CplusplusCmd c++
-+# define CcCmd FreeBSDCC
-+# define CplusplusCmd FreeBSDCXX
- #endif
-
- #define CppCmd /usr/bin/cpp
-@@ -224,6 +233,20 @@
- #endif
- #endif
-
-+/* Katmai (SSE) and 3DNow will be autodetected, so binutils is the only
-+ * requirement for enabling this. By 4.2 they were all supported.
-+ */
-+#ifdef i386Architecture && \
-+ (OSMajorVersion >= 5) || (OSMajorVersion == 4 && OSMinorVersion >= 2))
-+# define HasMMXSupport YES
-+# define Has3DNowSupport YES
-+# define HasKatmaiSupport YES
-+#else
-+# define HasMMXSupport NO
-+# define Has3DNowSupport NO
-+# define HasKatmaiSupport NO
-+#endif
-+
- /*
- * This doesn't work the way it does on every other system. On FreeBSD it's
- * only a "hint, not a demand", whatever that means. Note that this is not
-@@ -428,6 +451,9 @@
- #ifdef AlphaArchitecture
- #define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
- #endif
-+#ifdef Sparc64Architecture
-+#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
-+#endif
-
- #define StandardDefines -DCSRG_BASED
-
-@@ -449,18 +475,8 @@
- #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
- #endif
-
--/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
--#ifndef DefaultGcc2i386Opt
--#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
--#define DefaultGcc2i386Opt -O2
--#endif
--#endif
--
--#ifdef i386Architecture
--# define OptimizedCDebugFlags DefaultGcc2i386Opt
--#else
--# define OptimizedCDebugFlags -O
--#endif
-+#define DefaultGcc2i386Opt
-+#define OptimizedCDebugFlags FreeBSDCFLAGS
-
- #ifndef PreIncDir
- # define PreIncDir /usr/include
-@@ -513,6 +529,10 @@
-
- #ifndef PamLibraries
- #define PamLibraries -lpam DlLibrary
-+#endif
-+
-+#ifndef SharedLibXdmGreet
-+# define SharedLibXdmGreet NO
- #endif
-
- /*
diff --git a/x11/XFree86-4-libraries/files/patch-decode.c b/x11/XFree86-4-libraries/files/patch-decode.c
deleted file mode 100644
index 2725bf0..0000000
--- a/x11/XFree86-4-libraries/files/patch-decode.c
+++ /dev/null
@@ -1,35 +0,0 @@
---- extras/x86emu/src/x86emu/decode.c.orig Sat Jan 6 20:19:03 2001
-+++ extras/x86emu/src/x86emu/decode.c Mon May 20 02:02:34 2002
-@@ -734,6 +734,10 @@
- {
- unsigned offset;
-
-+ if (M.x86.mode & SYSMODE_PREFIX_ADDR) {
-+ u32* rp = decode_rm_long_register(rm);
-+ return (*rp);
-+ }
- switch (rm) {
- case 0:
- DECODE_PRINTF("[BX+SI]");
-@@ -782,6 +786,10 @@
- int rm)
- {
- int displacement = (s8)fetch_byte_imm();
-+ if (M.x86.mode & SYSMODE_PREFIX_ADDR) {
-+ u32* rp = decode_rm_long_register(rm);
-+ return (*rp + displacement);
-+ }
- switch (rm) {
- case 0:
- DECODE_PRINTF2("%d[BX+SI]", displacement);
-@@ -830,6 +838,10 @@
- int rm)
- {
- unsigned displacement = (u16)fetch_word_imm();
-+ if (M.x86.mode & SYSMODE_PREFIX_ADDR) {
-+ u32* rp = decode_rm_long_register(rm);
-+ return (*rp + displacement);
-+ }
- switch (rm) {
- case 0:
- DECODE_PRINTF2("%04x[BX+SI]", displacement);
diff --git a/x11/XFree86-4-libraries/files/patch-do_text.c b/x11/XFree86-4-libraries/files/patch-do_text.c
deleted file mode 100644
index adfd02f..0000000
--- a/x11/XFree86-4-libraries/files/patch-do_text.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- programs/x11perf/do_text.c.orig Wed Feb 19 07:39:37 2003
-+++ programs/x11perf/do_text.c Wed Feb 19 07:39:39 2003
-@@ -421,14 +421,6 @@
- p->font);
- return 0;
- }
--
-- if (aafont->core)
-- {
-- printf ("FreeType font '%s' not available, benchmark omitted\n",
-- p->font);
-- XftFontClose (xp->d, aafont);
-- return 0;
-- }
-
- aadraw = XftDrawCreate (xp->d, xp->w,
- DefaultVisual (xp->d, DefaultScreen (xp->d)),
diff --git a/x11/XFree86-4-libraries/files/patch-dps b/x11/XFree86-4-libraries/files/patch-dps
index d55f02d..8c64dce 100644
--- a/x11/XFree86-4-libraries/files/patch-dps
+++ b/x11/XFree86-4-libraries/files/patch-dps
@@ -1,5 +1,5 @@
---- lib/dps/Imakefile.orig Sat Apr 7 12:41:50 2001
-+++ lib/dps/Imakefile Tue Sep 3 22:37:23 2002
+--- lib/dps/Imakefile.orig Tue Dec 31 13:15:41 2002
++++ lib/dps/Imakefile Fri Jan 10 21:24:35 2003
@@ -29,7 +29,6 @@
SED = sed
AWK = awk
@@ -8,31 +8,31 @@
COMMONOBJECTFILES = \
dpsclient.o\
-@@ -195,7 +194,7 @@
+@@ -201,7 +200,7 @@
- includes :: $(DPSOPSCFILES) $(PSOPSCFILES) $(HEADERS)
+ includes:: $(DPSOPSCFILES) $(PSOPSCFILES) $(HEADERS)
--$(DPSOPSCFILES) $(PSOPSCFILES): ProgramTargetName($(PSWRAP))
-+$(DPSOPSCFILES) $(PSOPSCFILES) : PsWrapDependency
+-$(DPSOPSCFILES) $(PSOPSCFILES): HostProgramTargetName($(PSWRAP))
++$(DPSOPSCFILES) $(PSOPSCFILES): PsWrapDependency
SRCS = \
${COMMONSOURCEFILES} \
-@@ -218,16 +217,11 @@
+@@ -224,16 +223,11 @@
.SUFFIXES: .psw .h
--.psw.c : ProgramTargetName($(PSWRAP))
+-.psw.c : HostProgramTargetName($(PSWRAP))
+.psw.c : PsWrapDependency
RunProgram(PSWRAP,-a -o $*.c -h $*.h $<)
--.psw.h : ProgramTargetName($(PSWRAP))
+-.psw.h : HostProgramTargetName($(PSWRAP))
+.psw.h : PsWrapDependency
RunProgram(PSWRAP,-a -h $*.h $< > /dev/null)
-
--ProgramTargetName($(PSWRAP)):
+-HostProgramTargetName($(PSWRAP)):
- @echo "checking $@ over in $(PSWRAPSRC) first..."; \
- cd $(PSWRAPSRC) && $(MAKE); \
- echo "okay, continuing in $(CURRENT_DIR)"
- HEADERS = psops.h dpsops.h
-
+ includes :: $(HEADERS)
+ depend :: $(DPSOPSCFILES) $(PSOPSCFILES)
diff --git a/x11/XFree86-4-libraries/files/patch-dri-Imakefile b/x11/XFree86-4-libraries/files/patch-dri-Imakefile
new file mode 100644
index 0000000..3e6ea59
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-dri-Imakefile
@@ -0,0 +1,11 @@
+--- programs/Xserver/GL/dri/Imakefile.orig Mon Mar 3 20:21:30 2003
++++ programs/Xserver/GL/dri/Imakefile Mon Mar 3 20:21:31 2003
+@@ -13,7 +13,7 @@
+
+ INCLUDES = -I$(SERVERSRC)/include -I$(INCLUDESRC) -I$(XINCLUDESRC) \
+ -I$(EXTINCSRC) \
+- -I$(XF86OSSRC) -I$(XF86COMSRC) \
++ -I$(XF86OSSRC) -I$(XF86OSSRC)/bus -I$(XF86COMSRC) \
+ -I../include -I../glx -I$(LIBSRC)/GL/include \
+ -I$(SERVERSRC)/mi -I$(FONTINCSRC)
+ DEFINES = $(GLX_DEFINES)
diff --git a/x11/XFree86-4-libraries/files/patch-drilx11 b/x11/XFree86-4-libraries/files/patch-drilx11
deleted file mode 100644
index 1635ced..0000000
--- a/x11/XFree86-4-libraries/files/patch-drilx11
+++ /dev/null
@@ -1,99 +0,0 @@
---- lib/GL/mesa/src/drv/ffb/Imakefile.orig Sat Jun 8 16:02:28 2002
-+++ lib/GL/mesa/src/drv/ffb/Imakefile Sat Jun 8 16:02:29 2002
-@@ -38,7 +38,7 @@
- SRCS = $(FFBSRCS)
- OBJS = $(FFBOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS)
-
--REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
-+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
-
- #include <Library.tmpl>
-
---- lib/GL/mesa/src/drv/gamma/Imakefile.orig Sat Jun 8 16:01:51 2002
-+++ lib/GL/mesa/src/drv/gamma/Imakefile Sat Jun 8 16:01:53 2002
-@@ -46,7 +46,7 @@
- OBJS = $(LOWOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
- $(MESA_ASM_OBJS) $(GAMMAOBJS) $(HIOBJS)
-
--REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
-+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
-
- #include <Library.tmpl>
-
---- lib/GL/mesa/src/drv/i810/Imakefile.orig Sat Jun 8 16:00:38 2002
-+++ lib/GL/mesa/src/drv/i810/Imakefile Sat Jun 8 16:01:32 2002
-@@ -46,7 +46,7 @@
- OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
- $(MESA_ASM_OBJS) $(COMMONOBJS) $(I810OBJS) $(HIOBJS)
-
--REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
-+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
-
- #include <Library.tmpl>
-
---- lib/GL/mesa/src/drv/i830/Imakefile.orig Sat Jun 8 16:00:43 2002
-+++ lib/GL/mesa/src/drv/i830/Imakefile Sat Jun 8 16:01:31 2002
-@@ -46,7 +46,7 @@
- OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
- $(MESA_ASM_OBJS) $(COMMONOBJS) $(I830OBJS) $(HIOBJS)
-
--REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
-+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
-
- #include <Library.tmpl>
-
---- lib/GL/mesa/src/drv/mga/Imakefile.orig Sat Jun 8 16:00:31 2002
-+++ lib/GL/mesa/src/drv/mga/Imakefile Sat Jun 8 16:01:29 2002
-@@ -47,7 +47,7 @@
- OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
- $(MESA_ASM_OBJS) $(COMMONOBJS) $(MGAOBJS) $(HIOBJS)
-
--REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
-+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
-
- #include <Library.tmpl>
-
---- lib/GL/mesa/src/drv/r128/Imakefile.orig Sat Jun 8 16:00:24 2002
-+++ lib/GL/mesa/src/drv/r128/Imakefile Sat Jun 8 16:01:34 2002
-@@ -47,7 +47,7 @@
- OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
- $(MESA_ASM_OBJS) $(COMMONOBJS) $(R128OBJS) $(HIOBJS)
-
--REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
-+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
-
- #include <Library.tmpl>
-
---- lib/GL/mesa/src/drv/radeon/Imakefile.orig Sat Jun 8 15:59:52 2002
-+++ lib/GL/mesa/src/drv/radeon/Imakefile Sat Jun 8 15:59:54 2002
-@@ -47,7 +47,7 @@
- OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
- $(MESA_ASM_OBJS) $(COMMONOBJS) $(RADEONOBJS) $(HIOBJS)
-
--REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
-+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
-
- #include <Library.tmpl>
-
---- lib/GL/mesa/src/drv/sis/Imakefile.orig Sat Jun 8 16:02:40 2002
-+++ lib/GL/mesa/src/drv/sis/Imakefile Sat Jun 8 16:02:45 2002
-@@ -53,7 +53,7 @@
- OBJS = $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
- $(MESA_ASM_OBJS) $(SISOBJS) $(HIOBJS)
-
--REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
-+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
-
- #include <Library.tmpl>
-
---- lib/GL/mesa/src/drv/tdfx/Imakefile.orig Sat Jun 8 16:00:17 2002
-+++ lib/GL/mesa/src/drv/tdfx/Imakefile Sat Jun 8 16:01:12 2002
-@@ -47,7 +47,7 @@
- OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
- $(MESA_ASM_OBJS) $(TDFXOBJS) $(HIOBJS)
-
--REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
-+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
-
- #include <Library.tmpl>
-
diff --git a/x11/XFree86-4-libraries/files/patch-drmclean b/x11/XFree86-4-libraries/files/patch-drmclean
deleted file mode 100644
index dadf794..0000000
--- a/x11/XFree86-4-libraries/files/patch-drmclean
+++ /dev/null
@@ -1,17 +0,0 @@
---- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile.orig Tue Mar 19 17:35:44 2002
-+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile Tue Mar 19 17:35:50 2002
-@@ -11,10 +11,11 @@
-
- install::
- $(MAKE) -f Makefile.bsd install
-+
-+clean::
-+ $(MAKE) -f Makefile.bsd clean
-+
- #else
- all::
- @echo 'Use "make -f Makefile.bsd" to manually build the modules'
- #endif
--
--clean::
-- $(MAKE) -f Makefile.bsd clean
diff --git a/x11/XFree86-4-libraries/files/patch-f b/x11/XFree86-4-libraries/files/patch-f
index df0b829..d1b90e4 100644
--- a/x11/XFree86-4-libraries/files/patch-f
+++ b/x11/XFree86-4-libraries/files/patch-f
@@ -1,69 +1,6 @@
---- nls/compose.dir.orig Wed Nov 21 23:29:11 2001
-+++ nls/compose.dir Wed Jul 17 15:05:38 2002
-@@ -62,6 +62,7 @@
- iso8859-1/Compose: en_TT.ISO8859-1
- iso8859-1/Compose: en_UK.ISO8859-1
- iso8859-1/Compose: en_US.ISO8859-1
-+iso8859-15/Compose: en_US.ISO8859-15
- iso8859-1/Compose: en_ZA.ISO8859-1
- iso8859-3/Compose: eo_XX.ISO8859-3
- iso8859-1/Compose: es_AR.ISO8859-1
-@@ -211,7 +212,7 @@
- zh_CN/Compose: zh_CN.GB2312
- zh_CN.gbk/Compose: zh_CN.GBK
- zh_TW.big5/Compose: zh_TW.big5
--zh_TW.big5/Compose: zh_TW.Big5
-+zh_TW.Big5/Compose: zh_TW.Big5
- zh_TW/Compose: zh_TW.eucTW
- XCOMM
- XCOMM
---- nls/locale.alias.orig Thu Dec 20 06:29:40 2001
-+++ nls/locale.alias Sat Jan 19 22:22:20 2002
-@@ -637,18 +637,18 @@
- yi_US.MICROSOFT-CP1255: yi_US.CP1255
- zh: zh_CN.eucCN
- zh_CN: zh_CN.eucCN
--zh_CN.Big5: zh_TW.big5
-+zh_CN.Big5: zh_TW.Big5
- zh_CN.EUC: zh_CN.eucCN
- zh_CN.GB2312: zh_CN.eucCN
- zh_CN.GBK: zh_CN.gbk
--zh_CN.big5: zh_TW.big5
-+zh_CN.big5: zh_TW.Big5
- zh_CN.euc: zh_CN.eucCN
- zh_CN.gb2312: zh_CN.eucCN
- zh_HK: zh_HK.big5
- zh_HK.Big5: zh_HK.big5
- zh_HK.Big5HKSCS: zh_HK.big5hkscs
--zh_TW: zh_TW.big5
--zh_TW.Big5: zh_TW.big5
-+zh_TW: zh_TW.Big5
-+zh_TW.Big5: zh_TW.Big5
- zh_TW.EUC: zh_TW.eucTW
-
- XCOMM The following locale names are used in SCO 3.0
---- nls/locale.dir.orig Wed Jan 9 17:14:16 2002
-+++ nls/locale.dir Wed Jul 17 15:06:35 2002
-@@ -68,6 +68,7 @@
- iso8859-1/XLC_LOCALE: en_TT.ISO8859-1
- iso8859-1/XLC_LOCALE: en_UK.ISO8859-1
- iso8859-1/XLC_LOCALE: en_US.ISO8859-1
-+iso8859-15/XLC_LOCALE: en_US.ISO8859-15
- iso8859-1/XLC_LOCALE: en_ZA.ISO8859-1
- iso8859-3/XLC_LOCALE: eo_EO.ISO8859-3
- iso8859-3/XLC_LOCALE: eo_XX.ISO8859-3
-@@ -216,7 +217,7 @@
- zh_CN.gbk/XLC_LOCALE: zh_CN.gbk
- zh_HK.big5/XLC_LOCALE: zh_HK.big5
- zh_HK.big5hkscs/XLC_LOCALE: zh_HK.big5hkscs
--zh_TW.big5/XLC_LOCALE: zh_TW.big5
-+zh_TW.Big5/XLC_LOCALE: zh_TW.Big5
- zh_TW/XLC_LOCALE: zh_TW.eucTW
- XCOMM Note: The UTF-8 locales don't work correctly yet. Work in progress.
- en_US.UTF-8/XLC_LOCALE: af_ZA.UTF-8
---- nls/Compose/Imakefile.orig Sun Nov 24 15:54:38 2002
-+++ nls/Compose/Imakefile Sun Nov 24 15:55:37 2002
-@@ -64,11 +64,12 @@
+--- nls/Compose/Imakefile.orig Mon Jun 3 22:19:43 2002
++++ nls/Compose/Imakefile Sat Jan 11 01:00:46 2003
+@@ -54,6 +54,7 @@
ComposeTarget(koi8-r)
ComposeTarget(koi8-u)
ComposeTarget(koi8-c)
@@ -71,31 +8,3 @@
ComposeTarget(mulelao-1)
ComposeTarget(vi_VN.tcvn)
ComposeTarget(vi_VN.viscii)
- ComposeTarget(zh_CN)
- ComposeTarget(zh_CN.gbk)
- ComposeTarget(zh_TW)
--ComposeTarget(zh_TW.big5)
-+ComposeTarget(zh_TW.Big5)
-
---- nls/XI18N_OBJS/Imakefile.orig Fri Nov 16 09:52:31 2001
-+++ nls/XI18N_OBJS/Imakefile Sun Jan 20 01:08:44 2002
-@@ -57,7 +57,7 @@
- XI18NTarget(zh_CN.gbk)
- XI18NTarget(zh_HK.big5hkscs)
- XI18NTarget(zh_TW)
--XI18NTarget(zh_TW.big5)
-+XI18NTarget(zh_TW.Big5)
- XI18NTarget(th_TH)
- XI18NTarget(en_US.UTF-8)
- #ifdef UXPArchitecture
---- nls/XLC_LOCALE/Imakefile.orig Fri Nov 2 08:35:28 2001
-+++ nls/XLC_LOCALE/Imakefile Sat Jan 19 22:19:27 2002
-@@ -89,7 +89,7 @@
- LTarget(zh_HK.big5)
- LTarget(zh_HK.big5hkscs)
- LTarget(zh_TW)
--LTarget(zh_TW.big5)
-+LTarget(zh_TW.Big5)
- LTarget(th_TH)
- LTarget(en_US.UTF-8)
- #ifdef UXPArchitecture
diff --git a/x11/XFree86-4-libraries/files/patch-freetype b/x11/XFree86-4-libraries/files/patch-freetype
deleted file mode 100644
index 0ab7e6d..0000000
--- a/x11/XFree86-4-libraries/files/patch-freetype
+++ /dev/null
@@ -1,26 +0,0 @@
---- config/cf/X11.tmpl.orig Tue Jan 15 14:55:26 2002
-+++ config/cf/X11.tmpl Mon Sep 2 13:28:05 2002
-@@ -1380,7 +1380,14 @@
- #endif
-
- #ifndef PsWrap
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
-+#define PsWrap pswrap
-+#define PsWrapDependency /**/
-+#else
- #define PsWrap $(PSWRAPSRC)/pswrap
-+#define PsWrapDependency ProgramTargetName($(PSWRAP))
-+#endif
-+ PSWRAP = PsWrap
- #endif
-
- #ifndef ResourceConfigurationManagement
-@@ -2622,7 +2629,7 @@
- FREETYPE2DIR = Freetype2Dir
- FREETYPE2LIBDIR = Freetype2LibDir
- FREETYPE2INCDIR = Freetype2IncDir
--FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)
-+FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -I$(FREETYPE2DIR)/include
- FREETYPE2LIB = -L$(FREETYPE2LIBDIR) -lfreetype
- FREETYPE2DEFINES = -DFREETYPE2
- #endif
diff --git a/x11/XFree86-4-libraries/files/patch-h b/x11/XFree86-4-libraries/files/patch-h
deleted file mode 100644
index 5a424c8..0000000
--- a/x11/XFree86-4-libraries/files/patch-h
+++ /dev/null
@@ -1,74 +0,0 @@
---- config/cf/Imake.rules.orig Mon Dec 17 12:00:37 2001
-+++ config/cf/Imake.rules Sun Sep 1 22:20:08 2002
-@@ -1369,7 +1369,7 @@
- * this Imakefile is within the source tree.
- */
- #ifndef RmanDependency
--#ifdef UseInstalled
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
- #define RmanDependency() /**/
- #else
- #define RmanDependency() @@\
-@@ -1384,7 +1384,7 @@
- #endif /* RmanDependency */
-
- #ifndef RmanCmdDependency
--#ifdef UseInstalled
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
- #define RmanCmdDependency /**/
- #else
- #define RmanCmdDependency ProgramTargetName($(RMAN))
-@@ -1399,7 +1399,7 @@
- dest.suffix.html: file.$(MANNEWSUFFIX) RmanCmdDependency @@\
- RemoveFiles(dest.suffix.html dest.suffix-html) @@\
- RunProgram(RMAN,$(RMANOPTIONS) < file.$(MANNEWSUFFIX) \ @@\
-- > dest.suffix-html) && $(MV) dest.suffix-html $@ @@\
-+ > dest.suffix-html) && $(MV) dest.suffix-html dest.suffix.html @@\
- @@\
- install.man:: dest.suffix.html @@\
- MakeDir($(DESTDIR)$(DOCHTMLDIR)) @@\
-@@ -1644,7 +1644,7 @@
- MakeDir(Concat($(DESTDIR),npath/mdir)) @@\
- @MakeFlagsToShellFlags(i,set +e); \ @@\
- if [ -d Concat($(DESTDIR),opath/cdir) ]; then \ @@\
-- RELPATH=`echo opath/cdir | \ @@\
-+ RELPATH=`cd opath/cdir; pwd | \ @@\
- sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ @@\
- cd Concat($(DESTDIR),opath/cdir); \ @@\
- if [ -d rdir -a ! -h rdir ]; then \ @@\
-@@ -1691,7 +1691,7 @@
- MakeDir(Concat($(DESTDIR),npath)) @@\
- @MakeFlagsToShellFlags(i,set +e); \ @@\
- if [ -d Concat($(DESTDIR),opath) ]; then \ @@\
-- RELPATH=`echo opath | \ @@\
-+ RELPATH=`cd opath; pwd | \ @@\
- sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \ @@\
- cd Concat($(DESTDIR),opath); \ @@\
- if [ -f lfile -a ! -h lfile ]; then \ @@\
-@@ -1833,7 +1833,7 @@
- * this Imakefile is within the source tree.
- */
- #ifndef DependDependency
--#ifdef UseInstalled
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
- #define DependDependency() /**/
- #else
- #define DependDependency() @@\
-@@ -1928,7 +1928,7 @@
- * within the source tree.
- */
- #ifndef ImakeDependency
--#ifdef UseInstalled
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
- #define ImakeDependency(target) /**/
- #else
- #define ImakeDependency(target) @@\
-@@ -3077,6 +3077,8 @@
-
- #ifdef UseInstalled
- #define ImakeSubCmdHelper $(IMAKE_CMD)
-+#elif defined(UseInstalledPrograms)
-+#define ImakeSubCmdHelper $(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) $(IMAKE_DEFINES)
- #else
- #define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) $(IMAKE_DEFINES)
- #endif
diff --git a/x11/XFree86-4-libraries/files/patch-imLcPrs.c b/x11/XFree86-4-libraries/files/patch-imLcPrs.c
deleted file mode 100644
index f4e347f..0000000
--- a/x11/XFree86-4-libraries/files/patch-imLcPrs.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- lib/X11/imLcPrs.c.orig Wed Dec 4 00:16:59 2002
-+++ lib/X11/imLcPrs.c Wed Dec 4 00:17:44 2002
-@@ -518,13 +518,13 @@
- FILE *fp;
- DefTree **ptop;
- {
-- char tb[65535];
-+ char tb[8192];
- char* tbp;
- struct stat st;
-
- if (fstat (fileno (fp), &st) != -1) {
- unsigned long size = (unsigned long) st.st_size;
-- if (size < sizeof tb) tbp = tb;
-+ if (size <= sizeof tb) tbp = tb;
- else tbp = malloc (size);
-
- if (tbp != NULL) {
diff --git a/x11/XFree86-4-libraries/files/patch-imake.c b/x11/XFree86-4-libraries/files/patch-imake.c
new file mode 100644
index 0000000..43699ed
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-imake.c
@@ -0,0 +1,22 @@
+--- config/imake/imake.c.orig Tue Dec 17 04:21:38 2002
++++ config/imake/imake.c Sat Jan 4 15:57:23 2003
+@@ -1384,6 +1384,19 @@
+ name = &uts_name;
+ }
+ #endif
++# ifdef __FreeBSD__
++ /* Hack for FreeBSD ports "Cross Version" compiling system. */
++ {
++ char *e;
++ if ((e = getenv("OSREL")) != NULL &&
++ strlen(name->sysname) + strlen(e) + 1 < SYS_NMLN) {
++ strcpy(name->release, e);
++ strcpy(name->version, name->sysname);
++ strcat(name->version, " ");
++ strcat(name->version, e);
++ }
++ }
++# endif
+
+ # if defined DEFAULT_OS_NAME
+ # if defined CROSSCOMPILE
diff --git a/x11/XFree86-4-libraries/files/patch-ioctl b/x11/XFree86-4-libraries/files/patch-ioctl
deleted file mode 100644
index 09f605e..0000000
--- a/x11/XFree86-4-libraries/files/patch-ioctl
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm.h~ Sun Dec 16 12:45:01 2001
-+++ ./programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm.h Tue Apr 9 21:45:35 2002
-@@ -35,7 +35,9 @@
- #ifndef _DRM_H_
- #define _DRM_H_
-
-+#undef ioctl
- #include <sys/ioccom.h>
-+#define ioctl(a,b,c) xf86ioctl(a,b,c)
- #define DRM_IOCTL_NR(n) ((n) & 0xff)
-
- #define XFREE86_VERSION(major,minor,patch,snap) \
diff --git a/x11/XFree86-4-libraries/files/patch-joycal.c b/x11/XFree86-4-libraries/files/patch-joycal.c
deleted file mode 100644
index 377504c..0000000
--- a/x11/XFree86-4-libraries/files/patch-joycal.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./programs/Xserver/hw/xfree86/etc/joycal.c.orig Sat Nov 22 09:00:18 1997
-+++ ./programs/Xserver/hw/xfree86/etc/joycal.c Mon Apr 8 15:08:17 2002
-@@ -6,7 +6,7 @@
- #include <unistd.h>
- #include <string.h>
- #if defined (__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
--#include <machine/joystick.h>
-+#include <sys/joystick.h>
- #define JS_RETURN sizeof(struct joystick)
- #define JS_DATA_TYPE joystick
- #define button_down(j) (j.b1 | j.b2)
diff --git a/x11/XFree86-4-libraries/files/patch-lib-Imakefile b/x11/XFree86-4-libraries/files/patch-lib-Imakefile
new file mode 100644
index 0000000..b9de3d4
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-lib-Imakefile
@@ -0,0 +1,11 @@
+--- lib/Imakefile.orig Sun Mar 2 19:44:29 2003
++++ lib/Imakefile Sun Mar 2 19:44:31 2003
+@@ -211,7 +211,7 @@
+ $(DPSLIBDIR) $(DPSTKLIBDIR) $(PSRESLIBDIR) $(XINERAMADIR) \
+ $(ZLIBDIR) $(REGEXDIR) $(RENDERLIBDIR) $(FREETYPE2BUILDDIR) \
+ $(LIBXML2BUILDDIR) $(EXPATBUILDDIR) $(FONTCONFIGBUILDDIR) \
+- $(XFT1LIBDIR) $(XFTLIBDIR) $(XVMCLIBDIR) $(RANDRLIBDIR) \
++ $(XVMCLIBDIR) $(RANDRLIBDIR) \
+ $(XTRAPLIBDIR) $(XRESLIBDIR) $(XCURSORLIBDIR)
+
+ SUBDIRS = $(BERKDIR) xtrans $(LINTSUBDIRS) $(FONTSUBDIR) $(FONTENCSUBDIR) \
diff --git a/x11/XFree86-4-libraries/files/patch-luit b/x11/XFree86-4-libraries/files/patch-luit
new file mode 100644
index 0000000..8d73f80
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-luit
@@ -0,0 +1,61 @@
+--- programs/luit/Imakefile.orig Wed Oct 16 18:06:09 2002
++++ programs/luit/Imakefile Tue Mar 11 14:57:02 2003
+@@ -8,7 +8,7 @@
+ LOCAL_LIBRARIES = $(XFONTENCLIB)
+ DEPLIBS = $(DEPXFONTENCLIB)
+
+-SYS_LIBRARIES = MathLibrary GzipLibrary
++SYS_LIBRARIES = MathLibrary GzipLibrary -lutil
+
+ SRCS = luit.c iso2022.c charset.c parser.c sys.c other.c
+
+--- programs/luit/sys.c.orig Mon Jan 7 12:38:30 2002
++++ programs/luit/sys.c Tue Mar 11 14:57:02 2003
+@@ -33,6 +33,7 @@
+ #include <termios.h>
+ #include <signal.h>
+ #include <errno.h>
++#include <libutil.h>
+
+ #ifdef SVR4
+ #define HAVE_POLL
+@@ -313,6 +314,7 @@
+ int pty = -1;
+ char *name1 = "pqrstuvwxyzPQRST", *name2 = "0123456789abcdef";
+ char *p1, *p2;
++ int tty;
+
+ #ifdef HAVE_GRANTPT
+ char *temp_line;
+@@ -355,27 +357,11 @@
+ bsd:
+ #endif /* HAVE_GRANTPT */
+
+- strcpy(name, "/dev/pty??");
+- for(p1 = name1; *p1; p1++) {
+- name[8] = *p1;
+- for(p2 = name2; *p2; p2++) {
+- name[9] = *p2;
+- pty = open(name, O_RDWR);
+- if(pty >= 0)
+- goto found;
+- if(errno == ENOENT)
+- goto bail;
+- else
+- continue;
+- }
+- }
+-
+- goto bail;
+-
+- found:
+- line = malloc(strlen(name));
++ if (openpty(&pty, &tty, name, NULL, NULL) == -1)
++ goto bail;
++ close(tty);
++ line = malloc(strlen(name) + 1);
+ strcpy(line, name);
+- line[5] = 't';
+ fix_pty_perms(line);
+ *pty_return = pty;
+ *line_return = line;
diff --git a/x11/XFree86-4-libraries/files/patch-mouse.c b/x11/XFree86-4-libraries/files/patch-mouse.c
deleted file mode 100644
index 11f7a54..0000000
--- a/x11/XFree86-4-libraries/files/patch-mouse.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- programs/Xserver/hw/xfree86/input/mouse/mouse.c.orig Wed Dec 19 16:05:22 2001
-+++ programs/Xserver/hw/xfree86/input/mouse/mouse.c Thu Jan 9 22:48:18 2003
-@@ -1505,8 +1505,8 @@
- dy = - ((char)(pBuf[2]) + (char)(pBuf[4]));
- /* FreeBSD sysmouse sends additional data bytes */
- if (pMse->protoPara[4] >= 8) {
-- dz = ((char)(pBuf[5] << 1) + (char)(pBuf[6] << 1)) / 2;
-- buttons |= (int)(~pBuf[7] & 0x07) << 3;
-+ dz = ((signed char)(pBuf[5] << 1) + (signed char)(pBuf[6] << 1)) >> 1;
-+ buttons |= (int)(~pBuf[7] & 0x7f) << 3;
- }
- break;
-
diff --git a/x11/XFree86-4-libraries/files/patch-programs-Imakefile b/x11/XFree86-4-libraries/files/patch-programs-Imakefile
deleted file mode 100644
index 3647855..0000000
--- a/x11/XFree86-4-libraries/files/patch-programs-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- programs/Imakefile.orig Tue Feb 18 23:53:09 2003
-+++ programs/Imakefile Tue Feb 18 23:54:11 2003
-@@ -127,7 +127,7 @@
- $(XTERMSRCDIR) $(XTRAPCLIENTDIRS) $(XVIDTUNESRCDIR) xwd xwininfo xwud \
- $(XPMCLIENTDIRS) $(XVINFOSRCDIR) \
- $(XSSRCDIR) $(XASSRCDIR) $(LBXPROXYSRCDIR) $(SCRIPTSDIR) \
-- $(GLXCLIENTDIRS) $(XFTCACHEDIR) $(XRANDRDIR)
-+ $(GLXCLIENTDIRS) $(XRANDRDIR)
- #endif
-
- MakeSubdirs($(SUBDIRS))
diff --git a/x11/XFree86-4-libraries/files/patch-programs::Xserver::hw::xfree86::drivers::s3::s3_driver.c b/x11/XFree86-4-libraries/files/patch-programs::Xserver::hw::xfree86::drivers::s3::s3_driver.c
deleted file mode 100644
index 025f8b8..0000000
--- a/x11/XFree86-4-libraries/files/patch-programs::Xserver::hw::xfree86::drivers::s3::s3_driver.c
+++ /dev/null
@@ -1,25 +0,0 @@
-
-$FreeBSD$
-
---- programs/Xserver/hw/xfree86/drivers/s3/s3_driver.c 2002/08/26 06:45:40 1.1
-+++ programs/Xserver/hw/xfree86/drivers/s3/s3_driver.c 2002/08/26 06:49:53
-@@ -174,6 +174,7 @@
- #ifdef S3_USEFB
- static const char *fbSymbols[] = {
- "fbScreenInit",
-+ "fbPictureInit",
- NULL
- };
- #else
-@@ -850,6 +851,11 @@
- }
- }
- }
-+
-+#ifdef S3_USEFB
-+ /* must be after RGB order fixed */
-+ fbPictureInit (pScreen, 0, 0);
-+#endif
-
- S3DGAInit(pScreen);
-
diff --git a/x11/XFree86-4-libraries/files/patch-s02 b/x11/XFree86-4-libraries/files/patch-s02
deleted file mode 100644
index 6aea4c5..0000000
--- a/x11/XFree86-4-libraries/files/patch-s02
+++ /dev/null
@@ -1,11 +0,0 @@
---- programs/Xserver/GL/dri/Imakefile.ORIG Tue Aug 8 15:42:21 2000
-+++ programs/Xserver/GL/dri/Imakefile Tue Aug 8 15:43:34 2000
-@@ -14,7 +14,7 @@
- INCLUDES = -I$(SERVERSRC)/include -I$(XTOP)/include -I$(EXTINCSRC) \
- -I$(XF86OSSRC) -I$(XF86COMSRC) \
- -I../include -I../glx -I$(LIBSRC)/GL/include \
-- -I$(SERVERSRC)/mi -I$(FONTINCSRC)
-+ -I$(SERVERSRC)/mi -I$(FONTINCSRC) -I$(XF86OSSRC)/bus
- DEFINES = $(GLX_DEFINES)
-
- LinkSourceFile(xf86dri.h,$(LIBSRC)/GL/dri)
diff --git a/x11/XFree86-4-libraries/files/patch-sysvipc b/x11/XFree86-4-libraries/files/patch-sysvipc
deleted file mode 100644
index 22bc4ed..0000000
--- a/x11/XFree86-4-libraries/files/patch-sysvipc
+++ /dev/null
@@ -1,34 +0,0 @@
---- programs/Xserver/hw/xfree86/os-support/bsd/Imakefile.orig Fri Aug 2 00:27:08 2002
-+++ programs/Xserver/hw/xfree86/os-support/bsd/Imakefile Fri Aug 2 00:28:25 2002
-@@ -62,6 +62,10 @@
- MTRRDEFINES = -DHAS_MTRR_BUILTIN
- #endif
-
-+#if defined(FreeBSDArchitecture)
-+SYSVIPCDEFINES = -DHAVE_SYSV_IPC
-+#endif
-+
- #if UsbMouseSupport
- USBMOUSEDEFINES1 = -DUSBMOUSE_SUPPORT
- #if !HasLibUsb
-@@ -142,7 +146,7 @@
- #endif
-
- DEFINES = $(CONSDEFINES) $(APDEFINES) $(IOPERMDEFINES) $(RESDEFINES) \
-- $(MTRRDEFINES) $(USBMOUSEDEFINES)
-+ $(MTRRDEFINES) $(USBMOUSEDEFINES) $(SYSVIPCDEFINES)
-
- #if defined(AlphaArchitecture)
- SpecialObjectRule(bsd_ev56.o, bsd_ev56.c, -mcpu=ev56)
---- programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c.orig Fri Aug 2 00:25:26 2002
-+++ programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c Fri Aug 2 00:25:48 2002
-@@ -1879,7 +1879,9 @@
-
- if (xf86shmflg & XF86SHM_RDONLY) shmflg |= SHM_RDONLY;
- if (xf86shmflg & XF86SHM_RND) shmflg |= SHM_RND;
-+#ifdef SHM_REMAP
- if (xf86shmflg & XF86SHM_REMAP) shmflg |= SHM_REMAP;
-+#endif
-
- return shmat(id,addr,shmflg);
- }
diff --git a/x11/XFree86-4-libraries/files/patch-t01 b/x11/XFree86-4-libraries/files/patch-t01
deleted file mode 100644
index 227a967..0000000
--- a/x11/XFree86-4-libraries/files/patch-t01
+++ /dev/null
@@ -1,34 +0,0 @@
-
-$FreeBSD$
-
---- config/imake/imake.c.orig Fri Dec 14 21:53:18 2001
-+++ config/imake/imake.c Sat May 11 03:03:51 2002
-@@ -1161,7 +1161,7 @@
- get_gcc_incdir(FILE *inFile)
- {
- static char* gcc_path[] = {
--#if defined(linux) || defined(__OpenBSD__) || defined (__GNU__)
-+#if defined(linux) || defined(__OpenBSD__) || defined (__GNU__) || defined(__FreeBSD__)
- "/usr/bin/cc", /* for Linux PostIncDir */
- #endif
- "/usr/local/bin/gcc",
-@@ -1207,6 +1207,19 @@
- if (uname(&name) < 0)
- LogFatal("Cannot invoke uname", "");
-
-+# ifdef __FreeBSD__
-+ /* Hack for FreeBSD ports "Cross Version" compiling system. */
-+ {
-+ char *e;
-+ if ((e = getenv("OSREL")) != NULL &&
-+ strlen(name.sysname) + strlen(e) + 1 < SYS_NMLN) {
-+ strcpy(name.release, e);
-+ strcpy(name.version, name.sysname);
-+ strcat(name.version, " ");
-+ strcat(name.version, e);
-+ }
-+ }
-+# endif
- # ifdef DEFAULT_OS_NAME
- parse_utsname(&name, DEFAULT_OS_NAME, buf,
- "Bad DEFAULT_OS_NAME syntax %s");
diff --git a/x11/XFree86-4-libraries/files/patch-ttcalc.c b/x11/XFree86-4-libraries/files/patch-ttcalc.c
deleted file mode 100644
index adac5b6..0000000
--- a/x11/XFree86-4-libraries/files/patch-ttcalc.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- extras/FreeType/lib/ttcalc.c.orig Wed Jan 15 17:48:58 2003
-+++ extras/FreeType/lib/ttcalc.c Wed Jan 15 17:49:03 2003
-@@ -84,7 +84,7 @@
-
- while ( z )
- {
-- z = (unsigned INT64)z >> 1;
-+ z = (CARD64)z >> 1;
- j++;
- }
- return j - 1;
diff --git a/x11/XFree86-4-libraries/files/patch-x11perf-Imakefile b/x11/XFree86-4-libraries/files/patch-x11perf-Imakefile
deleted file mode 100644
index f39a57c..0000000
--- a/x11/XFree86-4-libraries/files/patch-x11perf-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- programs/x11perf/Imakefile.orig Tue Feb 18 23:05:33 2003
-+++ programs/x11perf/Imakefile Tue Feb 18 23:06:18 2003
-@@ -17,6 +17,8 @@
- XFTDEPS = XftClientDepLibs $(DEPXRENDERLIB)
- XFTLIBS = XftClientLibs $(XRENDERLIB)
- #endif
-+ XFTDEFS = -DXFT `pkg-config xft --cflags`
-+ XFTLIBS = `pkg-config xft --libs`
- DEFINES = $(SIGNAL_DEFINES) $(SHMDEFS) $(XFTDEFS)
- PERFLIB = X11perfcompLib
- HEADERS = x11perf.h bitmaps.h
diff --git a/x11/XFree86-4-libraries/files/patch-xdm-config b/x11/XFree86-4-libraries/files/patch-xdm-config
deleted file mode 100644
index 8cb26a8..0000000
--- a/x11/XFree86-4-libraries/files/patch-xdm-config
+++ /dev/null
@@ -1,11 +0,0 @@
---- programs/xdm/config/Imakefile.org Sun Nov 25 13:49:19 2001
-+++ programs/xdm/config/Imakefile Tue Mar 19 18:11:50 2002
-@@ -28,7 +28,7 @@
- XDMPIDDIR = $(XDMDIR)
- #endif
-
--#if defined(OpenBSDArchitecture) || defined(NetBSDArchitecture)
-+#if defined(OpenBSDArchitecture) || defined(NetBSDArchitecture) || defined(FreeBSDArchitecture)
- SU = "su -m"
- #else
- SU = su
diff --git a/x11/XFree86-4-libraries/files/patch-xdm_session.c b/x11/XFree86-4-libraries/files/patch-xdm_session.c
deleted file mode 100644
index c7c2d43..0000000
--- a/x11/XFree86-4-libraries/files/patch-xdm_session.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- programs/xdm/session.c.orig Wed May 30 00:56:22 2001
-+++ programs/xdm/session.c Fri Sep 28 23:25:16 2001
-@@ -541,6 +541,7 @@
- int pid;
- #ifdef HAS_SETUSERCONTEXT
- struct passwd* pwd;
-+ extern char **environ;
- #endif
- #ifdef USE_PAM
- pam_handle_t *pamh = thepamh();
-@@ -623,6 +624,8 @@
- * Set the user's credentials: uid, gid, groups,
- * environment variables, resource limits, and umask.
- */
-+ /* destroy user environment before calling setusercontext */
-+ environ = verify->userEnviron;
- pwd = getpwnam(name);
- if (pwd)
- {
-@@ -632,6 +635,7 @@
- errno);
- return (0);
- }
-+ verify->userEnviron = environ;
- endpwent();
- }
- else
diff --git a/x11/XFree86-4-libraries/files/patch-xf86.tmpl b/x11/XFree86-4-libraries/files/patch-xf86.tmpl
index 27d92ee..3bf0b44 100644
--- a/x11/XFree86-4-libraries/files/patch-xf86.tmpl
+++ b/x11/XFree86-4-libraries/files/patch-xf86.tmpl
@@ -1,11 +1,12 @@
---- config/cf/xf86.tmpl.orig Mon Sep 2 11:45:21 2002
-+++ config/cf/xf86.tmpl Mon Sep 2 11:45:24 2002
-@@ -27,6 +27,8 @@
+--- config/cf/xf86.tmpl.orig Tue Dec 17 04:21:38 2002
++++ config/cf/xf86.tmpl Thu Jan 2 14:10:44 2003
+@@ -19,6 +19,9 @@
#ifdef UseInstalled
- #define ImakeSubCmdHelper $(IMAKE) -DUseInstalled -I$(IMAKETOP) \
- -I$(IRULESRC) $(IMAKE_DEFINES)
-+#elif defined(UseInstalledPrograms)
-+#define ImakeSubCmdHelper $(IMAKE) -I$(IMAKETOP) -I$(IRULESRC) $(IMAKE_DEFINES)
+ IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(TOP) -I$(IRULESRC) \
+ $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
++#elif UseInstalledPrograms
++ IMAKE_CMD = $(IMAKE) -I$(TOP) -I$(IRULESRC) \
++ $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
#else
- #define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKETOP) \
- -I$(IMAKEPREFIX)$(IRULESRC) $(IMAKE_DEFINES)
+ IMAKE_CMD = $(IMAKE) -I$(TOP) -I$(IRULESRC) \
+ $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
diff --git a/x11/XFree86-4-libraries/files/patch-xfree86.cf b/x11/XFree86-4-libraries/files/patch-xfree86.cf
new file mode 100644
index 0000000..2bb1d41
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-xfree86.cf
@@ -0,0 +1,11 @@
+--- config/cf/xfree86.cf.orig Tue Mar 4 16:39:46 2003
++++ config/cf/xfree86.cf Tue Mar 4 16:39:48 2003
+@@ -1803,6 +1803,8 @@
+ #ifndef XFree86ConsoleDefines
+ # if defined(i386BsdArchitecture) || defined(AlphaBsdArchitecture)
+ # define XFree86ConsoleDefines -DPCCONS_SUPPORT -DSYSCONS_SUPPORT -DPCVT_SUPPORT
++# elif defined(FreeBSDArchitecture)
++# define XFree86ConsoleDefines -DSYSCONS_SUPPORT
+ # else
+ # define XFree86ConsoleDefines /**/
+ # endif
diff --git a/x11/XFree86-4-libraries/files/patch-z06 b/x11/XFree86-4-libraries/files/patch-z06
deleted file mode 100644
index c471857..0000000
--- a/x11/XFree86-4-libraries/files/patch-z06
+++ /dev/null
@@ -1,11 +0,0 @@
---- programs/Xserver/hw/xfree86/os-support/Imakefile.orig Fri Dec 28 05:07:05 2001
-+++ programs/Xserver/hw/xfree86/os-support/Imakefile Sat Jan 19 23:46:45 2002
-@@ -95,6 +95,8 @@
- SRCS = $(OS_SUBDIR)/?*.c $(BUS_SUBDIR)/?*.c misc/?*.c $(VBE_SRC) $(DRM_SRC)
- OBJS = $(OS_SUBDIR)/?*.o $(BUS_SUBDIR)/?*.o misc/?*.o $(VBE_OBJ) $(DRM_OBJ)
-
-+HEADERS = xf86_ansic.h
-+
- DONES = $(OS_SUBDIR)/DONE $(BUS_SUBDIR)/DONE misc/DONE $(VBE_DONES) $(DRM_DONES)
-
- #if HasParallelMake
diff --git a/x11/XFree86-4-libraries/files/patch-z16 b/x11/XFree86-4-libraries/files/patch-z16
deleted file mode 100644
index b8670c7..0000000
--- a/x11/XFree86-4-libraries/files/patch-z16
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/Xaw/Imakefile~ Mon Jun 28 02:27:45 1999
-+++ lib/Xaw/Imakefile Tue May 9 14:19:57 2000
-@@ -196,5 +196,7 @@
- #endif
-
- MANSUFFIX = $(LIBMANSUFFIX)
-+#if !defined(FreeBSDBuildXbin) || !FreeBSDBuildXbin
- InstallManPage(Xaw,$(LIBMANDIR))
-+#endif
- DependTarget()
diff --git a/x11/XFree86-4-libraries/files/patch-z37 b/x11/XFree86-4-libraries/files/patch-z37
deleted file mode 100644
index 2a0e488..0000000
--- a/x11/XFree86-4-libraries/files/patch-z37
+++ /dev/null
@@ -1,11 +0,0 @@
---- programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig Tue Jul 10 08:45:24 2001
-+++ programs/Xserver/hw/xfree86/xf86cfg/Imakefile Mon Jan 21 07:27:55 2002
-@@ -84,7 +84,7 @@
- MODULEDEFINES = -DUSE_MODULES
- INCLUDES = -I../common -I../loader -I$(XF86OSSRC) \
- -I$(SERVERSRC)/include -I$(XINCLUDESRC) \
-- -I$(FONTLIBSRC)/include
-+ -I$(FONTLIBSRC)/include -I$(XF86OSSRC)/bus -I../parser
- #if !HasSnprintf
- SNPRINTF_DEFS = -DNEED_SNPRINTF
- #endif
diff --git a/x11/XFree86-4-libraries/files/patch-z39 b/x11/XFree86-4-libraries/files/patch-z39
deleted file mode 100644
index 790babc..0000000
--- a/x11/XFree86-4-libraries/files/patch-z39
+++ /dev/null
@@ -1,12 +0,0 @@
---- programs/Xserver/include/Imakefile~ Sat Oct 28 10:26:51 2000
-+++ programs/Xserver/include/Imakefile Tue Dec 26 13:22:59 2000
-@@ -55,3 +55,9 @@
- InstallDriverSDKNonExecFile(validate.h,$(DRIVERSDKINCLUDEDIR))
- InstallDriverSDKNonExecFile(window.h,$(DRIVERSDKINCLUDEDIR))
- InstallDriverSDKNonExecFile(windowstr.h,$(DRIVERSDKINCLUDEDIR))
-+
-+/* Followings are for programs/rgb (aka. showrgb) */
-+#if !defined(LibHeaders) || LibHeaders
-+HEADERS= rgb.h site.h
-+InstallMultipleFlags($(HEADERS),$(INCDIR),$(INSTINCFLAGS))
-+#endif
diff --git a/x11/XFree86-4-libraries/files/patch-z40 b/x11/XFree86-4-libraries/files/patch-z40
deleted file mode 100644
index a311ef5..0000000
--- a/x11/XFree86-4-libraries/files/patch-z40
+++ /dev/null
@@ -1,15 +0,0 @@
---- /usr/local/src/XFree86-4/ORIG/xc/programs/Xserver/hw/xfree86/os-support/bus/Imakefile Tue Dec 5 11:57:47 2000
-+++ programs/Xserver/hw/xfree86/os-support/bus/Imakefile Tue Dec 19 23:50:18 2000
-@@ -74,6 +74,7 @@
-
- SRCS = Pci.c $(PCIDRVRSRC) $(SBUSDRVSRC)
- OBJS = Pci.o $(PCIDRVROBJ) $(SBUSDRVOBJ)
-+HEADERS= xf86Pci.h
-
- INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \
- -I$(SERVERSRC)/include -I$(XINCLUDESRC)
-@@ -91,3 +92,4 @@
-
- DependTarget()
-
-+BuildIncludesTop($(HEADERS))
diff --git a/x11/XFree86-4-libraries/files/patch-z42 b/x11/XFree86-4-libraries/files/patch-z42
deleted file mode 100644
index 8c5d7db..0000000
--- a/x11/XFree86-4-libraries/files/patch-z42
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Imakefile.orig Wed Apr 4 02:36:28 2001
-+++ lib/Imakefile Tue Jun 5 20:58:27 2001
-@@ -28,7 +28,7 @@
- XKBUILIBDIR = xkbui
- #endif
-
--#if BuildThreadStubLibrary && BuildLibraries
-+#if BuildThreadStubLibrary
- THRSTUBLIBDIR = XThrStub
- #endif
-
diff --git a/x11/XFree86-4-libraries/files/patch-z43 b/x11/XFree86-4-libraries/files/patch-z43
deleted file mode 100644
index 6db2365..0000000
--- a/x11/XFree86-4-libraries/files/patch-z43
+++ /dev/null
@@ -1,16 +0,0 @@
---- programs/Xserver/hw/xfree86/input/joystick/Imakefile.orig Tue Mar 20 09:10:03 2001
-+++ programs/Xserver/hw/xfree86/input/joystick/Imakefile Tue Mar 20 09:10:18 2001
-@@ -12,11 +12,11 @@
- -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC)
-
- #ifdef LinuxArchitecture
-- ARCH_JSTK = ../os-support/linux/lnx_jstk.o
-+ ARCH_JSTK = ../../os-support/linux/lnx_jstk.o
- #endif
-
- #if defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || defined(OpenBSDArchitecture)
-- ARCH_JSTK = ../os-support/bsd/bsd_jstk.o
-+ ARCH_JSTK = ../../os-support/bsd/bsd_jstk.o
- #endif
-
- #if MakeHasPosixVariableSubstitutions
diff --git a/x11/XFree86-4-libraries/files/patch-z45 b/x11/XFree86-4-libraries/files/patch-z45
index 9fc8266..430c24d 100644
--- a/x11/XFree86-4-libraries/files/patch-z45
+++ b/x11/XFree86-4-libraries/files/patch-z45
@@ -1,5 +1,5 @@
---- lib/GLU/Imakefile.orig Wed Feb 14 04:19:11 2001
-+++ lib/GLU/Imakefile Thu Jun 7 03:00:26 2001
+--- lib/GLU/Imakefile.orig Fri May 31 11:45:39 2002
++++ lib/GLU/Imakefile Thu Jan 2 12:04:03 2003
@@ -103,6 +103,7 @@
#undef _LinkBuildLibrary
#define _LinkBuildLibrary(lib) LinkBuildLibrary(lib)
@@ -8,11 +8,12 @@
#if NormalLibGlu
NormalDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(STATIC_OBJS))
InstallLibrary($(LIBNAME),$(USRLIBDIR))
-@@ -122,6 +123,7 @@
+@@ -126,7 +127,7 @@
ProfiledDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(PROFILE_OBJS))
InstallLibrary($(LIBNAME)_p,$(USRLIBDIR))
- #endif /* ProfileLibFont */
+ #endif /* ProfileLibGlu */
+-
+#endif
-
ForceSubdirs($(SUBDIRS))
+ DependSubdirs($(SUBDIRS))
diff --git a/x11/XFree86-4-libraries/files/patch-z46 b/x11/XFree86-4-libraries/files/patch-z46
deleted file mode 100644
index 6ea5a0d..0000000
--- a/x11/XFree86-4-libraries/files/patch-z46
+++ /dev/null
@@ -1,11 +0,0 @@
---- programs/Xserver/hw/xfree86/loader/Imakefile.orig Sat Nov 17 01:47:55 2001
-+++ programs/Xserver/hw/xfree86/loader/Imakefile Mon Jan 21 00:22:06 2002
-@@ -35,7 +35,7 @@
-
- MODULEDEFINES = -DDEFAULT_MODULE_PATH=\"$(MODULEDIR)\"
-
-- INCLUDES = -I. -I.. -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(XF86OSSRC)/vbe \
-+ INCLUDES = -I. -I.. -I../parser -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(XF86OSSRC)/vbe \
- -I$(SERVERSRC)/dbe -I$(SERVERSRC)/Xext -I$(XF86SRC)/int10 \
- -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \
- -I$(SERVERSRC)/os -I$(XINCLUDESRC) -I$(FONTINCSRC) \
diff --git a/x11/XFree86-4-libraries/pkg-plist b/x11/XFree86-4-libraries/pkg-plist
index bc7a65e..5d6d16b 100644
--- a/x11/XFree86-4-libraries/pkg-plist
+++ b/x11/XFree86-4-libraries/pkg-plist
@@ -1,5 +1,4 @@
-@unexec %D/bin/mkhtmlindex %D/lib/X11/doc/html
-@exec %D/bin/mkhtmlindex %D/lib/X11/doc/html
+bin/xcursor-config
include/DPS/ColorSB.h
include/DPS/ColorSBP.h
include/DPS/DPSScrollW.h
@@ -34,6 +33,7 @@ include/GL/gl.h
include/GL/glext.h
include/GL/glu.h
include/GL/glx.h
+include/GL/glxext.h
include/GL/glxint.h
include/GL/glxmd.h
include/GL/glxproto.h
@@ -57,11 +57,6 @@ include/X11/Intrinsic.h
include/X11/IntrinsicP.h
include/X11/Object.h
include/X11/ObjectP.h
-include/X11/PEX5/PEX.h
-include/X11/PEX5/PEXlib.h
-include/X11/PEX5/PEXlibint.h
-include/X11/PEX5/PEXproto.h
-include/X11/PEX5/PEXprotost.h
include/X11/PM/PM.h
include/X11/PM/PMproto.h
include/X11/RectObj.h
@@ -156,6 +151,7 @@ include/X11/Xaw/ViewportP.h
include/X11/Xaw/XawImP.h
include/X11/Xaw/XawInit.h
include/X11/Xcms.h
+include/X11/Xcursor/Xcursor.h
include/X11/Xdefs.h
include/X11/Xdmcp.h
include/X11/Xfuncproto.h
@@ -273,7 +269,6 @@ include/X11/extensions/XEVI.h
include/X11/extensions/XEVIstr.h
include/X11/extensions/XI.h
include/X11/extensions/XIE.h
-include/X11/extensions/XIElib.h
include/X11/extensions/XIEproto.h
include/X11/extensions/XIEprotost.h
include/X11/extensions/XInput.h
@@ -291,6 +286,8 @@ include/X11/extensions/XKBui.h
include/X11/extensions/XKM.h
include/X11/extensions/XKMformat.h
include/X11/extensions/XLbx.h
+include/X11/extensions/XRes.h
+include/X11/extensions/XResproto.h
include/X11/extensions/XShm.h
include/X11/extensions/XTest.h
include/X11/extensions/Xag.h
@@ -310,8 +307,10 @@ include/X11/extensions/XvMClib.h
include/X11/extensions/XvMCproto.h
include/X11/extensions/Xvlib.h
include/X11/extensions/Xvproto.h
+include/X11/extensions/bigreqstr.h
include/X11/extensions/dpms.h
include/X11/extensions/dpmsstr.h
+include/X11/extensions/extutil.h
include/X11/extensions/fontcache.h
include/X11/extensions/fontcacheP.h
include/X11/extensions/fontcachstr.h
@@ -322,7 +321,9 @@ include/X11/extensions/lbximage.h
include/X11/extensions/lbxopts.h
include/X11/extensions/lbxstr.h
include/X11/extensions/lbxzlib.h
+include/X11/extensions/mitmiscstr.h
include/X11/extensions/multibuf.h
+include/X11/extensions/multibufst.h
include/X11/extensions/panoramiXext.h
include/X11/extensions/panoramiXproto.h
include/X11/extensions/randr.h
@@ -337,7 +338,11 @@ include/X11/extensions/scrnsaver.h
include/X11/extensions/security.h
include/X11/extensions/securstr.h
include/X11/extensions/shape.h
+include/X11/extensions/shapestr.h
+include/X11/extensions/shmstr.h
include/X11/extensions/sync.h
+include/X11/extensions/syncstr.h
+include/X11/extensions/xcmiscstr.h
include/X11/extensions/xf86bigfont.h
include/X11/extensions/xf86bigfstr.h
include/X11/extensions/xf86dga.h
@@ -349,6 +354,7 @@ include/X11/extensions/xf86mscstr.h
include/X11/extensions/xf86vmode.h
include/X11/extensions/xf86vmstr.h
include/X11/extensions/xtestext1.h
+include/X11/extensions/xteststr.h
include/X11/extensions/xtrapbits.h
include/X11/extensions/xtrapddmi.h
include/X11/extensions/xtrapdi.h
@@ -370,24 +376,18 @@ include/X11/fonts/fsmasks.h
include/X11/keysym.h
include/X11/keysymdef.h
include/X11/xpm.h
-include/rgb.h
-include/site.h
include/xf86Optrec.h
include/xf86Parser.h
lib/X11/XErrorDB
lib/X11/XKeysymDB
+lib/X11/Xcms.txt
lib/X11/locale/C/XI18N_OBJS
lib/X11/locale/C/XLC_LOCALE
lib/X11/locale/armscii-8/Compose
lib/X11/locale/armscii-8/XI18N_OBJS
lib/X11/locale/armscii-8/XLC_LOCALE
-lib/X11/locale/common/ximcp.so.2
-lib/X11/locale/common/xlcDef.so.2
-lib/X11/locale/common/xlcUTF8Load.so.2
-lib/X11/locale/common/xlibi18n.so.2
-lib/X11/locale/common/xlocale.so.2
-lib/X11/locale/common/xomGeneric.so.2
lib/X11/locale/compose.dir
+lib/X11/locale/el_GR.UTF-8/Compose
lib/X11/locale/en_US.UTF-8/Compose
lib/X11/locale/en_US.UTF-8/XI18N_OBJS
lib/X11/locale/en_US.UTF-8/XLC_LOCALE
@@ -410,6 +410,8 @@ lib/X11/locale/iso8859-1/XLC_LOCALE
lib/X11/locale/iso8859-10/Compose
lib/X11/locale/iso8859-10/XI18N_OBJS
lib/X11/locale/iso8859-10/XLC_LOCALE
+lib/X11/locale/iso8859-11/XI18N_OBJS
+lib/X11/locale/iso8859-11/XLC_LOCALE
lib/X11/locale/iso8859-13/Compose
lib/X11/locale/iso8859-13/XI18N_OBJS
lib/X11/locale/iso8859-13/XLC_LOCALE
@@ -455,9 +457,13 @@ lib/X11/locale/ja.SJIS/XLC_LOCALE
lib/X11/locale/ja/Compose
lib/X11/locale/ja/XI18N_OBJS
lib/X11/locale/ja/XLC_LOCALE
+lib/X11/locale/ja_JP.UTF-8/XI18N_OBJS
+lib/X11/locale/ja_JP.UTF-8/XLC_LOCALE
lib/X11/locale/ko/Compose
lib/X11/locale/ko/XI18N_OBJS
lib/X11/locale/ko/XLC_LOCALE
+lib/X11/locale/ko_KR.UTF-8/XI18N_OBJS
+lib/X11/locale/ko_KR.UTF-8/XLC_LOCALE
lib/X11/locale/koi8-c/Compose
lib/X11/locale/koi8-c/XI18N_OBJS
lib/X11/locale/koi8-c/XLC_LOCALE
@@ -467,6 +473,12 @@ lib/X11/locale/koi8-r/XLC_LOCALE
lib/X11/locale/koi8-u/Compose
lib/X11/locale/koi8-u/XI18N_OBJS
lib/X11/locale/koi8-u/XLC_LOCALE
+lib/X11/locale/lib/common/ximcp.so.2
+lib/X11/locale/lib/common/xlcDef.so.2
+lib/X11/locale/lib/common/xlcUTF8Load.so.2
+lib/X11/locale/lib/common/xlibi18n.so.2
+lib/X11/locale/lib/common/xlocale.so.2
+lib/X11/locale/lib/common/xomGeneric.so.2
lib/X11/locale/locale.alias
lib/X11/locale/locale.dir
lib/X11/locale/microsoft-cp1251/Compose
@@ -483,6 +495,8 @@ lib/X11/locale/nokhchi-1/XI18N_OBJS
lib/X11/locale/nokhchi-1/XLC_LOCALE
lib/X11/locale/tatar-cyr/XI18N_OBJS
lib/X11/locale/tatar-cyr/XLC_LOCALE
+lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
+lib/X11/locale/th_TH.UTF-8/XLC_LOCALE
lib/X11/locale/th_TH/XI18N_OBJS
lib/X11/locale/th_TH/XLC_LOCALE
lib/X11/locale/tscii-0/XI18N_OBJS
@@ -493,18 +507,20 @@ lib/X11/locale/vi_VN.tcvn/XLC_LOCALE
lib/X11/locale/vi_VN.viscii/Compose
lib/X11/locale/vi_VN.viscii/XI18N_OBJS
lib/X11/locale/vi_VN.viscii/XLC_LOCALE
-lib/X11/locale/zh/XI18N_OBJS
lib/X11/locale/zh_CN.gbk/Compose
lib/X11/locale/zh_CN.gbk/XI18N_OBJS
lib/X11/locale/zh_CN.gbk/XLC_LOCALE
lib/X11/locale/zh_CN/Compose
+lib/X11/locale/zh_CN/XI18N_OBJS
lib/X11/locale/zh_CN/XLC_LOCALE
lib/X11/locale/zh_HK.big5/XLC_LOCALE
lib/X11/locale/zh_HK.big5hkscs/XI18N_OBJS
lib/X11/locale/zh_HK.big5hkscs/XLC_LOCALE
-lib/X11/locale/zh_TW.Big5/Compose
-lib/X11/locale/zh_TW.Big5/XLC_LOCALE
-lib/X11/locale/zh_TW.Big5/XI18N_OBJS
+lib/X11/locale/zh_TW.UTF-8/XI18N_OBJS
+lib/X11/locale/zh_TW.UTF-8/XLC_LOCALE
+lib/X11/locale/zh_TW.big5/Compose
+lib/X11/locale/zh_TW.big5/XI18N_OBJS
+lib/X11/locale/zh_TW.big5/XLC_LOCALE
lib/X11/locale/zh_TW/Compose
lib/X11/locale/zh_TW/XI18N_OBJS
lib/X11/locale/zh_TW/XLC_LOCALE
@@ -521,19 +537,14 @@ lib/libICE.so
lib/libICE.so.6
%%OSMESA:%%lib/libOSMesa.a
%%OSMESA:%%lib/libOSMesa.so
-%%OSMESA:%%lib/libOSMesa.so.3
-lib/libPEX5.a
-lib/libPEX5.so
-lib/libPEX5.so.6
+%%OSMESA:%%lib/libOSMesa.so.4
lib/libSM.a
lib/libSM.so
lib/libSM.so.6
lib/libX11.a
lib/libX11.so
lib/libX11.so.6
-lib/libXIE.a
-lib/libXIE.so
-lib/libXIE.so.6
+lib/libXRes.a
%%XTHRSTUB:%%lib/libXThrStub.so
%%XTHRSTUB:%%lib/libXThrStub.so.6
lib/libXTrap.a
@@ -544,6 +555,9 @@ lib/libXaw.a
lib/libXaw.so
lib/libXaw.so.6
lib/libXaw.so.7
+lib/libXcursor.a
+lib/libXcursor.so
+lib/libXcursor.so.1
lib/libXdmcp.a
lib/libXext.a
lib/libXext.so
@@ -570,7 +584,7 @@ lib/libXpm.so
lib/libXpm.so.4
lib/libXrandr.a
lib/libXrandr.so
-lib/libXrandr.so.1
+lib/libXrandr.so.2
lib/libXrender.a
lib/libXrender.so
lib/libXrender.so.1
@@ -582,6 +596,8 @@ lib/libXtst.a
lib/libXtst.so
lib/libXtst.so.6
lib/libXv.a
+lib/libXv.so
+lib/libXv.so.1
lib/libXvMC.a
lib/libXxf86dga.a
lib/libXxf86misc.a
@@ -603,5 +619,4 @@ lib/libpsres.so.1
lib/libxf86config.a
lib/libxkbfile.a
lib/libxkbui.a
-lib/libxrx.so
-lib/libxrx.so.6
+lib/pkgconfig/xcursor.pc
diff --git a/x11/XFree86-4-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure
index b1aaeea..a78d610 100644
--- a/x11/XFree86-4-libraries/scripts/configure
+++ b/x11/XFree86-4-libraries/scripts/configure
@@ -1,14 +1,11 @@
#!/bin/sh
# This script does the following:
-# (1) cp current xf86site.def (it is created by the imake-4 port)
+# (1) cp xf86site.def, installed by imake-4 port,
# to ${WRKDIR}/xc/config/cf.
-# this means this port uses imake-4's config for defaults.
-# (2) Generate temporal config for compiling.
-# Some configs, such as `ForceNormalLib', `FreeBSDBuildXprog', are
-# used locally for compiling this port, so these configs will be generated
-# by this script. These configs will be stored to the `host.def' file,
-# but this host.def will never be installed.
+# this provides settings for the ports system.
+# (2) Create a host.def for this specific port, using
+# host.def as a base.
ORIGDEF=$PREFIX/lib/X11/config/xf86site.def
DESTDEF=$WRKDIR/xc/config/cf/xf86site.def
@@ -16,41 +13,22 @@ ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def
LOCALDEF=$WRKDIR/.config
HOSTDEF=$WRKDIR/xc/config/cf/host.def
-configure () {
- # Use original host.def as initial config file
- rm -f $LOCALDEF
- grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF
- echo "#define ProjectRoot $PREFIX" >> $LOCALDEF
+# Use original host.def as initial config file
+rm -f $LOCALDEF
+grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF
+echo "#define ProjectRoot $PREFIX" >> $LOCALDEF
- # It's good for FreeBSD ports/packages system.
- echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF
- echo "#define InstallXserverSetUID NO" >> $LOCALDEF
+# This is also defined in xf86site.def, but doesn't get
+# picked up for some reason.
+echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF
- # User Config.
- if [ X$HasSecureRPC != XDEFAULT -a X$HasSecureRPC != X ]; then
- echo "#define HasSecureRPC $HasSecureRPC" >> $LOCALDEF
- fi
- if [ X$BuildPexExt != XDEFAULT -a X$BuildPexExt != X ]; then
- echo "#define BuildPexExt $BuildPexExt" >> $LOCALDEF
- fi
- if [ X$BuildXinerama != XDEFAULT -a X$BuildXinerama != X ]; then
- echo "#define BuildXinerama $BuildXinerama" >> $LOCALDEF
- fi
- if [ X$BuildXIE != XDEFAULT -a X$BuildXIE != X ]; then
- echo "#define BuildXIE $BuildXIE" >> $LOCALDEF
- fi
- if [ X$BuildAoutLibraries != XDEFAULT -a X$BuildAoutLibraries != X ]; then
- echo "#define BuildAoutLibraries $BuildAoutLibraries" >> $LOCALDEF
- fi
- if [ X$ForceNormalLib != XDEFAULT -a X$ForceNormalLib != X ]; then
- echo "#define ForceNormalLib $ForceNormalLib" >> $LOCALDEF
- fi
- if [ X$DebuggableLibraries != XDEFAULT -a X$DebuggableLibraries != X ]; then
- echo "#define DebuggableLibraries $DebuggableLibraries" >> $LOCALDEF
- fi
+# User Config.
+if [ X$DebuggableLibraries != XDEFAULT -a X$DebuggableLibraries != X ]; then
+echo "#define DebuggableLibraries $DebuggableLibraries" >> $LOCALDEF
+fi
- # disable some configs: there are not used this ports
- for i in \
+# disable some options
+for i in \
InstallXdmConfig \
InstallXinitConfig \
InstallFSConfig \
@@ -64,28 +42,25 @@ configure () {
BuildType1Fonts \
BuildCIDFonts \
BuildCyrillicFonts \
- BuildLatin2Fonts
- do \
- echo "#define $i NO" >> $LOCALDEF
- done
- echo "#define HasFreetype2 YES" >> $LOCALDEF
- echo "#define Freetype2Dir ${LOCALBASE}" >> $LOCALDEF
- echo "#define FreeBSDBuildXlib YES" >> $LOCALDEF
- echo "#define FreeBSDBuildXbin NO" >> $LOCALDEF
- echo "#define UseInstalledPrograms YES" >> $LOCALDEF
- echo "#define FreeBSDCC ${CC}" >> $LOCALDEF
- echo "#define FreeBSDCXX ${CXX}" >> $LOCALDEF
- echo "#define FreeBSDCFLAGS ${CFLAGS}" >> $LOCALDEF
- echo "#define BuildXftLibrary NO" >> $LOCALDEF
+ BuildLatin2Fonts \
+ BuildPlugin
+do \
+ echo "#define $i NO" >> $LOCALDEF
+done
- # Copy ORIGDEF to DESTDEF
- rm -f $DESTDEF
- cp -f $ORIGDEF $DESTDEF
+echo "#define FreeBSDCC ${CC}" >> $LOCALDEF
+echo "#define FreeBSDCXX ${CXX}" >> $LOCALDEF
+echo "#define FreeBSDCFLAGS ${CFLAGS}" >> $LOCALDEF
- # copy generated config to host.def
- cp -f $LOCALDEF $HOSTDEF
-}
+echo "#define FreeBSDBuildXlib YES" >> $LOCALDEF
+echo "#define FreeBSDBuildXbin NO" >> $LOCALDEF
+echo "#define UseInstalledPrograms YES" >> $LOCALDEF
+
+# Copy ORIGDEF to DESTDEF
+rm -f $DESTDEF
+cp -f $ORIGDEF $DESTDEF
+
+# copy generated config to host.def
+cp -f $LOCALDEF $HOSTDEF
-configure
-cp ${X11BASE}/lib/X11/config/version.def ${WRKSRC}/config/cf
exit 0
diff --git a/x11/XFree86-4-manuals/Makefile b/x11/XFree86-4-manuals/Makefile
index 194f6eb..3d2790c7 100644
--- a/x11/XFree86-4-manuals/Makefile
+++ b/x11/XFree86-4-manuals/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= manuals
-PORTVERSION= 4.2.0
+PORTVERSION= 4.3.0
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XFREE}
MASTER_SITE_SUBDIR= ${PORTVERSION}
diff --git a/x11/XFree86-4-manuals/distinfo b/x11/XFree86-4-manuals/distinfo
index df48626..55cc1b9 100644
--- a/x11/XFree86-4-manuals/distinfo
+++ b/x11/XFree86-4-manuals/distinfo
@@ -1 +1 @@
-MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
+MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af
diff --git a/x11/XFree86-4-manuals/files/manpages b/x11/XFree86-4-manuals/files/manpages
index 63494e2..2adf970 100644
--- a/x11/XFree86-4-manuals/files/manpages
+++ b/x11/XFree86-4-manuals/files/manpages
@@ -389,7 +389,7 @@ MAN3= AllPlanes.3 \
XRaiseWindow.3 \
XReadBitmapFile.3 \
XReadBitmapFileData.3 \
- XRebindKeySym.3 \
+ XRebindKeysym.3 \
XRecolorCursor.3 \
XReconfigureWMWindow.3 \
XRectInRegion.3 \
diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile
index 1cac191..8c278d5 100644
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= XFree86
-PORTVERSION= 4.2.0
-PORTREVISION= 1
+PORTVERSION= 4.3.0
PORTEPOCH= 1
CATEGORIES= x11
MASTER_SITES= # none
@@ -36,7 +35,7 @@ FONT100DPI= ${X11BASE}/lib/X11/fonts/100dpi/UTBI__10-ISO8859-1.pcf.gz
FONT75DPI= ${X11BASE}/lib/X11/fonts/75dpi/UTBI__10-ISO8859-1.pcf.gz
FONTCYR= ${X11BASE}/lib/X11/fonts/cyrillic/crox1c.pcf.gz
FONTDEFAULT= ${X11BASE}/lib/X11/fonts/misc/cursor.pcf.gz
-FONTSCALE= ${X11BASE}/lib/X11/fonts/PEX/Roman.phont
+FONTSCALE= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
.if make(package)
DEPENDS_TARGET="package"
diff --git a/x11/gnome-fifth-toe/Makefile b/x11/gnome-fifth-toe/Makefile
index 2625763..899429b 100644
--- a/x11/gnome-fifth-toe/Makefile
+++ b/x11/gnome-fifth-toe/Makefile
@@ -15,9 +15,9 @@ EXTRACT_ONLY= # empty
MAINTAINER= gnome@FreeBSD.org
COMMENT= The "meta-port" for the GNOME "Fifth-Toe" extra package set
+#gabber:${PORTSDIR}/net/gabber \
-RUN_DEPENDS= gabber:${PORTSDIR}/net/gabber \
- galeon:${PORTSDIR}/www/galeon \
+RUN_DEPENDS= galeon:${PORTSDIR}/www/galeon \
pan:${PORTSDIR}/news/pan \
gnumeric:${PORTSDIR}/math/gnumeric \
atomix:${PORTSDIR}/games/atomix \
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 53e55c1..1513169 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -47,7 +47,7 @@ CONFIGURE_ARGS+=--disable-ltdl-install \
--enable-cups \
${XINERAMA}
-FONTSCALE= ${X11BASE}/lib/X11/fonts/PEX/Roman.phont
+FONTSCALE= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
FONTENCOD= ${X11BASE}/lib/X11/fonts/encodings/tcvn-0.enc
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 53e55c1..1513169 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -47,7 +47,7 @@ CONFIGURE_ARGS+=--disable-ltdl-install \
--enable-cups \
${XINERAMA}
-FONTSCALE= ${X11BASE}/lib/X11/fonts/PEX/Roman.phont
+FONTSCALE= ${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
FONTENCOD= ${X11BASE}/lib/X11/fonts/encodings/tcvn-0.enc
.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
OpenPOWER on IntegriCloud