head	1.47;
access;
symbols
	pkgsrc-2013Q2:1.47.0.24
	pkgsrc-2013Q2-base:1.47
	pkgsrc-2012Q4:1.47.0.22
	pkgsrc-2012Q4-base:1.47
	pkgsrc-2011Q4:1.47.0.20
	pkgsrc-2011Q4-base:1.47
	pkgsrc-2011Q2:1.47.0.18
	pkgsrc-2011Q2-base:1.47
	pkgsrc-2009Q4:1.47.0.16
	pkgsrc-2009Q4-base:1.47
	pkgsrc-2008Q4:1.47.0.14
	pkgsrc-2008Q4-base:1.47
	pkgsrc-2008Q3:1.47.0.12
	pkgsrc-2008Q3-base:1.47
	cube-native-xorg:1.47.0.10
	cube-native-xorg-base:1.47
	pkgsrc-2008Q2:1.47.0.8
	pkgsrc-2008Q2-base:1.47
	pkgsrc-2008Q1:1.47.0.6
	pkgsrc-2008Q1-base:1.47
	pkgsrc-2007Q4:1.47.0.4
	pkgsrc-2007Q4-base:1.47
	pkgsrc-2007Q3:1.47.0.2
	pkgsrc-2007Q3-base:1.47
	pkgsrc-2007Q2:1.46.0.2
	pkgsrc-2007Q2-base:1.46
	pkgsrc-2007Q1:1.45.0.4
	pkgsrc-2007Q1-base:1.45
	pkgsrc-2006Q4:1.45.0.2
	pkgsrc-2006Q4-base:1.45
	pkgsrc-2006Q3:1.44.0.2
	pkgsrc-2006Q3-base:1.44
	pkgsrc-2006Q2:1.36.0.2
	pkgsrc-2006Q2-base:1.36
	pkgsrc-2006Q1:1.33.0.2
	pkgsrc-2006Q1-base:1.33
	pkgsrc-2005Q4:1.28.0.2
	pkgsrc-2005Q4-base:1.28
	pkgsrc-2005Q3:1.23.0.2
	pkgsrc-2005Q3-base:1.23
	pkgsrc-2005Q2:1.22.0.2
	pkgsrc-2005Q2-base:1.22
	pkgsrc-2005Q1:1.15.0.2
	pkgsrc-2005Q1-base:1.15
	pkgsrc-2004Q4:1.10.0.2
	pkgsrc-2004Q4-base:1.10
	pkgsrc-2004Q3:1.5.0.2
	pkgsrc-2004Q3-base:1.5
	pkgsrc-base:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.47
date	2007.08.17.20.25.18;	author joerg;	state dead;
branches;
next	1.46;

1.46
date	2007.05.25.18.52.48;	author reinoud;	state Exp;
branches;
next	1.45;

1.45
date	2006.10.09.12.52.36;	author joerg;	state Exp;
branches;
next	1.44;

1.44
date	2006.09.14.17.13.58;	author joerg;	state Exp;
branches;
next	1.43;

1.43
date	2006.09.13.12.27.26;	author joerg;	state Exp;
branches;
next	1.42;

1.42
date	2006.08.26.15.20.44;	author joerg;	state Exp;
branches;
next	1.41;

1.41
date	2006.08.22.18.12.14;	author joerg;	state Exp;
branches;
next	1.40;

1.40
date	2006.07.31.16.39.41;	author joerg;	state Exp;
branches;
next	1.39;

1.39
date	2006.07.26.16.02.21;	author minskim;	state Exp;
branches;
next	1.38;

1.38
date	2006.07.24.14.11.13;	author joerg;	state Exp;
branches;
next	1.37;

1.37
date	2006.07.23.15.45.36;	author minskim;	state Exp;
branches;
next	1.36;

1.36
date	2006.06.12.00.36.25;	author joerg;	state Exp;
branches
	1.36.2.1;
next	1.35;

1.35
date	2006.06.01.22.44.08;	author tron;	state Exp;
branches;
next	1.34;

1.34
date	2006.04.22.09.22.17;	author rillig;	state Exp;
branches;
next	1.33;

1.33
date	2006.02.12.15.29.19;	author xtraeme;	state Exp;
branches
	1.33.2.1;
next	1.32;

1.32
date	2006.02.05.23.11.48;	author joerg;	state Exp;
branches;
next	1.31;

1.31
date	2006.01.24.07.33.02;	author wiz;	state Exp;
branches;
next	1.30;

1.30
date	2006.01.18.23.53.06;	author xtraeme;	state Exp;
branches;
next	1.29;

1.29
date	2006.01.08.14.51.11;	author abs;	state Exp;
branches;
next	1.28;

1.28
date	2005.12.12.19.52.17;	author joerg;	state Exp;
branches;
next	1.27;

1.27
date	2005.12.08.09.52.17;	author rillig;	state Exp;
branches;
next	1.26;

1.26
date	2005.12.05.20.51.20;	author rillig;	state Exp;
branches;
next	1.25;

1.25
date	2005.11.09.01.05.06;	author reed;	state Exp;
branches;
next	1.24;

1.24
date	2005.10.16.16.56.22;	author tonio;	state Exp;
branches;
next	1.23;

