head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.24 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.22 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.20 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.18 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.16 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.5.0.14 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.12 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.10 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.8 pkgsrc-2008Q2-base:1.5 pkgsrc-2008Q1:1.5.0.6 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.4 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.2 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.4.0.12 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.10 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.8 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.6 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.4 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.2 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.3.0.8 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.6 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.4 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.2 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.2.0.2 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.1.0.2 pkgsrc-2004Q3-base:1.1; locks; strict; comment @# @; 1.5 date 2007.08.17.20.25.25; author joerg; state dead; branches; next 1.4; 1.4 date 2006.01.18.23.53.06; author xtraeme; state Exp; branches; next 1.3; 1.3 date 2005.01.25.17.49.57; author xtraeme; state Exp; branches; next 1.2; 1.2 date 2004.09.21.17.38.53; author xtraeme; state Exp; branches; next 1.1; 1.1 date 2004.09.16.19.36.10; author minskim; state Exp; branches; next ; desc @@ 1.5 log @To quote Johnny Lam: "In modular-xorg we trust" Remove xorg 6.9 packages from pkgsrc. @ text @$NetBSD: patch-ak,v 1.4 2006/01/18 23:53:06 xtraeme Exp $ --- programs/xdm/config/Imakefile.orig 2006-01-02 10:57:27.000000000 +0100 +++ programs/xdm/config/Imakefile 2006-01-02 10:59:46.000000000 +0100 @@@@ -23,9 +23,9 @@@@ # define XdmbwPixmap XVendorStdFilePrefix-bw.xpm #endif -CHOOSERPATH = $(XDMDIR)/chooser +CHOOSERPATH = $(BINDIR)/chooser -XPM_DEFINES=-DXPM -DBITMAPDIR=$(XDMDIR)/pixmaps -DXDM_PIXMAP=XdmPixmap\ @@@@\ +XPM_DEFINES=-DXPM -DBITMAPDIR=$(INCDIR)/X11/pixmaps -DXDM_PIXMAP=XdmPixmap\ @@@@\ -DXDM_BWPIXMAP=XdmbwPixmap XDMLOGDIR = $(LOGDIRECTORY) @@@@ -48,24 +48,23 @@@@ #endif CppFileTarget(Xservers.ws,Xserv.ws.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT) -DSHELL_CMD=$(SHELL_CMD),NullParameter) -CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH=$(CHOOSERPATH) $(XPM_DEFINES),NullParameter) +CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMAUTHDIR=$(XDMVARDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH=$(CHOOSERPATH) $(XPM_DEFINES),NullParameter) CppFileTarget(Xresources,Xres.cpp,$(XPM_DEFINES),NullParameter) CppFileTarget(Xsession,Xsession.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT) -DSHELL_CMD=$(SHELL_CMD),NullParameter) LinkFile(Xservers,Xservers.$(SERVERSTYPE)) #if InstallXdmConfig -InstallNonExecFile(xdm-config,$(XDMDIR)) -InstallNonExecFile(Xresources,$(XDMDIR)) -InstallNonExecFile(Xservers,$(XDMDIR)) -InstallNonExecFile(Xaccess,$(XDMDIR)) -InstallNamedProg(Xsession,Xsession,$(XDMDIR)) -InstallNamedProg(GiveConsole,GiveConsole,$(XDMDIR)) -InstallNamedProg(TakeConsole,TakeConsole,$(XDMDIR)) -InstallNamedProg(Xsetup_0,Xsetup_0,$(XDMDIR)) -InstallNamedProg(Xstartup,Xstartup,$(XDMDIR)) -InstallNamedProg(Xreset,Xreset,$(XDMDIR)) -InstallNamedProg(Xwilling,Xwilling,$(XDMDIR)) +XDMEGDIR = XdmEgDir +InstallNonExecFile(xdm-config,$(XDMEGDIR)) +InstallNonExecFile(Xresources,$(XDMEGDIR)) +InstallNonExecFile(Xservers,$(XDMEGDIR)) +InstallNonExecFile(Xaccess,$(XDMEGDIR)) +InstallNamedProg(Xsession,Xsession,$(XDMEGDIR)) +InstallNamedProg(GiveConsole,GiveConsole,$(XDMEGDIR)) +InstallNamedProg(TakeConsole,TakeConsole,$(XDMEGDIR)) +InstallNamedProg(Xsetup_0,Xsetup_0,$(XDMEGDIR)) +InstallNamedProg(Xwilling,Xwilling,$(XDMEGDIR)) #else InstallNonExecFileNoClobber(xdm-config,$(XDMDIR)) InstallNonExecFileNoClobber(Xresources,$(XDMDIR)) @@@@ -81,8 +80,8 @@@@ #endif #if InstallXdmConfig -InstallNonExecFile(XdmPixmap,$(XDMDIR)/pixmaps) -InstallNonExecFile(XdmbwPixmap,$(XDMDIR)/pixmaps) +InstallNonExecFile(XdmPixmap,$(INCDIR)/X11/pixmaps) +InstallNonExecFile(XdmbwPixmap,$(INCDIR)/X11/pixmaps) #else InstallNonExecFileNoClobber(XdmPixmap,$(XDMDIR)/pixmaps) InstallNonExecFileNoClobber(XdmbwPixmap,$(XDMDIR)/pixmaps) @ 1.4 log @Update meta-pkgs/xorg to 6.9.0. The full list of changes: http://ftp.x.org/pub/X11R7.0/doc/html/RELNOTES2.html Thanks to joerg@@ and reed@@ for testing on DragonFlyBSD. Tested on NetBSD/i386 3.0/-current and DragonFlyBSD-1.4/i386. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Apply patches from Todd Willey for DragonFlyBSD, this closes PR pkg/29042. Thank you! @ text @d3 4 a6 4 --- programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig 2005-01-21 19:27:21.000000000 +0000 +++ programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2005-01-21 19:41:06.000000000 +0000 @@@@ -127,10 +127,11 @@@@ DLLIB = DlLibrary d9 2 a10 8 -LOCAL_LIBRARIES = $(XKBUILIB) $(XKBFILELIB) -lxf86config $(XXF86MISCLIB) \ - $(XXF86VMLIB) $(XAWLIB) $(XMULIB) $(XTOOLLIB) \ +LOCAL_LIBRARIES = -lxf86config $(XXF86MISCLIB) \ + $(XXF86VMLIB) -lXaw $(XMULIB) $(XTOOLLIB) \ $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(LOADERLIB) $(DLLIB) \ - $(XLIB) $(CURSESLIB) RegexLibrary -lm + $(XLIB) $(CURSESLIB) RegexLibrary -lm \ + $(XKBUILIB) $(XKBFILELIB) d12 52 a63 2 NormalProgramTarget($(PROG),$(OBJS),,$(LOCAL_LIBRARIES),) InstallProgramWithFlags($(PROG),$(BINDIR),NullParameter) @ 1.2 log @Update X.org packages to 6.8.1. To see the changes about this release, please review the "RELNOTES" file, which is available via www or in the distribution tarballs. These packages were tested on: * NetBSD 2.0/-current * Bluewall GNU/Linux * Slackware 10 GNU/Linux I'm currently testing them on FreeBSD 5.3BETA4. @ text @d3 4 a6 3 --- programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig 2004-09-14 10:59:24.000000000 +0200 +++ programs/Xserver/hw/xfree86/xf86cfg/Imakefile 2004-09-14 11:00:01.000000000 +0200 @@@@ -128,7 +128,7 @@@@ d9 1 a9 1 LOCAL_LIBRARIES = $(XKBUILIB) $(XKBFILELIB) -lxf86config $(XXF86MISCLIB) \ d11 1 d14 3 a16 1 $(XLIB) $(CURSESLIB) RegexLibrary -lm d18 2 @ 1.1 log @Incorporate libXpm security fixes of X.Org X11R6.8.1. Bump PKGREVISION and BUILDLINK_RECOMMENDED. @ text @d3 11 a13 11 --- extras/Xpm/lib/data.c.orig 2004-03-04 11:46:10.000000000 -0600 +++ extras/Xpm/lib/data.c @@@@ -375,7 +375,7 @@@@ xpmGetCmt(data, cmt) { if (!data->type) *cmt = NULL; - else if (data->CommentLength) { + else if (data->CommentLength != 0 && data->CommentLength < SIZE_MAX - 1) { *cmt = (char *) XpmMalloc(data->CommentLength + 1); strncpy(*cmt, data->Comment, data->CommentLength); (*cmt)[data->CommentLength] = '\0'; @