Sun Jul 18 12:19:47 2010 UTC ()
fix previous


(drochner)
diff -r1.23 -r1.24 pkgsrc/multimedia/x264-devel/Makefile
cvs diff -r1.23 -r1.24 pkgsrc/multimedia/x264-devel/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/x264-devel/Attic/Makefile 2010/07/18 09:48:44 1.23
+++ pkgsrc/multimedia/x264-devel/Attic/Makefile 2010/07/18 12:19:47 1.24
@@ -1,37 +1,37 @@ @@ -1,37 +1,37 @@
1# $NetBSD: Makefile,v 1.23 2010/07/18 09:48:44 wiz Exp $ 1# $NetBSD: Makefile,v 1.24 2010/07/18 12:19:47 drochner Exp $
2 2
3SNAPSHOT_DATE= 20090920 3SNAPSHOT_DATE= 20090920
4 4
5DISTNAME= x264-snapshot-${SNAPSHOT_DATE}-2245 5DISTNAME= x264-snapshot-${SNAPSHOT_DATE}-2245
6PKGNAME= x264-devel-${SNAPSHOT_DATE} 6PKGNAME= x264-devel-${SNAPSHOT_DATE}
7CATEGORIES= multimedia 7CATEGORIES= multimedia
8MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ 8MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= joerg@NetBSD.org 11MAINTAINER= joerg@NetBSD.org
12HOMEPAGE= http://www.videolan.org/developers/x264.html 12HOMEPAGE= http://www.videolan.org/developers/x264.html
13COMMENT= GPL licensed H.264 encoder 13COMMENT= GPL licensed H.264 encoder
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17.include "../../mk/bsd.prefs.mk" 17.include "../../mk/bsd.prefs.mk"
18 18
19.if exists(/usr/include/stdlib.h) && ${OPSYS} != Linux # XXX should be fine 19.if exists(/usr/include/stdlib.h) && ${OPSYS} != Linux # XXX should be fine
20CFLAGS+= -DHAVE_STDLIB_H 20CFLAGS+= -DHAVE_STDLIB_H
21.endif 21.endif
22 22
23.if ${MACHINE_ARCH} == "i386" 23.if ${MACHINE_ARCH} == "i386"
24. if ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS" \ 24. if ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS" || \
25 (${OPSYS} == "NetBSD" && \ 25 (${OPSYS} == "NetBSD" && \
26 (!empty(OS_VERSION:M[1-5].*) && empty(OS_VERSION:M5.99.*))) 26 (!empty(OS_VERSION:M[1-5].*) && empty(OS_VERSION:M5.99.*)))
27CONFIGURE_ARGS+= --disable-asm 27CONFIGURE_ARGS+= --disable-asm
28. else 28. else
29BUILD_DEPENDS+= yasm>=0.4.0:../../devel/yasm 29BUILD_DEPENDS+= yasm>=0.4.0:../../devel/yasm
30. endif 30. endif
31.elif ${MACHINE_ARCH} == "x86_64" 31.elif ${MACHINE_ARCH} == "x86_64"
32CONFIGURE_ARGS+= --disable-asm 32CONFIGURE_ARGS+= --disable-asm
33.endif 33.endif
34 34
35USE_TOOLS+= gmake bash 35USE_TOOLS+= gmake bash
36USE_LIBTOOL= yes 36USE_LIBTOOL= yes
37 37