1.23
date	2005.09.18.19.33.42;	author xtraeme;	state Exp;
branches;
next	1.22;

1.22
date	2005.04.15.16.38.07;	author hira;	state Exp;
branches;
next	1.21;

1.21
date	2005.04.15.15.26.48;	author hira;	state Exp;
branches;
next	1.20;

1.20
date	2005.04.14.21.35.51;	author xtraeme;	state Exp;
branches;
next	1.19;

1.19
date	2005.04.11.21.48.15;	author tv;	state Exp;
branches;
next	1.18;

1.18
date	2005.03.30.20.29.19;	author hira;	state Exp;
branches;
next	1.17;

1.17
date	2005.03.23.22.44.00;	author xtraeme;	state Exp;
branches;
next	1.16;

1.16
date	2005.03.22.09.48.48;	author adam;	state Exp;
branches;
next	1.15;

1.15
date	2005.03.01.19.00.11;	author xtraeme;	state Exp;
branches;
next	1.14;

1.14
date	2005.02.09.12.53.19;	author xtraeme;	state Exp;
branches;
next	1.13;

1.13
date	2005.02.09.11.39.19;	author xtraeme;	state Exp;
branches;
next	1.12;

1.12
date	2005.01.13.00.01.15;	author xtraeme;	state Exp;
branches;
next	1.11;

1.11
date	2004.12.27.17.26.18;	author xtraeme;	state Exp;
branches;
next	1.10;

1.10
date	2004.12.20.14.45.25;	author xtraeme;	state Exp;
branches
	1.10.2.1;
next	1.9;

1.9
date	2004.10.22.06.31.42;	author xtraeme;	state Exp;
branches;
next	1.8;

1.8
date	2004.10.09.09.32.19;	author xtraeme;	state Exp;
branches;
next	1.7;

1.7
date	2004.10.03.00.18.40;	author tv;	state Exp;
branches;
next	1.6;

1.6
date	2004.09.21.17.38.53;	author xtraeme;	state Exp;
branches;
next	1.5;

1.5
date	2004.09.16.19.36.10;	author minskim;	state Exp;
branches;
next	1.4;

1.4
date	2004.08.11.15.40.49;	author recht;	state Exp;
branches;
next	1.3;

1.3
date	2004.07.30.07.48.56;	author xtraeme;	state Exp;
branches;
next	1.2;

1.2
date	2004.07.29.06.36.34;	author xtraeme;	state Exp;
branches;
next	1.1;

1.1
date	2004.07.29.04.50.56;	author xtraeme;	state Exp;
branches
	1.1.1.1;
next	;

1.36.2.1
date	2006.08.23.23.30.32;	author salo;	state Exp;
branches;
next	1.36.2.2;

1.36.2.2
date	2006.09.16.10.27.04;	author salo;	state Exp;
branches;
next	;

1.33.2.1
date	2006.05.09.15.09.25;	author salo;	state Exp;
branches;
next	;

1.10.2.1
date	2004.12.27.18.30.52;	author snj;	state Exp;
branches;
next	1.10.2.2;

1.10.2.2
date	2005.01.17.21.02.56;	author snj;	state Exp;
branches;
next	;

1.1.1.1
date	2004.07.29.04.50.56;	author xtraeme;	state Exp;
branches;
next	;


desc
@@


1.47
log
@To quote Johnny Lam: "In modular-xorg we trust"

Remove xorg 6.9 packages from pkgsrc.
@
text
@# $NetBSD: Makefile,v 1.46 2007/05/25 18:52:48 reinoud Exp $

DISTNAME=		${DISTFILES}
PKGNAME=		xorg-libs-${XORG_VER}
PKGREVISION=		11
CATEGORIES=		x11
MASTER_SITES=		${MASTER_SITE_XORG}
DISTFILES=		X11R${XORG_VER}-src1.tar.gz X11R${XORG_VER}-src2.tar.gz \
			X11R${XORG_VER}-src3.tar.gz

MAINTAINER=		joerg@@NetBSD.org
HOMEPAGE=		http://www.x.org/
COMMENT=		X.org Libraries

BUILD_DEPENDS=		xorg-imake-[0-9]*:../../x11/xorg-imake
PKG_DESTDIR_SUPPORT=	user-destdir

.include "../../mk/bsd.prefs.mk"

PLIST_SRC=		${WRKDIR}/.PLIST_SRC
XORG_PLIST_ENTRY=	${OPSYS}
.if ${OPSYS} != "Darwin"
XORG_PLIST_ENTRY+=	i18n
.  if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
      ${MACHINE_ARCH} == "sparc64"
XORG_PLIST_ENTRY+=	DGA-common
.  endif
.endif

.include "../../meta-pkgs/xorg/Makefile.common"

.if ${X11ROOT} == ${LOCALBASE}
CONFLICTS+=		MesaLib-[0-9]* glu-[0-9]*
CONFLICTS+=		xextensions-[0-9]*
CONFLICTS+=		libX11-[0-9]*
CONFLICTS+=		libXau-[0-9]*
.endif

INSTALLATION_DIRS+=	${X11BASE}/lib/pkgconfig

BUILDLINK_PASSTHRU_DIRS+=	${X11ROOT}/lib

