diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2004-12-20 14:45:25 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2004-12-20 14:45:25 +0000 |
| commit | 156eefc5de564ed608a4ebec33c36327d719fab6 (patch) | |
| tree | 0037a5355fd754f46e96a5908347fc5bf4a80c32 /x11/xorg-libs/Makefile | |
| parent | bf17acc8abb4ae78be98dd73961e4fa17286ba1d (diff) | |
| download | pkgsrc-156eefc5de564ed608a4ebec33c36327d719fab6.tar.gz | |
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.
Diffstat (limited to 'x11/xorg-libs/Makefile')
| -rw-r--r-- | x11/xorg-libs/Makefile | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile index ea7d213b4e7..b066b4b026a 100644 --- a/x11/xorg-libs/Makefile +++ b/x11/xorg-libs/Makefile @@ -1,12 +1,14 @@ -# $NetBSD: Makefile,v 1.9 2004/10/22 06:31:42 xtraeme Exp $ +# $NetBSD: Makefile,v 1.10 2004/12/20 14:45:25 xtraeme Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-libs-${XORG_VER} -PKGREVISION= 3 +PKGREVISION= 4 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 +PATCH_SITES= http://www.x.org/pub/X11R6.8.1/patches/ +PATCHFILES= xorg-681-CAN-2004-0914.patch MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.x.org/ @@ -34,7 +36,7 @@ XINSTALL_DIRS= include lib nls programs/Xserver/include \ programs/Xserver/hw/xfree86/parser XINSTALL_MAN_DIRS= ${XINSTALL_DIRS} -SUBST_CLASSES= mkstrs +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' @@ -45,6 +47,21 @@ post-install: @${LDCONFIG} ${X11ROOT}/lib || ${TRUE} .endif +.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 + pre-install: .if !exists(${X11ROOT}/lib/pkgconfig) ${INSTALL_DATA_DIR} ${X11BASE}/lib/pkgconfig |