Sat Sep 29 20:10:35 2012 UTC ()
MAKE_JOBS_SAFE should go in Makefile.common as it applies to the build
system, and hence the plugins as well as the base package.


(dholland)
diff -r1.104 -r1.105 pkgsrc/multimedia/xine-lib/Makefile
diff -r1.78 -r1.79 pkgsrc/multimedia/xine-lib/Makefile.common
cvs diff -r1.104 -r1.105 pkgsrc/multimedia/xine-lib/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/xine-lib/Makefile 2012/09/27 23:55:37 1.104
+++ pkgsrc/multimedia/xine-lib/Makefile 2012/09/29 20:10:35 1.105
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.104 2012/09/27 23:55:37 dholland Exp $ 1# $NetBSD: Makefile,v 1.105 2012/09/29 20:10:35 dholland Exp $
2 2
3PKGREVISION= 2 3PKGREVISION= 2
4 4
5PKG_DESTDIR_SUPPORT= user-destdir 5PKG_DESTDIR_SUPPORT= user-destdir
6MAKE_JOBS_SAFE= no 
7 6
8.include "Makefile.common" 7.include "Makefile.common"
9 8
10COMMENT= Multimedia player library 9COMMENT= Multimedia player library
11 10
12CONFLICTS+= xine-xcb-[0-9]* 11CONFLICTS+= xine-xcb-[0-9]*
13 12
14CONFIGURE_ARGS+= --disable-v4l 13CONFIGURE_ARGS+= --disable-v4l
15CONFIGURE_ARGS+= --disable-v4l2 14CONFIGURE_ARGS+= --disable-v4l2
16CONFIGURE_ARGS+= --disable-real-codecs 15CONFIGURE_ARGS+= --disable-real-codecs
17CONFIGURE_ARGS+= --disable-aalib 16CONFIGURE_ARGS+= --disable-aalib
18CONFIGURE_ARGS+= --disable-mlib 17CONFIGURE_ARGS+= --disable-mlib
19 18
cvs diff -r1.78 -r1.79 pkgsrc/multimedia/xine-lib/Makefile.common (expand / switch to unified diff)

--- pkgsrc/multimedia/xine-lib/Makefile.common 2012/07/02 16:27:11 1.78
+++ pkgsrc/multimedia/xine-lib/Makefile.common 2012/09/29 20:10:35 1.79
@@ -1,31 +1,33 @@ @@ -1,31 +1,33 @@
1# $NetBSD: Makefile.common,v 1.78 2012/07/02 16:27:11 drochner Exp $ 1# $NetBSD: Makefile.common,v 1.79 2012/09/29 20:10:35 dholland Exp $
2# 2#
3# used by audio/xine-alsa/Makefile 3# used by audio/xine-alsa/Makefile
4# used by audio/xine-esound/Makefile 4# used by audio/xine-esound/Makefile
5# used by audio/xine-pulse/Makefile 5# used by audio/xine-pulse/Makefile
6# used by multimedia/xine-v4l/Makefile 6# used by multimedia/xine-v4l/Makefile
7# used by multimedia/xine-v4l2/Makefile 7# used by multimedia/xine-v4l2/Makefile
8 8
9DISTNAME= xine-lib-1.2.2 9DISTNAME= xine-lib-1.2.2
10XINE_PKGNAME= xine-lib-1.2.2 10XINE_PKGNAME= xine-lib-1.2.2
11PKGNAME?= ${XINE_PKGNAME} 11PKGNAME?= ${XINE_PKGNAME}
12CATEGORIES?= multimedia 12CATEGORIES?= multimedia
13MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/} 13MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
14EXTRACT_SUFX= .tar.xz 14EXTRACT_SUFX= .tar.xz
15 15
16MAINTAINER= pkgsrc-users@NetBSD.org 16MAINTAINER= pkgsrc-users@NetBSD.org
17HOMEPAGE= http://xinehq.de/ 17HOMEPAGE= http://xinehq.de/
18 18
 19MAKE_JOBS_SAFE= no
 20
19XINE_MOD_DIR_VER= 2.2 21XINE_MOD_DIR_VER= 2.2
20PLIST_SUBST+= XINE_MOD_DIR_VER=${XINE_MOD_DIR_VER:Q} 22PLIST_SUBST+= XINE_MOD_DIR_VER=${XINE_MOD_DIR_VER:Q}
21 23
22DISTINFO_FILE= ${.CURDIR}/../../multimedia/xine-lib/distinfo 24DISTINFO_FILE= ${.CURDIR}/../../multimedia/xine-lib/distinfo
23PATCHDIR= ${.CURDIR}/../../multimedia/xine-lib/patches 25PATCHDIR= ${.CURDIR}/../../multimedia/xine-lib/patches
24 26
25GNU_CONFIGURE= YES 27GNU_CONFIGURE= YES
26USE_PKGLOCALEDIR= YES 28USE_PKGLOCALEDIR= YES
27USE_LIBTOOL= YES 29USE_LIBTOOL= YES
28LIBTOOL_OVERRIDE= libtool libtool-nofpic 30LIBTOOL_OVERRIDE= libtool libtool-nofpic
29PKGCONFIG_OVERRIDE= misc/libxine.pc.in 31PKGCONFIG_OVERRIDE= misc/libxine.pc.in
30USE_TOOLS+= autoconf automake gmake msgfmt pkg-config xmkmf perl 32USE_TOOLS+= autoconf automake gmake msgfmt pkg-config xmkmf perl
31 33