Fri May 7 09:34:44 2010 UTC ()
as suggested by OBATA Akio, give up on replacing bashisms and
just use bash to run the configure script


(drochner)
diff -r1.21 -r1.22 pkgsrc/multimedia/x264-devel/Makefile
diff -r1.20 -r1.21 pkgsrc/multimedia/x264-devel/distinfo
diff -r1.9 -r1.10 pkgsrc/multimedia/x264-devel/patches/patch-aa
cvs diff -r1.21 -r1.22 pkgsrc/multimedia/x264-devel/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/x264-devel/Attic/Makefile 2010/05/06 17:02:12 1.21
+++ pkgsrc/multimedia/x264-devel/Attic/Makefile 2010/05/07 09:34:43 1.22
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.21 2010/05/06 17:02:12 drochner Exp $ 1# $NetBSD: Makefile,v 1.22 2010/05/07 09:34:43 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
@@ -22,30 +22,31 @@ CFLAGS+= -DHAVE_STDLIB_H @@ -22,30 +22,31 @@ CFLAGS+= -DHAVE_STDLIB_H
22 22
23.if ${MACHINE_ARCH} == "i386" 23.if ${MACHINE_ARCH} == "i386"
24. if ${OPSYS} == "Darwin" || \ 24. if ${OPSYS} == "Darwin" || \
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 35USE_TOOLS+= gmake bash
36USE_LIBTOOL= yes 36USE_LIBTOOL= yes
37 37
38HAS_CONFIGURE= yes 38HAS_CONFIGURE= yes
 39CONFIG_SHELL= ${BASH}