XBUILD_DIRS=		lib nls programs/Xserver/include \
			programs/Xserver/hw/xfree86/parser
XINSTALL_DIRS=		include lib nls programs/Xserver/include \
			programs/Xserver/hw/xfree86/parser
XINSTALL_MAN_DIRS=	${XINSTALL_DIRS}

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.

post-install:
	@@${SED} ${XORG_PLIST_SED} ${PKGDIR}/PLIST > ${PLIST_SRC}

pre-install:
.if !exists(${X11BASE}/lib/pkgconfig)
	${INSTALL_DATA_DIR} ${DESTDIR}${X11BASE}/lib/pkgconfig
.endif
.for f in render.pc fixesext.pc compositeext.pc
	@@${SED} -e "s,@@X11BASE@@,${X11BASE},g"		\
		-e "s,@@LOCALBASE@@,${LOCALBASE},g"	\
		${FILESDIR}/${f} > ${WRKSRC}/${f}
	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${X11BASE}/lib/pkgconfig/${f}
.endfor

.include "../../devel/zlib/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
@


1.46
log
@Fix unlocking unlocked mutex error that would get generated when GL was
initialised on a non GL display. Somehow an extra UnlockDisplay(dpy) was put
in.

This patch could also be of use in the modular xorg libs GL libs.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.45 2006/10/09 12:52:36 joerg Exp $
@


1.45
log
@Flag a number of packages I use as supporting (user-)destdir.
apg is a bit special as it has some hardcoded ownership, so
mark that as "destdir".
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.44 2006/09/14 17:13:58 joerg Exp $
d5 1
a5 1
PKGREVISION=		10
@


1.44
log
@Actually bump the revisions as promised.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.43 2006/09/13 12:27:26 joerg Exp $
d16 1
d39 2
a56 3
.if ${OPSYS} == "Linux"
	@@${LDCONFIG} ${X11ROOT}/lib || ${TRUE}
.endif
d60 1
a60 1
	${INSTALL_DATA_DIR} ${X11BASE}/lib/pkgconfig
d66 1
a66 1
	${INSTALL_DATA} ${WRKSRC}/${f} ${X11BASE}/lib/pkgconfig/${f}
@


1.43
log
@Fixes for CVE-2006-2006-3739 and CVE-2006-3740.
Bump revision.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.42 2006/08/26 15:20:44 joerg Exp $
d5 1
a5 1
PKGREVISION=		9
@


1.42
log
@Fix PLIST for FreeBSD. Bump revision.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.41 2006/08/22 18:12:14 joerg Exp $
d5 1
a5 1
PKGREVISION=		8
@


1.41
log
@Fix SA21450 using patch from Xorg CVS. Bump revisions of xorg-libs and
xorg-server.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.40 2006/07/31 16:39:41 joerg Exp $
d5 1
a5 1
PKGREVISION=		7
@


1.40
log
@Don't drop -fno-strict-aliasing on NetBSD/!i386. Fixes PR 34099.
Bump revision of xorg-imake and xorg-libs.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.39 2006/07/26 16:02:21 minskim Exp $
d5 1
a5 1
PKGREVISION=		6
@


1.39
log
@Add a missing file on Linux.  Bump PKGREVISION.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.38 2006/07/24 14:11:13 joerg Exp $
d5 1
a5 1
PKGREVISION=		5
@


1.38
log
@Move zlib SUBST magic to Makefile.common, it is always needed.
Fixes problems found by abs@@
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.37 2006/07/23 15:45:36 minskim Exp $
d5 1
a5 1
PKGREVISION=		4
@


1.37
log
@Make this package build on platforms without native zlib by including
zlib's buildlink3.mk.  Thanks to Joerg Sonnenberger for review.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.36 2006/06/12 00:36:25 joerg Exp $
a51 7
SUBST_CLASSES+=		zlib
SUBST_STAGE.zlib=	pre-configure
SUBST_FILES.zlib=	config/cf/Imake.tmpl
SUBST_SED.zlib=		-e 's|@@ZLIBDIR@@|${BUILDLINK_PREFIX.zlib}/lib|g' \
			-e 's|@@COMPILER_RPATH_FLAG@@|${COMPILER_RPATH_FLAG}|g'
SUBST_MESSAGE.zlib=	Adding the zlib library path.

@


1.36
log
@Improve Linux/AMD64 support. Bump revisions of xorg-imake and
xorg-libs due to changed packages.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.35 2006/06/01 22:44:08 tron Exp $
d52 7
d76 1
@


1.36.2.1
log
@Pullup ticket 1804 - requested by joerg
security fix and sync with HEAD for xorg

