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.10 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.8 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.6 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.4 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.2 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.1.0.2 pkgsrc-2004Q3-base:1.1; locks; strict; comment @# @; 1.5 date 2007.08.17.20.25.26; 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 2004.10.20.14.33.30; author reed; state Exp; branches; next 1.2; 1.2 date 2004.09.21.17.38.53; author xtraeme; state dead; 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-ao,v 1.4 2006/01/18 23:53:06 xtraeme Exp $ --- config/cf/xorg.cf.orig 2005-12-06 12:40:11.000000000 +0100 +++ config/cf/xorg.cf 2005-12-06 12:40:59.000000000 +0100 @@@@ -1285,6 +1285,8 @@@@ #ifndef BuildScanpci # if SystemV || SystemV4 || \ (defined(LinuxArchitecture) && !defined(Mc68020Architecture)) || \ + (defined(NetBSDArchitecture) && \ + (defined(AMD64Architecture) || defined(PpcArchitecture))) || \ defined(i386BsdArchitecture) || defined(LynxOSArchitecture) || \ defined(OS2Architecture) || defined(GNUMachArchitecture) || \ (defined(KFreeBSDArchitecture) && defined(i386Architecture)) @ 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 @Make xdm use configs from under PKG_SYSCONFDIR. Some ideas came from NetBSD's XFree86 customizations. Use USE_PKGINSTALL and CONF_FILES for xorg-clients. Installs xdm configs (and shell scripts) to examples directory. Create OWN_DIRS for the authDir. PLIST changes are for chooser is now in bin directory. And pixmaps moved to include/X11/pixmaps directory. xdm configs are no longer in lib/X11/xdm (so they are no longer lost on reinstall). (Anyone want to do twm and other configs?) @ text @d3 11 a13 58 --- programs/xdm/config/Imakefile.orig 2004-07-26 23:24:47.000000000 -0700 +++ programs/xdm/config/Imakefile @@@@ -23,9 +23,9 @@@@ DEFAULTVT=vt7 # 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) @@@@ -42,21 +42,22 @@@@ SU = su #endif CppFileTarget(Xservers.ws,Xserv.ws.cpp,-DBINDIR=$(BINDIR) -DDEFAULTVT=$(DEFAULTVT),NullParameter) -CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH=$(CHOOSERPATH),NullParameter) +CppFileTarget(xdm-config,xdm-conf.cpp,-DXDMDIR=$(XDMDIR) -DXDMAUTHDIR=$(XDMVARDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) -DSU=$(SU) -DCHOOSERPATH=$(CHOOSERPATH),NullParameter) CppFileTarget(Xresources,Xres.cpp,$(XPM_DEFINES),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(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)) @@@@ -70,8 +71,8 @@@@ InstallNamedProgNoClobber(Xwilling,Xwill #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.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 @d1 1 a1 1 $NetBSD: patch-ao,v 1.1 2004/09/16 19:36:10 minskim Exp $ d3 58 a60 28 --- extras/Xpm/lib/Attrib.c.orig 2003-11-14 10:48:24.000000000 -0600 +++ extras/Xpm/lib/Attrib.c @@@@ -35,7 +35,7 @@@@ #include "XpmI.h" /* 3.2 backward compatibility code */ -LFUNC(CreateOldColorTable, int, (XpmColor *ct, int ncolors, +LFUNC(CreateOldColorTable, int, (XpmColor *ct, unsigned int ncolors, XpmColor ***oldct)); LFUNC(FreeOldColorTable, void, (XpmColor **colorTable, int ncolors)); @@@@ -46,12 +46,15 @@@@ LFUNC(FreeOldColorTable, void, (XpmColor static int CreateOldColorTable(ct, ncolors, oldct) XpmColor *ct; - int ncolors; + unsigned int ncolors; XpmColor ***oldct; { XpmColor **colorTable, **color; int a; + if (ncolors >= SIZE_MAX / sizeof(XpmColor *)) + return XpmNoMemory; + colorTable = (XpmColor **) XpmMalloc(ncolors * sizeof(XpmColor *)); if (!colorTable) { *oldct = NULL; @ 1.1 log @Incorporate libXpm security fixes of X.Org X11R6.8.1. Bump PKGREVISION and BUILDLINK_RECOMMENDED. @ text @d1 1 a1 1 $NetBSD$ @