From 2fb3e05efa48e45adabc4d93f75a3a2435550fb3 Mon Sep 17 00:00:00 2001 From: Boris Samorodov Date: Tue, 8 Aug 2006 19:19:35 +0000 Subject: [PATCH] Let the ports which have both bz2 and gz distfiles extract on 4.x (actually, if ${OSVERSION} < 502111): - remove BROKEN from graphics/linux_dri-devel; - remove IGNORE from graphics/linux_dri. The next technique is used (thanks Brooks Davis): .if ${OSVERSION} < 502111 EXTRACT_DEPENDS+= bsdtar:${PORTSDIR}/archivers/libarchive TAR= bsdtar .endif Approved by: netchild (mentor, implicit) --- graphics/linux_dri-devel/Makefile | 11 +++++++---- graphics/linux_dri/Makefile | 5 +++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/graphics/linux_dri-devel/Makefile b/graphics/linux_dri-devel/Makefile index dce738339844..25d94b2d60f9 100644 --- a/graphics/linux_dri-devel/Makefile +++ b/graphics/linux_dri-devel/Makefile @@ -33,6 +33,13 @@ MODULELIST= i810_dri.so i915_dri.so mach64_dri.so mga_dri.so r128_dri.so \ sis_dri.so tdfx_dri.so LDCONFIG_LINUX= ${LINUXBASE}/sbin/ldconfig +.include + +.if ${OSVERSION} < 502111 +EXTRACT_DEPENDS+= bsdtar:${PORTSDIR}/archivers/libarchive +TAR= bsdtar +.endif + do-install: ${MKDIR} ${PREFIX}/usr/X11R6/lib/modules/dri ${INSTALL_PROGRAM} ${WRKSRC}/linux_dri/libGL.so.1.2 \ @@ -61,8 +68,4 @@ do-install: post-install: @${LDCONFIG_LINUX} ${PREFIX}/usr/X11R6/lib -.include -.if ${OSVERSION} < 500000 -BROKEN= does not extract on 4.x (both bz2 and gz sources are used) -.endif .include diff --git a/graphics/linux_dri/Makefile b/graphics/linux_dri/Makefile index a6c8e68932da..45f69cf51f3e 100644 --- a/graphics/linux_dri/Makefile +++ b/graphics/linux_dri/Makefile @@ -35,8 +35,9 @@ LDCONFIG_LINUX= ${LINUXBASE}/sbin/ldconfig .include -.if ${OSVERSION} < 500000 -IGNORE= does not extract with the tar in FreeBSD 4.x +.if ${OSVERSION} < 502111 +EXTRACT_DEPENDS+= bsdtar:${PORTSDIR}/archivers/libarchive +TAR= bsdtar .endif do-install: