Mon Dec 17 12:39:46 2012 UTC ()
Remove duplicate &&


(wiz)
diff -r1.30 -r1.31 pkgsrc/audio/taglib/Makefile
cvs diff -r1.30 -r1.31 pkgsrc/audio/taglib/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/taglib/Makefile 2012/12/17 11:10:42 1.30
+++ pkgsrc/audio/taglib/Makefile 2012/12/17 12:39:46 1.31
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.30 2012/12/17 11:10:42 obache Exp $ 1# $NetBSD: Makefile,v 1.31 2012/12/17 12:39:46 wiz Exp $
2# 2#
3 3
4DISTNAME= taglib-1.8 4DISTNAME= taglib-1.8
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= audio 6CATEGORIES= audio
7MASTER_SITES= http://cloud.github.com/downloads/taglib/taglib/ 7MASTER_SITES= http://cloud.github.com/downloads/taglib/taglib/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://taglib.github.com/ 10HOMEPAGE= http://taglib.github.com/
11COMMENT= Library for accessing id tags in various media files 11COMMENT= Library for accessing id tags in various media files
12LICENSE= gnu-lgpl-v2.1 OR mpl-1.1 12LICENSE= gnu-lgpl-v2.1 OR mpl-1.1
13 13
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
@@ -20,20 +20,20 @@ USE_LIBTOOL= YES @@ -20,20 +20,20 @@ USE_LIBTOOL= YES
20PKGCONFIG_OVERRIDE= bindings/c/taglib_c.pc.cmake taglib.pc.cmake 20PKGCONFIG_OVERRIDE= bindings/c/taglib_c.pc.cmake taglib.pc.cmake
21REPLACE_SH= taglib-config.cmake 21REPLACE_SH= taglib-config.cmake
22 22
23SUBST_CLASSES+= pc 23SUBST_CLASSES+= pc
24SUBST_FILES.pc= taglib-config.cmake 24SUBST_FILES.pc= taglib-config.cmake
25SUBST_STAGE.pc= pre-configure 25SUBST_STAGE.pc= pre-configure
26SUBST_SED.pc= -e 's|-L\([ ]*[^ ]*\)|${COMPILER_RPATH_FLAG}\1 -L\1|g' 26SUBST_SED.pc= -e 's|-L\([ ]*[^ ]*\)|${COMPILER_RPATH_FLAG}\1 -L\1|g'
27SUBST_MESSAGE.pc= Fixing rpath in taglib-config. 27SUBST_MESSAGE.pc= Fixing rpath in taglib-config.
28 28
29.include "../../mk/compiler.mk" 29.include "../../mk/compiler.mk"
30# 30#
31# depends on builtin functions which enabled with i486 and later with GCC. 31# depends on builtin functions which enabled with i486 and later with GCC.
32# 32#
33.if ${OPSYS} == "NetBSD" && && !empty(CC_VERSION:M[4-9]*) && !empty(MACHINE_ARCH:Mi386) 33.if ${OPSYS} == "NetBSD" && !empty(CC_VERSION:M[4-9]*) && !empty(MACHINE_ARCH:Mi386)
34GNU_ARCH.i386= i486 34GNU_ARCH.i386= i486
35CFLAGS+= -march=i486 35CFLAGS+= -march=i486
36.endif 36.endif
37 37
38.include "../../devel/zlib/buildlink3.mk" 38.include "../../devel/zlib/buildlink3.mk"
39.include "../../mk/bsd.pkg.mk" 39.include "../../mk/bsd.pkg.mk"