From f3f9ce35816458e40bb5b0872517d0812007a92d Mon Sep 17 00:00:00 2001
From: tnn <tnn@pkgsrc.org>
Date: Wed, 19 Jan 2011 20:40:06 +0000
Subject: revert my change, drochner@ fixed the problem.

---
 multimedia/x264-devel/Makefile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'multimedia')

diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index 3fd1fb34f03..da9f984c644 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.31 2011/01/19 02:04:02 dsainty Exp $
+# $NetBSD: Makefile,v 1.32 2011/01/19 20:40:06 tnn Exp $
 
 SNAPSHOT_DATE=		20110101
 
 DISTNAME=		x264-snapshot-${SNAPSHOT_DATE}-2245
 PKGNAME=		x264-devel-${SNAPSHOT_DATE}
+PKGREVISION=		1
 CATEGORIES=		multimedia
 MASTER_SITES=		ftp://ftp.videolan.org/pub/videolan/x264/snapshots/
 EXTRACT_SUFX=		.tar.bz2
@@ -25,13 +26,17 @@ CFLAGS+=	-DHAVE_STDLIB_H
 # "libtool" to create shared libraries. We therefore need to switch
 # them off even if the C versions are slower.
 .if ${MACHINE_ARCH} == "i386"
-.  if ${OPSYS} == "SunOS" || ${OPSYS} == "NetBSD" || ${OPSYS} == "Darwin"
+.  if ${OPSYS} == "SunOS" || (${OPSYS} == "NetBSD" && \
+	(!empty(OS_VERSION:M[1-5].*) && empty(OS_VERSION:M5.99.*))) || \
+      ${OPSYS} == "Darwin"
 CONFIGURE_ARGS+=	--disable-asm
 .  else
 BUILD_DEPENDS+=		yasm>=0.4.0:../../devel/yasm
 .  endif
 .elif ${MACHINE_ARCH} == "x86_64"
-.  if ${OPSYS} == "SunOS" || ${OPSYS} == "NetBSD" || ${OPSYS} == "Darwin"
+.  if ${OPSYS} == "SunOS" || (${OPSYS} == "NetBSD" && \
+	(!empty(OS_VERSION:M[1-5].*) && empty(OS_VERSION:M5.99.*))) || \
+      ${OPSYS} == "Darwin"
 CONFIGURE_ARGS+=	--disable-asm
 .  else
 BUILD_DEPENDS+=		yasm>=0.4.0:../../devel/yasm
-- 
cgit v1.2.3