Revisions pulled up:
- pkgsrc/meta-pkgs/xorg/Makefile.common		1.41, 1.42
- pkgsrc/x11/xorg-imake/Makefile		1.29, 1.30
- pkgsrc/x11/xorg-imake/distinfo		1.21
- pkgsrc/x11/xorg-imake/patches/patch-ac	1.8
- pkgsrc/x11/xorg-libs/Makefile			1.37, 1.39, 1.40, 1.41
- pkgsrc/x11/xorg-libs/PLIST			1.8, 1.9, 1.10
- pkgsrc/x11/xorg-libs/distinfo			1.48, 1.49, 1.50, 1.51, 1.52
- pkgsrc/x11/xorg-libs/patches/patch-ac		1.10
- pkgsrc/x11/xorg-libs/patches/patch-ad		1.6
- pkgsrc/x11/xorg-libs/patches/patch-au		1.3
- pkgsrc/x11/xorg-libs/patches/patch-bq		1.1
- pkgsrc/x11/xorg-libs/patches/patch-br		1.1
- pkgsrc/x11/xorg-server/Makefile		1.45

   Module Name:		pkgsrc
   Committed By:	rillig
   Date:		Tue Jul  4 09:20:18 UTC 2006

   Modified Files:
   	pkgsrc/meta-pkgs/xorg: Makefile.common

   Log Message:
   Made a SUBST block much simpler.
---
   Module Name:		pkgsrc
   Committed By:	joerg
   Date:		Mon Jul 17 17:06:59 UTC 2006

   Modified Files:
   	pkgsrc/x11/xorg-imake: Makefile

   Log Message:
   Since mkhtmlindex is now a Perl script, depend on Perl and replace
   the interpreter. Bump revision.
---
   Module Name:		pkgsrc
   Committed By:	minskim
   Date:		Sun Jul 23 15:45:36 UTC 2006

   Modified Files:
   	pkgsrc/x11/xorg-libs: Makefile distinfo
   	pkgsrc/x11/xorg-libs/patches: patch-au

   Log Message:
   Make this package build on platforms without native zlib by including
   zlib's buildlink3.mk.  Thanks to Joerg Sonnenberger for review.
---
   Module Name:		pkgsrc
   Committed By:	minskim
   Date:		Sun Jul 23 16:54:20 UTC 2006

   Modified Files:
   	pkgsrc/x11/xorg-libs: PLIST

   Log Message:
   Add missing entries for Linux.  Approved by the maintainer.
---
   Module Name:		pkgsrc
   Committed By:	joerg
   Date:		Mon Jul 24 14:11:13 UTC 2006

   Modified Files:
   	pkgsrc/meta-pkgs/xorg: Makefile.common
   	pkgsrc/x11/xorg-libs: Makefile

   Log Message:
   Move zlib SUBST magic to Makefile.common, it is always needed.
   Fixes problems found by abs@@
---
   Module Name:		pkgsrc
   Committed By:	minskim
   Date:		Mon Jul 24 22:00:47 UTC 2006

   Modified Files:
   	pkgsrc/x11/xorg-libs: PLIST distinfo
   	pkgsrc/x11/xorg-libs/patches: patch-ad

   Log Message:
   Set ForceNormalLib and SharedFontLib to YES regardless of Linux distribution,
   so that the same set of libraries are built on every Linux distribution.
   Thanks to Joerg Sonnenberger for guide and review.
---
   Module Name:		pkgsrc
   Committed By:	minskim
   Date:		Wed Jul 26 16:02:21 UTC 2006

   Modified Files:
   	pkgsrc/x11/xorg-libs: Makefile PLIST

   Log Message:
   Add a missing file on Linux.  Bump PKGREVISION.
--
   Module Name:		pkgsrc
   Committed By:	joerg
   Date:		Mon Jul 31 16:39:42 UTC 2006

   Modified Files:
   	pkgsrc/x11/xorg-imake: Makefile distinfo
   	pkgsrc/x11/xorg-imake/patches: patch-ac
   	pkgsrc/x11/xorg-libs: Makefile distinfo
   	pkgsrc/x11/xorg-libs/patches: patch-ac

   Log Message:
   Don't drop -fno-strict-aliasing on NetBSD/!i386. Fixes PR 34099.
   Bump revision of xorg-imake and xorg-libs.
---
   Module Name:		pkgsrc
   Committed By:	joerg
   Date:		Mon Aug 14 09:54:39 UTC 2006

   Modified Files:
   	pkgsrc/x11/xorg-libs: distinfo
   Added Files:
   	pkgsrc/x11/xorg-libs/patches: patch-bq

   Log Message:
   Don't install os.h and misc.h in server builds, it would override
   files from xorg-libs.
---
   Module Name:		pkgsrc
   Committed By:	joerg
   Date:		Tue Aug 22 18:12:14 UTC 2006

   Modified Files:
   	pkgsrc/x11/xorg-libs: Makefile distinfo
   	pkgsrc/x11/xorg-server: Makefile

   Log Message:
   Fix SA21450 using patch from Xorg CVS. Bump revisions of xorg-libs and
   xorg-server.
---
   Module Name:		pkgsrc
   Committed By:	joerg
   Date:		Wed Aug 23 00:11:08 UTC 2006

   Added Files:
   	pkgsrc/x11/xorg-libs/patches: patch-br

   Log Message:
   Actually add the patch as well.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.41 2006/08/22 18:12:14 joerg Exp $
d5 1
a5 1
PKGREVISION=		7
a68 1
.include "../../devel/zlib/buildlink3.mk"
@


1.36.2.2
log
@Pullup ticket 1825 - requested by joerg
security fixes for xorg

