diff options
| author | xtraeme <xtraeme> | 2004-01-24 08:47:24 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme> | 2004-01-24 08:47:24 +0000 |
| commit | f329448a3081f0d642060cd22887515a4167cc9a (patch) | |
| tree | 8fcc9d9c883942340eecd285d5784b4c0a61de62 /x11/XFree86-libs | |
| parent | df01deb28287fde492005d818ab60dc594b5f559 (diff) | |
| download | pkgsrc-f329448a3081f0d642060cd22887515a4167cc9a.tar.gz | |
Initial import of XFree86-libs-4.3.0 from pkgsrc-wip.
This package contains the XFree86 include header files and shared
library files.
Diffstat (limited to 'x11/XFree86-libs')
35 files changed, 2565 insertions, 0 deletions
diff --git a/x11/XFree86-libs/DESCR b/x11/XFree86-libs/DESCR new file mode 100644 index 00000000000..7d5bf8fd10d --- /dev/null +++ b/x11/XFree86-libs/DESCR @@ -0,0 +1,2 @@ +This package contains the XFree86 include header files and shared +library files. diff --git a/x11/XFree86-libs/Makefile b/x11/XFree86-libs/Makefile new file mode 100644 index 00000000000..c2c935b06a4 --- /dev/null +++ b/x11/XFree86-libs/Makefile @@ -0,0 +1,50 @@ +# $NetBSD: Makefile,v 1.1.1.1 2004/01/24 08:47:28 xtraeme Exp $ + +DISTNAME= ${DISTFILES} +PKGNAME= XFree86-libs-${XF_VER} +CATEGORIES= x11 +MASTER_SITES= ${MASTER_SITE_XFREE} +DISTFILES= X430src-1.tgz X430src-2.tgz \ + X430src-3.tgz X430src-4.tgz + +MAINTAINER= xfree86@blef.org +HOMEPAGE= http://www.xfree86.org/ +COMMENT= XFree86 Libraries + +CONFLICTS+= xextensions-[0-9]* +CONFLICTS+= libX11-[0-9]* +CONFLICTS+= libXau-[0-9]* + +DEPENDS= imake>=4.3.0:../../x11/imake + +.include "../../mk/bsd.prefs.mk" + +# XXX later should add CONFLICTS with XFree86-libs to these packages too +.if ${X11PREFIX} == ${LOCALBASE} +CONFLICTS+= render-[0-9]* +CONFLICTS+= Xrender-[0-9]* +CONFLICTS+= MesaLibs-[0-9]* +.endif + +USE_BUILDLINK2= YES + +XBUILD_DIRS= lib nls programs/Xserver/include \ + programs/Xserver/hw/xfree86/parser +XINCLUDE_DIRS= programs/proxymngr +XINSTALL_DIRS= include lib nls programs/Xserver/include \ + programs/Xserver/hw/xfree86/parser +XINSTALL_MAN_DIRS= ${XINSTALL_DIRS} + +post-patch: + ${SED} -e 's,@MAKESTRS@,${X11PREFIX}/bin/makestrs,g' \ + ${WRKSRC}/config/cf/Library.tmpl \ + > ${WRKSRC}/config/cf/Library.tmpl.tmp && \ + ${MV} ${WRKSRC}/config/cf/Library.tmpl.tmp \ + ${WRKSRC}/config/cf/Library.tmpl + +.include "../../fonts/fontconfig/buildlink2.mk" +.include "../../graphics/freetype2/buildlink2.mk" +.include "../../textproc/expat/buildlink2.mk" +.include "../../meta-pkgs/XFree86/Makefile.common" + +.include "../../mk/bsd.pkg.mk" diff --git a/x11/XFree86-libs/PLIST.FreeBSD b/x11/XFree86-libs/PLIST.FreeBSD new file mode 100644 index 00000000000..45bf27bd888 --- /dev/null +++ b/x11/XFree86-libs/PLIST.FreeBSD @@ -0,0 +1,4 @@ +@comment $NetBSD: PLIST.FreeBSD,v 1.1.1.1 2004/01/24 08:47:28 xtraeme Exp $ +man/man3/Xaw.3.gz +man/man3/Xcursor.3.gz +man/man3/Xrandr.3.gz diff --git a/x11/XFree86-libs/PLIST.Linux b/x11/XFree86-libs/PLIST.Linux new file mode 100644 index 00000000000..98d3f0d041b --- /dev/null +++ b/x11/XFree86-libs/PLIST.Linux @@ -0,0 +1,38 @@ +@comment $NetBSD: PLIST.Linux,v 1.1.1.1 2004/01/24 08:47:24 xtraeme Exp $ +include/X11/extensions/xf86rush.h +include/X11/extensions/xf86rushstr.h +lib/libI810XvMC.a +lib/libXxf86rush.a +lib/libGL.so.1.2 +lib/libGLU.so.1.3 +lib/libICE.so.6.3 +lib/libOSMesa.so.4.0 +lib/libSM.so.6.0 +lib/libX11.so.6.2 +lib/libXThrStub.so +lib/libXThrStub.so.6 +lib/libXThrStub.so.6.1 +lib/libXTrap.so.6.4 +lib/libXaw.so.6.1 +lib/libXaw.so.7.0 +lib/libXcursor.so.1.0 +lib/libXext.so.6.4 +lib/libXfont.so.1.4 +lib/libXi.so.6.0 +lib/libXinerama.so.1.0 +lib/libXmu.so.6.2 +lib/libXmuu.so.1.0 +lib/libXp.so.6.2 +lib/libXpm.so.4.11 +lib/libXrandr.so.2.0 +lib/libXrender.so.1.2 +lib/libXt.so.6.0 +lib/libXtst.so.6.1 +lib/libXv.so.1.0 +lib/libdps.so.1.0 +lib/libdpstk.so.1.0 +lib/liboldX.so.6.0 +lib/libpsres.so.1.0 +man/man3/Xaw.3x +man/man3/Xcursor.3x +man/man3/Xrandr.3x diff --git a/x11/XFree86-libs/PLIST.NetBSD b/x11/XFree86-libs/PLIST.NetBSD new file mode 100644 index 00000000000..9a3a71ea6f9 --- /dev/null +++ b/x11/XFree86-libs/PLIST.NetBSD @@ -0,0 +1,34 @@ +@comment $NetBSD: PLIST.NetBSD,v 1.1.1.1 2004/01/24 08:47:24 xtraeme Exp $ +lib/libGL.so.1.2 +lib/libGLU.so.1.3 +lib/libICE.so.6.3 +lib/libOSMesa.so.4.0 +lib/libSM.so.6.0 +lib/libX11.so.6.2 +lib/libXThrStub.so +lib/libXThrStub.so.6 +lib/libXThrStub.so.6.1 +lib/libXTrap.so.6.4 +lib/libXaw.so.6.1 +lib/libXaw.so.7.0 +lib/libXcursor.so.1.0 +lib/libXext.so.6.4 +lib/libXfont.so.1.4 +lib/libXi.so.6.0 +lib/libXinerama.so.1.0 +lib/libXmu.so.6.2 +lib/libXmuu.so.1.0 +lib/libXp.so.6.2 +lib/libXpm.so.4.11 +lib/libXrandr.so.2.0 +lib/libXrender.so.1.2 +lib/libXt.so.6.0 +lib/libXtst.so.6.1 +lib/libXv.so.1.0 +lib/libdps.so.1.0 +lib/libdpstk.so.1.0 +lib/liboldX.so.6.0 +lib/libpsres.so.1.0 +man/cat3/Xaw.0 +man/cat3/Xcursor.0 +man/cat3/Xrandr.0 diff --git a/x11/XFree86-libs/PLIST.common b/x11/XFree86-libs/PLIST.common new file mode 100644 index 00000000000..4e2fa55b642 --- /dev/null +++ b/x11/XFree86-libs/PLIST.common @@ -0,0 +1,660 @@ +@comment $NetBSD: PLIST.common,v 1.1.1.1 2004/01/24 08:47:27 xtraeme Exp $ +bin/xcursor-config +include/DPS/ColorSB.h +include/DPS/ColorSBP.h +include/DPS/DPSScrollW.h +include/DPS/DPSScrollWP.h +include/DPS/FontCreatP.h +include/DPS/FontCreato.h +include/DPS/FontSB.h +include/DPS/FontSBP.h +include/DPS/FontSamplP.h +include/DPS/FontSample.h +include/DPS/PSres.h +include/DPS/XDPS.h +include/DPS/XDPSlib.h +include/DPS/XDPSproto.h +include/DPS/dpsNXargs.h +include/DPS/dpsXclient.h +include/DPS/dpsXcommon.h +include/DPS/dpsXpreview.h +include/DPS/dpsXshare.h +include/DPS/dpsXuserpath.h +include/DPS/dpsclient.h +include/DPS/dpsconfig.h +include/DPS/dpsexcept.h +include/DPS/dpsfriends.h +include/DPS/dpsops.h +include/DPS/psops.h +include/GL/GLwDrawA.h +include/GL/GLwDrawAP.h +include/GL/GLwMDrawA.h +include/GL/GLwMDrawAP.h +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 +include/GL/glxtokens.h +include/GL/osmesa.h +include/X11/Composite.h +include/X11/CompositeP.h +include/X11/ConstrainP.h +include/X11/Constraint.h +include/X11/Core.h +include/X11/CoreP.h +include/X11/DECkeysym.h +include/X11/HPkeysym.h +include/X11/ICE/ICE.h +include/X11/ICE/ICEconn.h +include/X11/ICE/ICElib.h +include/X11/ICE/ICEmsg.h +include/X11/ICE/ICEproto.h +include/X11/ICE/ICEutil.h +include/X11/Intrinsic.h +include/X11/IntrinsicP.h +include/X11/Object.h +include/X11/ObjectP.h +include/X11/RectObj.h +include/X11/RectObjP.h +include/X11/SM/SM.h +include/X11/SM/SMlib.h +include/X11/SM/SMproto.h +include/X11/Shell.h +include/X11/ShellP.h +include/X11/StringDefs.h +include/X11/Sunkeysym.h +include/X11/Vendor.h +include/X11/VendorP.h +include/X11/X.h +include/X11/X10.h +include/X11/XF86keysym.h +include/X11/XKBlib.h +include/X11/XWDFile.h +include/X11/Xalloca.h +include/X11/Xarch.h +include/X11/Xatom.h +include/X11/Xauth.h +include/X11/Xaw/AllWidgets.h +include/X11/Xaw/AsciiSink.h +include/X11/Xaw/AsciiSinkP.h +include/X11/Xaw/AsciiSrc.h +include/X11/Xaw/AsciiSrcP.h +include/X11/Xaw/AsciiText.h +include/X11/Xaw/AsciiTextP.h +include/X11/Xaw/Box.h +include/X11/Xaw/BoxP.h +include/X11/Xaw/Cardinals.h +include/X11/Xaw/Command.h +include/X11/Xaw/CommandP.h +include/X11/Xaw/Dialog.h +include/X11/Xaw/DialogP.h +include/X11/Xaw/Form.h +include/X11/Xaw/FormP.h +include/X11/Xaw/Grip.h +include/X11/Xaw/GripP.h +include/X11/Xaw/Label.h +include/X11/Xaw/LabelP.h +include/X11/Xaw/List.h +include/X11/Xaw/ListP.h +include/X11/Xaw/MenuButtoP.h +include/X11/Xaw/MenuButton.h +include/X11/Xaw/MultiSink.h +include/X11/Xaw/MultiSinkP.h +include/X11/Xaw/MultiSrc.h +include/X11/Xaw/MultiSrcP.h +include/X11/Xaw/Paned.h +include/X11/Xaw/PanedP.h +include/X11/Xaw/Panner.h +include/X11/Xaw/PannerP.h +include/X11/Xaw/Porthole.h +include/X11/Xaw/PortholeP.h +include/X11/Xaw/Repeater.h +include/X11/Xaw/RepeaterP.h +include/X11/Xaw/Reports.h +include/X11/Xaw/Scrollbar.h +include/X11/Xaw/ScrollbarP.h +include/X11/Xaw/Simple.h +include/X11/Xaw/SimpleMenP.h +include/X11/Xaw/SimpleMenu.h +include/X11/Xaw/SimpleP.h +include/X11/Xaw/Sme.h +include/X11/Xaw/SmeBSB.h +include/X11/Xaw/SmeBSBP.h +include/X11/Xaw/SmeLine.h +include/X11/Xaw/SmeLineP.h +include/X11/Xaw/SmeP.h +include/X11/Xaw/StripCharP.h +include/X11/Xaw/StripChart.h +include/X11/Xaw/Template.c +include/X11/Xaw/Template.h +include/X11/Xaw/TemplateP.h +include/X11/Xaw/Text.h +include/X11/Xaw/TextP.h +include/X11/Xaw/TextSink.h +include/X11/Xaw/TextSinkP.h +include/X11/Xaw/TextSrc.h +include/X11/Xaw/TextSrcP.h +include/X11/Xaw/Tip.h +include/X11/Xaw/TipP.h +include/X11/Xaw/Toggle.h +include/X11/Xaw/ToggleP.h +include/X11/Xaw/Tree.h +include/X11/Xaw/TreeP.h +include/X11/Xaw/VendorEP.h +include/X11/Xaw/Viewport.h +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 +include/X11/Xfuncs.h +include/X11/Xlib.h +include/X11/Xlibint.h +include/X11/Xlocale.h +include/X11/Xmd.h +include/X11/Xmu/Atoms.h +include/X11/Xmu/CharSet.h +include/X11/Xmu/CloseHook.h +include/X11/Xmu/Converters.h +include/X11/Xmu/CurUtil.h +include/X11/Xmu/CvtCache.h +include/X11/Xmu/DisplayQue.h +include/X11/Xmu/Drawing.h +include/X11/Xmu/Editres.h +include/X11/Xmu/EditresP.h +include/X11/Xmu/Error.h +include/X11/Xmu/ExtAgent.h +include/X11/Xmu/Initer.h +include/X11/Xmu/Lookup.h +include/X11/Xmu/Misc.h +include/X11/Xmu/StdCmap.h +include/X11/Xmu/StdSel.h +include/X11/Xmu/SysUtil.h +include/X11/Xmu/WidgetNode.h +include/X11/Xmu/WinUtil.h +include/X11/Xmu/Xct.h +include/X11/Xmu/Xmu.h +include/X11/Xos.h +include/X11/Xos_r.h +include/X11/Xosdefs.h +include/X11/Xpoll.h +include/X11/Xproto.h +include/X11/Xprotostr.h +include/X11/Xresource.h +include/X11/Xthreads.h +include/X11/Xutil.h +include/X11/ap_keysym.h +include/X11/bitmaps/1x1 +include/X11/bitmaps/2x2 +include/X11/bitmaps/black +include/X11/bitmaps/boxes +include/X11/bitmaps/calculator +include/X11/bitmaps/cntr_ptr +include/X11/bitmaps/cntr_ptrmsk +include/X11/bitmaps/cross_weave +include/X11/bitmaps/dimple1 +include/X11/bitmaps/dimple3 +include/X11/bitmaps/dot +include/X11/bitmaps/dropbar7 +include/X11/bitmaps/dropbar8 +include/X11/bitmaps/escherknot +include/X11/bitmaps/flagdown +include/X11/bitmaps/flagup +include/X11/bitmaps/flipped_gray +include/X11/bitmaps/gray +include/X11/bitmaps/gray1 +include/X11/bitmaps/gray3 +include/X11/bitmaps/grid16 +include/X11/bitmaps/grid2 +include/X11/bitmaps/grid4 +include/X11/bitmaps/grid8 +include/X11/bitmaps/hlines2 +include/X11/bitmaps/hlines3 +include/X11/bitmaps/icon +include/X11/bitmaps/keyboard16 +include/X11/bitmaps/left_ptr +include/X11/bitmaps/left_ptrmsk +include/X11/bitmaps/letters +include/X11/bitmaps/light_gray +include/X11/bitmaps/mailempty +include/X11/bitmaps/mailemptymsk +include/X11/bitmaps/mailfull +include/X11/bitmaps/mailfullmsk +include/X11/bitmaps/mensetmanus +include/X11/bitmaps/menu10 +include/X11/bitmaps/menu12 +include/X11/bitmaps/menu16 +include/X11/bitmaps/menu6 +include/X11/bitmaps/menu8 +include/X11/bitmaps/noletters +include/X11/bitmaps/opendot +include/X11/bitmaps/opendotMask +include/X11/bitmaps/plaid +include/X11/bitmaps/right_ptr +include/X11/bitmaps/right_ptrmsk +include/X11/bitmaps/root_weave +include/X11/bitmaps/scales +include/X11/bitmaps/sipb +include/X11/bitmaps/star +include/X11/bitmaps/starMask +include/X11/bitmaps/stipple +include/X11/bitmaps/target +include/X11/bitmaps/terminal +include/X11/bitmaps/tie_fighter +include/X11/bitmaps/vlines2 +include/X11/bitmaps/vlines3 +include/X11/bitmaps/weird_size +include/X11/bitmaps/wide_weave +include/X11/bitmaps/wingdogs +include/X11/bitmaps/woman +include/X11/bitmaps/xfd_icon +include/X11/bitmaps/xlogo11 +include/X11/bitmaps/xlogo16 +include/X11/bitmaps/xlogo32 +include/X11/bitmaps/xlogo64 +include/X11/bitmaps/xsnow +include/X11/cursorfont.h +include/X11/extensions/MITMisc.h +include/X11/extensions/Print.h +include/X11/extensions/Printstr.h +include/X11/extensions/XEVI.h +include/X11/extensions/XEVIstr.h +include/X11/extensions/XI.h +include/X11/extensions/XIE.h +include/X11/extensions/XIEproto.h +include/X11/extensions/XIEprotost.h +include/X11/extensions/XInput.h +include/X11/extensions/XIproto.h +include/X11/extensions/XKB.h +include/X11/extensions/XKBbells.h +include/X11/extensions/XKBconfig.h +include/X11/extensions/XKBfile.h +include/X11/extensions/XKBgeom.h +include/X11/extensions/XKBproto.h +include/X11/extensions/XKBrules.h +include/X11/extensions/XKBsrv.h +include/X11/extensions/XKBstr.h +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 +include/X11/extensions/Xagsrv.h +include/X11/extensions/Xagstr.h +include/X11/extensions/Xcup.h +include/X11/extensions/Xcupstr.h +include/X11/extensions/Xdbe.h +include/X11/extensions/Xdbeproto.h +include/X11/extensions/Xext.h +include/X11/extensions/Xinerama.h +include/X11/extensions/Xrandr.h +include/X11/extensions/Xrender.h +include/X11/extensions/Xv.h +include/X11/extensions/XvMC.h +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 +include/X11/extensions/lbxbuf.h +include/X11/extensions/lbxbufstr.h +include/X11/extensions/lbxdeltastr.h +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 +include/X11/extensions/randrproto.h +include/X11/extensions/record.h +include/X11/extensions/recordstr.h +include/X11/extensions/render.h +include/X11/extensions/renderproto.h +include/X11/extensions/saver.h +include/X11/extensions/saverproto.h +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 +include/X11/extensions/xf86dga1.h +include/X11/extensions/xf86dga1str.h +include/X11/extensions/xf86dgastr.h +include/X11/extensions/xf86misc.h +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 +include/X11/extensions/xtrapemacros.h +include/X11/extensions/xtraplib.h +include/X11/extensions/xtraplibp.h +include/X11/extensions/xtrapproto.h +include/X11/fonts/FS.h +include/X11/fonts/FSlib.h +include/X11/fonts/FSproto.h +include/X11/fonts/codeconv/cconvversion.h +include/X11/fonts/codeconv/xttcap.h +include/X11/fonts/codeconv/xttcconv.h +include/X11/fonts/codeconv/xttcconvP.h +include/X11/fonts/codeconv/xttcommon.h +include/X11/fonts/codeconv/xttversion.h +include/X11/fonts/fontenc.h +include/X11/fonts/fsmasks.h +include/X11/keysym.h +include/X11/keysymdef.h +include/X11/xpm.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/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 +lib/X11/locale/georgian-academy/Compose +lib/X11/locale/georgian-academy/XI18N_OBJS +lib/X11/locale/georgian-academy/XLC_LOCALE +lib/X11/locale/georgian-ps/Compose +lib/X11/locale/georgian-ps/XI18N_OBJS +lib/X11/locale/georgian-ps/XLC_LOCALE +lib/X11/locale/ibm-cp1133/Compose +lib/X11/locale/ibm-cp1133/XI18N_OBJS +lib/X11/locale/ibm-cp1133/XLC_LOCALE +lib/X11/locale/iscii-dev/XI18N_OBJS +lib/X11/locale/iscii-dev/XLC_LOCALE +lib/X11/locale/isiri-3342/XI18N_OBJS +lib/X11/locale/isiri-3342/XLC_LOCALE +lib/X11/locale/iso8859-1/Compose +lib/X11/locale/iso8859-1/XI18N_OBJS +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 +lib/X11/locale/iso8859-14/Compose +lib/X11/locale/iso8859-14/XI18N_OBJS +lib/X11/locale/iso8859-14/XLC_LOCALE +lib/X11/locale/iso8859-15/Compose +lib/X11/locale/iso8859-15/XI18N_OBJS +lib/X11/locale/iso8859-15/XLC_LOCALE +lib/X11/locale/iso8859-2/Compose +lib/X11/locale/iso8859-2/XI18N_OBJS +lib/X11/locale/iso8859-2/XLC_LOCALE +lib/X11/locale/iso8859-3/Compose +lib/X11/locale/iso8859-3/XI18N_OBJS +lib/X11/locale/iso8859-3/XLC_LOCALE +lib/X11/locale/iso8859-4/Compose +lib/X11/locale/iso8859-4/XI18N_OBJS +lib/X11/locale/iso8859-4/XLC_LOCALE +lib/X11/locale/iso8859-5/Compose +lib/X11/locale/iso8859-5/XI18N_OBJS +lib/X11/locale/iso8859-5/XLC_LOCALE +lib/X11/locale/iso8859-6/Compose +lib/X11/locale/iso8859-6/XI18N_OBJS +lib/X11/locale/iso8859-6/XLC_LOCALE +lib/X11/locale/iso8859-7/Compose +lib/X11/locale/iso8859-7/XI18N_OBJS +lib/X11/locale/iso8859-7/XLC_LOCALE +lib/X11/locale/iso8859-8/Compose +lib/X11/locale/iso8859-8/XI18N_OBJS +lib/X11/locale/iso8859-8/XLC_LOCALE +lib/X11/locale/iso8859-9/Compose +lib/X11/locale/iso8859-9/XI18N_OBJS +lib/X11/locale/iso8859-9/XLC_LOCALE +lib/X11/locale/iso8859-9e/Compose +lib/X11/locale/iso8859-9e/XI18N_OBJS +lib/X11/locale/iso8859-9e/XLC_LOCALE +lib/X11/locale/ja.JIS/Compose +lib/X11/locale/ja.JIS/XI18N_OBJS +lib/X11/locale/ja.JIS/XLC_LOCALE +lib/X11/locale/ja.SJIS/Compose +lib/X11/locale/ja.SJIS/XI18N_OBJS +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 +lib/X11/locale/koi8-r/Compose +lib/X11/locale/koi8-r/XI18N_OBJS +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/XI18N_OBJS +lib/X11/locale/microsoft-cp1251/XLC_LOCALE +lib/X11/locale/microsoft-cp1255/XI18N_OBJS +lib/X11/locale/microsoft-cp1255/XLC_LOCALE +lib/X11/locale/microsoft-cp1256/XI18N_OBJS +lib/X11/locale/microsoft-cp1256/XLC_LOCALE +lib/X11/locale/mulelao-1/Compose +lib/X11/locale/mulelao-1/XI18N_OBJS +lib/X11/locale/mulelao-1/XLC_LOCALE +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 +lib/X11/locale/tscii-0/XLC_LOCALE +lib/X11/locale/vi_VN.tcvn/Compose +lib/X11/locale/vi_VN.tcvn/XI18N_OBJS +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_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.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 +lib/libFS.a +lib/libGL.a +lib/libGL.so +lib/libGL.so.1 +lib/libGLU.a +lib/libGLU.so +lib/libGLU.so.1 +lib/libGLw.a +lib/libICE.a +lib/libICE.so +lib/libICE.so.6 +lib/libOSMesa.a +lib/libOSMesa.so +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/libXRes.a +lib/libXTrap.a +lib/libXTrap.so +lib/libXTrap.so.6 +lib/libXau.a +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 +lib/libXext.so.6 +lib/libXfont.a +lib/libXfont.so +lib/libXfont.so.1 +lib/libXfontcache.a +lib/libXi.a +lib/libXi.so +lib/libXi.so.6 +lib/libXinerama.a +lib/libXinerama.so +lib/libXinerama.so.1 +lib/libXmu.a +lib/libXmu.so +lib/libXmu.so.6 +lib/libXmuu.a +lib/libXmuu.so +lib/libXmuu.so.1 +lib/libXp.a +lib/libXp.so +lib/libXp.so.6 +lib/libXpm.a +lib/libXpm.so +lib/libXpm.so.4 +lib/libXrandr.a +lib/libXrandr.so +lib/libXrandr.so.2 +lib/libXrender.a +lib/libXrender.so +lib/libXrender.so.1 +lib/libXss.a +lib/libXt.a +lib/libXt.so +lib/libXt.so.6 +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 +lib/libXxf86vm.a +lib/libdps.a +lib/libdps.so +lib/libdps.so.1 +lib/libdpstk.a +lib/libdpstk.so +lib/libdpstk.so.1 +lib/libfntstubs.a +lib/libfontenc.a +lib/liboldX.a +lib/liboldX.so +lib/liboldX.so.6 +lib/libpsres.a +lib/libpsres.so +lib/libpsres.so.1 +lib/libxf86config.a +lib/libxkbfile.a +lib/libxkbui.a +@dirrm include/DPS +@dirrm include/GL +@dirrm include/X11/Xcursor +@dirrm include/X11/fonts/codeconv +@dirrm lib/X11/locale/armscii-8 +@dirrm lib/X11/locale/el_GR.UTF-8 +@dirrm lib/X11/locale/en_US.UTF-8 +@dirrm lib/X11/locale/georgian-academy +@dirrm lib/X11/locale/georgian-ps +@dirrm lib/X11/locale/ibm-cp1133 +@dirrm lib/X11/locale/iscii-dev +@dirrm lib/X11/locale/isiri-3342 +@dirrm lib/X11/locale/iso8859-10 +@dirrm lib/X11/locale/iso8859-11 +@dirrm lib/X11/locale/iso8859-13 +@dirrm lib/X11/locale/iso8859-14 +@dirrm lib/X11/locale/iso8859-15 +@dirrm lib/X11/locale/iso8859-9e +@dirrm lib/X11/locale/ja_JP.UTF-8 +@dirrm lib/X11/locale/ko_KR.UTF-8 +@dirrm lib/X11/locale/koi8-c +@dirrm lib/X11/locale/koi8-u +@dirrm lib/X11/locale/lib/common +@dirrm lib/X11/locale/lib +@dirrm lib/X11/locale/microsoft-cp1251 +@dirrm lib/X11/locale/microsoft-cp1255 +@dirrm lib/X11/locale/microsoft-cp1256 +@dirrm lib/X11/locale/mulelao-1 +@dirrm lib/X11/locale/nokhchi-1 +@dirrm lib/X11/locale/tatar-cyr +@dirrm lib/X11/locale/th_TH +@dirrm lib/X11/locale/th_TH.UTF-8 +@dirrm lib/X11/locale/tscii-0 +@dirrm lib/X11/locale/vi_VN.tcvn +@dirrm lib/X11/locale/vi_VN.viscii +@dirrm lib/X11/locale/zh_CN +@dirrm lib/X11/locale/zh_CN.gbk +@dirrm lib/X11/locale/zh_HK.big5 +@dirrm lib/X11/locale/zh_HK.big5hkscs +@dirrm lib/X11/locale/zh_TW.UTF-8 +@dirrm lib/X11/locale/zh_TW.big5 diff --git a/x11/XFree86-libs/buildlink2.mk b/x11/XFree86-libs/buildlink2.mk new file mode 100644 index 00000000000..a9a341ca81a --- /dev/null +++ b/x11/XFree86-libs/buildlink2.mk @@ -0,0 +1,85 @@ +# $NetBSD: buildlink2.mk,v 1.1.1.1 2004/01/24 08:47:27 xtraeme Exp $ +# +# This Makefile fragment is included by packages that use XFree86-libs. +# +# This file was created automatically using createbuildlink 2.6. +# + +.if !defined(XFREE86_LIBS_BUILDLINK2_MK) +XFREE86_LIBS_BUILDLINK2_MK= # defined + +.include "../../mk/bsd.prefs.mk" + +BUILDLINK_PACKAGES+= XFree86-libs +BUILDLINK_DEPENDS.XFree86-libs?= XFree86-libs>=4.3.0 +BUILDLINK_PKGSRCDIR.XFree86-libs?= ../../x11/XFree86-libs + +EVAL_PREFIX+= BUILDLINK_PREFIX.XFree86-libs=XFree86-libs +BUILDLINK_PREFIX.XFree86-libs_DEFAULT= ${X11BASE} +BUILDLINK_FILES.XFree86-libs+= include/DPS/*.h +BUILDLINK_FILES.XFree86-libs+= include/GL/*.h +BUILDLINK_FILES.XFree86-libs+= include/X11/*.h +BUILDLINK_FILES.XFree86-libs+= include/X11/ICE/*.h +BUILDLINK_FILES.XFree86-libs+= include/X11/SM/*.h +BUILDLINK_FILES.XFree86-libs+= include/X11/Xaw/*.h +BUILDLINK_FILES.XFree86-libs+= include/X11/Xcursor/*.h +BUILDLINK_FILES.XFree86-libs+= include/X11/Xmu/*.h +BUILDLINK_FILES.XFree86-libs+= include/X11/extensions/*.h +BUILDLINK_FILES.XFree86-libs+= include/X11/fonts/*.h +BUILDLINK_FILES.XFree86-libs+= include/*.h +BUILDLINK_FILES.XFree86-libs+= lib/X11/locale/lib/common/ximcp.* +BUILDLINK_FILES.XFree86-libs+= lib/X11/locale/lib/common/xlcDef.* +BUILDLINK_FILES.XFree86-libs+= lib/X11/locale/lib/common/xlcUTF8Load.* +BUILDLINK_FILES.XFree86-libs+= lib/X11/locale/lib/common/xlibi18n.* +BUILDLINK_FILES.XFree86-libs+= lib/X11/locale/lib/common/xlocale.* +BUILDLINK_FILES.XFree86-libs+= lib/X11/locale/lib/common/xomGeneric.* +BUILDLINK_FILES.XFree86-libs+= lib/libGLw.* +BUILDLINK_FILES.XFree86-libs+= lib/libICE.* +BUILDLINK_FILES.XFree86-libs+= lib/libSM.* +BUILDLINK_FILES.XFree86-libs+= lib/libX11.* +BUILDLINK_FILES.XFree86-libs+= lib/libXRes.* +BUILDLINK_FILES.XFree86-libs+= lib/libXTrap.* +BUILDLINK_FILES.XFree86-libs+= lib/libXau.* +BUILDLINK_FILES.XFree86-libs+= lib/libXaw.* +BUILDLINK_FILES.XFree86-libs+= lib/libXcursor.* +BUILDLINK_FILES.XFree86-libs+= lib/libXdmcp.* +BUILDLINK_FILES.XFree86-libs+= lib/libXext.* +BUILDLINK_FILES.XFree86-libs+= lib/libXfont.* +BUILDLINK_FILES.XFree86-libs+= lib/libXfontcache.* +BUILDLINK_FILES.XFree86-libs+= lib/libXi.* +BUILDLINK_FILES.XFree86-libs+= lib/libXinerama.* +BUILDLINK_FILES.XFree86-libs+= lib/libXmu.* +BUILDLINK_FILES.XFree86-libs+= lib/libXmuu.* +BUILDLINK_FILES.XFree86-libs+= lib/libXp.* +BUILDLINK_FILES.XFree86-libs+= lib/libXpm.* +BUILDLINK_FILES.XFree86-libs+= lib/libXrandr.* +BUILDLINK_FILES.XFree86-libs+= lib/libXrender.* +BUILDLINK_FILES.XFree86-libs+= lib/libXss.* +BUILDLINK_FILES.XFree86-libs+= lib/libXt.* +BUILDLINK_FILES.XFree86-libs+= lib/libXtst.* +BUILDLINK_FILES.XFree86-libs+= lib/libXv.* +BUILDLINK_FILES.XFree86-libs+= lib/libXvMC.* +BUILDLINK_FILES.XFree86-libs+= lib/libXxf86dga.* +BUILDLINK_FILES.XFree86-libs+= lib/libXxf86misc.* +BUILDLINK_FILES.XFree86-libs+= lib/libXxf86vm.* +BUILDLINK_FILES.XFree86-libs+= lib/libdps.* +BUILDLINK_FILES.XFree86-libs+= lib/libdpstk.* +BUILDLINK_FILES.XFree86-libs+= lib/libfntstubs.* +BUILDLINK_FILES.XFree86-libs+= lib/libfontenc.* +BUILDLINK_FILES.XFree86-libs+= lib/liboldX.* +BUILDLINK_FILES.XFree86-libs+= lib/libpsres.* +BUILDLINK_FILES.XFree86-libs+= lib/libxf86config.* +BUILDLINK_FILES.XFree86-libs+= lib/libxkbfile.* +BUILDLINK_FILES.XFree86-libs+= lib/libxkbui.* +BUILDLINK_FILES.XFree86-libs+= lib/libGL.* +BUILDLINK_FILES.XFree86-libs+= lib/libGLU.* +BUILDLINK_FILES.XFree86-libs+= lib/libOSMesa.* + +.include "../../fonts/fontconfig/buildlink2.mk" +.include "../../graphics/freetype2/buildlink2.mk" +.include "../../textproc/expat/buildlink2.mk" +BUILDLINK_TARGETS+= XFree86-libs-buildlink + +XFree86-libs-buildlink: _BUILDLINK_USE + +.endif # XFREE86_LIBS_BUILDLINK2_MK diff --git a/x11/XFree86-libs/distinfo b/x11/XFree86-libs/distinfo new file mode 100644 index 00000000000..695d31b3df1 --- /dev/null +++ b/x11/XFree86-libs/distinfo @@ -0,0 +1,35 @@ +$NetBSD: distinfo,v 1.1.1.1 2004/01/24 08:47:28 xtraeme Exp $ + +SHA1 (X430src-1.tgz) = 3aaf219e8c2d3eb299f150bd4a2554a84a19354b +Size (X430src-1.tgz) = 10993622 bytes +SHA1 (X430src-2.tgz) = 0fd76324484d793498900655c15117f15c539000 +Size (X430src-2.tgz) = 7962239 bytes +SHA1 (X430src-3.tgz) = a11e619ba0b628d9e2e39e838379658b3b347f66 +Size (X430src-3.tgz) = 12366363 bytes +SHA1 (X430src-4.tgz) = b462d0bf7d1a947e9dbb18b5a9c08602969905e0 +Size (X430src-4.tgz) = 12906091 bytes +SHA1 (patch-aa) = cf384e765cc7c8ab5b22e6befea5df0316a12a4d +SHA1 (patch-ab) = d17449a05df23d7db143f90f5c9d8e3a9f1c530c +SHA1 (patch-ac) = edfd8daf9c60208b91df265e247078264b627d42 +SHA1 (patch-ad) = 30ced438fe85260baea1b2bb71856b31cf2678b7 +SHA1 (patch-ae) = fe41b7e4550cc027542ca415acb2a1b5687f6a43 +SHA1 (patch-af) = 39c580202284f5fc8271bfa6f01e15cd019bad96 +SHA1 (patch-ag) = c12a13b07e5f0636da195266c743fc8095b486b3 +SHA1 (patch-ah) = bec3d071020c9354c7f1203d0467343b32298518 +SHA1 (patch-ai) = c0596d43675869c4cb7be56a7cd644f4d14817d7 +SHA1 (patch-aj) = 3583c2e81da8511ce1d514fd5609968a9d12c980 +SHA1 (patch-ak) = 5dda86383ad52b506df6ae743773b81773be49d5 +SHA1 (patch-al) = 115d87ba50515ddd13b1bf865c8ab551b34c035c +SHA1 (patch-am) = 9df8fb1882fd1ef0fd4b5d0d299cddaa17b65cc0 +SHA1 (patch-an) = 711d234122d6c128cb2786cd32582e39e74af11d +SHA1 (patch-ao) = 17ede6e7c6c232f9fe2804d7ab4addd85b5cd25c +SHA1 (patch-ap) = d684198cb6b6822b91612f1f283fe6af316753a2 +SHA1 (patch-aq) = c229aac69ac0e503c4cac3c7f532cd6b4cbdef39 +SHA1 (patch-ar) = 129171c7ce2bfb08a6fef06e8ed77e7031a29eb0 +SHA1 (patch-as) = 5bfc792b879c859745b5dd1e71ac3e57ea9a7a37 +SHA1 (patch-at) = 89a4bcd4351d7b2967da744619e3912b2efa7138 +SHA1 (patch-au) = 47d802003d04c4d64f661104458592f86db81dce +SHA1 (patch-av) = 4c124eaf876e48b9deea2f7a63fd052f4fb11baa +SHA1 (patch-aw) = b9e4c6f04b0f55abd8c589889ba5d3721deaf670 +SHA1 (patch-ax) = 65c6a325c5378b18b55915c002be2827c8acab24 +SHA1 (patch-ay) = 42f380dce37126616095e4423dc0a163bfecb28d diff --git a/x11/XFree86-libs/files/Wraphelp.c b/x11/XFree86-libs/files/Wraphelp.c new file mode 100755 index 00000000000..d6fd58694aa --- /dev/null +++ b/x11/XFree86-libs/files/Wraphelp.c @@ -0,0 +1,409 @@ +/* $NetBSD: Wraphelp.c,v 1.1.1.1 2004/01/24 08:47:33 xtraeme Exp $ */ + +/* Export of this software from the United States of America is assumed + * to require a specific license from the United States Government. + * It is the responsibility of any person or organization contemplating + * export to obtain such a license before exporting. + */ + +/* + * This program implements the + * Proposed Federal Information Processing + * Data Encryption Standard. + * See Federal Register, March 17, 1975 (40FR12134) + */ + +/* + * Initial permutation, + */ +static char IP[] = { + 58,50,42,34,26,18,10, 2, + 60,52,44,36,28,20,12, 4, + 62,54,46,38,30,22,14, 6, + 64,56,48,40,32,24,16, 8, + 57,49,41,33,25,17, 9, 1, + 59,51,43,35,27,19,11, 3, + 61,53,45,37,29,21,13, 5, + 63,55,47,39,31,23,15, 7, +}; + +/* + * Final permutation, FP = IP^(-1) + */ +static char FP[] = { + 40, 8,48,16,56,24,64,32, + 39, 7,47,15,55,23,63,31, + 38, 6,46,14,54,22,62,30, + 37, 5,45,13,53,21,61,29, + 36, 4,44,12,52,20,60,28, + 35, 3,43,11,51,19,59,27, + 34, 2,42,10,50,18,58,26, + 33, 1,41, 9,49,17,57,25, +}; + +/* + * Permuted-choice 1 from the key bits + * to yield C and D. + * Note that bits 8,16... are left out: + * They are intended for a parity check. + */ +static char PC1_C[] = { + 57,49,41,33,25,17, 9, + 1,58,50,42,34,26,18, + 10, 2,59,51,43,35,27, + 19,11, 3,60,52,44,36, +}; + +static char PC1_D[] = { + 63,55,47,39,31,23,15, + 7,62,54,46,38,30,22, + 14, 6,61,53,45,37,29, + 21,13, 5,28,20,12, 4, +}; + +/* + * Sequence of shifts used for the key schedule. +*/ +static char shifts[] = { + 1,1,2,2,2,2,2,2,1,2,2,2,2,2,2,1, +}; + +/* + * Permuted-choice 2, to pick out the bits from + * the CD array that generate the key schedule. + */ +static char PC2_C[] = { + 14,17,11,24, 1, 5, + 3,28,15, 6,21,10, + 23,19,12, 4,26, 8, + 16, 7,27,20,13, 2, +}; + +static char PC2_D[] = { + 41,52,31,37,47,55, + 30,40,51,45,33,48, + 44,49,39,56,34,53, + 46,42,50,36,29,32, +}; + +/* + * The C and D arrays used to calculate the key schedule. + */ + +static char C[28]; +static char D[28]; + +/* + * The key schedule. + * Generated from the key. + */ +static char KS[16][48]; + +/* + * The E bit-selection table. + */ +static char E[48]; +static char e[] = { + 32, 1, 2, 3, 4, 5, + 4, 5, 6, 7, 8, 9, + 8, 9,10,11,12,13, + 12,13,14,15,16,17, + 16,17,18,19,20,21, + 20,21,22,23,24,25, + 24,25,26,27,28,29, + 28,29,30,31,32, 1, +}; + +/* + * Set up the key schedule from the key. + */ + +static +setkey(key) +char *key; +{ + int i, j, k; + int t; + char *ptr; + + /* + * First, generate C and D by permuting + * the key. The low order bit of each + * 8-bit char is not used, so C and D are only 28 + * bits apiece. + */ + for (i=0; i<28; i++) { + C[i] = key[PC1_C[i]-1]; + D[i] = key[PC1_D[i]-1]; + } + /* + * To generate Ki, rotate C and D according + * to schedule and pick up a permutation + * using PC2. + */ + for (i=0; i<16; i++) { + /* + * rotate. + */ + for (k=0; k<shifts[i]; k++) { + t = C[0]; + ptr = C; + for (j=0; j<28-1; j++) + { + *ptr = ptr[1]; + ptr++; + } + C[27] = t; + t = D[0]; + ptr = D; + for (j=0; j<28-1; j++) + { + *ptr = ptr[1]; + ptr++; + } + D[27] = t; + } + /* + * get Ki. Note C and D are concatenated. + */ + ptr = &KS[i][0]; + for (j=0; j<24; j++) { + ptr[j] = C[PC2_C[j]-1]; + ptr[j+24] = D[PC2_D[j]-28-1]; + } + } + + for(i=0;i<48;i++) + E[i] = e[i]; +} + +/* + * The 8 selection functions. + * For some reason, they give a 0-origin + * index, unlike everything else. + */ +static char S[8][64] = { + 14, 4,13, 1, 2,15,11, 8, 3,10, 6,12, 5, 9, 0, 7, + 0,15, 7, 4,14, 2,13, 1,10, 6,12,11, 9, 5, 3, 8, + 4, 1,14, 8,13, 6, 2,11,15,12, 9, 7, 3,10, 5, 0, + 15,12, 8, 2, 4, 9, 1, 7, 5,11, 3,14,10, 0, 6,13, + + 15, 1, 8,14, 6,11, 3, 4, 9, 7, 2,13,12, 0, 5,10, + 3,13, 4, 7,15, 2, 8,14,12, 0, 1,10, 6, 9,11, 5, + 0,14, 7,11,10, 4,13, 1, 5, 8,12, 6, 9, 3, 2,15, + 13, 8,10, 1, 3,15, 4, 2,11, 6, 7,12, 0, 5,14, 9, + + 10, 0, 9,14, 6, 3,15, 5, 1,13,12, 7,11, 4, 2, 8, + 13, 7, 0, 9, 3, 4, 6,10, 2, 8, 5,14,12,11,15, 1, + 13, 6, 4, 9, 8,15, 3, 0,11, 1, 2,12, 5,10,14, 7, + 1,10,13, 0, 6, 9, 8, 7, 4,15,14, 3,11, 5, 2,12, + + 7,13,14, 3, 0, 6, 9,10, 1, 2, 8, 5,11,12, 4,15, + 13, 8,11, 5, 6,15, 0, 3, 4, 7, 2,12, 1,10,14, 9, + 10, 6, 9, 0,12,11, 7,13,15, 1, 3,14, 5, 2, 8, 4, + 3,15, 0, 6,10, 1,13, 8, 9, 4, 5,11,12, 7, 2,14, + + 2,12, 4, 1, 7,10,11, 6, 8, 5, 3,15,13, 0,14, 9, + 14,11, 2,12, 4, 7,13, 1, 5, 0,15,10, 3, 9, 8, 6, + 4, 2, 1,11,10,13, 7, 8,15, 9,12, 5, 6, 3, 0,14, + 11, 8,12, 7, 1,14, 2,13, 6,15, 0, 9,10, 4, 5, 3, + + 12, 1,10,15, 9, 2, 6, 8, 0,13, 3, 4,14, 7, 5,11, + 10,15, 4, 2, 7,12, 9, 5, 6, 1,13,14, 0,11, 3, 8, + 9,14,15, 5, 2, 8,12, 3, 7, 0, 4,10, 1,13,11, 6, + 4, 3, 2,12, 9, 5,15,10,11,14, 1, 7, 6, 0, 8,13, + + 4,11, 2,14,15, 0, 8,13, 3,12, 9, 7, 5,10, 6, 1, + 13, 0,11, 7, 4, 9, 1,10,14, 3, 5,12, 2,15, 8, 6, + 1, 4,11,13,12, 3, 7,14,10,15, 6, 8, 0, 5, 9, 2, + 6,11,13, 8, 1, 4,10, 7, 9, 5, 0,15,14, 2, 3,12, + + 13, 2, 8, 4, 6,15,11, 1,10, 9, 3,14, 5, 0,12, 7, + 1,15,13, 8,10, 3, 7, 4,12, 5, 6,11, 0,14, 9, 2, + 7,11, 4, 1, 9,12,14, 2, 0, 6,10,13,15, 3, 5, 8, + 2, 1,14, 7, 4,10, 8,13,15,12, 9, 0, 3, 5, 6,11, +}; + +/* + * P is a permutation on the selected combination + * of the current L and key. + */ +static char P[] = { + 16, 7,20,21, + 29,12,28,17, + 1,15,23,26, + 5,18,31,10, + 2, 8,24,14, + 32,27, 3, 9, + 19,13,30, 6, + 22,11, 4,25, +}; + +/* + * The current block, divided into 2 halves. + */ + +static char L[64]; +#define R (L + 32) +static char tempL[32]; +static char f[32]; + +/* + * The combination of the key and the input, before selection. + */ +static char preS[48]; + +/* + * The payoff: encrypt a block. + */ + +static +encrypt (block, edflag) +char *block; +{ + int i, ii; + register t, j, k; + + /* + * First, permute the bits in the input + */ + for (j=0; j<64; j++) + L[j] = block[IP[j]-1]; + /* + * Perform an encryption operation 16 times. + */ + for (ii=0; ii<16; ii++) { +/* print_bits ("L R", L); */ + /* + * Set direction + */ + if (edflag) + i = 15-ii; + else + i = ii; + /* + * Save the R array, + * which will be the new L. + */ + for (j=0; j<32; j++) + tempL[j] = R[j]; + /* + * Expand R to 48 bits using the E selector; + * exclusive-or with the current key bits. + */ + for (j=0; j<48; j++) + preS[j] = R[E[j]-1] ^ KS[i][j]; + /* + * The pre-select bits are now considered + * in 8 groups of 6 bits each. + * The 8 selection functions map these + * 6-bit quantities into 4-bit quantities + * and the results permuted + * to make an f(R, K). + * The indexing into the selection functions + * is peculiar; it could be simplified by + * rewriting the tables. + */ + for (j=0; j<8; j++) { + t = 6*j; + k = S[j][(preS[t+0]<<5)+ + (preS[t+1]<<3)+ + (preS[t+2]<<2)+ + (preS[t+3]<<1)+ + (preS[t+4]<<0)+ + (preS[t+5]<<4)]; + t = 4*j; + f[t+0] = (k>>3)&01; + f[t+1] = (k>>2)&01; + f[t+2] = (k>>1)&01; + f[t+3] = (k>>0)&01; + } + /* + * The new R is L ^ f(R, K). + * The f here has to be permuted first, though. + */ + for (j=0; j<32; j++) + R[j] = L[j] ^ f[P[j]-1]; + /* + * Finally, the new L (the original R) + * is copied back. + */ + for (j=0; j<32; j++) + L[j] = tempL[j]; + } + /* + * The output L and R are reversed. + */ + for (j=0; j<32; j++) { + t = L[j]; + L[j] = R[j]; + R[j] = t; + } + /* + * The final output + * gets the inverse permutation of the very original. + */ + for (j=0; j<64; j++) + block[j] = L[FP[j]-1]; +} + +static +bytes_to_bits (bytes, bits) + unsigned char *bytes; + char *bits; +{ + int bit, byte, value; + + for (byte = 0; byte < 8; byte++) + { + value = *bytes++; + for (bit = 0; bit < 8; bit++) + *bits++ = (value >> (7-bit)) & 1; + } +} + +static +bits_to_bytes (bits, bytes) + char *bits; + unsigned char *bytes; +{ + int bit, byte, value; + + for (byte = 0; byte < 8; byte++) + { + value = 0; + for (bit = 0; bit < 8; bit++) + value |= *bits++ << (7-bit); + *bytes++ = value; + } +} + +/* + * Interface compatible with Kerberos DES implementation + */ + +# include "Wrap.h" + +/*ARGSUSED*/ +_XdmcpAuthSetup (key, schedule) + auth_cblock key; + auth_wrapper_schedule schedule; +{ + char expand_key[64]; + + bytes_to_bits ((unsigned char *) key, expand_key); + setkey (expand_key); +} + +/*ARGSUSED*/ +_XdmcpAuthDoIt (input, output, schedule, edflag) + auth_cblock input, output; + auth_wrapper_schedule schedule; + int edflag; +{ + char expand_input[64]; + + bytes_to_bits ((unsigned char *) input, expand_input); + encrypt (expand_input, !edflag); + bits_to_bytes (expand_input, (unsigned char *) output); +} diff --git a/x11/XFree86-libs/files/host.def b/x11/XFree86-libs/files/host.def new file mode 100644 index 00000000000..c1f0300d88d --- /dev/null +++ b/x11/XFree86-libs/files/host.def @@ -0,0 +1,90 @@ +/* + * $NetBSD: host.def,v 1.1.1.1 2004/01/24 08:47:34 xtraeme Exp $ + * + * XFree86 packages for pkgsrc system + */ + +#define ProjectRoot @PREFIX@ + +#define MakeCmd @MAKE@ +#define HasGnuMake NO +#define ImakeCmd @IMAKE@ +#define RmanCmd @RMAN@ +#define HtmlIndexCmd @MKHTMLINDEX@ +#define DependDir @GCCMAKEDEP@ +#define DependCmd @MAKEDEPEND@ +#define RevPathCmd @REVPATH@ + +#define NothingOutsideProjectRoot YES + +#define InstallXdmConfig NO +#define InstallXinitConfig NO +#define InstallFSConfig NO +#define InstallAppDefFiles NO +#define BuildServer NO +#define BuildFontServer NO +#define BuildFonts NO +#define Build75DpiFonts NO +#define Build100DpiFonts NO +#define BuildSpeedoFonts NO +#define BuildType1Fonts NO +#define BuildCIDFonts NO +#define BuildCyrillicFonts NO +#define BuildLatin2Fonts NO +#define BuildPlugin NO +#define DebuggableLibraries NO +#define StandardIncludes \ + -I@BLNK@/include \ + -I@PREFIX@/include \ + -I@LOCALBASE@/include + +/* Common build of libs */ + +#define NormalLibFSa YES +#define NormalLibICE YES +#define NormalLibPex YES +#define NormalLibPhigs YES +#define NormalLibSM YES +#define NormalLibX11i YES +#define NormalLibXau YES +#define NormalLibXaw YES +#define NormalLibXdmcp YES +#define NormalLibXext YES +#define NormalLibXi YES +#define NormalLibXie YES +#define NormalLibXmu YES +#define NormalLibXt YES +#define NormalLibXtst YES +#define NormalLibXag YES +#define NormalOldX YES + +/* We need to build Xinerama shared library at least for metacity */ + +#undef SharedLibXinerama +#define SharedLibXinerama YES + +#ifndef DriDrivers +#define DriDrivers /* Don't build the drivers here */ +#endif + +#define HasXdmAuth YES +#define UseInstalledPrograms YES + +#ifndef FreeBSDArchitecture +#ifndef BuildThreadStubLibrary +# define BuildThreadStubLibrary YES +#endif +#endif + +#define HasZlib YES + +#define HasFreetype2 YES +#define Freetype2Dir @BLNK@ + +#define HasExpat YES +#define ExpatDir @BLNK@ + +#define HasFontconfig YES +#define FontconfigDir @BLNK@ + +#define BuildHtmlManPages NO diff --git a/x11/XFree86-libs/patches/patch-aa b/x11/XFree86-libs/patches/patch-aa new file mode 100644 index 00000000000..22aeee6f235 --- /dev/null +++ b/x11/XFree86-libs/patches/patch-aa @@ -0,0 +1,14 @@ +$NetBSD: patch-aa,v 1.1.1.1 2004/01/24 08:47:28 xtraeme Exp $ + +--- programs/Xserver/hw/xfree86/parser/scan.c.orig 2003-07-15 23:55:49.000000000 +0000 ++++ programs/Xserver/hw/xfree86/parser/scan.c 2003-07-15 23:56:40.000000000 +0000 +@@ -425,7 +425,8 @@ + #ifndef XCONFENV + #define XCONFENV "XF86CONFIG" + #endif +-#ifndef XF86_VERSION_MAJOR ++#define XF86_VERSION_MAJOR 4 ++#if 0 + #ifdef XVERSION + #if XVERSION > 40000000 + #define XF86_VERSION_MAJOR (XVERSION / 10000000) diff --git a/x11/XFree86-libs/patches/patch-ab b/x11/XFree86-libs/patches/patch-ab new file mode 100644 index 00000000000..5d85bde1f30 --- /dev/null +++ b/x11/XFree86-libs/patches/patch-ab @@ -0,0 +1,21 @@ +$NetBSD: patch-ab,v 1.1.1.1 2004/01/24 08:47:28 xtraeme Exp $ + +--- config/cf/X11.tmpl.orig 2003-02-25 21:57:52.000000000 +0000 ++++ config/cf/X11.tmpl 2003-07-21 15:11:05.000000000 +0000 +@@ -1498,6 +1498,7 @@ + + #ifndef PsWrap + #define PsWrap $(PSWRAPSRC)/pswrap ++#define PsWrapDependency /* empty */ + #endif + + #ifndef ResourceConfigurationManagement +@@ -3029,7 +3030,7 @@ + #endif /* else BuildFreetype2Library */ + + #if BuildFreetype2Library || HasFreetype2 +-FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) ++FREETYPE2INCLUDES = -I$(FREETYPE2DIR)/include -I$(FREETYPE2INCDIR) + FREETYPE2DEFINES = -DFREETYPE2 + #endif + diff --git a/x11/XFree86-libs/patches/patch-ac b/x11/XFree86-libs/patches/patch-ac new file mode 100644 index 00000000000..14b79af0657 --- /dev/null +++ b/x11/XFree86-libs/patches/patch-ac @@ -0,0 +1,50 @@ +$NetBSD: patch-ac,v 1.1.1.1 2004/01/24 08:47:28 xtraeme Exp $ + +--- 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-libs/patches/patch-ad b/x11/XFree86-libs/patches/patch-ad new file mode 100644 index 00000000000..8d5c447fc2a --- /dev/null +++ b/x11/XFree86-libs/patches/patch-ad @@ -0,0 +1,77 @@ +$NetBSD: patch-ad,v 1.1.1.1 2004/01/24 08:47:29 xtraeme Exp $ + +--- 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 */ + #define RmanCmd rman + #else + #define RmanCmd $(TOP)/config/util/rman +@@ -1348,7 +1349,8 @@ + #define LoaderLibPrefix /**/ + #endif + #ifndef ImakeCmd +-#ifdef UseInstalled /* assume BINDIR in path */ ++#if defined(UseInstalled) || defined(UseInstalledPrograms) ++/* assume BINDIR in path */ + #define ImakeCmd imake + #else + #define ImakeCmd $(IMAKESRC)/imake +@@ -1359,19 +1361,22 @@ + #endif + #ifndef DependCmd + #if UseGccMakeDepend +-#ifdef UseInstalled /* 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 */ + #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 */ + #define DependCmd makedepend + #else + #define DependCmd $(DEPENDSRC)/makedepend +@@ -1398,21 +1403,23 @@ + #ifndef ExportListCmd + # ifndef ExportListGenSource + # define ExportListCmd /**/ +-# elif !defined(UseInstalled) ++# elif !defined(UseInstalled) && !defined(UseInstalledPrograms) + # define ExportListCmd $(CONFIGSRC)/util/exportlistgen + # else + # define ExportListCmd exportlistgen + # endif + #endif + #ifndef MkdirHierCmd +-#ifdef UseInstalled /* assume BINDIR in path */ ++#if defined(UseInstalled) || defined(UseInstalledPrograms) ++/* assume BINDIR in path */ + #define MkdirHierCmd mkdirhier + #else + #define MkdirHierCmd $(SHELL) $(CONFIGSRC)/util/mkdirhier.sh + #endif + #endif + #ifndef RevPathCmd +-#ifdef UseInstalled /* 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-libs/patches/patch-ae b/x11/XFree86-libs/patches/patch-ae new file mode 100644 index 00000000000..c32fd8b0cbd --- /dev/null +++ b/x11/XFree86-libs/patches/patch-ae @@ -0,0 +1,12 @@ +$NetBSD: patch-ae,v 1.1.1.1 2004/01/24 08:47:29 xtraeme Exp $ + +--- lib/Xcursor/Imakefile.orig Tue May 13 14:34:23 2003 ++++ lib/Xcursor/Imakefile Tue May 13 14:34:34 2003 +@@ -69,8 +69,6 @@ + RemoveFile($@) + sh config-subst $(SUBSTVARS) < xcursor.pc.in > $@ + +-InstallNonExecFile(xcursor.pc,$(USRLIBDIR)/pkgconfig) +- + clean:: + RemoveFile(xcursor.pc) diff --git a/x11/XFree86-libs/patches/patch-af b/x11/XFree86-libs/patches/patch-af new file mode 100644 index 00000000000..c8e0edcb27c --- /dev/null +++ b/x11/XFree86-libs/patches/patch-af @@ -0,0 +1,110 @@ +$NetBSD: patch-af,v 1.1.1.1 2004/01/24 08:47:29 xtraeme Exp $ + +Index: lib/X11/XlcDL.c +=================================================================== +RCS file: /home/ncvs/xfree/xc/lib/X11/XlcDL.c,v +retrieving revision 1.9 +retrieving revision 1.9.2.1 +diff -u -u -r1.9 -r1.9.2.1 +--- lib/X11/XlcDL.c 25 Nov 2002 14:04:53 -0000 1.9 ++++ lib/X11/XlcDL.c 11 Mar 2003 23:18:49 -0000 1.9.2.1 +@@ -406,7 +406,7 @@ + + if (lc_name == NULL) return (XLCd)NULL; + +- if (_XlcLocaleDirName(lc_dir, (char *)lc_name) == (char*)NULL) ++ if (_XlcLocaleDirName(lc_dir, BUFSIZE, (char *)lc_name) == (char*)NULL) + return (XLCd)NULL; + + resolve_object(lc_dir, lc_name); +@@ -452,7 +452,7 @@ + + lc_name = lcd->core->name; + +- if (_XlcLocaleDirName(lc_dir, lc_name) == NULL) return (XIM)0; ++ if (_XlcLocaleDirName(lc_dir, BUFSIZE, lc_name) == NULL) return (XIM)0; + + count = lc_count; + for (; count-- > 0; objects_list++) { +@@ -498,7 +498,7 @@ + + lc_name = lcd->core->name; + +- if (_XlcLocaleDirName(lc_dir, lc_name) == NULL) return False; ++ if (_XlcLocaleDirName(lc_dir, BUFSIZE, lc_name) == NULL) return False; + + count = lc_count; + for (; count-- > 0; objects_list++) { +@@ -543,7 +543,7 @@ + #endif + + lc_name = lcd->core->name; +- if (_XlcLocaleDirName(lc_dir, lc_name) == NULL) return False; ++ if (_XlcLocaleDirName(lc_dir, BUFSIZE, lc_name) == NULL) return False; + + count = lc_count; + for (; count-- > 0; objects_list++) { +@@ -610,7 +610,7 @@ + + lc_name = lcd->core->name; + +- if (_XlcLocaleDirName(lc_dir, lc_name) == NULL) return (XOM)0; ++ if (_XlcLocaleDirName(lc_dir, BUFSIZE, lc_name) == NULL) return (XOM)0; + + count = lc_count; + for (; count-- > 0; objects_list++) { +Index: lib/X11/XlcPubI.h +=================================================================== +RCS file: /home/ncvs/xfree/xc/lib/X11/XlcPubI.h,v +retrieving revision 3.9 +retrieving revision 3.9.6.1 +diff -u -u -r3.9 -r3.9.6.1 +--- lib/X11/XlcPubI.h 16 Nov 2001 00:52:27 -0000 3.9 ++++ lib/X11/XlcPubI.h 11 Mar 2003 23:18:49 -0000 3.9.6.1 +@@ -217,6 +217,7 @@ + extern char *_XlcLocaleDirName( + #if NeedFunctionPrototypes + char* /* dir_name */, ++ size_t, /* dir_len */ + char* /* lc_name */ + #endif + ); +Index: lib/X11/lcFile.c +=================================================================== +RCS file: /home/ncvs/xfree/xc/lib/X11/lcFile.c,v +retrieving revision 3.30 +retrieving revision 3.30.2.1 +diff -u -u -r3.30 -r3.30.2.1 +--- lib/X11/lcFile.c 25 Nov 2002 14:04:53 -0000 3.30 ++++ lib/X11/lcFile.c 11 Mar 2003 23:18:49 -0000 3.30.2.1 +@@ -429,8 +429,9 @@ + } + + char * +-_XlcLocaleDirName(dir_name, lc_name) ++_XlcLocaleDirName(dir_name, dir_len, lc_name) + char *dir_name; ++ size_t dir_len; + char *lc_name; + { + char dir[PATH_MAX], buf[PATH_MAX], *name = NULL; +@@ -486,9 +487,16 @@ + target_dir = args[0]; + target_name = lc_name; + } +- strcpy(dir_name, target_dir); +- strcat(dir_name, "/"); +- strcat(dir_name, target_name); ++ /* snprintf(dir_name, dir_len, "%s/%", target_dir, target_name); */ ++ strncpy(dir_name, target_dir, dir_len - 1); ++ if (strlen(target_dir) >= dir_len - 1) { ++ dir_name[dir_len - 1] = '\0'; ++ } else { ++ strcat(dir_name, "/"); ++ strncat(dir_name, target_name, dir_len - strlen(dir_name) - 1); ++ if (strlen(target_name) >= dir_len - strlen(dir_name) - 1) ++ dir_name[dir_len - 1] = '\0'; ++ } + if (target_name != lc_name) + Xfree(target_name); + return dir_name; diff --git a/x11/XFree86-libs/patches/patch-ag b/x11/XFree86-libs/patches/patch-ag new file mode 100644 index 00000000000..3805d6f58da --- /dev/null +++ b/x11/XFree86-libs/patches/patch-ag @@ -0,0 +1,23 @@ +$NetBSD: patch-ag,v 1.1.1.1 2004/01/24 08:47:29 xtraeme Exp $ + +--- config/cf/Library.tmpl.orig Mon Aug 27 10:40:55 2001 ++++ config/cf/Library.tmpl Wed Oct 16 21:53:13 2002 +@@ -300,6 +300,10 @@ + */ + + #ifndef MakeStringsDependency ++#if defined(UseInstalled) || defined(UseInstalledPrograms) ++#define MakeStringsDependency @@\ ++MAKESTRS = @MAKESTRS@ ++#else + # define MakeStringsDependency @@\ + MAKESTRS = $(CONFIGSRC)/util/makestrs @@\ + NoCmpScript(HostProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf) @@\ +@@ -308,6 +312,7 @@ + cd $(CONFIGSRC)/util && $(MAKE) HostProgramTargetName(makestrs) @@\ + @@\ + includes:: HostProgramTargetName($(MAKESTRS)) ++#endif + #endif + + #ifndef ToolkitMakeStrings diff --git a/x11/XFree86-libs/patches/patch-ah b/x11/XFree86-libs/patches/patch-ah new file mode 100644 index 00000000000..78dcf69e410 --- /dev/null +++ b/x11/XFree86-libs/patches/patch-ah @@ -0,0 +1,41 @@ +$NetBSD: patch-ah,v 1.1.1.1 2004/01/24 08:47:29 xtraeme Exp $ + +--- config/cf/linux.cf.in.orig 2003-07-24 05:18:24.000000000 +0200 ++++ config/cf/linux.cf.in 2003-07-24 05:20:54.000000000 +0200 +@@ -555,15 +555,15 @@ + # if defined (i386Architecture) && ((GccMajorVersion >3) \ + || ((GccMajorVersion == 3) && (GccMinorVersion >= 1))) + # ifndef CcCmd +-# define CcCmd gcc -m32 ++# define CcCmd @@PKGSRC_CC@@ + # endif + # ifndef CplusplusCmd +-# define CplusplusCmd c++ -m32 ++# define CplusplusCmd @@PKGSRC_CXX@@ + # endif + # endif + # ifndef CcCmd +-# define CcCmd gcc +-# define CplusplusCmd c++ ++# define CcCmd @@PKGSRC_CC@@ ++# define CplusplusCmd @@PKGSRC_CXX@@ + # endif + # ifndef AsCmd + # define AsCmd CcCmd -c -x assembler +@@ -715,7 +715,6 @@ + #define YaccCmd bison -y + #define LexCmd flex -l + #define HasFlex YES +-#define LexLib -lfl + #define PreProcessCmd CcCmd -E + #define PostIncDir DefaultGccIncludeDir + #define LdCombineFlags -r +@@ -775,7 +774,7 @@ + + #ifdef i386Architecture + # ifndef OptimizedCDebugFlags +-# define OptimizedCDebugFlags DefaultGcc2i386Opt ++# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ + # endif + # define LinuxMachineDefines -D__i386__ + # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET diff --git a/x11/XFree86-libs/patches/patch-ai b/x11/XFree86-libs/patches/patch-ai new file mode 100644 index 00000000000..e8353273c2d --- /dev/null +++ b/x11/XFree86-libs/patches/patch-ai @@ -0,0 +1,14 @@ +$NetBSD: patch-ai,v 1.1.1.1 2004/01/24 08:47:29 xtraeme Exp $ + +--- fonts/util/Imakefile.orig 2003-07-25 21:20:40.000000000 +0200 ++++ fonts/util/Imakefile 2003-07-25 21:21:08.000000000 +0200 +@@ -7,8 +7,7 @@ + map-ISO8859-16 map-JISX0201.1976-0 map-KOI8-R + + InstallMultipleFlags($(MAPFILES),$(FONTDIR)/util,$(INSTDATFLAGS)) +-InstallNamedProg(ucs2any.pl,ucs2any,$(BINDIR)) +-InstallManPage(ucs2any,$(MANDIR)) ++SimpleProgramTarget(ucs2any) + InstallNamedProg(bdftruncate.pl,bdftruncate,$(BINDIR)) + InstallManPage(bdftruncate,$(MANDIR)) + diff --git a/x11/XFree86-libs/patches/patch-aj b/x11/XFree86-libs/patches/patch-aj new file mode 100644 index 00000000000..c47a33ac1d7 --- /dev/null +++ b/x11/XFree86-libs/patches/patch-aj @@ -0,0 +1,13 @@ +$NetBSD: patch-aj,v 1.1.1.1 2004/01/24 08:47:29 xtraeme Exp $ + +--- 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-libs/patches/patch-ak b/x11/XFree86-libs/patches/patch-ak new file mode 100644 index 00000000000..5bd3269a543 --- /dev/null +++ b/x11/XFree86-libs/patches/patch-ak @@ -0,0 +1,12 @@ +$NetBSD: patch-ak,v 1.1.1.1 2004/01/24 08:47:29 xtraeme Exp $ + +--- lib/X11/lcPrTxt.c.orig Mon Jun 3 15:36:00 2002 ++++ lib/X11/lcPrTxt.c Mon Apr 21 23:38:30 2003 +@@ -154,7 +154,6 @@ + buf_len = text_prop->nitems * 6 + 1; + else + buf_len = text_prop->nitems * XLC_PUBLIC(lcd, mb_cur_max) + 1; +- buf = (XPointer) Xmalloc(buf_len); + } + buf = (XPointer) Xmalloc(buf_len); + if (buf == NULL) diff --git a/x11/XFree86-libs/patches/patch-al b/x11/XFree86-libs/patches/patch-al new file mode 100644 index 00000000000..842d23367e4 --- /dev/null +++ b/x11/XFree86-libs/patches/patch-al @@ -0,0 +1,12 @@ +$NetBSD: patch-al,v 1.1.1.1 2004/01/24 08:47:29 xtraeme Exp $ + +--- programs/Xserver/hw/xfree86/os-support/shared/sigio.c.orig 2003-09-06 10:52:49.000000000 -0700 ++++ programs/Xserver/hw/xfree86/os-support/shared/sigio.c 2003-09-06 10:54:17.000000000 -0700 +@@ -151,6 +151,7 @@ + fprintf(stderr,"fcntl(%d, F_SETOWN): %s\n", + fd, strerror(errno)); + #endif ++ xf86UnblockSIGIO(blocked); + return 0; + } + sigemptyset(&sa.sa_mask); diff --git a/x11/XFree86-libs/patches/patch-am b/x11/XFree86-libs/patches/patch-am new file mode 100644 index 00000000000..f73283dc692 --- /dev/null +++ b/x11/XFree86-libs/patches/patch-am @@ -0,0 +1,13 @@ +$NetBSD: patch-am,v 1.1.1.1 2004/01/24 08:47:29 xtraeme Exp $ + +--- 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-libs/patches/patch-an b/x11/XFree86-libs/patches/patch-an new file mode 100644 index 00000000000..25fed104992 --- /dev/null +++ b/x11/XFree86-libs/patches/patch-an @@ -0,0 +1,352 @@ +$NetBSD: patch-an,v 1.1.1.1 2004/01/24 08:47:31 xtraeme Exp $ +Index: lib/FS/FSFontInfo.c +=================================================================== +RCS file: /home/ncvs/xfree/xc/lib/FS/FSFontInfo.c,v +retrieving revision 1.2 +retrieving revision 1.3 +diff -u -u -r1.2 -r1.3 +--- lib/FS/FSFontInfo.c 14 Dec 2001 19:53:32 -0000 1.2 ++++ lib/FS/FSFontInfo.c 29 Aug 2003 18:01:10 -0000 1.3 +@@ -65,7 +65,7 @@ + long nbytes; + int i, + j; +- int size = 0; ++ size_t size = 0; + FSXFontInfoHeader **fhdr = (FSXFontInfoHeader **) 0; + FSPropInfo **pi = (FSPropInfo **) 0; + FSPropOffset **po = (FSPropOffset **) 0; +@@ -123,8 +123,14 @@ + if (reply.nameLength == 0) /* got last reply in version 1 */ + break; + if ((i + reply.nReplies) >= size) { ++ ++ if (reply.nReplies > SIZE_T_MAX - i - 1) ++ goto badmem; + size = i + reply.nReplies + 1; + ++ if (size > SIZE_T_MAX / sizeof(char *)) ++ goto badmem; ++ + if (fhdr) { + FSXFontInfoHeader **tmp_fhdr = (FSXFontInfoHeader **) + FSrealloc((char *) fhdr, +@@ -237,6 +243,9 @@ + pi[i]->num_offsets = local_pi.num_offsets; + pi[i]->data_len = local_pi.data_len; + ++ if (pi[i]->num_offsets > SIZE_T_MAX / sizeof(FSPropOffset)) ++ goto badmem; ++ + po[i] = (FSPropOffset *) + FSmalloc(pi[i]->num_offsets * sizeof(FSPropOffset)); + if (!po[i]) { +@@ -281,6 +290,10 @@ + + nbytes = pi[i]->data_len + reply.nameLength; + _FSEatData(svr, (unsigned long) (((nbytes+3)&~3) - nbytes)); ++ } ++ /* avoid integer overflow */ ++ if (i > INT_MAX - 1) { ++ goto badmem; + } + } + *info = fhdr; +Index: lib/FS/FSFtNames.c +=================================================================== +RCS file: /home/ncvs/xfree/xc/lib/FS/FSFtNames.c,v +retrieving revision 1.2 +retrieving revision 1.3 +diff -u -u -r1.2 -r1.3 +--- lib/FS/FSFtNames.c 14 Dec 2001 19:53:32 -0000 1.2 ++++ lib/FS/FSFtNames.c 29 Aug 2003 18:01:10 -0000 1.3 +@@ -78,7 +78,8 @@ + (SIZEOF(fsListFontsReply) - SIZEOF(fsGenericReply)) >> 2, fsFalse)) + return (char **) 0; + +- if (rep.nFonts) { ++ if (rep.nFonts && rep.nFonts <= SIZE_T_MAX / sizeof(char *) ++ && rep.length <= ((SIZE_T_MAX + SIZEOF(fsListFontsReply) - 1) >> 2)) { + flist = (char **) FSmalloc((unsigned) rep.nFonts * sizeof(char *)); + rlen = (rep.length << 2) - SIZEOF(fsListFontsReply); + c = (char *) FSmalloc((unsigned) (rlen + 1)); +Index: lib/FS/FSGetCats.c +=================================================================== +RCS file: /home/ncvs/xfree/xc/lib/FS/FSGetCats.c,v +retrieving revision 1.2 +retrieving revision 1.3 +diff -u -u -r1.2 -r1.3 +--- lib/FS/FSGetCats.c 14 Dec 2001 19:53:32 -0000 1.2 ++++ lib/FS/FSGetCats.c 29 Aug 2003 18:01:10 -0000 1.3 +@@ -72,9 +72,10 @@ + SyncHandle(); + return (char **) NULL; + } +- if (rep.num_catalogues) { ++ if (rep.num_catalogues && rep.num_catalogues <= SIZE_T_MAX/sizeof(char *) ++ && rep.length <= ((SIZE_T_MAX + SIZEOF(fsGetCataloguesReply) - 1)>>2)) { + list = (char **) +- FSmalloc((unsigned) (rep.num_catalogues * sizeof(char *))); ++ FSmalloc((unsigned) (rep.num_catalogues * sizeof(char *))); + rlen = (rep.length << 2) - SIZEOF(fsGetCataloguesReply); + c = (char *) FSmalloc((unsigned) rlen + 1); + if ((!list) || (!c)) { +Index: lib/FS/FSListCats.c +=================================================================== +RCS file: /home/ncvs/xfree/xc/lib/FS/FSListCats.c,v +retrieving revision 1.2 +retrieving revision 1.3 +diff -u -u -r1.2 -r1.3 +--- lib/FS/FSListCats.c 14 Dec 2001 19:53:32 -0000 1.2 ++++ lib/FS/FSListCats.c 29 Aug 2003 18:01:10 -0000 1.3 +@@ -78,7 +78,8 @@ + (SIZEOF(fsListCataloguesReply) - SIZEOF(fsGenericReply)) >> 2, fsFalse)) + return (char **) 0; + +- if (rep.num_catalogues) { ++ if (rep.num_catalogues && rep.num_catalogues <= SIZE_T_MAX/sizeof(char *) ++ && rep.length <= ((SIZE_T_MAX+SIZEOF(fsListCataloguesReply)+1)>>2)) { + clist = (char **) + FSmalloc((unsigned) rep.num_catalogues * sizeof(char *)); + rlen = (rep.length << 2) - SIZEOF(fsListCataloguesReply); +Index: lib/FS/FSListExt.c +=================================================================== +RCS file: /home/ncvs/xfree/xc/lib/FS/FSListExt.c,v +retrieving revision 1.2 +retrieving revision 1.3 +diff -u -u -r1.2 -r1.3 +--- lib/FS/FSListExt.c 14 Dec 2001 19:53:32 -0000 1.2 ++++ lib/FS/FSListExt.c 29 Aug 2003 18:01:10 -0000 1.3 +@@ -72,7 +72,8 @@ + SyncHandle(); + return (char **) NULL; + } +- if (rep.nExtensions) { ++ if (rep.nExtensions && rep.nExtensions <= SIZE_T_MAX / sizeof(char *) ++ && rep.length <= ((SIZE_T_MAX+SIZEOF(fsListExtensionsReply)+1)>>2)) { + list = (char **) FSmalloc((unsigned)(rep.nExtensions * sizeof(char *))); + rlen = (rep.length << 2) - SIZEOF(fsListExtensionsReply); + c = (char *) FSmalloc((unsigned) rlen + 1); +Index: lib/FS/FSOpenServ.c +=================================================================== +RCS file: /home/ncvs/xfree/xc/lib/FS/FSOpenServ.c,v +retrieving revision 1.6 +retrieving revision 1.7 +diff -u -u -r1.6 -r1.7 +--- lib/FS/FSOpenServ.c 14 Dec 2001 19:53:33 -0000 1.6 ++++ lib/FS/FSOpenServ.c 29 Aug 2003 18:01:11 -0000 1.7 +@@ -118,7 +118,7 @@ + AlternateServer *alts; + int altlen; + char *vendor_string; +- long setuplength; ++ unsigned long setuplength; + + if (server == NULL || *server == '\0') { + if ((server = getenv("FONTSERVER")) == NULL) { +@@ -153,7 +153,8 @@ + _FSRead(svr, (char *) &prefix, (long) SIZEOF(fsConnSetup)); + + setuplength = prefix.alternate_len << 2; +- if ((alt_data = (char *) ++ if (setuplength > (SIZE_T_MAX>>2) ++ || (alt_data = (char *) + (setup = FSmalloc((unsigned) setuplength))) == NULL) { + errno = ENOMEM; + FSfree((char *) svr); +@@ -162,6 +163,10 @@ + _FSRead(svr, (char *) alt_data, setuplength); + ad = alt_data; + ++ if (prefix.num_alternates > SIZE_T_MAX / sizeof(AlternateServer)) { ++ errno = ENOMEM; ++ return (FSServer *) 0; ++ } + alts = (AlternateServer *) + FSmalloc(sizeof(AlternateServer) * prefix.num_alternates); + if (!alts) { +@@ -193,7 +198,8 @@ + svr->num_alternates = prefix.num_alternates; + + setuplength = prefix.auth_len << 2; +- if ((auth_data = (char *) ++ if (prefix.auth_len > (SIZE_T_MAX>>2) ++ || (auth_data = (char *) + (setup = FSmalloc((unsigned) setuplength))) == NULL) { + errno = ENOMEM; + FSfree((char *) svr); +Index: lib/FS/FSQGlyphs.c +=================================================================== +RCS file: /home/ncvs/xfree/xc/lib/FS/FSQGlyphs.c,v +retrieving revision 1.2 +retrieving revision 1.3 +diff -u -u -r1.2 -r1.3 +--- lib/FS/FSQGlyphs.c 14 Dec 2001 19:53:33 -0000 1.2 ++++ lib/FS/FSQGlyphs.c 29 Aug 2003 18:01:11 -0000 1.3 +@@ -85,12 +85,20 @@ + (SIZEOF(fsQueryXBitmaps8Reply) - SIZEOF(fsGenericReply)) >> 2, fsFalse)) + return FSBadAlloc; + ++ if (reply.num_chars > SIZE_T_MAX / sizeof(FSOffset)) ++ return FSBadAlloc; ++ + offs = (FSOffset *) FSmalloc(sizeof(FSOffset) * reply.num_chars); + *offsets = offs; + if (!offs) + return FSBadAlloc; + left = (reply.length << 2) - SIZEOF(fsQueryXBitmaps8Reply) + - (SIZEOF(fsOffset32) * reply.num_chars); ++ /* XXX This thest is incomplete */ ++ if (reply.length > (SIZE_T_MAX >> 2)) { ++ FSfree((char *) offs); ++ return FSBadAlloc; ++ } + gd = (unsigned char *) FSmalloc(left); + *glyphdata = gd; + if (!gd) { +@@ -141,6 +149,8 @@ + int i; + fsChar2b_version1 *swapped_str; + ++ if (str_len > SIZE_T_MAX/SIZEOF(fsChar2b_version1)) ++ return FSBadAlloc; + swapped_str = (fsChar2b_version1 *) + FSmalloc(SIZEOF(fsChar2b_version1) * str_len); + if (!swapped_str) +@@ -160,12 +170,19 @@ + fsFalse)) + return FSBadAlloc; + ++ if(reply.num_chars > SIZE_T_MAX/sizeof(FSOffset)) ++ return FSBadAlloc; + offs = (FSOffset *) FSmalloc(sizeof(FSOffset) * reply.num_chars); + *offsets = offs; + if (!offs) + return FSBadAlloc; + left = (reply.length << 2) - SIZEOF(fsQueryXBitmaps16Reply) + - (SIZEOF(fsOffset32) * reply.num_chars); ++ /* XXX - this test is incomplete */ ++ if (reply.length > (SIZE_T_MAX>>2)) { ++ FSfree((char *) offs); ++ return FSBadAlloc; ++ } + gd = (unsigned char *) FSmalloc(left); + *glyphdata = gd; + if (!gd) { +Index: lib/FS/FSQXExt.c +=================================================================== +RCS file: /home/ncvs/xfree/xc/lib/FS/FSQXExt.c,v +retrieving revision 1.5 +retrieving revision 1.6 +diff -u -u -r1.5 -r1.6 +--- lib/FS/FSQXExt.c 14 Dec 2001 19:53:33 -0000 1.5 ++++ lib/FS/FSQXExt.c 29 Aug 2003 18:01:12 -0000 1.6 +@@ -92,6 +92,9 @@ + (SIZEOF(fsQueryXExtents8Reply) - SIZEOF(fsGenericReply)) >> 2, + fsFalse)) + return FSBadAlloc; ++ ++ if (reply.num_extents > SIZE_T_MAX / sizeof(FSXCharInfo)) ++ return FSBadAlloc; + + ext = (FSXCharInfo *) FSmalloc(sizeof(FSXCharInfo) * reply.num_extents); + *extents = ext; +@@ -147,6 +150,9 @@ + if (!_FSReply(svr, (fsReply *) & reply, + (SIZEOF(fsQueryXExtents16Reply) - SIZEOF(fsGenericReply)) >> 2, + fsFalse)) ++ return FSBadAlloc; ++ ++ if (reply.num_extents > SIZE_T_MAX/sizeof(FSXCharInfo)) + return FSBadAlloc; + + ext = (FSXCharInfo *) FSmalloc(sizeof(FSXCharInfo) * reply.num_extents); +Index: lib/FS/FSQXInfo.c +=================================================================== +RCS file: /home/ncvs/xfree/xc/lib/FS/FSQXInfo.c,v +retrieving revision 1.2 +retrieving revision 1.3 +diff -u -u -r1.2 -r1.3 +--- lib/FS/FSQXInfo.c 14 Dec 2001 19:53:33 -0000 1.2 ++++ lib/FS/FSQXInfo.c 29 Aug 2003 18:01:12 -0000 1.3 +@@ -91,6 +91,9 @@ + props->num_offsets = local_pi.num_offsets; + props->data_len = local_pi.data_len; + ++ if (props->num_offsets > SIZE_T_MAX / sizeof(FSPropOffset)) ++ return FSBadAlloc; ++ + /* prepare for prop data */ + offset_data = (FSPropOffset *) + FSmalloc(props->num_offsets * sizeof(FSPropOffset)); +Index: lib/FS/FSlibint.h +=================================================================== +RCS file: /home/ncvs/xfree/xc/lib/FS/FSlibint.h,v +retrieving revision 3.7 +retrieving revision 3.8 +diff -u -u -r3.7 -r3.8 +--- lib/FS/FSlibint.h 14 Dec 2001 19:53:33 -0000 3.7 ++++ lib/FS/FSlibint.h 29 Aug 2003 18:01:12 -0000 3.8 +@@ -76,6 +76,11 @@ + #include "FSlibos.h" + #include <errno.h> + #include <stddef.h> ++ ++#include <limits.h> ++#ifndef SIZE_T_MAX ++#define SIZE_T_MAX UINT_MAX ++#endif + + typedef int (* FSIOErrorHandler)(FSServer *); + typedef int (* FSErrorHandler)(FSServer *, FSErrorEvent *); +Index: lib/font/fc/fserve.c +=================================================================== +RCS file: /home/ncvs/xfree/xc/lib/font/fc/fserve.c,v +retrieving revision 3.23 +retrieving revision 3.24 +diff -u -u -r3.23 -r3.24 +--- lib/font/fc/fserve.c 27 May 2003 22:26:48 -0000 3.23 ++++ lib/font/fc/fserve.c 29 Aug 2003 18:01:13 -0000 3.24 +@@ -1505,8 +1505,8 @@ + + if (conn->blockState & FS_GIVE_UP) + return BadFontName; +- +- if (namelen > sizeof (buf) - 1) ++ ++ if (namelen <= 0 || namelen > sizeof (buf) - 1) + return BadFontName; + + /* +Index: lib/font/fc/fslibos.h +=================================================================== +RCS file: /home/ncvs/xfree/xc/lib/font/fc/fslibos.h,v +retrieving revision 3.7 +retrieving revision 3.8 +diff -u -u -r3.7 -r3.8 +--- lib/font/fc/fslibos.h 31 May 2002 18:45:49 -0000 3.7 ++++ lib/font/fc/fslibos.h 29 Aug 2003 18:01:14 -0000 3.8 +@@ -48,13 +48,16 @@ + #ifndef FONT_OPEN_MAX + + #ifndef X_NOT_POSIX +-#ifdef _POSIX_SOURCE +-#include <limits.h> +-#else +-#define _POSIX_SOURCE +-#include <limits.h> +-#undef _POSIX_SOURCE ++# ifdef _POSIX_SOURCE ++# include <limits.h> ++# else ++# define _POSIX_SOURCE ++# include <limits.h> ++# undef _POSIX_SOURCE ++# endif + #endif ++#ifndef SIZE_T_MAX ++# define SIZE_T_MAX UINT_MAX + #endif + #ifndef OPEN_MAX + #if defined(SVR4) || defined(__UNIXOS2__) + diff --git a/x11/XFree86-libs/patches/patch-ao b/x11/XFree86-libs/patches/patch-ao new file mode 100644 index 00000000000..a82af8f268b --- /dev/null +++ b/x11/XFree86-libs/patches/patch-ao @@ -0,0 +1,13 @@ +$NetBSD: patch-ao,v 1.1.1.1 2004/01/24 08:47:31 xtraeme Exp $ + +--- programs/Xserver/dix/main.c.orig 2003-07-07 01:39:11.000000000 +0000 ++++ programs/Xserver/dix/main.c 2003-07-07 01:43:07.000000000 +0000 +@@ -505,7 +505,7 @@ + /* Leave off the ridBase and ridMask, these must be sent with + connection */ + +- setup.release = VENDOR_RELEASE; ++ setup.release = NULL; + /* + * per-server image and bitmap parameters are defined in Xmd.h + */ diff --git a/x11/XFree86-libs/patches/patch-ap b/x11/XFree86-libs/patches/patch-ap new file mode 100644 index 00000000000..da265fd1b84 --- /dev/null +++ b/x11/XFree86-libs/patches/patch-ap @@ -0,0 +1,14 @@ +$NetBSD: patch-ap,v 1.1.1.1 2004/01/24 08:47:31 xtraeme Exp $ + +--- 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 + 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 + IMAKE_CMD = $(IMAKE) -I$(TOP) -I$(IRULESRC) \ + $(IMAKE_DEFINES) $(IMAKE_WARNINGS) diff --git a/x11/XFree86-libs/patches/patch-aq b/x11/XFree86-libs/patches/patch-aq new file mode 100644 index 00000000000..0cf3e6627a1 --- /dev/null +++ b/x11/XFree86-libs/patches/patch-aq @@ -0,0 +1,12 @@ +$NetBSD: patch-aq,v 1.1.1.1 2004/01/24 08:47:31 xtraeme Exp $ + +--- programs/mkfontscale/mkfontscale.c.orig 2003-09-12 21:15:41.000000000 -0700 ++++ programs/mkfontscale/mkfontscale.c 2003-09-12 21:16:34.000000000 -0700 +@@ -549,6 +549,7 @@ + encoding->value); + } + free(filename); ++ FT_Done_Face(face); + } + entries = reverseList(entries); + fprintf(fontscale, "%d\n", listLength(entries)); diff --git a/x11/XFree86-libs/patches/patch-ar b/x11/XFree86-libs/patches/patch-ar new file mode 100644 index 00000000000..8338dac5855 --- /dev/null +++ b/x11/XFree86-libs/patches/patch-ar @@ -0,0 +1,61 @@ +$NetBSD: patch-ar,v 1.1.1.1 2004/01/24 08:47:31 xtraeme Exp $ + +--- config/cf/NetBSD.cf.in.orig 2003-09-01 22:15:38.000000000 +0200 ++++ config/cf/NetBSD.cf.in 2003-09-01 22:17:27.000000000 +0200 +@@ -92,21 +92,6 @@ + + #define InstallXloadSetGID NO + +-/* Defines for using the GNU pth thread library -- experimental */ +- +-#ifdef NetBSDPth +-#define PthreadHLocation -I/usr/local/include /* where is pthread.h? */ +-#define LibPthreadLocation -L/usr/local/lib /* where is libpthread? */ +-#define HasThreadSafeAPI NO +-#define HasPosixThreads YES +-#define SystemMTDefines -D_REENTRANT PthreadHLocation +-#define ThreadsLibraries LibPthreadLocation -Wl,-rpath,/usr/local/lib -lpthread +-#define SharedX11Reqs ThreadsLibraries +-#else +-#define HasPosixThreads NO +-#define ThreadedX NO +-#endif +- + /* + * Compiler Features + */ +@@ -123,7 +108,7 @@ + #define MkdirHierCmd mkdir -p + + #undef CcCmd +-#define CcCmd gcc ++#define CcCmd @@PKGSRC_CC@@ + #ifndef DefaultCCOptions + #if defined(UseInstalled) + #define DefaultCCOptions /**/ +@@ -143,7 +128,7 @@ + #define UseGccMakeDepend YES + #endif + +-#define CppCmd cpp ++#define CppCmd @@PKGSRC_CPP@@ + #define StandardCppOptions -traditional + #define StandardCppDefines /**/ + #define PreProcessCmd CcCmd -E +@@ -194,7 +179,7 @@ + # define DefaultGcc2i386Opt -O2 + # endif + # endif +-# define OptimizedCDebugFlags DefaultGcc2i386Opt ++# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ + # if OSMajorVersion < 1 + # define ServerOSDefines XFree86ServerOSDefines -DXNO_SYSCONF + # else +@@ -648,3 +633,7 @@ + #ifndef UseSeparateConfDir + #define UseSeparateConfDir NO /* We don't want appdefs in "/etc/X11". */ + #endif ++ ++/* TheadedX */ ++ ++ diff --git a/x11/XFree86-libs/patches/patch-as b/x11/XFree86-libs/patches/patch-as new file mode 100644 index 00000000000..037ae4a56df --- /dev/null +++ b/x11/XFree86-libs/patches/patch-as @@ -0,0 +1,141 @@ +$NetBSD: patch-as,v 1.1.1.1 2004/01/24 08:47:32 xtraeme Exp $ + +--- include/Xthreads.h.orig 2003-07-06 17:59:42.000000000 +0000 ++++ include/Xthreads.h 2003-07-06 18:00:03.000000000 +0000 +@@ -1,14 +1,16 @@ + /* +- * $Xorg: Xthreads.h,v 1.5 2001/02/09 02:03:23 xorgcvs Exp $ ++ * $XConsortium: Xthreads.h /main/35 1996/12/04 10:23:02 lehors $ ++ * $XFree86: xc/include/Xthreads.h,v 3.3 1996/12/23 05:58:11 dawes Exp $ + * + * +-Copyright 1993, 1998 The Open Group ++Copyright (c) 1993 X Consortium + +-Permission to use, copy, modify, distribute, and sell this software and its +-documentation for any purpose is hereby granted without fee, provided that +-the above copyright notice appear in all copies and that both that +-copyright notice and this permission notice appear in supporting +-documentation. ++Permission is hereby granted, free of charge, to any person obtaining a copy ++of this software and associated documentation files (the "Software"), to deal ++in the Software without restriction, including without limitation the rights ++to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++copies of the Software, and to permit persons to whom the Software is ++furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. +@@ -16,16 +18,15 @@ + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +-Except as contained in this notice, the name of The Open Group shall not be ++Except as contained in this notice, the name of the X Consortium shall not be + used in advertising or otherwise to promote the sale, use or other dealings +-in this Software without prior written authorization from The Open Group. ++in this Software without prior written authorization from the X Consortium. + * * + */ +-/* $XFree86: xc/include/Xthreads.h,v 3.10 2001/12/14 19:53:26 dawes Exp $ */ + + #ifndef _XTHREADS_H_ + #define _XTHREADS_H_ +@@ -63,9 +64,12 @@ + #define xcondition_broadcast(cv) condition_broadcast(cv) + #define xcondition_set_name(cv,str) condition_set_name(cv,str) + #else /* !CTHREADS */ +-#if defined(SVR4) && !defined(__sgi) && !defined(_SEQUENT_) ++#if defined(SVR4) && !defined(__sgi) + #include <thread.h> + #include <synch.h> ++#ifndef LINE_MAX ++#define LINE_MAX 2048 ++#endif + typedef thread_t xthread_t; + typedef thread_key_t xthread_key_t; + typedef cond_t xcondition_rec; +@@ -82,6 +86,7 @@ + #endif + #define xthread_set_specific(k,v) thr_setspecific(k,v) + #define xthread_get_specific(k,vp) thr_getspecific(k,vp) ++#define XMUTEX_INITIALIZER {0} + #define xmutex_init(m) mutex_init(m,USYNC_THREAD,0) + #define xmutex_clear(m) mutex_destroy(m) + #define xmutex_lock(m) mutex_lock(m) +@@ -196,7 +201,41 @@ + #define xcondition_signal(c) tis_cond_signal(c) + #define xcondition_broadcast(c) tis_cond_broadcast(c) + #else ++#ifdef USE_NBSD_THREADLIB ++/* ++ * NetBSD threadlib support is intended for thread safe libraries. ++ * This should not be used for general client programming. ++ */ ++#include <threadlib.h> ++typedef thr_t xthread_t; ++typedef thread_key_t xthread_key_t; ++typedef cond_t xcondition_rec; ++typedef mutex_t xmutex_rec; ++#define xthread_self thr_self ++#define xthread_fork(func,closure) { thr_t _tmpxthr; \ ++ /* XXX Create it detached? --thorpej */ \ ++ thr_create(&_tmpxthr,NULL,func,closure); } ++#define xthread_yield() thr_yield() ++#define xthread_exit(v) thr_exit(v) ++#define xthread_key_create(kp,d) thr_keycreate(kp,d) ++#define xthread_key_delete(k) thr_keydelete(k) ++#define xthread_set_specific(k,v) thr_setspecific(k,v) ++#define xthread_get_specific(k,vp) *(vp) = thr_getspecific(k) ++#define XMUTEX_INITIALIZER MUTEX_INITIALIZER ++#define xmutex_init(m) mutex_init(m, 0) ++#define xmutex_clear(m) mutex_destroy(m) ++#define xmutex_lock(m) mutex_lock(m) ++#define xmutex_unlock(m) mutex_unlock(m) ++#define xcondition_init(c) cond_init(c, 0, 0) ++#define xcondition_clear(c) cond_destroy(c) ++#define xcondition_wait(c,m) cond_wait(c,m) ++#define xcondition_signal(c) cond_signal(c) ++#define xcondition_broadcast(c) cond_broadcast(c) ++#else + #include <pthread.h> ++#ifndef LINE_MAX ++#define LINE_MAX 2048 ++#endif + typedef pthread_t xthread_t; + typedef pthread_key_t xthread_key_t; + typedef pthread_cond_t xcondition_rec; +@@ -230,24 +269,20 @@ + #define xcondition_wait(c,m) pthread_cond_wait(c,m) + #define xcondition_signal(c) pthread_cond_signal(c) + #define xcondition_broadcast(c) pthread_cond_broadcast(c) +-#if defined(_DECTHREADS_) ++#if defined(_DECTHREADS_) || defined(linux) + static xthread_t _X_no_thread_id; + #define xthread_have_id(id) !pthread_equal(id, _X_no_thread_id) + #define xthread_clear_id(id) id = _X_no_thread_id + #define xthread_equal(id1,id2) pthread_equal(id1, id2) +-#endif /* _DECTHREADS_ */ +-#if defined(linux) +-#define xthread_have_id(id) !pthread_equal(id, 0) +-#define xthread_clear_id(id) id = 0 +-#define xthread_equal(id1,id2) pthread_equal(id1, id2) +-#endif /* linux */ +-#if defined(_CMA_VENDOR_) && defined(_CMA__IBM) && (_CMA_VENDOR_ == _CMA__IBM) ++#endif /* _DECTHREADS_ || linux */ ++#if _CMA_VENDOR_ == _CMA__IBM + #ifdef DEBUG /* too much of a hack to enable normally */ + /* see also cma__obj_set_name() */ + #define xmutex_set_name(m,str) ((char**)(m)->field1)[5] = (str) + #define xcondition_set_name(cv,str) ((char**)(cv)->field1)[5] = (str) + #endif /* DEBUG */ + #endif /* _CMA_VENDOR_ == _CMA__IBM */ ++#endif /* USE_NBSD_THREADLIB */ + #endif /* USE_TIS_SUPPORT */ + #endif /* WIN32 */ + #endif /* SVR4 */ diff --git a/x11/XFree86-libs/patches/patch-at b/x11/XFree86-libs/patches/patch-at new file mode 100644 index 00000000000..21153e75014 --- /dev/null +++ b/x11/XFree86-libs/patches/patch-at @@ -0,0 +1,22 @@ +$NetBSD: patch-at,v 1.1.1.1 2004/01/24 08:47:32 xtraeme Exp $ + +--- programs/Xserver/hw/xfree86/xf86config/xf86config.c.orig 2003-07-09 13:48:58.000000000 +0000 ++++ programs/Xserver/hw/xfree86/xf86config/xf86config.c 2003-07-09 13:49:42.000000000 +0000 +@@ -176,6 +176,9 @@ + #endif + #define CONFIGNAME XCONFIGFILE + ++/* Comment this out for now ... */ ++ ++#if 0 + #ifndef XF86_VERSION_MAJOR + #ifdef XVERSION + #if XVERSION > 40000000 +@@ -187,6 +190,7 @@ + #define XF86_VERSION_MAJOR 4 + #endif + #endif ++#endif + + + int config_mousetype; /* Mouse. */ diff --git a/x11/XFree86-libs/patches/patch-au b/x11/XFree86-libs/patches/patch-au new file mode 100644 index 00000000000..20c29ce2a21 --- /dev/null +++ b/x11/XFree86-libs/patches/patch-au @@ -0,0 +1,53 @@ +$NetBSD: patch-au,v 1.1.1.1 2004/01/24 08:47:32 xtraeme Exp $ + +--- config/cf/FreeBSD.cf.in.orig Tue Jul 22 05:38:50 2003 ++++ config/cf/FreeBSD.cf.in Tue Jul 22 05:42:22 2003 +@@ -162,14 +162,14 @@ + * 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) @@PKGSRC_CC@@ ++# define CplusplusCmd $(CLIENTENVSETUP) @@PKGSRC_CXX@@ + #else +-# define CcCmd cc +-# define CplusplusCmd c++ ++# define CcCmd @@PKGSRC_CC@@ ++# define CplusplusCmd @@PKGSRC_CXX@@ + #endif + +-#define CppCmd /usr/bin/cpp ++#define CppCmd @@PKGSRC_CPP@@ + #define PreProcessCmd CppCmd + #define StandardCppOptions -traditional + #define StandardCppDefines /**/ +@@ -177,7 +177,7 @@ + #if defined(UseInstalled) + #define DefaultCCOptions /**/ + #else +-#define DefaultCCOptions -ansi -pedantic -Dasm=__asm GccWarningOptions ++#define DefaultCCOptions -ansi @@PKGSRC_CFLAGS@@ -Dasm=__asm + #endif + #endif + #ifndef ExtraLibraries +@@ -482,17 +482,12 @@ + #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 ++#define DefaultGcc2i386Opt + + #ifdef i386Architecture + # define OptimizedCDebugFlags DefaultGcc2i386Opt + #else +-# define OptimizedCDebugFlags -O ++# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ + #endif + + #ifndef PreIncDir diff --git a/x11/XFree86-libs/patches/patch-av b/x11/XFree86-libs/patches/patch-av new file mode 100644 index 00000000000..a9b30465a42 --- /dev/null +++ b/x11/XFree86-libs/patches/patch-av @@ -0,0 +1,23 @@ +$NetBSD: patch-av,v 1.1.1.1 2004/01/24 08:47:32 xtraeme Exp $ + +--- lib/font/fc/fsconvert.c.orig 2002-09-10 16:14:35.000000000 +0000 ++++ lib/font/fc/fsconvert.c 2003-09-24 08:32:26.000000000 +0000 +@@ -36,6 +36,7 @@ + #include "fontstruct.h" + #include "fservestr.h" + #include "fontutil.h" ++#include "fslibos.h" + + extern char _fs_glyph_undefined; + extern char _fs_glyph_requested; +@@ -102,6 +103,10 @@ + + nprops = pfi->nprops = pi->num_offsets; + ++ if (nprops < 0 ++ || nprops > SIZE_T_MAX/(sizeof(FontPropRec) + sizeof(char))) ++ return -1; ++ + dprop = (FontPropPtr) xalloc(sizeof(FontPropRec) * nprops + + sizeof (char) * nprops); + if (!dprop) diff --git a/x11/XFree86-libs/patches/patch-aw b/x11/XFree86-libs/patches/patch-aw new file mode 100644 index 00000000000..22a61267e4a --- /dev/null +++ b/x11/XFree86-libs/patches/patch-aw @@ -0,0 +1,28 @@ +$NetBSD: patch-aw,v 1.1.1.1 2004/01/24 08:47:32 xtraeme Exp $ + +--- programs/Xserver/hw/xfree86/os-support/bus/Pci.h.orig Tue Mar 4 16:42:16 2003 ++++ programs/Xserver/hw/xfree86/os-support/bus/Pci.h Tue Mar 4 16:42:21 2003 +@@ -230,6 +230,10 @@ + # define ARCH_PCI_INIT linuxPciInit + # define INCLUDE_XF86_MAP_PCI_MEM + # define INCLUDE_XF86_NO_DOMAIN ++# elif defined(FreeBSD) ++# define ARCH_PCI_INIT freebsdPciInit ++# define INCLUDE_XF86_MAP_PCI_MEM ++# define INCLUDE_XF86_NO_DOMAIN + # endif + # define XF86SCANPCI_WRAPPER ia64ScanPCIWrapper + #elif defined(__i386__) +@@ -298,7 +302,11 @@ + # endif + # define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge + #elif defined(__x86_64__) +-# define ARCH_PCI_INIT ix86PciInit ++# if defined(__FreeBSD__) ++# define ARCH_PCI_INIT freebsdPciInit ++# else ++# define ARCH_PCI_INIT ix86PciInit ++# endif + # define INCLUDE_XF86_MAP_PCI_MEM + # define INCLUDE_XF86_NO_DOMAIN + # if defined(linux) diff --git a/x11/XFree86-libs/patches/patch-ax b/x11/XFree86-libs/patches/patch-ax new file mode 100644 index 00000000000..5ce317535d1 --- /dev/null +++ b/x11/XFree86-libs/patches/patch-ax @@ -0,0 +1,13 @@ +$NetBSD: patch-ax,v 1.1.1.1 2004/01/24 08:47:32 xtraeme Exp $ + +--- lib/GL/mesa/src/drv/radeon/radeon_vtxtmp_x86.S.orig Wed Jul 16 13:47:09 2003 ++++ lib/GL/mesa/src/drv/radeon/radeon_vtxtmp_x86.S Wed Jul 16 13:47:10 2003 +@@ -28,7 +28,7 @@ + + #define GLOBL( x ) \ + .globl x; \ +-x##: ++x: + + .data + .align 4 diff --git a/x11/XFree86-libs/patches/patch-ay b/x11/XFree86-libs/patches/patch-ay new file mode 100644 index 00000000000..b99f2ada38d --- /dev/null +++ b/x11/XFree86-libs/patches/patch-ay @@ -0,0 +1,14 @@ +$NetBSD: patch-ay,v 1.1.1.1 2004/01/24 08:47:32 xtraeme Exp $ + +--- lib/GL/mesa/src/drv/r200/r200_vtxtmp_x86.S.orig Wed Jul 16 13:48:41 2003 ++++ lib/GL/mesa/src/drv/r200/r200_vtxtmp_x86.S Wed Jul 16 13:48:56 2003 +@@ -28,7 +28,7 @@ + + #define GLOBL( x ) \ + .globl x; \ +-x##: ++x: + + .data + .align 4 + |