diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2004-03-28 22:06:15 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2004-03-28 22:06:15 +0000 |
| commit | 770c956a77033bad4142a38dd44da1dee5051799 (patch) | |
| tree | 0a14a167a5e6fa293f4372364539467a1d5018de /x11/XFree86-libs | |
| parent | 2b90b59091637afbbdd6268b0189129463c3973b (diff) | |
| download | pkgsrc-770c956a77033bad4142a38dd44da1dee5051799.tar.gz | |
Upgrade XFree86 packages to 4.4.0.
To see a full list of changes, please review:
http://xfree86.org/4.4.0/RELNOTES.html
These packages has been tested under NetBSD 1.6/-current, FreeBSD 4.x/5.x,
and GNU/Linux (i386) by Jeremy C. Reed, Michal Pasternak and myself.
Diffstat (limited to 'x11/XFree86-libs')
33 files changed, 328 insertions, 2028 deletions
diff --git a/x11/XFree86-libs/MESSAGE b/x11/XFree86-libs/MESSAGE index 0c07a14e00e..6795da4bfcf 100644 --- a/x11/XFree86-libs/MESSAGE +++ b/x11/XFree86-libs/MESSAGE @@ -1,13 +1,10 @@ ========================================================================== -$NetBSD: MESSAGE,v 1.1 2004/02/02 17:59:12 xtraeme Exp $ +$NetBSD: MESSAGE,v 1.2 2004/03/28 22:06:15 xtraeme Exp $ Make sure you have defined X11BASE in /etc/mk.conf before try to install -pkgtools/x11-links. Then you can just add the following: +any package that uses X11 headers/libraries. Then you can just add the +following: - X11BASE=${X11PREFIX}/X11R6 - -If you had previously installed x11-links, make sure you have modified -X11BASE and then reinstalled x11-links before building any X11 -application. + X11BASE=${X11ROOT} ========================================================================== diff --git a/x11/XFree86-libs/Makefile b/x11/XFree86-libs/Makefile index 2b1277450c9..b74e1c9146e 100644 --- a/x11/XFree86-libs/Makefile +++ b/x11/XFree86-libs/Makefile @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.4 2004/02/02 17:59:12 xtraeme Exp $ +# $NetBSD: Makefile,v 1.5 2004/03/28 22:06:15 xtraeme Exp $ DISTNAME= ${DISTFILES} PKGNAME= XFree86-libs-${XF_VER} -PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE} -DISTFILES= X430src-1.tgz X430src-2.tgz \ - X430src-3.tgz X430src-4.tgz +DISTFILES= XFree86-4.4.0-src-1.tgz XFree86-4.4.0-src-2.tgz \ + XFree86-4.4.0-src-3.tgz XFree86-4.4.0-src-4.tgz MAINTAINER= xfree86@blef.org HOMEPAGE= http://www.xfree86.org/ @@ -16,27 +15,16 @@ CONFLICTS+= xextensions-[0-9]* CONFLICTS+= libX11-[0-9]* CONFLICTS+= libXau-[0-9]* -USE_IMAKE= yes -DEPENDS= imake>=4.3.0:../../x11/imake +DEPENDS= imake>=4.4.0:../../x11/imake .include "../../mk/bsd.prefs.mk" -MESSAGE_SUBST+= X11PREFIX=${X11PREFIX} - -.if ${OPSYS} == "NetBSD" -PLIST_SUBST+= MANPAGE_SUFFIX=${IMAKE_MANNEWSUFFIX} -.else -PLIST_SUBST+= MANPAGE_SUFFIX=${IMAKE_LIBMAN_SUFFIX} -.endif - -# 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 +USE_BUILDLINK3= yes +BUILDLINK_PASSTHRU_DIRS+= ${X11ROOT}/lib XBUILD_DIRS= lib nls programs/Xserver/include \ programs/Xserver/hw/xfree86/parser @@ -45,16 +33,14 @@ 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}/X11R6/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 +SUBST_CLASSES= mkstrs +SUBST_STAGE.mkstrs= post-patch +SUBST_FILES.mkstrs= config/cf/Library.tmpl +SUBST_SED.mkstrs= -e 's,@MAKESTRS@,${X11ROOT}/bin/makestrs,g' +SUBST_MESSAGE.mkstrs= "Fixing path of makestrs." -.include "../../fonts/fontconfig/buildlink2.mk" -.include "../../graphics/freetype2/buildlink2.mk" -.include "../../textproc/expat/buildlink2.mk" +.include "../../fonts/fontconfig/buildlink3.mk" +.include "../../graphics/freetype2/buildlink3.mk" .include "../../meta-pkgs/XFree86/Makefile.common" - +.include "../../textproc/expat/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/XFree86-libs/PLIST.Linux b/x11/XFree86-libs/PLIST.Linux deleted file mode 100644 index 808dbdb356f..00000000000 --- a/x11/XFree86-libs/PLIST.Linux +++ /dev/null @@ -1,35 +0,0 @@ -@comment $NetBSD: PLIST.Linux,v 1.3 2004/02/02 14:15:27 xtraeme Exp $ -X11R6/include/X11/extensions/xf86rush.h -X11R6/include/X11/extensions/xf86rushstr.h -X11R6/lib/libI810XvMC.a -X11R6/lib/libXxf86rush.a -X11R6/lib/libGL.so.1.2 -X11R6/lib/libGLU.so.1.3 -X11R6/lib/libICE.so.6.3 -X11R6/lib/libOSMesa.so.4.0 -X11R6/lib/libSM.so.6.0 -X11R6/lib/libX11.so.6.2 -X11R6/lib/libXThrStub.so -X11R6/lib/libXThrStub.so.6 -X11R6/lib/libXThrStub.so.6.1 -X11R6/lib/libXTrap.so.6.4 -X11R6/lib/libXaw.so.6.1 -X11R6/lib/libXaw.so.7.0 -X11R6/lib/libXcursor.so.1.0 -X11R6/lib/libXext.so.6.4 -X11R6/lib/libXfont.so.1.4 -X11R6/lib/libXi.so.6.0 -X11R6/lib/libXinerama.so.1.0 -X11R6/lib/libXmu.so.6.2 -X11R6/lib/libXmuu.so.1.0 -X11R6/lib/libXp.so.6.2 -X11R6/lib/libXpm.so.4.11 -X11R6/lib/libXrandr.so.2.0 -X11R6/lib/libXrender.so.1.2 -X11R6/lib/libXt.so.6.0 -X11R6/lib/libXtst.so.6.1 -X11R6/lib/libXv.so.1.0 -X11R6/lib/libdps.so.1.0 -X11R6/lib/libdpstk.so.1.0 -X11R6/lib/liboldX.so.6.0 -X11R6/lib/libpsres.so.1.0 diff --git a/x11/XFree86-libs/PLIST.NetBSD b/x11/XFree86-libs/PLIST.NetBSD deleted file mode 100644 index 6237c7ef832..00000000000 --- a/x11/XFree86-libs/PLIST.NetBSD +++ /dev/null @@ -1,31 +0,0 @@ -@comment $NetBSD: PLIST.NetBSD,v 1.3 2004/02/02 14:15:27 xtraeme Exp $ -X11R6/lib/libGL.so.1.2 -X11R6/lib/libGLU.so.1.3 -X11R6/lib/libICE.so.6.3 -X11R6/lib/libOSMesa.so.4.0 -X11R6/lib/libSM.so.6.0 -X11R6/lib/libX11.so.6.2 -X11R6/lib/libXThrStub.so -X11R6/lib/libXThrStub.so.6 -X11R6/lib/libXThrStub.so.6.1 -X11R6/lib/libXTrap.so.6.4 -X11R6/lib/libXaw.so.6.1 -X11R6/lib/libXaw.so.7.0 -X11R6/lib/libXcursor.so.1.0 -X11R6/lib/libXext.so.6.4 -X11R6/lib/libXfont.so.1.4 -X11R6/lib/libXi.so.6.0 -X11R6/lib/libXinerama.so.1.0 -X11R6/lib/libXmu.so.6.2 -X11R6/lib/libXmuu.so.1.0 -X11R6/lib/libXp.so.6.2 -X11R6/lib/libXpm.so.4.11 -X11R6/lib/libXrandr.so.2.0 -X11R6/lib/libXrender.so.1.2 -X11R6/lib/libXt.so.6.0 -X11R6/lib/libXtst.so.6.1 -X11R6/lib/libXv.so.1.0 -X11R6/lib/libdps.so.1.0 -X11R6/lib/libdpstk.so.1.0 -X11R6/lib/liboldX.so.6.0 -X11R6/lib/libpsres.so.1.0 diff --git a/x11/XFree86-libs/PLIST.common b/x11/XFree86-libs/PLIST.common deleted file mode 100644 index 520007ab1a1..00000000000 --- a/x11/XFree86-libs/PLIST.common +++ /dev/null @@ -1,663 +0,0 @@ -@comment $NetBSD: PLIST.common,v 1.3 2004/02/02 14:15:27 xtraeme Exp $ -X11R6/bin/xcursor-config -X11R6/include/DPS/ColorSB.h -X11R6/include/DPS/ColorSBP.h -X11R6/include/DPS/DPSScrollW.h -X11R6/include/DPS/DPSScrollWP.h -X11R6/include/DPS/FontCreatP.h -X11R6/include/DPS/FontCreato.h -X11R6/include/DPS/FontSB.h -X11R6/include/DPS/FontSBP.h -X11R6/include/DPS/FontSamplP.h -X11R6/include/DPS/FontSample.h -X11R6/include/DPS/PSres.h -X11R6/include/DPS/XDPS.h -X11R6/include/DPS/XDPSlib.h -X11R6/include/DPS/XDPSproto.h -X11R6/include/DPS/dpsNXargs.h -X11R6/include/DPS/dpsXclient.h -X11R6/include/DPS/dpsXcommon.h -X11R6/include/DPS/dpsXpreview.h -X11R6/include/DPS/dpsXshare.h -X11R6/include/DPS/dpsXuserpath.h -X11R6/include/DPS/dpsclient.h -X11R6/include/DPS/dpsconfig.h -X11R6/include/DPS/dpsexcept.h -X11R6/include/DPS/dpsfriends.h -X11R6/include/DPS/dpsops.h -X11R6/include/DPS/psops.h -X11R6/include/GL/GLwDrawA.h -X11R6/include/GL/GLwDrawAP.h -X11R6/include/GL/GLwMDrawA.h -X11R6/include/GL/GLwMDrawAP.h -X11R6/include/GL/gl.h -X11R6/include/GL/glext.h -X11R6/include/GL/glu.h -X11R6/include/GL/glx.h -X11R6/include/GL/glxext.h -X11R6/include/GL/glxint.h -X11R6/include/GL/glxmd.h -X11R6/include/GL/glxproto.h -X11R6/include/GL/glxtokens.h -X11R6/include/GL/osmesa.h -X11R6/include/X11/Composite.h -X11R6/include/X11/CompositeP.h -X11R6/include/X11/ConstrainP.h -X11R6/include/X11/Constraint.h -X11R6/include/X11/Core.h -X11R6/include/X11/CoreP.h -X11R6/include/X11/DECkeysym.h -X11R6/include/X11/HPkeysym.h -X11R6/include/X11/ICE/ICE.h -X11R6/include/X11/ICE/ICEconn.h -X11R6/include/X11/ICE/ICElib.h -X11R6/include/X11/ICE/ICEmsg.h -X11R6/include/X11/ICE/ICEproto.h -X11R6/include/X11/ICE/ICEutil.h -X11R6/include/X11/Intrinsic.h -X11R6/include/X11/IntrinsicP.h -X11R6/include/X11/Object.h -X11R6/include/X11/ObjectP.h -X11R6/include/X11/RectObj.h -X11R6/include/X11/RectObjP.h -X11R6/include/X11/SM/SM.h -X11R6/include/X11/SM/SMlib.h -X11R6/include/X11/SM/SMproto.h -X11R6/include/X11/Shell.h -X11R6/include/X11/ShellP.h -X11R6/include/X11/StringDefs.h -X11R6/include/X11/Sunkeysym.h -X11R6/include/X11/Vendor.h -X11R6/include/X11/VendorP.h -X11R6/include/X11/X.h -X11R6/include/X11/X10.h -X11R6/include/X11/XF86keysym.h -X11R6/include/X11/XKBlib.h -X11R6/include/X11/XWDFile.h -X11R6/include/X11/Xalloca.h -X11R6/include/X11/Xarch.h -X11R6/include/X11/Xatom.h -X11R6/include/X11/Xauth.h -X11R6/include/X11/Xaw/AllWidgets.h -X11R6/include/X11/Xaw/AsciiSink.h -X11R6/include/X11/Xaw/AsciiSinkP.h -X11R6/include/X11/Xaw/AsciiSrc.h -X11R6/include/X11/Xaw/AsciiSrcP.h -X11R6/include/X11/Xaw/AsciiText.h -X11R6/include/X11/Xaw/AsciiTextP.h -X11R6/include/X11/Xaw/Box.h -X11R6/include/X11/Xaw/BoxP.h -X11R6/include/X11/Xaw/Cardinals.h -X11R6/include/X11/Xaw/Command.h -X11R6/include/X11/Xaw/CommandP.h -X11R6/include/X11/Xaw/Dialog.h -X11R6/include/X11/Xaw/DialogP.h -X11R6/include/X11/Xaw/Form.h -X11R6/include/X11/Xaw/FormP.h -X11R6/include/X11/Xaw/Grip.h -X11R6/include/X11/Xaw/GripP.h -X11R6/include/X11/Xaw/Label.h -X11R6/include/X11/Xaw/LabelP.h -X11R6/include/X11/Xaw/List.h -X11R6/include/X11/Xaw/ListP.h -X11R6/include/X11/Xaw/MenuButtoP.h -X11R6/include/X11/Xaw/MenuButton.h -X11R6/include/X11/Xaw/MultiSink.h -X11R6/include/X11/Xaw/MultiSinkP.h -X11R6/include/X11/Xaw/MultiSrc.h -X11R6/include/X11/Xaw/MultiSrcP.h -X11R6/include/X11/Xaw/Paned.h -X11R6/include/X11/Xaw/PanedP.h -X11R6/include/X11/Xaw/Panner.h -X11R6/include/X11/Xaw/PannerP.h -X11R6/include/X11/Xaw/Porthole.h -X11R6/include/X11/Xaw/PortholeP.h -X11R6/include/X11/Xaw/Repeater.h -X11R6/include/X11/Xaw/RepeaterP.h -X11R6/include/X11/Xaw/Reports.h -X11R6/include/X11/Xaw/Scrollbar.h -X11R6/include/X11/Xaw/ScrollbarP.h -X11R6/include/X11/Xaw/Simple.h -X11R6/include/X11/Xaw/SimpleMenP.h -X11R6/include/X11/Xaw/SimpleMenu.h -X11R6/include/X11/Xaw/SimpleP.h -X11R6/include/X11/Xaw/Sme.h -X11R6/include/X11/Xaw/SmeBSB.h -X11R6/include/X11/Xaw/SmeBSBP.h -X11R6/include/X11/Xaw/SmeLine.h -X11R6/include/X11/Xaw/SmeLineP.h -X11R6/include/X11/Xaw/SmeP.h -X11R6/include/X11/Xaw/StripCharP.h -X11R6/include/X11/Xaw/StripChart.h -X11R6/include/X11/Xaw/Template.c -X11R6/include/X11/Xaw/Template.h -X11R6/include/X11/Xaw/TemplateP.h -X11R6/include/X11/Xaw/Text.h -X11R6/include/X11/Xaw/TextP.h -X11R6/include/X11/Xaw/TextSink.h -X11R6/include/X11/Xaw/TextSinkP.h -X11R6/include/X11/Xaw/TextSrc.h -X11R6/include/X11/Xaw/TextSrcP.h -X11R6/include/X11/Xaw/Tip.h -X11R6/include/X11/Xaw/TipP.h -X11R6/include/X11/Xaw/Toggle.h -X11R6/include/X11/Xaw/ToggleP.h -X11R6/include/X11/Xaw/Tree.h -X11R6/include/X11/Xaw/TreeP.h -X11R6/include/X11/Xaw/VendorEP.h -X11R6/include/X11/Xaw/Viewport.h -X11R6/include/X11/Xaw/ViewportP.h -X11R6/include/X11/Xaw/XawImP.h -X11R6/include/X11/Xaw/XawInit.h -X11R6/include/X11/Xcms.h -X11R6/include/X11/Xcursor/Xcursor.h -X11R6/include/X11/Xdefs.h -X11R6/include/X11/Xdmcp.h -X11R6/include/X11/Xfuncproto.h -X11R6/include/X11/Xfuncs.h -X11R6/include/X11/Xlib.h -X11R6/include/X11/Xlibint.h -X11R6/include/X11/Xlocale.h -X11R6/include/X11/Xmd.h -X11R6/include/X11/Xmu/Atoms.h -X11R6/include/X11/Xmu/CharSet.h -X11R6/include/X11/Xmu/CloseHook.h -X11R6/include/X11/Xmu/Converters.h -X11R6/include/X11/Xmu/CurUtil.h -X11R6/include/X11/Xmu/CvtCache.h -X11R6/include/X11/Xmu/DisplayQue.h -X11R6/include/X11/Xmu/Drawing.h -X11R6/include/X11/Xmu/Editres.h -X11R6/include/X11/Xmu/EditresP.h -X11R6/include/X11/Xmu/Error.h -X11R6/include/X11/Xmu/ExtAgent.h -X11R6/include/X11/Xmu/Initer.h -X11R6/include/X11/Xmu/Lookup.h -X11R6/include/X11/Xmu/Misc.h -X11R6/include/X11/Xmu/StdCmap.h -X11R6/include/X11/Xmu/StdSel.h -X11R6/include/X11/Xmu/SysUtil.h -X11R6/include/X11/Xmu/WidgetNode.h -X11R6/include/X11/Xmu/WinUtil.h -X11R6/include/X11/Xmu/Xct.h -X11R6/include/X11/Xmu/Xmu.h -X11R6/include/X11/Xos.h -X11R6/include/X11/Xos_r.h -X11R6/include/X11/Xosdefs.h -X11R6/include/X11/Xpoll.h -X11R6/include/X11/Xproto.h -X11R6/include/X11/Xprotostr.h -X11R6/include/X11/Xresource.h -X11R6/include/X11/Xthreads.h -X11R6/include/X11/Xutil.h -X11R6/include/X11/ap_keysym.h -X11R6/include/X11/bitmaps/1x1 -X11R6/include/X11/bitmaps/2x2 -X11R6/include/X11/bitmaps/black -X11R6/include/X11/bitmaps/boxes -X11R6/include/X11/bitmaps/calculator -X11R6/include/X11/bitmaps/cntr_ptr -X11R6/include/X11/bitmaps/cntr_ptrmsk -X11R6/include/X11/bitmaps/cross_weave -X11R6/include/X11/bitmaps/dimple1 -X11R6/include/X11/bitmaps/dimple3 -X11R6/include/X11/bitmaps/dot -X11R6/include/X11/bitmaps/dropbar7 -X11R6/include/X11/bitmaps/dropbar8 -X11R6/include/X11/bitmaps/escherknot -X11R6/include/X11/bitmaps/flagdown -X11R6/include/X11/bitmaps/flagup -X11R6/include/X11/bitmaps/flipped_gray -X11R6/include/X11/bitmaps/gray -X11R6/include/X11/bitmaps/gray1 -X11R6/include/X11/bitmaps/gray3 -X11R6/include/X11/bitmaps/grid16 -X11R6/include/X11/bitmaps/grid2 -X11R6/include/X11/bitmaps/grid4 -X11R6/include/X11/bitmaps/grid8 -X11R6/include/X11/bitmaps/hlines2 -X11R6/include/X11/bitmaps/hlines3 -X11R6/include/X11/bitmaps/icon -X11R6/include/X11/bitmaps/keyboard16 -X11R6/include/X11/bitmaps/left_ptr -X11R6/include/X11/bitmaps/left_ptrmsk -X11R6/include/X11/bitmaps/letters -X11R6/include/X11/bitmaps/light_gray -X11R6/include/X11/bitmaps/mailempty -X11R6/include/X11/bitmaps/mailemptymsk -X11R6/include/X11/bitmaps/mailfull -X11R6/include/X11/bitmaps/mailfullmsk -X11R6/include/X11/bitmaps/mensetmanus -X11R6/include/X11/bitmaps/menu10 -X11R6/include/X11/bitmaps/menu12 -X11R6/include/X11/bitmaps/menu16 -X11R6/include/X11/bitmaps/menu6 -X11R6/include/X11/bitmaps/menu8 -X11R6/include/X11/bitmaps/noletters -X11R6/include/X11/bitmaps/opendot -X11R6/include/X11/bitmaps/opendotMask -X11R6/include/X11/bitmaps/plaid -X11R6/include/X11/bitmaps/right_ptr -X11R6/include/X11/bitmaps/right_ptrmsk -X11R6/include/X11/bitmaps/root_weave -X11R6/include/X11/bitmaps/scales -X11R6/include/X11/bitmaps/sipb -X11R6/include/X11/bitmaps/star -X11R6/include/X11/bitmaps/starMask -X11R6/include/X11/bitmaps/stipple -X11R6/include/X11/bitmaps/target -X11R6/include/X11/bitmaps/terminal -X11R6/include/X11/bitmaps/tie_fighter -X11R6/include/X11/bitmaps/vlines2 -X11R6/include/X11/bitmaps/vlines3 -X11R6/include/X11/bitmaps/weird_size -X11R6/include/X11/bitmaps/wide_weave -X11R6/include/X11/bitmaps/wingdogs -X11R6/include/X11/bitmaps/woman -X11R6/include/X11/bitmaps/xfd_icon -X11R6/include/X11/bitmaps/xlogo11 -X11R6/include/X11/bitmaps/xlogo16 -X11R6/include/X11/bitmaps/xlogo32 -X11R6/include/X11/bitmaps/xlogo64 -X11R6/include/X11/bitmaps/xsnow -X11R6/include/X11/cursorfont.h -X11R6/include/X11/extensions/MITMisc.h -X11R6/include/X11/extensions/Print.h -X11R6/include/X11/extensions/Printstr.h -X11R6/include/X11/extensions/XEVI.h -X11R6/include/X11/extensions/XEVIstr.h -X11R6/include/X11/extensions/XI.h -X11R6/include/X11/extensions/XIE.h -X11R6/include/X11/extensions/XIEproto.h -X11R6/include/X11/extensions/XIEprotost.h -X11R6/include/X11/extensions/XInput.h -X11R6/include/X11/extensions/XIproto.h -X11R6/include/X11/extensions/XKB.h -X11R6/include/X11/extensions/XKBbells.h -X11R6/include/X11/extensions/XKBconfig.h -X11R6/include/X11/extensions/XKBfile.h -X11R6/include/X11/extensions/XKBgeom.h -X11R6/include/X11/extensions/XKBproto.h -X11R6/include/X11/extensions/XKBrules.h -X11R6/include/X11/extensions/XKBsrv.h -X11R6/include/X11/extensions/XKBstr.h -X11R6/include/X11/extensions/XKBui.h -X11R6/include/X11/extensions/XKM.h -X11R6/include/X11/extensions/XKMformat.h -X11R6/include/X11/extensions/XLbx.h -X11R6/include/X11/extensions/XRes.h -X11R6/include/X11/extensions/XResproto.h -X11R6/include/X11/extensions/XShm.h -X11R6/include/X11/extensions/XTest.h -X11R6/include/X11/extensions/Xag.h -X11R6/include/X11/extensions/Xagsrv.h -X11R6/include/X11/extensions/Xagstr.h -X11R6/include/X11/extensions/Xcup.h -X11R6/include/X11/extensions/Xcupstr.h -X11R6/include/X11/extensions/Xdbe.h -X11R6/include/X11/extensions/Xdbeproto.h -X11R6/include/X11/extensions/Xext.h -X11R6/include/X11/extensions/Xinerama.h -X11R6/include/X11/extensions/Xrandr.h -X11R6/include/X11/extensions/Xrender.h -X11R6/include/X11/extensions/Xv.h -X11R6/include/X11/extensions/XvMC.h -X11R6/include/X11/extensions/XvMClib.h -X11R6/include/X11/extensions/XvMCproto.h -X11R6/include/X11/extensions/Xvlib.h -X11R6/include/X11/extensions/Xvproto.h -X11R6/include/X11/extensions/bigreqstr.h -X11R6/include/X11/extensions/dpms.h -X11R6/include/X11/extensions/dpmsstr.h -X11R6/include/X11/extensions/extutil.h -X11R6/include/X11/extensions/fontcache.h -X11R6/include/X11/extensions/fontcacheP.h -X11R6/include/X11/extensions/fontcachstr.h -X11R6/include/X11/extensions/lbxbuf.h -X11R6/include/X11/extensions/lbxbufstr.h -X11R6/include/X11/extensions/lbxdeltastr.h -X11R6/include/X11/extensions/lbximage.h -X11R6/include/X11/extensions/lbxopts.h -X11R6/include/X11/extensions/lbxstr.h -X11R6/include/X11/extensions/lbxzlib.h -X11R6/include/X11/extensions/mitmiscstr.h -X11R6/include/X11/extensions/multibuf.h -X11R6/include/X11/extensions/multibufst.h -X11R6/include/X11/extensions/panoramiXext.h -X11R6/include/X11/extensions/panoramiXproto.h -X11R6/include/X11/extensions/randr.h -X11R6/include/X11/extensions/randrproto.h -X11R6/include/X11/extensions/record.h -X11R6/include/X11/extensions/recordstr.h -X11R6/include/X11/extensions/render.h -X11R6/include/X11/extensions/renderproto.h -X11R6/include/X11/extensions/saver.h -X11R6/include/X11/extensions/saverproto.h -X11R6/include/X11/extensions/scrnsaver.h -X11R6/include/X11/extensions/security.h -X11R6/include/X11/extensions/securstr.h -X11R6/include/X11/extensions/shape.h -X11R6/include/X11/extensions/shapestr.h -X11R6/include/X11/extensions/shmstr.h -X11R6/include/X11/extensions/sync.h -X11R6/include/X11/extensions/syncstr.h -X11R6/include/X11/extensions/xcmiscstr.h -X11R6/include/X11/extensions/xf86bigfont.h -X11R6/include/X11/extensions/xf86bigfstr.h -X11R6/include/X11/extensions/xf86dga.h -X11R6/include/X11/extensions/xf86dga1.h -X11R6/include/X11/extensions/xf86dga1str.h -X11R6/include/X11/extensions/xf86dgastr.h -X11R6/include/X11/extensions/xf86misc.h -X11R6/include/X11/extensions/xf86mscstr.h -X11R6/include/X11/extensions/xf86vmode.h -X11R6/include/X11/extensions/xf86vmstr.h -X11R6/include/X11/extensions/xtestext1.h -X11R6/include/X11/extensions/xteststr.h -X11R6/include/X11/extensions/xtrapbits.h -X11R6/include/X11/extensions/xtrapddmi.h -X11R6/include/X11/extensions/xtrapdi.h -X11R6/include/X11/extensions/xtrapemacros.h -X11R6/include/X11/extensions/xtraplib.h -X11R6/include/X11/extensions/xtraplibp.h -X11R6/include/X11/extensions/xtrapproto.h -X11R6/include/X11/fonts/FS.h -X11R6/include/X11/fonts/FSlib.h -X11R6/include/X11/fonts/FSproto.h -X11R6/include/X11/fonts/codeconv/cconvversion.h -X11R6/include/X11/fonts/codeconv/xttcap.h -X11R6/include/X11/fonts/codeconv/xttcconv.h -X11R6/include/X11/fonts/codeconv/xttcconvP.h -X11R6/include/X11/fonts/codeconv/xttcommon.h -X11R6/include/X11/fonts/codeconv/xttversion.h -X11R6/include/X11/fonts/fontenc.h -X11R6/include/X11/fonts/fsmasks.h -X11R6/include/X11/keysym.h -X11R6/include/X11/keysymdef.h -X11R6/include/X11/xpm.h -X11R6/include/xf86Optrec.h -X11R6/include/xf86Parser.h -X11R6/lib/X11/XErrorDB -X11R6/lib/X11/XKeysymDB -X11R6/lib/X11/Xcms.txt -X11R6/lib/X11/locale/C/XI18N_OBJS -X11R6/lib/X11/locale/C/XLC_LOCALE -X11R6/lib/X11/locale/armscii-8/Compose -X11R6/lib/X11/locale/armscii-8/XI18N_OBJS -X11R6/lib/X11/locale/armscii-8/XLC_LOCALE -X11R6/lib/X11/locale/compose.dir -X11R6/lib/X11/locale/el_GR.UTF-8/Compose -X11R6/lib/X11/locale/en_US.UTF-8/Compose -X11R6/lib/X11/locale/en_US.UTF-8/XI18N_OBJS -X11R6/lib/X11/locale/en_US.UTF-8/XLC_LOCALE -X11R6/lib/X11/locale/georgian-academy/Compose -X11R6/lib/X11/locale/georgian-academy/XI18N_OBJS -X11R6/lib/X11/locale/georgian-academy/XLC_LOCALE -X11R6/lib/X11/locale/georgian-ps/Compose -X11R6/lib/X11/locale/georgian-ps/XI18N_OBJS -X11R6/lib/X11/locale/georgian-ps/XLC_LOCALE -X11R6/lib/X11/locale/ibm-cp1133/Compose -X11R6/lib/X11/locale/ibm-cp1133/XI18N_OBJS -X11R6/lib/X11/locale/ibm-cp1133/XLC_LOCALE -X11R6/lib/X11/locale/iscii-dev/XI18N_OBJS -X11R6/lib/X11/locale/iscii-dev/XLC_LOCALE -X11R6/lib/X11/locale/isiri-3342/XI18N_OBJS -X11R6/lib/X11/locale/isiri-3342/XLC_LOCALE -X11R6/lib/X11/locale/iso8859-1/Compose -X11R6/lib/X11/locale/iso8859-1/XI18N_OBJS -X11R6/lib/X11/locale/iso8859-1/XLC_LOCALE -X11R6/lib/X11/locale/iso8859-10/Compose -X11R6/lib/X11/locale/iso8859-10/XI18N_OBJS -X11R6/lib/X11/locale/iso8859-10/XLC_LOCALE -X11R6/lib/X11/locale/iso8859-11/XI18N_OBJS -X11R6/lib/X11/locale/iso8859-11/XLC_LOCALE -X11R6/lib/X11/locale/iso8859-13/Compose -X11R6/lib/X11/locale/iso8859-13/XI18N_OBJS -X11R6/lib/X11/locale/iso8859-13/XLC_LOCALE -X11R6/lib/X11/locale/iso8859-14/Compose -X11R6/lib/X11/locale/iso8859-14/XI18N_OBJS -X11R6/lib/X11/locale/iso8859-14/XLC_LOCALE -X11R6/lib/X11/locale/iso8859-15/Compose -X11R6/lib/X11/locale/iso8859-15/XI18N_OBJS -X11R6/lib/X11/locale/iso8859-15/XLC_LOCALE -X11R6/lib/X11/locale/iso8859-2/Compose -X11R6/lib/X11/locale/iso8859-2/XI18N_OBJS -X11R6/lib/X11/locale/iso8859-2/XLC_LOCALE -X11R6/lib/X11/locale/iso8859-3/Compose -X11R6/lib/X11/locale/iso8859-3/XI18N_OBJS -X11R6/lib/X11/locale/iso8859-3/XLC_LOCALE -X11R6/lib/X11/locale/iso8859-4/Compose -X11R6/lib/X11/locale/iso8859-4/XI18N_OBJS -X11R6/lib/X11/locale/iso8859-4/XLC_LOCALE -X11R6/lib/X11/locale/iso8859-5/Compose -X11R6/lib/X11/locale/iso8859-5/XI18N_OBJS -X11R6/lib/X11/locale/iso8859-5/XLC_LOCALE -X11R6/lib/X11/locale/iso8859-6/Compose -X11R6/lib/X11/locale/iso8859-6/XI18N_OBJS -X11R6/lib/X11/locale/iso8859-6/XLC_LOCALE -X11R6/lib/X11/locale/iso8859-7/Compose -X11R6/lib/X11/locale/iso8859-7/XI18N_OBJS -X11R6/lib/X11/locale/iso8859-7/XLC_LOCALE -X11R6/lib/X11/locale/iso8859-8/Compose -X11R6/lib/X11/locale/iso8859-8/XI18N_OBJS -X11R6/lib/X11/locale/iso8859-8/XLC_LOCALE -X11R6/lib/X11/locale/iso8859-9/Compose -X11R6/lib/X11/locale/iso8859-9/XI18N_OBJS -X11R6/lib/X11/locale/iso8859-9/XLC_LOCALE -X11R6/lib/X11/locale/iso8859-9e/Compose -X11R6/lib/X11/locale/iso8859-9e/XI18N_OBJS -X11R6/lib/X11/locale/iso8859-9e/XLC_LOCALE -X11R6/lib/X11/locale/ja.JIS/Compose -X11R6/lib/X11/locale/ja.JIS/XI18N_OBJS -X11R6/lib/X11/locale/ja.JIS/XLC_LOCALE -X11R6/lib/X11/locale/ja.SJIS/Compose -X11R6/lib/X11/locale/ja.SJIS/XI18N_OBJS -X11R6/lib/X11/locale/ja.SJIS/XLC_LOCALE -X11R6/lib/X11/locale/ja/Compose -X11R6/lib/X11/locale/ja/XI18N_OBJS -X11R6/lib/X11/locale/ja/XLC_LOCALE -X11R6/lib/X11/locale/ja_JP.UTF-8/XI18N_OBJS -X11R6/lib/X11/locale/ja_JP.UTF-8/XLC_LOCALE -X11R6/lib/X11/locale/ko/Compose -X11R6/lib/X11/locale/ko/XI18N_OBJS -X11R6/lib/X11/locale/ko/XLC_LOCALE -X11R6/lib/X11/locale/ko_KR.UTF-8/XI18N_OBJS -X11R6/lib/X11/locale/ko_KR.UTF-8/XLC_LOCALE -X11R6/lib/X11/locale/koi8-c/Compose -X11R6/lib/X11/locale/koi8-c/XI18N_OBJS -X11R6/lib/X11/locale/koi8-c/XLC_LOCALE -X11R6/lib/X11/locale/koi8-r/Compose -X11R6/lib/X11/locale/koi8-r/XI18N_OBJS -X11R6/lib/X11/locale/koi8-r/XLC_LOCALE -X11R6/lib/X11/locale/koi8-u/Compose -X11R6/lib/X11/locale/koi8-u/XI18N_OBJS -X11R6/lib/X11/locale/koi8-u/XLC_LOCALE -X11R6/lib/X11/locale/lib/common/ximcp.so.2 -X11R6/lib/X11/locale/lib/common/xlcDef.so.2 -X11R6/lib/X11/locale/lib/common/xlcUTF8Load.so.2 -X11R6/lib/X11/locale/lib/common/xlibi18n.so.2 -X11R6/lib/X11/locale/lib/common/xlocale.so.2 -X11R6/lib/X11/locale/lib/common/xomGeneric.so.2 -X11R6/lib/X11/locale/locale.alias -X11R6/lib/X11/locale/locale.dir -X11R6/lib/X11/locale/microsoft-cp1251/XI18N_OBJS -X11R6/lib/X11/locale/microsoft-cp1251/XLC_LOCALE -X11R6/lib/X11/locale/microsoft-cp1255/XI18N_OBJS -X11R6/lib/X11/locale/microsoft-cp1255/XLC_LOCALE -X11R6/lib/X11/locale/microsoft-cp1256/XI18N_OBJS -X11R6/lib/X11/locale/microsoft-cp1256/XLC_LOCALE -X11R6/lib/X11/locale/mulelao-1/Compose -X11R6/lib/X11/locale/mulelao-1/XI18N_OBJS -X11R6/lib/X11/locale/mulelao-1/XLC_LOCALE -X11R6/lib/X11/locale/nokhchi-1/XI18N_OBJS -X11R6/lib/X11/locale/nokhchi-1/XLC_LOCALE -X11R6/lib/X11/locale/tatar-cyr/XI18N_OBJS -X11R6/lib/X11/locale/tatar-cyr/XLC_LOCALE -X11R6/lib/X11/locale/th_TH.UTF-8/XI18N_OBJS -X11R6/lib/X11/locale/th_TH.UTF-8/XLC_LOCALE -X11R6/lib/X11/locale/th_TH/XI18N_OBJS -X11R6/lib/X11/locale/th_TH/XLC_LOCALE -X11R6/lib/X11/locale/tscii-0/XI18N_OBJS -X11R6/lib/X11/locale/tscii-0/XLC_LOCALE -X11R6/lib/X11/locale/vi_VN.tcvn/Compose -X11R6/lib/X11/locale/vi_VN.tcvn/XI18N_OBJS -X11R6/lib/X11/locale/vi_VN.tcvn/XLC_LOCALE -X11R6/lib/X11/locale/vi_VN.viscii/Compose -X11R6/lib/X11/locale/vi_VN.viscii/XI18N_OBJS -X11R6/lib/X11/locale/vi_VN.viscii/XLC_LOCALE -X11R6/lib/X11/locale/zh_CN.gbk/Compose -X11R6/lib/X11/locale/zh_CN.gbk/XI18N_OBJS -X11R6/lib/X11/locale/zh_CN.gbk/XLC_LOCALE -X11R6/lib/X11/locale/zh_CN/Compose -X11R6/lib/X11/locale/zh_CN/XI18N_OBJS -X11R6/lib/X11/locale/zh_CN/XLC_LOCALE -X11R6/lib/X11/locale/zh_HK.big5/XLC_LOCALE -X11R6/lib/X11/locale/zh_HK.big5hkscs/XI18N_OBJS -X11R6/lib/X11/locale/zh_HK.big5hkscs/XLC_LOCALE -X11R6/lib/X11/locale/zh_TW.UTF-8/XI18N_OBJS -X11R6/lib/X11/locale/zh_TW.UTF-8/XLC_LOCALE -X11R6/lib/X11/locale/zh_TW.big5/Compose -X11R6/lib/X11/locale/zh_TW.big5/XI18N_OBJS -X11R6/lib/X11/locale/zh_TW.big5/XLC_LOCALE -X11R6/lib/X11/locale/zh_TW/Compose -X11R6/lib/X11/locale/zh_TW/XI18N_OBJS -X11R6/lib/X11/locale/zh_TW/XLC_LOCALE -X11R6/lib/libFS.a -X11R6/lib/libGL.a -X11R6/lib/libGL.so -X11R6/lib/libGL.so.1 -X11R6/lib/libGLU.a -X11R6/lib/libGLU.so -X11R6/lib/libGLU.so.1 -X11R6/lib/libGLw.a -X11R6/lib/libICE.a -X11R6/lib/libICE.so -X11R6/lib/libICE.so.6 -X11R6/lib/libOSMesa.a -X11R6/lib/libOSMesa.so -X11R6/lib/libOSMesa.so.4 -X11R6/lib/libSM.a -X11R6/lib/libSM.so -X11R6/lib/libSM.so.6 -X11R6/lib/libX11.a -X11R6/lib/libX11.so -X11R6/lib/libX11.so.6 -X11R6/lib/libXRes.a -X11R6/lib/libXTrap.a -X11R6/lib/libXTrap.so -X11R6/lib/libXTrap.so.6 -X11R6/lib/libXau.a -X11R6/lib/libXaw.a -X11R6/lib/libXaw.so -X11R6/lib/libXaw.so.6 -X11R6/lib/libXaw.so.7 -X11R6/lib/libXcursor.a -X11R6/lib/libXcursor.so -X11R6/lib/libXcursor.so.1 -X11R6/lib/libXdmcp.a -X11R6/lib/libXext.a -X11R6/lib/libXext.so -X11R6/lib/libXext.so.6 -X11R6/lib/libXfont.a -X11R6/lib/libXfont.so -X11R6/lib/libXfont.so.1 -X11R6/lib/libXfontcache.a -X11R6/lib/libXi.a -X11R6/lib/libXi.so -X11R6/lib/libXi.so.6 -X11R6/lib/libXinerama.a -X11R6/lib/libXinerama.so -X11R6/lib/libXinerama.so.1 -X11R6/lib/libXmu.a -X11R6/lib/libXmu.so -X11R6/lib/libXmu.so.6 -X11R6/lib/libXmuu.a -X11R6/lib/libXmuu.so -X11R6/lib/libXmuu.so.1 -X11R6/lib/libXp.a -X11R6/lib/libXp.so -X11R6/lib/libXp.so.6 -X11R6/lib/libXpm.a -X11R6/lib/libXpm.so -X11R6/lib/libXpm.so.4 -X11R6/lib/libXrandr.a -X11R6/lib/libXrandr.so -X11R6/lib/libXrandr.so.2 -X11R6/lib/libXrender.a -X11R6/lib/libXrender.so -X11R6/lib/libXrender.so.1 -X11R6/lib/libXss.a -X11R6/lib/libXt.a -X11R6/lib/libXt.so -X11R6/lib/libXt.so.6 -X11R6/lib/libXtst.a -X11R6/lib/libXtst.so -X11R6/lib/libXtst.so.6 -X11R6/lib/libXv.a -X11R6/lib/libXv.so -X11R6/lib/libXv.so.1 -X11R6/lib/libXvMC.a -X11R6/lib/libXxf86dga.a -X11R6/lib/libXxf86misc.a -X11R6/lib/libXxf86vm.a -X11R6/lib/libdps.a -X11R6/lib/libdps.so -X11R6/lib/libdps.so.1 -X11R6/lib/libdpstk.a -X11R6/lib/libdpstk.so -X11R6/lib/libdpstk.so.1 -X11R6/lib/libfntstubs.a -X11R6/lib/libfontenc.a -X11R6/lib/liboldX.a -X11R6/lib/liboldX.so -X11R6/lib/liboldX.so.6 -X11R6/lib/libpsres.a -X11R6/lib/libpsres.so -X11R6/lib/libpsres.so.1 -X11R6/lib/libxf86config.a -X11R6/lib/libxkbfile.a -X11R6/lib/libxkbui.a -X11R6/${IMAKE_LIBMAN_DIR}/Xaw.${MANPAGE_SUFFIX} -X11R6/${IMAKE_LIBMAN_DIR}/Xcursor.${MANPAGE_SUFFIX} -X11R6/${IMAKE_LIBMAN_DIR}/Xrandr.${MANPAGE_SUFFIX} -@dirrm X11R6/include/DPS -@dirrm X11R6/include/GL -@dirrm X11R6/include/X11/Xcursor -@dirrm X11R6/include/X11/fonts/codeconv -@dirrm X11R6/lib/X11/locale/armscii-8 -@dirrm X11R6/lib/X11/locale/el_GR.UTF-8 -@dirrm X11R6/lib/X11/locale/en_US.UTF-8 -@dirrm X11R6/lib/X11/locale/georgian-academy -@dirrm X11R6/lib/X11/locale/georgian-ps -@dirrm X11R6/lib/X11/locale/ibm-cp1133 -@dirrm X11R6/lib/X11/locale/iscii-dev -@dirrm X11R6/lib/X11/locale/isiri-3342 -@dirrm X11R6/lib/X11/locale/iso8859-10 -@dirrm X11R6/lib/X11/locale/iso8859-11 -@dirrm X11R6/lib/X11/locale/iso8859-13 -@dirrm X11R6/lib/X11/locale/iso8859-14 -@dirrm X11R6/lib/X11/locale/iso8859-15 -@dirrm X11R6/lib/X11/locale/iso8859-9e -@dirrm X11R6/lib/X11/locale/ja_JP.UTF-8 -@dirrm X11R6/lib/X11/locale/ko_KR.UTF-8 -@dirrm X11R6/lib/X11/locale/koi8-c -@dirrm X11R6/lib/X11/locale/koi8-u -@dirrm X11R6/lib/X11/locale/lib/common -@dirrm X11R6/lib/X11/locale/lib -@dirrm X11R6/lib/X11/locale/microsoft-cp1251 -@dirrm X11R6/lib/X11/locale/microsoft-cp1255 -@dirrm X11R6/lib/X11/locale/microsoft-cp1256 -@dirrm X11R6/lib/X11/locale/mulelao-1 -@dirrm X11R6/lib/X11/locale/nokhchi-1 -@dirrm X11R6/lib/X11/locale/tatar-cyr -@dirrm X11R6/lib/X11/locale/th_TH -@dirrm X11R6/lib/X11/locale/th_TH.UTF-8 -@dirrm X11R6/lib/X11/locale/tscii-0 -@dirrm X11R6/lib/X11/locale/vi_VN.tcvn -@dirrm X11R6/lib/X11/locale/vi_VN.viscii -@dirrm X11R6/lib/X11/locale/zh_CN -@dirrm X11R6/lib/X11/locale/zh_CN.gbk -@dirrm X11R6/lib/X11/locale/zh_HK.big5 -@dirrm X11R6/lib/X11/locale/zh_HK.big5hkscs -@dirrm X11R6/lib/X11/locale/zh_TW.UTF-8 -@dirrm X11R6/lib/X11/locale/zh_TW.big5 diff --git a/x11/XFree86-libs/buildlink2.mk b/x11/XFree86-libs/buildlink2.mk index 30e62089a97..86417a4471d 100644 --- a/x11/XFree86-libs/buildlink2.mk +++ b/x11/XFree86-libs/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.2 2004/02/02 14:15:27 xtraeme Exp $ +# $NetBSD: buildlink2.mk,v 1.3 2004/03/28 22:06:15 xtraeme Exp $ # # This Makefile fragment is included by packages that use XFree86-libs. # @@ -8,72 +8,64 @@ .if !defined(XFREE86_LIBS_BUILDLINK2_MK) XFREE86_LIBS_BUILDLINK2_MK= # defined -.include "../../mk/bsd.prefs.mk" +.include "../../XFree86/XFree86/Makefile.common" BUILDLINK_PACKAGES+= XFree86-libs -BUILDLINK_DEPENDS.XFree86-libs?= XFree86-libs>=4.3.0 -BUILDLINK_PKGSRCDIR.XFree86-libs?= ../../x11/XFree86-libs +BUILDLINK_DEPENDS.XFree86-libs?= XFree86-libs>=4.4.0 +BUILDLINK_PKGSRCDIR.XFree86-libs?= ../../XFree86/XFree86-libs EVAL_PREFIX+= BUILDLINK_PREFIX.XFree86-libs=XFree86-libs -BUILDLINK_PREFIX.XFree86-libs_DEFAULT= ${X11PREFIX} -BUILDLINK_FILES.XFree86-libs+= X11R6/include/DPS/*.h -BUILDLINK_FILES.XFree86-libs+= X11R6/include/GL/*.h -BUILDLINK_FILES.XFree86-libs+= X11R6/include/X11/*.h -BUILDLINK_FILES.XFree86-libs+= X11R6/include/X11/ICE/*.h -BUILDLINK_FILES.XFree86-libs+= X11R6/include/X11/SM/*.h -BUILDLINK_FILES.XFree86-libs+= X11R6/include/X11/Xaw/*.h -BUILDLINK_FILES.XFree86-libs+= X11R6/include/X11/Xcursor/*.h -BUILDLINK_FILES.XFree86-libs+= X11R6/include/X11/Xmu/*.h -BUILDLINK_FILES.XFree86-libs+= X11R6/include/X11/extensions/*.h -BUILDLINK_FILES.XFree86-libs+= X11R6/include/X11/fonts/*.h -BUILDLINK_FILES.XFree86-libs+= X11R6/include/*.h -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/X11/locale/lib/common/ximcp.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/X11/locale/lib/common/xlcDef.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/X11/locale/lib/common/xlcUTF8Load.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/X11/locale/lib/common/xlibi18n.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/X11/locale/lib/common/xlocale.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/X11/locale/lib/common/xomGeneric.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libGLw.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libICE.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libSM.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libX11.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libXRes.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libXTrap.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libXau.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libXaw.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libXcursor.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libXdmcp.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libXext.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libXfont.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libXfontcache.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libXi.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libXinerama.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libXmu.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libXmuu.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libXp.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libXpm.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libXrandr.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libXrender.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libXss.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libXt.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libXtst.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libXv.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libXvMC.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libXxf86dga.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libXxf86misc.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libXxf86vm.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libdps.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libdpstk.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libfntstubs.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libfontenc.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/liboldX.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libpsres.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libxf86config.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libxkbfile.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libxkbui.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libGL.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libGLU.* -BUILDLINK_FILES.XFree86-libs+= X11R6/lib/libOSMesa.* +BUILDLINK_PREFIX.XFree86-libs_DEFAULT= ${LOCALBASE}/${X11ROOT_PREFIX} +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/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/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" diff --git a/x11/XFree86-libs/buildlink3.mk b/x11/XFree86-libs/buildlink3.mk new file mode 100644 index 00000000000..e97f8b3b398 --- /dev/null +++ b/x11/XFree86-libs/buildlink3.mk @@ -0,0 +1,29 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/03/28 22:06:15 xtraeme Exp $ + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +XFREE86_LIBS_BUILDLINK3_MK:= ${XFREE86_LIBS_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= XFree86-libs +.endif + +# +# XFree86-libs must come first so that packages listed later can overwrite +# any symlinks created by buildlinking XFree86-libs. +# +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NXFree86-libs} +BUILDLINK_PACKAGES:= XFree86-libs ${BUILDLINK_PACKAGES} + +.if !empty(XFREE86_LIBS_BUILDLINK3_MK:M+) + +BUILDLINK_DEPENDS.XFree86-libs+= XFree86-libs>=4.4.0 +BUILDLINK_PKGSRCDIR.XFree86-libs?= ../../XFree86/XFree86-libs +BUILDLINK_TRANSFORM.XFree86-libs+= -e "s|/X11R6/|/|" + +.endif # XFREE86_LIBS_BUILDLINK3_MK + +.include "../../fonts/fontconfig/buildlink3.mk" +.include "../../graphics/freetype2/buildlink3.mk" +.include "../../textproc/expat/buildlink3.mk" + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/XFree86-libs/distinfo b/x11/XFree86-libs/distinfo index 81456592a53..7aae6f29f9d 100644 --- a/x11/XFree86-libs/distinfo +++ b/x11/XFree86-libs/distinfo @@ -1,35 +1,16 @@ -$NetBSD: distinfo,v 1.2 2004/01/31 15:06:24 xtraeme Exp $ +$NetBSD: distinfo,v 1.3 2004/03/28 22:06:15 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 (XFree86-4.4.0-src-1.tgz) = 44b38a7044c82d0b2f785b0e6a935349abcb5d79 +Size (XFree86-4.4.0-src-1.tgz) = 11760814 bytes +SHA1 (XFree86-4.4.0-src-2.tgz) = ee2dd36c0b3f29bd2df776ad23c850374001f1a6 +Size (XFree86-4.4.0-src-2.tgz) = 5745538 bytes +SHA1 (XFree86-4.4.0-src-3.tgz) = a012694d5a5aa3df1d9a3a52363d73cf8f03326b +Size (XFree86-4.4.0-src-3.tgz) = 11239253 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) = 77568c9cddca68e910e6db8d6d7baa5e495a0fb5 -SHA1 (patch-av) = 4c124eaf876e48b9deea2f7a63fd052f4fb11baa -SHA1 (patch-aw) = b9e4c6f04b0f55abd8c589889ba5d3721deaf670 -SHA1 (patch-ax) = 65c6a325c5378b18b55915c002be2827c8acab24 -SHA1 (patch-ay) = 42f380dce37126616095e4423dc0a163bfecb28d +SHA1 (patch-ab) = c12a13b07e5f0636da195266c743fc8095b486b3 +SHA1 (patch-ac) = 89a4bcd4351d7b2967da744619e3912b2efa7138 +SHA1 (patch-ad) = 17ede6e7c6c232f9fe2804d7ab4addd85b5cd25c +SHA1 (patch-ae) = 90584e5732fb882f431afd69f6fd1c26c9d22bee +SHA1 (patch-af) = b34f46d715e90159df3897cf20023b58b9deff67 +SHA1 (patch-ag) = a06752ee9f55e64a407fac6fbde3547fd096c71d +SHA1 (patch-ah) = 30618658577dd37b31191197cd2c156ff72e0d90 diff --git a/x11/XFree86-libs/files/host.def b/x11/XFree86-libs/files/host.def index c1f0300d88d..7fc7d69f538 100644 --- a/x11/XFree86-libs/files/host.def +++ b/x11/XFree86-libs/files/host.def @@ -1,8 +1,4 @@ -/* - * $NetBSD: host.def,v 1.1.1.1 2004/01/24 08:47:34 xtraeme Exp $ - * - * XFree86 packages for pkgsrc system - */ +/* $NetBSD: host.def,v 1.2 2004/03/28 22:06:15 xtraeme Exp $ */ #define ProjectRoot @PREFIX@ @@ -33,50 +29,33 @@ #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 */ +#define StandardIncludes -I@BLNK@/include #undef SharedLibXinerama #define SharedLibXinerama YES +#define LibInstallBuild YES + #ifndef DriDrivers -#define DriDrivers /* Don't build the drivers here */ +# define DriDrivers /* Don't build the drivers here */ #endif #define HasXdmAuth YES #define UseInstalledPrograms YES #ifndef FreeBSDArchitecture -#ifndef BuildThreadStubLibrary +# ifndef BuildThreadStubLibrary # define BuildThreadStubLibrary YES -#endif +# endif #endif -#define HasZlib YES +#define BuildRenderLibrary NO +#define BuildExpatLibrary NO +#define BuildFreetype2Library NO +#define BuildFontconfigLibrary NO +#define BuildXftLibrary NO +#define BuildXft1Library NO +#define BuildRandRLibrary NO #define HasFreetype2 YES #define Freetype2Dir @BLNK@ diff --git a/x11/XFree86-libs/patches/patch-ab b/x11/XFree86-libs/patches/patch-ab index 5d85bde1f30..fc63926a56e 100644 --- a/x11/XFree86-libs/patches/patch-ab +++ b/x11/XFree86-libs/patches/patch-ab @@ -1,21 +1,23 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/01/24 08:47:28 xtraeme Exp $ +$NetBSD: patch-ab,v 1.2 2004/03/28 22:06:15 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 @@ +--- 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 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 + #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-ac b/x11/XFree86-libs/patches/patch-ac index 14b79af0657..75d85d91cae 100644 --- a/x11/XFree86-libs/patches/patch-ac +++ b/x11/XFree86-libs/patches/patch-ac @@ -1,50 +1,22 @@ -$NetBSD: patch-ac,v 1.1.1.1 2004/01/24 08:47:28 xtraeme Exp $ +$NetBSD: patch-ac,v 1.2 2004/03/28 22:06:15 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 */ +--- 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 - #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 @@ ++/* 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 - #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) + + int config_mousetype; /* Mouse. */ diff --git a/x11/XFree86-libs/patches/patch-ad b/x11/XFree86-libs/patches/patch-ad index 8d5c447fc2a..610edcd0624 100644 --- a/x11/XFree86-libs/patches/patch-ad +++ b/x11/XFree86-libs/patches/patch-ad @@ -1,77 +1,13 @@ -$NetBSD: patch-ad,v 1.1.1.1 2004/01/24 08:47:29 xtraeme Exp $ +$NetBSD: patch-ad,v 1.2 2004/03/28 22:06:15 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 @@ +--- 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 */ - #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 +- 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-ae b/x11/XFree86-libs/patches/patch-ae index c32fd8b0cbd..4401ca0a98b 100644 --- a/x11/XFree86-libs/patches/patch-ae +++ b/x11/XFree86-libs/patches/patch-ae @@ -1,12 +1,46 @@ -$NetBSD: patch-ae,v 1.1.1.1 2004/01/24 08:47:29 xtraeme Exp $ +$NetBSD: patch-ae,v 1.2 2004/03/28 22:06:15 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 > $@ +--- config/cf/NetBSD.cf.in.orig 2004-03-03 07:53:38.000000000 +0000 ++++ config/cf/NetBSD.cf.in 2004-03-03 07:54:59.000000000 +0000 +@@ -143,7 +143,7 @@ + #define MkdirHierCmd mkdir -p --InstallNonExecFile(xcursor.pc,$(USRLIBDIR)/pkgconfig) -- - clean:: - RemoveFile(xcursor.pc) + #undef CcCmd +-#define CcCmd gcc ++#define CcCmd @@PKGSRC_CC@@ + #ifndef DefaultCCOptions + #if defined(UseInstalled) + #define DefaultCCOptions /**/ +@@ -159,7 +159,7 @@ + #endif + #endif + +-#define CppCmd cpp ++#define CppCmd @@PKGSRC_CPP@@ + #define StandardCppOptions -traditional + #define StandardCppDefines /**/ + #define PreProcessCmd CcCmd -E +@@ -208,13 +208,7 @@ + #define HasWeakSymbols UseElfFormat + + #ifdef i386Architecture +-# ifndef DefaultGcc2i386Opt +-# if OSMajorVersion > 1 || (OSMajorVersion == 1 && OSMinorVersion > 2) +- /* The GCC strength-reduce bug is fixed for NetBSD 1.3 and later */ +-# define DefaultGcc2i386Opt -O2 GccAliasingArgs +-# endif +-# endif +-# define OptimizedCDebugFlags DefaultGcc2i386Opt ++# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ + # if OSMajorVersion < 1 + # define ServerOSDefines XFree86ServerOSDefines -DXNO_SYSCONF + # else +@@ -224,7 +218,7 @@ + # define ServerExtraSysLibs -li386 + # endif + #else +-# define OptimizedCDebugFlags -O2 ++# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ + # if defined(SparcArchitecture) + # define ServerOSDefines -DDDXOSINIT + # elif defined(AlphaArchitecture) diff --git a/x11/XFree86-libs/patches/patch-af b/x11/XFree86-libs/patches/patch-af index c8e0edcb27c..644dc2a8d46 100644 --- a/x11/XFree86-libs/patches/patch-af +++ b/x11/XFree86-libs/patches/patch-af @@ -1,110 +1,58 @@ -$NetBSD: patch-af,v 1.1.1.1 2004/01/24 08:47:29 xtraeme Exp $ +$NetBSD: patch-af,v 1.2 2004/03/28 22:06:15 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 @@ +--- config/cf/FreeBSD.cf.in.orig 2004-03-03 07:40:43.000000000 +0000 ++++ config/cf/FreeBSD.cf.in 2004-03-03 07:44:05.000000000 +0000 +@@ -190,11 +190,11 @@ + # define CcCmd $(CLIENTENVSETUP) cc + # define CplusplusCmd $(CLIENTENVSETUP) c++ + #else +-# define CcCmd cc +-# define CplusplusCmd c++ ++# define CcCmd @@PKGSRC_CC@@ ++# define CplusplusCmd @@PKGSRC_CXX@@ #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; +-#define CppCmd /usr/bin/cpp ++#define CppCmd @@PKGSRC_CPP@@ + #define PreProcessCmd CppCmd + #define StandardCppOptions -traditional + #define StandardCppDefines /**/ +@@ -207,7 +207,7 @@ + #else + #define NoSystemWarn + #endif +-#define DefaultCCOptions -ansi -pedantic NoSystemWarn -Dasm=__asm \ ++#define DefaultCCOptions -ansi NoSystemWarn -Dasm=__asm \ + GccWarningOptions + #endif + #endif +@@ -439,18 +439,8 @@ + #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC + #endif - 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 */ +-/* 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 GccAliasingArgs +-#endif +-#endif +- +-#ifdef i386Architecture +-# define OptimizedCDebugFlags DefaultGcc2i386Opt +-#else +-# define OptimizedCDebugFlags -O +-#endif ++#define DefaultGcc2i386Opt ++#define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ + + #ifndef PreIncDir + # define PreIncDir /usr/include +@@ -476,7 +466,7 @@ + * Compress manual pages + */ + #ifndef CompressManPages +-# define CompressManPages YES ++# define CompressManPages NO #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; + #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 1) diff --git a/x11/XFree86-libs/patches/patch-ag b/x11/XFree86-libs/patches/patch-ag index 3805d6f58da..ca43c336d0d 100644 --- a/x11/XFree86-libs/patches/patch-ag +++ b/x11/XFree86-libs/patches/patch-ag @@ -1,23 +1,41 @@ -$NetBSD: patch-ag,v 1.1.1.1 2004/01/24 08:47:29 xtraeme Exp $ +$NetBSD: patch-ag,v 1.2 2004/03/28 22:06:15 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 @@ - */ +--- config/cf/linux.cf.in.orig 2004-03-03 07:44:42.000000000 +0000 ++++ config/cf/linux.cf.in 2004-03-03 07:46:51.000000000 +0000 +@@ -549,15 +549,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 +@@ -721,7 +721,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 +@@ -791,7 +790,7 @@ - #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 + #ifdef i386Architecture + # ifndef OptimizedCDebugFlags +-# define OptimizedCDebugFlags DefaultGcc2i386Opt ++# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ + # endif + # define LinuxMachineDefines -D__i386__ + # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME diff --git a/x11/XFree86-libs/patches/patch-ah b/x11/XFree86-libs/patches/patch-ah index 78dcf69e410..d2a2dd6bd89 100644 --- a/x11/XFree86-libs/patches/patch-ah +++ b/x11/XFree86-libs/patches/patch-ah @@ -1,41 +1,15 @@ -$NetBSD: patch-ah,v 1.1.1.1 2004/01/24 08:47:29 xtraeme Exp $ +$NetBSD: patch-ah,v 1.2 2004/03/28 22:06:15 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 +http://www.mail-archive.com/devel@xfree86.org/msg04688.html + +--- ./lib/XvMC/hw/i810/Imakefile.orig 2002-10-30 10:42:57.000000000 -0800 ++++ ./lib/XvMC/hw/i810/Imakefile +@@ -20,7 +20,7 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL + DEFINES = $(ALLOC_DEFINES) -DTRUE=1 -DFALSE=0 + INCLUDES = -I$(XINCLUDESRC) -I$(INCLUDESRC) -I$(XLIBSRC) -I$(EXTINCSRC) \ + -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(XF86OSSRC)/linux/drm/kernel \ +- -I$(XF86DRIVERSRC)/i810 ++ -I$(XF86DRIVERSRC)/i810 -I$(XF86OSSRC)/shared/drm/kernel + SRCS = I810XvMC.c + OBJS = I810XvMC.o xf86drm.o xf86drmHash.o xf86drmRandom.o xf86drmSL.o + LINTLIBS = $(LINTXLIB) diff --git a/x11/XFree86-libs/patches/patch-ai b/x11/XFree86-libs/patches/patch-ai deleted file mode 100644 index e8353273c2d..00000000000 --- a/x11/XFree86-libs/patches/patch-ai +++ /dev/null @@ -1,14 +0,0 @@ -$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 deleted file mode 100644 index c47a33ac1d7..00000000000 --- a/x11/XFree86-libs/patches/patch-aj +++ /dev/null @@ -1,13 +0,0 @@ -$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 deleted file mode 100644 index 5bd3269a543..00000000000 --- a/x11/XFree86-libs/patches/patch-ak +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index 842d23367e4..00000000000 --- a/x11/XFree86-libs/patches/patch-al +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index f73283dc692..00000000000 --- a/x11/XFree86-libs/patches/patch-am +++ /dev/null @@ -1,13 +0,0 @@ -$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 deleted file mode 100644 index 25fed104992..00000000000 --- a/x11/XFree86-libs/patches/patch-an +++ /dev/null @@ -1,352 +0,0 @@ -$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 deleted file mode 100644 index a82af8f268b..00000000000 --- a/x11/XFree86-libs/patches/patch-ao +++ /dev/null @@ -1,13 +0,0 @@ -$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 deleted file mode 100644 index da265fd1b84..00000000000 --- a/x11/XFree86-libs/patches/patch-ap +++ /dev/null @@ -1,14 +0,0 @@ -$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 deleted file mode 100644 index 0cf3e6627a1..00000000000 --- a/x11/XFree86-libs/patches/patch-aq +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index 8338dac5855..00000000000 --- a/x11/XFree86-libs/patches/patch-ar +++ /dev/null @@ -1,61 +0,0 @@ -$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 deleted file mode 100644 index 037ae4a56df..00000000000 --- a/x11/XFree86-libs/patches/patch-as +++ /dev/null @@ -1,141 +0,0 @@ -$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 deleted file mode 100644 index 21153e75014..00000000000 --- a/x11/XFree86-libs/patches/patch-at +++ /dev/null @@ -1,22 +0,0 @@ -$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 deleted file mode 100644 index a3827467ed7..00000000000 --- a/x11/XFree86-libs/patches/patch-au +++ /dev/null @@ -1,62 +0,0 @@ -$NetBSD: patch-au,v 1.2 2004/01/31 15:06:24 xtraeme Exp $ - ---- config/cf/FreeBSD.cf.in.orig Sat Jan 31 15:05:04 2004 -+++ config/cf/FreeBSD.cf.in Sat Jan 31 15:07:28 2004 -@@ -161,15 +161,10 @@ - * - * ld: warning: libXThrStub.so.6, needed by libX11.so, not found - */ --#if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11) --# define CcCmd $(CLIENTENVSETUP) cc --# define CplusplusCmd $(CLIENTENVSETUP) c++ --#else --# define CcCmd cc --# define CplusplusCmd c++ --#endif -+#define CcCmd @@PKGSRC_CC@@ -+#define CplusplusCmd @@PKGSRC_CXX@@ - --#define CppCmd /usr/bin/cpp -+#define CppCmd @@PKGSRC_CPP@@ - #define PreProcessCmd CppCmd - #define StandardCppOptions -traditional - #define StandardCppDefines /**/ -@@ -177,7 +172,7 @@ - #if defined(UseInstalled) - #define DefaultCCOptions /**/ - #else --#define DefaultCCOptions -ansi -pedantic -Dasm=__asm GccWarningOptions -+#define DefaultCCOptions -ansi -Dasm=__asm - #endif - #endif - #ifndef ExtraLibraries -@@ -482,18 +477,9 @@ - #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 @@PKGSRC_CFLAGS@@ - - #ifndef PreIncDir - # define PreIncDir /usr/include -@@ -519,7 +505,7 @@ - * Compress manual pages - */ - #ifndef CompressManPages --# define CompressManPages YES -+# define CompressManPages NO - #endif - - #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 1) diff --git a/x11/XFree86-libs/patches/patch-av b/x11/XFree86-libs/patches/patch-av deleted file mode 100644 index a9b30465a42..00000000000 --- a/x11/XFree86-libs/patches/patch-av +++ /dev/null @@ -1,23 +0,0 @@ -$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 deleted file mode 100644 index 22a61267e4a..00000000000 --- a/x11/XFree86-libs/patches/patch-aw +++ /dev/null @@ -1,28 +0,0 @@ -$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 deleted file mode 100644 index 5ce317535d1..00000000000 --- a/x11/XFree86-libs/patches/patch-ax +++ /dev/null @@ -1,13 +0,0 @@ -$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 deleted file mode 100644 index b99f2ada38d..00000000000 --- a/x11/XFree86-libs/patches/patch-ay +++ /dev/null @@ -1,14 +0,0 @@ -$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 - |