Revisions pulled up:
- pkgsrc/x11/xorg-libs/Makefile			1.42, 1.43, 1.44
- pkgsrc/x11/xorg-libs/PLIST			1.11
- pkgsrc/x11/xorg-libs/distinfo			1.53, 1.54
- pkgsrc/x11/xorg-libs/patches/patch-cg		1.1
- pkgsrc/x11/xorg-libs/patches/patch-ch		1.1
- pkgsrc/x11/xorg-libs/patches/patch-ci		1.1
- pkgsrc/x11/xorg-libs/patches/patch-cj		1.1
- pkgsrc/x11/xorg-libs/patches/patch-ck		1.1
- pkgsrc/x11/xorg-libs/patches/patch-cl		1.1
- pkgsrc/x11/xorg-libs/patches/patch-cm		1.1
- pkgsrc/x11/xorg-libs/patches/patch-cn		1.1
- pkgsrc/x11/xorg-libs/patches/patch-co		1.1
- pkgsrc/x11/xorg-libs/patches/patch-cp		1.1
- pkgsrc/x11/xorg-libs/patches/patch-cq		1.1
- pkgsrc/x11/xorg-libs/patches/patch-cr		1.1
- pkgsrc/x11/xorg-libs/patches/patch-cs		1.1
- pkgsrc/x11/xorg-libs/patches/patch-ct		1.1
- pkgsrc/x11/xorg-clients/Makefile		1.30, 1.31
- pkgsrc/x11/xorg-server/Makefile		1.46

   Module Name:		pkgsrc
   Committed By:	joerg
   Date:		Sat Aug 26 15:20:44 UTC 2006

   Modified Files:
   	pkgsrc/x11/xorg-libs: Makefile PLIST

   Log Message:
   Fix PLIST for FreeBSD. Bump revision.
---
   Module Name:		pkgsrc
   Committed By:	joerg
   Date:		Tue Aug 29 15:06:59 UTC 2006

   Modified Files:
   	pkgsrc/x11/xorg-clients: Makefile

   Log Message:
   Make xorg-libs dependency explicit instead of including it indirectly
   via xcursor->Xfixes. Bump revision. Noticed by tron@@.
---
   Module Name:		pkgsrc
   Committed By:	joerg
   Date:		Wed Sep 13 12:27:26 UTC 2006

   Modified Files:
   	pkgsrc/x11/xorg-libs: Makefile distinfo
   Added Files:
   	pkgsrc/x11/xorg-libs/patches: patch-cg patch-ch patch-ci

   Log Message:
   Fixes for CVE-2006-2006-3739 and CVE-2006-3740.
   Bump revision.
---
   Module Name:		pkgsrc
   Committed By:	joerg
   Date:		Thu Sep 14 16:52:54 UTC 2006

   Modified Files:
   	pkgsrc/x11/xorg-libs: distinfo
   Added Files:
   	pkgsrc/x11/xorg-libs/patches: patch-cj patch-ck patch-cl patch-cm
   	    patch-cn patch-co patch-cp patch-cq patch-cr patch-cs patch-ct

   Log Message:
   Check set*uid for error, at least on Linux it can fail.
   Bump revisions of xorg-clients, xorg-libs and xorg-server.
---
   Module Name:		pkgsrc
   Committed By:	joerg
   Date:		Thu Sep 14 17:13:58 UTC 2006

   Modified Files:
   	pkgsrc/x11/xorg-clients: Makefile
   	pkgsrc/x11/xorg-libs: Makefile
   	pkgsrc/x11/xorg-server: Makefile

   Log Message:
   Actually bump the revisions as promised.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.44 2006/09/14 17:13:58 joerg Exp $
d5 1
a5 1
PKGREVISION=		10
@


1.35
log
@Apply patch from bug #6918 in the "freedesktop.org" Bugzilla database
to make this package build with version 2.2.1 or newer of the "freetype2"
package. Bump package revision.

This should fix PR pkg/33606 by Mathieu.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.34 2006/04/22 09:22:17 rillig Exp $
d5 1
a5 1
PKGREVISION=		3
@


1.34
log
@Removed the superfluous "quotes" and 'quotes' from variables that don't
need them, for example RESTRICTED and SUBST_MESSAGE.*.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.33 2006/02/12 15:29:19 xtraeme Exp $
d5 1
a5 1
PKGREVISION=		2
@


1.33
log
@Joerg Sonnenberger will be the maintainer.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.32 2006/02/05 23:11:48 joerg Exp $
d50 1
a50 1
SUBST_MESSAGE.mkstrs=	"Fixing path of makestrs."
@


1.33.2.1
log
@Pullup ticket 1538 - requested by tron
security fix for xorg

Patch provided by the submitter.

   Module Name:		pkgsrc
   Committed By:	tron
   Date:		Wed May  3 12:23:48 UTC 2006

   Modified Files:
   	pkgsrc/x11/xorg-libs: distinfo
   	pkgsrc/x11/xorg-server: Makefile
   Added Files:
   	pkgsrc/x11/xorg-libs/patches: patch-bh

   Log Message:
   Apply patch to fix vulnerability reported in CVE-2006-1526.
   Bump package revision because of this fix.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.34 2006/04/22 09:22:17 rillig Exp $
d50 1
a50 1
SUBST_MESSAGE.mkstrs=	Fixing path of makestrs.
@


