summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2011-06-24 09:03:32 +0000
committertron <tron@pkgsrc.org>2011-06-24 09:03:32 +0000
commit2e21d045ab8e8c4eaf3cad194e7128443e105b38 (patch)
treedab7ca52c6633d36bf6a37c1a98f70dd7e2a3555
parent2105a48cd7d392e13523d1cd18140ffe55f32bec (diff)
downloadpkgsrc-2e21d045ab8e8c4eaf3cad194e7128443e105b38.tar.gz
Make this build with GNU patch 2.5.8 by avoiding patch files with ".."
in the filename. XXX We need a generic solution for this.
-rw-r--r--multimedia/xvidcore/Makefile5
-rw-r--r--multimedia/xvidcore/distinfo4
-rw-r--r--multimedia/xvidcore/patches/patch-ac6
3 files changed, 9 insertions, 6 deletions
diff --git a/multimedia/xvidcore/Makefile b/multimedia/xvidcore/Makefile
index 09e094aa4a5..90585d43e71 100644
--- a/multimedia/xvidcore/Makefile
+++ b/multimedia/xvidcore/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2010/05/26 14:30:36 tron Exp $
+# $NetBSD: Makefile,v 1.37 2011/06/24 09:03:32 tron Exp $
DISTNAME= xvidcore-1.2.2
CATEGORIES= multimedia
@@ -43,6 +43,9 @@ GNU_CONFIGURE= YES
MAKE_ENV+= MKDIR=${MKDIR:Q}
+post-extract:
+ @${LN} -s ../../src ${WRKSRC}/src
+
.if ${OPSYS} == "Darwin"
post-install:
${RM} -f ${DESTDIR}${PREFIX}/lib/libxvidcore.so.4
diff --git a/multimedia/xvidcore/distinfo b/multimedia/xvidcore/distinfo
index 960727d39fe..5e675237268 100644
--- a/multimedia/xvidcore/distinfo
+++ b/multimedia/xvidcore/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.23 2010/05/21 13:06:19 obache Exp $
+$NetBSD: distinfo,v 1.24 2011/06/24 09:03:32 tron Exp $
SHA1 (xvidcore-1.2.2.tar.bz2) = d03270c803592f7655e7aa4181de587be25ba97f
RMD160 (xvidcore-1.2.2.tar.bz2) = 5fbbc99a02d9eab7f2394220cec2c872957ff26f
Size (xvidcore-1.2.2.tar.bz2) = 643344 bytes
SHA1 (patch-aa) = 593ae63ddb5ec646d7f531b99783de64a9d6ceb3
SHA1 (patch-ab) = 870ae0eee0f1eafd87c9e5693b593642a564a3c9
-SHA1 (patch-ac) = 4318ab70e07444078cf0436b101f88bc4ae80aab
+SHA1 (patch-ac) = a04244714825effafbf0a6db9de38585413f794b
diff --git a/multimedia/xvidcore/patches/patch-ac b/multimedia/xvidcore/patches/patch-ac
index 0ae006d0f32..3a8d015628f 100644
--- a/multimedia/xvidcore/patches/patch-ac
+++ b/multimedia/xvidcore/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.5 2009/01/24 17:20:14 jmcneill Exp $
+$NetBSD: patch-ac,v 1.6 2011/06/24 09:03:32 tron Exp $
---- ../../src/xvid.c.orig 2009-01-24 00:33:11.000000000 -0500
-+++ ../../src/xvid.c 2009-01-24 00:33:42.000000000 -0500
+--- src/xvid.c.orig 2009-01-24 00:33:11.000000000 -0500
++++ src/xvid.c 2009-01-24 00:33:42.000000000 -0500
@@ -679,7 +679,11 @@ xvid_gbl_info(xvid_gbl_info_t * info)
#else