Tue Jan 20 23:25:55 2009 UTC ()
Fix for Sun Studio.


(sketch)
diff -r1.31 -r1.32 pkgsrc/multimedia/xvidcore/Makefile
cvs diff -r1.31 -r1.32 pkgsrc/multimedia/xvidcore/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/xvidcore/Makefile 2009/01/07 10:52:12 1.31
+++ pkgsrc/multimedia/xvidcore/Makefile 2009/01/20 23:25:55 1.32
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.31 2009/01/07 10:52:12 wiz Exp $ 1# $NetBSD: Makefile,v 1.32 2009/01/20 23:25:55 sketch Exp $
2 2
3DISTNAME= xvidcore-1.2.1 3DISTNAME= xvidcore-1.2.1
4CATEGORIES= multimedia 4CATEGORIES= multimedia
5MASTER_SITES= http://downloads.xvid.org/downloads/ 5MASTER_SITES= http://downloads.xvid.org/downloads/
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.xvid.org/ 9HOMEPAGE= http://www.xvid.org/
10COMMENT= ISO MPEG-4 compliant video codec 10COMMENT= ISO MPEG-4 compliant video codec
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14.include "../../mk/bsd.prefs.mk" 14.include "../../mk/bsd.prefs.mk"
@@ -16,26 +16,36 @@ PKG_DESTDIR_SUPPORT= user-destdir @@ -16,26 +16,36 @@ PKG_DESTDIR_SUPPORT= user-destdir
16# the resulting objects from the asm don't link correctly on Solaris. 16# the resulting objects from the asm don't link correctly on Solaris.
17# nor on amd64 -- they are not PIC, but the ABI demands it 17# nor on amd64 -- they are not PIC, but the ABI demands it
18# big patch available from Gentoo, if someone is interested: 18# big patch available from Gentoo, if someone is interested:
19# http://bugs.gentoo.org/show_bug.cgi?id=90287 19# http://bugs.gentoo.org/show_bug.cgi?id=90287
20.if ${OPSYS} == "SunOS" || ${MACHINE_ARCH} == "x86_64" || \ 20.if ${OPSYS} == "SunOS" || ${MACHINE_ARCH} == "x86_64" || \
21 !empty(MACHINE_PLATFORM:MDarwin-[9].*-i386) 21 !empty(MACHINE_PLATFORM:MDarwin-[9].*-i386)
22CONFIGURE_ARGS+= --disable-assembly 22CONFIGURE_ARGS+= --disable-assembly
23.elif ${MACHINE_ARCH} == "i386" 23.elif ${MACHINE_ARCH} == "i386"
24BUILD_DEPENDS+= nasm>=0.98.39nb3:../../devel/nasm 24BUILD_DEPENDS+= nasm>=0.98.39nb3:../../devel/nasm
25#.elif ${MACHINE_ARCH} == "x86_64" 25#.elif ${MACHINE_ARCH} == "x86_64"
26#BUILD_DEPENDS+= yasm>=0.4.0:../../devel/yasm 26#BUILD_DEPENDS+= yasm>=0.4.0:../../devel/yasm
27.endif 27.endif
28 28
 29.if !empty(PKGSRC_COMPILER:Msunpro)
 30CFLAGS+= -D__inline=inline
 31SUBST_CLASSES+= ld
 32SUBST_MESSAGE.ld= Fixing linker arguments for Solaris
 33SUBST_STAGE.ld= pre-configure
 34SUBST_FILES.ld= configure
 35SUBST_SED.ld= -e "s|-Wl,-soname,libxvidcore...(SHARED_EXTENSION)...(API_MAJOR)||"
 36SUBST_SED.ld+= -e "s|-Wl,--version-script=libxvidcore.ld||"
 37.endif
 38
29PKG_INSTALLATION_TYPES= overwrite pkgviews 39PKG_INSTALLATION_TYPES= overwrite pkgviews
30 40
31WRKSRC= ${WRKDIR}/xvidcore/build/generic 41WRKSRC= ${WRKDIR}/xvidcore/build/generic
32GNU_CONFIGURE= YES 42GNU_CONFIGURE= YES
33 43
34MAKE_ENV+= MKDIR=${MKDIR:Q} 44MAKE_ENV+= MKDIR=${MKDIR:Q}
35 45
36.if ${OPSYS} == "Darwin" 46.if ${OPSYS} == "Darwin"
37post-install: 47post-install:
38 ${RM} -f ${DESTDIR}${PREFIX}/lib/libxvidcore.so.4 48 ${RM} -f ${DESTDIR}${PREFIX}/lib/libxvidcore.so.4
39 ${MV} -f ${DESTDIR}${PREFIX}/lib/libxvidcore.so ${DESTDIR}${PREFIX}/lib/libxvidcore.dylib 49 ${MV} -f ${DESTDIR}${PREFIX}/lib/libxvidcore.so ${DESTDIR}${PREFIX}/lib/libxvidcore.dylib
40.endif 50.endif
41 51