1.32
log
@Recursive revision bump / recommended bump for gettext ABI change.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.31 2006/01/24 07:33:02 wiz Exp $
d11 1
a11 1
MAINTAINER=		xtraeme@@NetBSD.org
@


1.31
log
@Bump BUILDLINK_RECOMMENDED of textproc/expat to 2.0.0 because
of the shlib major bump.
PKGREVISION++ for the dependencies.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.30 2006/01/18 23:53:06 xtraeme Exp $
d5 1
a5 1
PKGREVISION=		1
@


1.30
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: Makefile,v 1.25 2005/11/09 01:05:06 reed Exp $
d5 1
@


1.29
log
@Update xorg-libs to 6.8.2nb6
If _POSIX_REENTRANT_FUNCTIONS on NetBSD is defined, use the correct
getpwnam_r() and gerpwuid_r() forms. This sidesteps the issue as to
whether _POSIX_REENTRANT_FUNCTIONS _should_ be defined on NetBSD.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.28 2005/12/12 19:52:17 joerg Exp $
a4 1
PKGREVISION=		6
d14 1
a14 1
BUILD_DEPENDS+=		xorg-imake>=${XORG_VER}:../../x11/xorg-imake
@


1.28
log
@Fix two issues in Xos_r.h for DragonFly:
- no thread safe pwd API
- rework the readdir implementation
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.27 2005/12/08 09:52:17 rillig Exp $
d5 1
a5 1
PKGREVISION=		5
@


1.27
log
@Bumped the PKGREVISION of the packages that have been broken by the recent
"pkglint --autofix" change.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.26 2005/12/05 20:51:20 rillig Exp $
d5 1
a5 1
PKGREVISION=		4
@


1.26
log
@Fixed pkglint warnings. The warnings are mostly quoting issues, for
example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some
other changes are outlined in

    http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.25 2005/11/09 01:05:06 reed Exp $
d5 1
a5 1
PKGREVISION=		3
@


1.25
log
@Check for ${X11BASE}/lib/pkgconfig instead of ${X11ROOT}/lib/pkgconfig
since it creates ${X11BASE}/lib/pkgconf directory if missing.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.24 2005/10/16 16:56:22 tonio Exp $
d15 1
a15 1
BUILD_DEPENDS=		xorg-imake>=${XORG_VER}:../../x11/xorg-imake
@


1.24
log
@add render.pc as Xrender (and probably others) seek for render with pkgconfig
bump PKGREVISION
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.23 2005/09/18 19:33:42 xtraeme Exp $
d59 1
a59 1
.if !exists(${X11ROOT}/lib/pkgconfig)
@


1.23
log
@Apply patch from FreeBSD ports to fix CAN-2005-2495.

Bump BUILDLINK_RECOMMENDED and PKGREVISION.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.22 2005/04/15 16:38:07 hira Exp $
d5 1
a5 1
PKGREVISION=		2
d62 1
a62 1
.for f in fixesext.pc compositeext.pc
@


1.22
log
@
Simplify comparison.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.21 2005/04/15 15:26:48 hira Exp $
d5 1
a5 1
PKGREVISION=		1
@


1.21
log
@
Don't build the DGA extension on the unsupported architectures.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.20 2005/04/14 21:35:51 xtraeme Exp $
d23 2
a24 2
.  if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64) || \
      !empty(MACHINE_ARCH:Msparc64)
@


1.20
log
@* Apply patch from OpenBSD CVS to fix libXpm vulnerability:
	http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2005-0605
* Apply patch from FreeBSD/ports to fix the problem with the radeon
  driver switching from graphics to text mode.

Bump PKGREVISION.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.19 2005/04/11 21:48:15 tv Exp $
a20 5
.if ${OPSYS} == "NetBSD"
.  if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64)
XORG_PLIST_ENTRY+=	NetBSD-i386
.  endif
.endif
d23 4
@


1.19
log
@Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.18 2005/03/30 20:29:19 hira Exp $
d5 1
@


1.18
log
@
Unify PLIST.  OK'd by xtraeme@@.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.17 2005/03/23 22:44:00 xtraeme Exp $
a37 1
USE_BUILDLINK3=			yes
@


1.17
log
@Add PLIST.${OPSYS} into PLIST_SRC when OPSYS != NetBSD, problem
reported by Todd Willey on the tech-pkg@@ list.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.16 2005/03/22 09:48:48 adam Exp $
d18 11
d53 2
a55 1
post-install:
a69 14
.if ${OPSYS} == "NetBSD"
.  if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64)
PLIST_SRC+=	${.CURDIR}/PLIST.${OPSYS}
PLIST_SRC+=	${.CURDIR}/PLIST.${OPSYS}.i386
.  endif
.else
PLIST_SRC+=     ${.CURDIR}/PLIST.${OPSYS}
.endif
PLIST_SRC+=	${.CURDIR}/PLIST.common
.if ${OPSYS} != "Darwin"
PLIST_SRC+=	${.CURDIR}/PLIST.common_i18n
.endif
PLIST_SRC+=	${.CURDIR}/PLIST.common_end

@


1.16
log
@Added support for Darwin/MacOSX
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.15 2005/03/01 19:00:11 xtraeme Exp $
d63 2
@