39CONFIGURE_ARGS+= --enable-pic # uses libtool's -prefer-pic 40CONFIGURE_ARGS+= --enable-pic # uses libtool's -prefer-pic
40CONFIGURE_ARGS+= --prefix=${PREFIX:Q} 41CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
41CONFIGURE_ARGS+= --disable-mp4-output # needs GPAC, not in pkgsrc 42CONFIGURE_ARGS+= --disable-mp4-output # needs GPAC, not in pkgsrc
42MAKE_ENV+= SH=${SH:Q} 43MAKE_ENV+= SH=${SH:Q}
43 44
44BUILD_TARGET= default 45BUILD_TARGET= default
45BUILDLINK_TRANSFORM+= rm:-O4 # XXX does this mean anything to any compiler? 46BUILDLINK_TRANSFORM+= rm:-O4 # XXX does this mean anything to any compiler?
46REPLACE_SH= strip_fopt.sh version.sh 47REPLACE_SH= strip_fopt.sh version.sh
47 48
48.include "../../mk/dlopen.buildlink3.mk" 49.include "../../mk/dlopen.buildlink3.mk"
49 50
50CHECK_BUILTIN.pthread:= yes 51CHECK_BUILTIN.pthread:= yes
51.include "../../mk/pthread.builtin.mk" 52.include "../../mk/pthread.builtin.mk"
cvs diff -r1.20 -r1.21 pkgsrc/multimedia/x264-devel/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/x264-devel/Attic/distinfo 2010/05/06 17:02:12 1.20
+++ pkgsrc/multimedia/x264-devel/Attic/distinfo 2010/05/07 09:34:43 1.21
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.20 2010/05/06 17:02:12 drochner Exp $ 1$NetBSD: distinfo,v 1.21 2010/05/07 09:34:43 drochner Exp $
2 2
3SHA1 (x264-snapshot-20090920-2245.tar.bz2) = de37c75bdcbfb4e16fba006afd932020b93d8a66 3SHA1 (x264-snapshot-20090920-2245.tar.bz2) = de37c75bdcbfb4e16fba006afd932020b93d8a66
4RMD160 (x264-snapshot-20090920-2245.tar.bz2) = c0303b906f4de285eb4c9460882e6df4cf92f4a3 4RMD160 (x264-snapshot-20090920-2245.tar.bz2) = c0303b906f4de285eb4c9460882e6df4cf92f4a3
5Size (x264-snapshot-20090920-2245.tar.bz2) = 2736477 bytes 5Size (x264-snapshot-20090920-2245.tar.bz2) = 2736477 bytes
6SHA1 (patch-aa) = c9c93b1d1bbbfe1b61564cb3ab7df68216d1d9d2 6SHA1 (patch-aa) = e77e346640cb0512f9ca5b678bf325f915a69da7
7SHA1 (patch-ab) = 6db45e7995b7986d8b0bf95a777eff71527a189d 7SHA1 (patch-ab) = 6db45e7995b7986d8b0bf95a777eff71527a189d
8SHA1 (patch-ac) = b3c91319b287278dd98c822dd7e35e273a238f70 8SHA1 (patch-ac) = b3c91319b287278dd98c822dd7e35e273a238f70
9SHA1 (patch-ak) = d8362f3beadcc5cc19684a12b3794d542f502f14 9SHA1 (patch-ak) = d8362f3beadcc5cc19684a12b3794d542f502f14
10SHA1 (patch-am) = 07418547d05fd6c6e1703725a4cc5f1ddc36dca1 10SHA1 (patch-am) = 07418547d05fd6c6e1703725a4cc5f1ddc36dca1
11SHA1 (patch-an) = 69e2a8f6167fd2410c69e4df3e3a071c8c0c835f 11SHA1 (patch-an) = 69e2a8f6167fd2410c69e4df3e3a071c8c0c835f
12SHA1 (patch-ba) = a80323251ccb1434e4154e9736462ddf39e04c1d 12SHA1 (patch-ba) = a80323251ccb1434e4154e9736462ddf39e04c1d
cvs diff -r1.9 -r1.10 pkgsrc/multimedia/x264-devel/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/multimedia/x264-devel/patches/Attic/patch-aa 2010/05/06 17:02:12 1.9
+++ pkgsrc/multimedia/x264-devel/patches/Attic/patch-aa 2010/05/07 09:34:43 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.9 2010/05/06 17:02:12 drochner Exp $ 1$NetBSD: patch-aa,v 1.10 2010/05/07 09:34:43 drochner Exp $
2 2
3--- configure.orig 2009-09-20 20:45:09.000000000 +0000 3--- configure.orig 2009-09-20 20:45:09.000000000 +0000
4+++ configure 4+++ configure
5@@ -117,7 +117,7 @@ for opt do 5@@ -117,7 +117,7 @@ for opt do
6 LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}" 6 LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
7 ;; 7 ;;
8 --enable-pthread) 8 --enable-pthread)
9- pthread="auto" # can't skip detection, since it differs by OS 9- pthread="auto" # can't skip detection, since it differs by OS
10+ pthread="yes" 10+ pthread="yes"
11 ;; 11 ;;
12 --disable-pthread) 12 --disable-pthread)
13 pthread="no" 13 pthread="no"
14@@ -137,7 +137,7 @@ for opt do 14@@ -137,7 +137,7 @@ for opt do
@@ -21,39 +21,26 @@ $NetBSD: patch-aa,v 1.9 2010/05/06 17:02 @@ -21,39 +21,26 @@ $NetBSD: patch-aa,v 1.9 2010/05/06 17:02
21 vis="yes" 21 vis="yes"
22 ;; 22 ;;
23@@ -187,6 +187,10 @@ case $host_os in 23@@ -187,6 +187,10 @@ case $host_os in
24 SYS="FREEBSD" 24 SYS="FREEBSD"
25 LDFLAGS="$LDFLAGS -lm" 25 LDFLAGS="$LDFLAGS -lm"
26 ;; 26 ;;
27+ dragonfly*) 27+ dragonfly*)
28+ SYS="DRAGONFLY" 28+ SYS="DRAGONFLY"
29+ LDFLAGS="$LDFLAGS -lm" 29+ LDFLAGS="$LDFLAGS -lm"
30+ ;; 30+ ;;
31 kfreebsd*-gnu) 31 kfreebsd*-gnu)
32 SYS="FREEBSD" 32 SYS="FREEBSD"
33 CFLAGS="$CFLAGS -DHAVE_MALLOC_H" 33 CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
34@@ -236,10 +240,10 @@ case $host_cpu in 
35 ARCH="X86" 
36 AS="yasm" 
37 ASFLAGS="$ASFLAGS -O2" 
38- if [[ "$asm" == yes && "$CFLAGS" != *-march* ]]; then 
39+ if [ "$asm" = yes -a "$CFLAGS" != *-march* ]; then 
40 CFLAGS="$CFLAGS -march=i686" 
41 fi 
42- if [[ "$asm" == yes && "$CFLAGS" != *-mfpmath* ]]; then 
43+ if [ "$asm" = yes -a "$CFLAGS" != *-mfpmath* ]; then 
44 CFLAGS="$CFLAGS -mfpmath=sse -msse" 
45 fi 
46 if [ "$SYS" = MACOSX ]; then 
47@@ -250,7 +254,7 @@ case $host_cpu in 34@@ -250,7 +254,7 @@ case $host_cpu in
48 ASFLAGS="$ASFLAGS -f elf" 35 ASFLAGS="$ASFLAGS -f elf"
49 fi 36 fi
50 ;; 37 ;;
51- x86_64) 38- x86_64)
52+ x86_64|amd64) 39+ x86_64|amd64)
53 ARCH="X86_64" 40 ARCH="X86_64"
54 AS="yasm" 41 AS="yasm"
55 if [ "$SYS" = MACOSX ];then 42 if [ "$SYS" = MACOSX ];then
56@@ -264,11 +268,11 @@ case $host_cpu in 43@@ -264,11 +268,11 @@ case $host_cpu in
57 fi 44 fi
58 ;; 45 ;;
59 powerpc|powerpc64) 46 powerpc|powerpc64)