1.15
log
@Update xorg to 6.8.2.

Changes:

    * Render implementation fixes
    * Updated x86emu and resynced with upstream at Scitech
    * Updated SiS driver
    * Updated Nvidia driver (opensource version)
    * Render acceleration for ATI's R100 and R200-series cards
    * Substantial speedups in the software implementation of the render
      extensions when compiled with gcc 3.4 on the i386 architecture.
    * Infrastructure for rotation support in drivers
    * New Trapezoid specification for the Render extension
          o Respecify Render to include only 'normal' traps
          o Allow backward compatibility but internally covert to new format
    * Software mouse cursor is now based on the Damage extension
    * A new keyboard driver is enabled by default. The old driver is
      disabled unless explicitly compiled in by defining the macro
      |USE_DEPRECATED_KEYBOARD_DRIVER|.
    * All extensions (except Xserver-specific extensions "DMX" and
      "XpExtension")can now be enabled/disabled from the configuration
      file and from the command line.
    * Mac OS X updates:
          o Support dynamic screen configuration changes in rootless mode
          o Added option to always use Mac command key equivalents
          o Interpret scroll wheel mouse events correctly when shift is
            held down
          o Added trivial Xinput support
          o Fixed launch of X clients from Finder with a space in their path
          o Fixed some GLX rendering problems on Mac OS X 10.2 and earlier
    * Updated xterm version
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.14 2005/02/09 12:53:19 xtraeme Exp $
d58 1
a58 2

.if !empty(OPSYS:MNetBSD)
a59 2
PLIST_SRC+=	${.CURDIR}/PLIST.common
PLIST_SRC+=	${.CURDIR}/PLIST.common_end
d64 5
@


1.14
log
@NetBSD/amd64 uses the same PLIST files as NetBSD/i386, fixing it.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.13 2005/02/09 11:39:19 xtraeme Exp $
a4 1
PKGREVISION=		5
a8 2
PATCH_SITES=		http://www.x.org/pub/X11R6.8.1/patches/
PATCHFILES=		xorg-681-CAN-2004-0914.patch
@


1.13
log
@Add PLIST NetBSD/i386 specific files into its own file, because DGA
is not available on sparc.

This package is now ready for NetBSD i386/sparc.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.12 2005/01/13 00:01:15 xtraeme Exp $
d61 8
a68 2
.if exists(${.CURDIR}/PLIST.${OPSYS}.${MACHINE_ARCH})
PLIST_SRC+=	${.CURDIR}/PLIST.${OPSYS}.${MACHINE_ARCH}
@


1.12
log
@Fix PLIST for OpenBSD, reported by Lasse Kliemann on tech-pkg@@.

Bump PKGREVISION.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.11 2004/12/27 17:26:18 xtraeme Exp $
d61 4
@


1.11
log
@Finish my previous commit and unbreak xorg-*:

* Move the subst macros for threadlib.h from xorg-libs to
  xorg/Makefile.common.
* SUBST_CLASSES should be appended.

Thanks to Manuel Stuehn <manuel.stuehn@@student.uni-siegen.de> for
the email showing me the problems.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.10 2004/12/20 14:45:25 xtraeme Exp $
d5 1
a5 1
PKGREVISION=		4
@


1.10
log
@Apply patch from X.org to fix:
http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0914

While I'm here, make this build again on NetBSD -current, which has not
/usr/include/threadlib.h.

Bump PKGREVISION.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.9 2004/10/22 06:31:42 xtraeme Exp $
a49 15
.if !empty(MACHINE_PLATFORM:MNetBSD-2.[0-9]*)
.  if exists(/usr/include/threadlib.h)
SUBST_CLASSES+=		thr
SUBST_STAGE.thr=	post-patch
SUBST_FILES.thr=	config/cf/NetBSD.cf.in
SUBST_SED.thr=		-e 's|@@@@NETBSD_THREADLIB@@@@|-DUSE_NBSD_THREADLIB|'
SUBST_MESSAGE.thr=	"Fixes for threadlib.h."
.  else
SUBST_CLASSES+=		nada
SUBST_STAGE.nada=	post-patch
SUBST_FILES.nada=	config/cf/NetBSD.cf.in
SUBST_SED.nada=		-e 's|@@@@NETBSD_THREADLIB@@@@||'
.  endif
.endif

@


1.10.2.1
log
@Pullup ticket 188 - requested by Juan RP
build fix for xorg-*

Module Name:    pkgsrc
Committed By:   xtraeme
Date:           Mon Dec 27 17:26:19 UTC 2004

Modified Files:
        pkgsrc/meta-pkgs/xorg: Makefile.common
        pkgsrc/x11/xorg-imake: Makefile distinfo
        pkgsrc/x11/xorg-imake/patches: patch-ac
        pkgsrc/x11/xorg-libs: Makefile
        pkgsrc/x11/xorg-server: Makefile

Log Message:
Finish my previous commit and unbreak xorg-*:

* Move the subst macros for threadlib.h from xorg-libs to
  xorg/Makefile.common.
* SUBST_CLASSES should be appended.

Thanks to Manuel Stuehn <manuel.stuehn@@student.uni-siegen.de> for
the email showing me the problems.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.11 2004/12/27 17:26:18 xtraeme Exp $
d50 15
@


1.10.2.2
log
@Pullup ticket 222 - requested by Juan RP
build fix for xorg-libs

   Module Name:    pkgsrc
   Committed By:   xtraeme
   Date:           Thu Jan 13 00:01:15 UTC 2005

   Modified Files:
           pkgsrc/x11/xorg-libs: Makefile PLIST.OpenBSD

   Log Message:
   Fix PLIST for OpenBSD, reported by Lasse Kliemann on tech-pkg@@.

   Bump PKGREVISION.
---
   Module Name:    pkgsrc
   Committed By:   xtraeme
   Date:           Thu Jan 13 01:40:27 UTC 2005

   Modified Files:
           pkgsrc/x11/xorg-libs: PLIST.OpenBSD

   Log Message:
   Add some more missing libs, required by xorg-clients. Reported by
   Lasse Kliemann on tech-pkg@@.
---
   Module Name:    pkgsrc
   Committed By:   xtraeme
   Date:           Sat Jan 15 17:04:22 UTC 2005

   Modified Files:
           pkgsrc/x11/xorg-libs: PLIST.OpenBSD

   Log Message:
   Add some more libs for OpenBSD, reported by Lasse Kliemann on tech-pkg@@.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.12 2005/01/13 00:01:15 xtraeme Exp $
d5 1
a5 1
PKGREVISION=		5
@


1.9
log
@The CONFLICTS lines for xextensions, libx11 and libXaw should be
only when X11BASE = LOCALBASE, otherwise they are useless, because
the xorg packages install the files into ${X11ROOT} aka ${PREFIX}/xorg
and not ${PREFIX}.

Bump PKGREVISION because the binary has been modified.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.8 2004/10/09 09:32:19 xtraeme Exp $
d5 1
a5 1
PKGREVISION=		3
d10 2
d39 1
a39 1
SUBST_CLASSES=		mkstrs
d50 15
@


1.8
log
@As jmmv@@ suggested in: http://news.gw.com/netbsd.pkgsrc.changes/53743
install pkgconfig files for compositeext and fixesext, required to use
the builtin versions.

Bump PKGREVISION.

Thanks for the suggestion Julio! :)
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.7 2004/10/03 00:18:40 tv Exp $
d5 1
a5 1
PKGREVISION=		2
a14 4
CONFLICTS+=		xextensions-[0-9]*
CONFLICTS+=		libX11-[0-9]*
CONFLICTS+=		libXau-[0-9]*

d23 3
@


1.7
log
@Libtool fix for PR pkg/26633, and other issues.  Update libtool to 1.5.10
in the process.  (More information on tech-pkg.)

Bump PKGREVISION and BUILDLINK_DEPENDS of all packages using libtool and
installing .la files.

Bump PKGREVISION (only) of all packages depending directly on the above
via a buildlink3 include.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.6 2004/09/21 17:38:53 xtraeme Exp $
d5 1
a5 1
PKGREVISION=	1
d49 11
@


1.6
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: Makefile,v 1.4 2004/08/11 15:40:49 recht Exp $
d5 1
@


1.5
log
@Incorporate libXpm security fixes of X.Org X11R6.8.1.

Bump PKGREVISION and BUILDLINK_RECOMMENDED.
@
text
@a4 1
PKGREVISION=		2
d7 2
a8 2
DISTFILES=		X11R6.7.0-src1.tar.gz X11R6.7.0-src2.tar.gz \
			X11R6.7.0-src3.tar.gz
@


1.4
log
@Add missing entries to PLIST.common.
Patch by Kouichirou Hiratsuka in PR pkg/26610

Bump PKGREVISION to 1.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.3 2004/07/30 07:48:56 xtraeme Exp $
d5 1
a5 1
PKGREVISION=		1
@


1.3
log
@Add a new variable to specify the installation prefix for
X11 packages (currently XFree86 and xorg), X11ROOT_PREFIX.

Defaults:

xorg: X11ROOT_PREFIX = xorg.
XFree86: X11ROOT_PREFIX = XFree86.

Otherwise it's undefined.

With this modification we don't have to specify X11BASE anymore,
because it's assigned automatically via bsd.pkg.defaults.mk.

If you want to change the defaults, specify X11ROOT_PREFIX in mk.conf.

Update Packages.txt now that we don't need X11BASE.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.2 2004/07/29 06:36:34 xtraeme Exp $
d5 1
@


1.2
log
@xorg packages now will be installed into ${PREFIX}/xorg by default,
so we don't have to conflict between XFree86 and xorg.

Suggested by grant@@.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 04:50:56 xtraeme Exp $
d18 1
a18 1
BUILD_DEPENDS=		xorg-imake>=6.7.0:../../x11/xorg-imake
a27 2
MESSAGE_SRC=		${_PKGSRCDIR}/x11/XFree86-libs/MESSAGE

@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.12 2004/07/21 23:55:19 xtraeme Exp $
a16 1
CONFLICTS+=		XFree86-libs-[0-9]*
@


1.1.1.1
log
@Initial import of xorg-libs-6.7.0.

This package contains the X.org include header files and shared
library files.
@
text
@@
