Mon Mar 2 19:59:07 2015 UTC ()
LLVM's correlated value propagation pass is known to require a lot of
memory and CPU time for certain input. Provide a variable
(CLANG_NO_VALUE_PROPAGATION_PASS) for selectively disabling it in those
places known to trigger it.


(joerg)
diff -r1.44 -r1.45 pkgsrc/editors/lyx/Makefile
diff -r1.29 -r1.30 pkgsrc/games/scummvm-tools/Makefile
diff -r1.12 -r1.13 pkgsrc/lang/gambc/Makefile
diff -r1.2 -r1.3 pkgsrc/lang/qore/Makefile
diff -r1.45 -r1.46 pkgsrc/math/qalculate/Makefile
diff -r1.14 -r1.15 pkgsrc/mk/compiler/clang.mk
diff -r1.72 -r1.73 pkgsrc/multimedia/mkvtoolnix/Makefile
diff -r1.52 -r1.53 pkgsrc/textproc/groonga/Makefile
diff -r1.3 -r0 pkgsrc/textproc/groonga/hacks.mk
diff -r1.6 -r1.7 pkgsrc/time/fet/Makefile

cvs diff -r1.44 -r1.45 pkgsrc/editors/lyx/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/lyx/Makefile 2015/01/10 18:13:22 1.44
+++ pkgsrc/editors/lyx/Makefile 2015/03/02 19:59:06 1.45
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.44 2015/01/10 18:13:22 rumko Exp $ 1# $NetBSD: Makefile,v 1.45 2015/03/02 19:59:06 joerg Exp $
2 2
3DISTNAME= lyx-2.1.2.2 3DISTNAME= lyx-2.1.2.2
4CATEGORIES= editors 4CATEGORIES= editors
5MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/ \ 5MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/ \
6 http://gd.tuwien.ac.at/publishing/tex/lyx/stable/2.1.x/ \ 6 http://gd.tuwien.ac.at/publishing/tex/lyx/stable/2.1.x/ \
7 ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/2.1.x/ \ 7 ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/2.1.x/ \
8 ftp://ftp.sdsc.edu/pub/other/lyx/stable/2.1.x/ \ 8 ftp://ftp.sdsc.edu/pub/other/lyx/stable/2.1.x/ \
9 ftp://ftp.lip6.fr/pub/lyx/stable/2.1.x/ \ 9 ftp://ftp.lip6.fr/pub/lyx/stable/2.1.x/ \
10 ftp://ftp.ntua.gr/pub/X11/LyX/stable/2.1.x/ 10 ftp://ftp.ntua.gr/pub/X11/LyX/stable/2.1.x/
11EXTRACT_SUFX= .tar.xz 11EXTRACT_SUFX= .tar.xz
12 12
13MAINTAINER= reed@reedmedia.net 13MAINTAINER= reed@reedmedia.net
14HOMEPAGE= http://www.lyx.org/ 14HOMEPAGE= http://www.lyx.org/
@@ -176,15 +176,17 @@ SUBST_SED.python+= -e 's,command("python @@ -176,15 +176,17 @@ SUBST_SED.python+= -e 's,command("python
176 176
177.include "../../converters/libiconv/buildlink3.mk" 177.include "../../converters/libiconv/buildlink3.mk"
178.include "../../devel/gettext-lib/buildlink3.mk" 178.include "../../devel/gettext-lib/buildlink3.mk"
179.include "../../lang/python/application.mk" 179.include "../../lang/python/application.mk"
180.include "../../textproc/aspell/buildlink3.mk" 180.include "../../textproc/aspell/buildlink3.mk"
181.include "../../x11/qt4-libs/buildlink3.mk" 181.include "../../x11/qt4-libs/buildlink3.mk"
182.include "../../x11/qt4-tools/buildlink3.mk" 182.include "../../x11/qt4-tools/buildlink3.mk"
183.include "../../textproc/mythes/buildlink3.mk" 183.include "../../textproc/mythes/buildlink3.mk"
184.include "../../devel/boost-libs/buildlink3.mk" 184.include "../../devel/boost-libs/buildlink3.mk"
185 185
186.include "../../sysutils/desktop-file-utils/desktopdb.mk" 186.include "../../sysutils/desktop-file-utils/desktopdb.mk"
187.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 187.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
188 188
 189CXXFLAGS+= ${CLANG_NO_VALUE_PROPAGATION_PASS}
 190
189.include "../../mk/pthread.buildlink3.mk" 191.include "../../mk/pthread.buildlink3.mk"
190.include "../../mk/bsd.pkg.mk" 192.include "../../mk/bsd.pkg.mk"

cvs diff -r1.29 -r1.30 pkgsrc/games/scummvm-tools/Makefile (expand / switch to unified diff)

--- pkgsrc/games/scummvm-tools/Makefile 2014/11/07 19:39:33 1.29
+++ pkgsrc/games/scummvm-tools/Makefile 2015/03/02 19:59:06 1.30
@@ -1,36 +1,33 @@ @@ -1,36 +1,33 @@
1# $NetBSD: Makefile,v 1.29 2014/11/07 19:39:33 adam Exp $ 1# $NetBSD: Makefile,v 1.30 2015/03/02 19:59:06 joerg Exp $
2# 2#
3 3
4DISTNAME= scummvm-tools-1.4.0 4DISTNAME= scummvm-tools-1.4.0
5PKGREVISION= 18 5PKGREVISION= 18
6CATEGORIES= games 6CATEGORIES= games
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scummvm/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scummvm/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://scummvm.sourceforge.net/ 11HOMEPAGE= http://scummvm.sourceforge.net/
12COMMENT= Conversion and compression tools for ScummVM 12COMMENT= Conversion and compression tools for ScummVM
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16USE_TOOLS+= gmake 16USE_TOOLS+= gmake
17HAS_CONFIGURE= yes 17HAS_CONFIGURE= yes
18CONFIGURE_ARGS+= --prefix=${PREFIX} 18CONFIGURE_ARGS+= --prefix=${PREFIX}
19 19
20INSTALLATION_DIRS= bin 20INSTALLATION_DIRS= bin
21 21
22.include "../../mk/compiler.mk" 22MAKE_ENV+= CLANG_NO_OPT=${CLANG_NO_VALUE_PROPAGATION_PASS:Q}
23.if !empty(PKGSRC_COMPILER:Mclang) 
24MAKE_ENV+= CLANG_NO_OPT=-O0 
25.endif 
26 23
27.include "../../audio/flac/buildlink3.mk" 24.include "../../audio/flac/buildlink3.mk"
28.include "../../audio/libmad/buildlink3.mk" 25.include "../../audio/libmad/buildlink3.mk"
29.include "../../audio/libvorbis/buildlink3.mk" 26.include "../../audio/libvorbis/buildlink3.mk"
30.include "../../converters/libiconv/buildlink3.mk" 27.include "../../converters/libiconv/buildlink3.mk"
31.include "../../devel/boost-libs/buildlink3.mk" 28.include "../../devel/boost-libs/buildlink3.mk"
32.include "../../devel/zlib/buildlink3.mk" 29.include "../../devel/zlib/buildlink3.mk"
33.include "../../graphics/png/buildlink3.mk" 30.include "../../graphics/png/buildlink3.mk"
34.include "../../graphics/freetype2/buildlink3.mk" 31.include "../../graphics/freetype2/buildlink3.mk"
35.include "../../x11/wxGTK28/buildlink3.mk" 32.include "../../x11/wxGTK28/buildlink3.mk"
36.include "../../mk/bsd.pkg.mk" 33.include "../../mk/bsd.pkg.mk"

cvs diff -r1.12 -r1.13 pkgsrc/lang/gambc/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/gambc/Makefile 2014/09/24 23:31:36 1.12
+++ pkgsrc/lang/gambc/Makefile 2015/03/02 19:59:06 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.12 2014/09/24 23:31:36 jperkin Exp $ 1# $NetBSD: Makefile,v 1.13 2015/03/02 19:59:06 joerg Exp $
2# 2#
3 3
4DISTNAME= gambc-${GAMBC_DIST_VERSION} 4DISTNAME= gambc-${GAMBC_DIST_VERSION}
5PKGNAME= gambc-${GAMBC_VERSION} 5PKGNAME= gambc-${GAMBC_VERSION}
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= http://www.iro.umontreal.ca/~gambit/download/gambit/v4.6/source/ 7MASTER_SITES= http://www.iro.umontreal.ca/~gambit/download/gambit/v4.6/source/
8EXTRACT_SUFX= .tgz 8EXTRACT_SUFX= .tgz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.iro.umontreal.ca/~gambit/ 11HOMEPAGE= http://www.iro.umontreal.ca/~gambit/
12COMMENT= GambitC Scheme System 12COMMENT= GambitC Scheme System
13 13
14# bin/scheme-r5rs 14# bin/scheme-r5rs
@@ -61,21 +61,18 @@ SUBST_FILES.build+= makefile.in */makefi @@ -61,21 +61,18 @@ SUBST_FILES.build+= makefile.in */makefi
61SUBST_MESSAGE.build= Preparing build-time and installation configuration. 61SUBST_MESSAGE.build= Preparing build-time and installation configuration.
62SUBST_SED.build= -e 's|v${GAMBC_DIST_VERSION}||' 62SUBST_SED.build= -e 's|v${GAMBC_DIST_VERSION}||'
63SUBST_SED.build+= -e 's|@target_vendor@|The NetBSD Foundation, Inc.|g' 63SUBST_SED.build+= -e 's|@target_vendor@|The NetBSD Foundation, Inc.|g'
64SUBST_STAGE.build= pre-configure 64SUBST_STAGE.build= pre-configure
65SUBST_VARS.build+= PACKAGE_SUBDIR PACKAGE_VERSION 65SUBST_VARS.build+= PACKAGE_SUBDIR PACKAGE_VERSION
66SUBST_VARS.build+= PACKAGE_STRING 66SUBST_VARS.build+= PACKAGE_STRING
67 67
68PACKAGE_SUBDIR= # empty 68PACKAGE_SUBDIR= # empty
69PACKAGE_VERSION= ${PKGVERSION} 69PACKAGE_VERSION= ${PKGVERSION}
70PACKAGE_STRING= ${${PKGBASE} ${PKGVERSION}:L} 70PACKAGE_STRING= ${${PKGBASE} ${PKGVERSION}:L}
71 71
72.include "version.mk" 72.include "version.mk"
73 73
74.include "../../mk/compiler.mk" 74MAKE_ENV+= CLANG_NO_OPT=${CLANG_NO_VALUE_PROPAGATION_PASS:Q}
75.if !empty(PKGSRC_COMPILER:Mclang) 
76MAKE_ENV+= CLANG_NO_OPT=-O0 
77.endif 
78 75
79.include "../../mk/dlopen.buildlink3.mk" 76.include "../../mk/dlopen.buildlink3.mk"
80.include "../../mk/termcap.buildlink3.mk" 77.include "../../mk/termcap.buildlink3.mk"
81.include "../../mk/bsd.pkg.mk" 78.include "../../mk/bsd.pkg.mk"

cvs diff -r1.2 -r1.3 pkgsrc/lang/qore/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/qore/Makefile 2015/01/16 10:23:24 1.2
+++ pkgsrc/lang/qore/Makefile 2015/03/02 19:59:07 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.2 2015/01/16 10:23:24 wiz Exp $ 1# $NetBSD: Makefile,v 1.3 2015/03/02 19:59:07 joerg Exp $
2 2
3DISTNAME= qore-0.8.11 3DISTNAME= qore-0.8.11
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qore/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qore/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= nros@users.sourceforge.net 9MAINTAINER= nros@users.sourceforge.net
10COMMENT= Qore programming language 10COMMENT= Qore programming language
11HOMEPAGE= http://www.qore.org/ 11HOMEPAGE= http://www.qore.org/
12LICENSE= gnu-gpl-v2 OR gnu-lgpl-v2.1 OR mit 12LICENSE= gnu-gpl-v2 OR gnu-lgpl-v2.1 OR mit
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
@@ -32,21 +32,24 @@ REPLACE_QORE= doxygen/qdx @@ -32,21 +32,24 @@ REPLACE_QORE= doxygen/qdx
32licensedir= share/doc/qore/license 32licensedir= share/doc/qore/license
33INSTALLATION_DIRS+= ${licensedir} 33INSTALLATION_DIRS+= ${licensedir}
34post-install: 34post-install:
35 ${INSTALL_DATA} ${WRKSRC}/COPYING.GPL ${DESTDIR}${PREFIX}/${licensedir} 35 ${INSTALL_DATA} ${WRKSRC}/COPYING.GPL ${DESTDIR}${PREFIX}/${licensedir}
36 ${INSTALL_DATA} ${WRKSRC}/COPYING.LGPL ${DESTDIR}${PREFIX}/${licensedir} 36 ${INSTALL_DATA} ${WRKSRC}/COPYING.LGPL ${DESTDIR}${PREFIX}/${licensedir}
37 ${INSTALL_DATA} ${WRKSRC}/COPYING.MIT ${DESTDIR}${PREFIX}/${licensedir} 37 ${INSTALL_DATA} ${WRKSRC}/COPYING.MIT ${DESTDIR}${PREFIX}/${licensedir}
38 ${INSTALL_DATA} ${WRKSRC}/README-LICENSE ${DESTDIR}${PREFIX}/${licensedir} 38 ${INSTALL_DATA} ${WRKSRC}/README-LICENSE ${DESTDIR}${PREFIX}/${licensedir}
39 cd ${WRKSRC}/docs/ && ${PAX} -wr * ${DESTDIR}${PREFIX}/share/doc/qore 39 cd ${WRKSRC}/docs/ && ${PAX} -wr * ${DESTDIR}${PREFIX}/share/doc/qore
40 ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/share/doc/qore 40 ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/share/doc/qore
41 41
42.include "application.mk" 42.include "application.mk"
43.include "options.mk" 43.include "options.mk"
44 44
 45_WRAP_EXTRA_ARGS.CXX+= ${CLANG_NO_VALUE_PROPAGATION_PASS}
 46CWRAPPERS_APPEND.cxx+= ${CLANG_NO_VALUE_PROPAGATION_PASS}
 47
45.include "../../archivers/bzip2/buildlink3.mk" 48.include "../../archivers/bzip2/buildlink3.mk"
46.include "../../converters/libiconv/buildlink3.mk" 49.include "../../converters/libiconv/buildlink3.mk"
47.include "../../devel/pcre/buildlink3.mk" 50.include "../../devel/pcre/buildlink3.mk"
48.include "../../devel/zlib/buildlink3.mk" 51.include "../../devel/zlib/buildlink3.mk"
49.include "../../mk/pthread.buildlink3.mk" 52.include "../../mk/pthread.buildlink3.mk"
50.include "../../math/mpfr/buildlink3.mk" 53.include "../../math/mpfr/buildlink3.mk"
51.include "../../security/openssl/buildlink3.mk" 54.include "../../security/openssl/buildlink3.mk"
52.include "../../mk/bsd.pkg.mk" 55.include "../../mk/bsd.pkg.mk"

cvs diff -r1.45 -r1.46 pkgsrc/math/qalculate/Makefile (expand / switch to unified diff)

--- pkgsrc/math/qalculate/Makefile 2013/12/15 19:41:23 1.45
+++ pkgsrc/math/qalculate/Makefile 2015/03/02 19:59:07 1.46
@@ -1,45 +1,42 @@ @@ -1,45 +1,42 @@
1# $NetBSD: Makefile,v 1.45 2013/12/15 19:41:23 joerg Exp $ 1# $NetBSD: Makefile,v 1.46 2015/03/02 19:59:07 joerg Exp $
2 2
3DISTNAME= libqalculate-0.9.7 3DISTNAME= libqalculate-0.9.7
4PKGNAME= qalculate-0.9.7 4PKGNAME= qalculate-0.9.7
5PKGREVISION= 6 5PKGREVISION= 6
6CATEGORIES= math 6CATEGORIES= math
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qalculate/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qalculate/}
8 8
9MAINTAINER= adam@NetBSD.org 9MAINTAINER= adam@NetBSD.org
10HOMEPAGE= http://qalculate.sourceforge.net/ 10HOMEPAGE= http://qalculate.sourceforge.net/
11COMMENT= Modern multi-purpose desktop calculator (console version) 11COMMENT= Modern multi-purpose desktop calculator (console version)
12 12
13USE_LANGUAGES= c c++ 13USE_LANGUAGES= c c++
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15USE_PKGLOCALEDIR= yes 15USE_PKGLOCALEDIR= yes
16USE_TOOLS+= autoconf gmake intltool msgfmt pkg-config 16USE_TOOLS+= autoconf gmake intltool msgfmt pkg-config
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18PKGCONFIG_OVERRIDE= ${WRKSRC}/libqalculate.pc.in 18PKGCONFIG_OVERRIDE= ${WRKSRC}/libqalculate.pc.in
19 19
20UNLIMIT_RESOURCES= datasize 20UNLIMIT_RESOURCES= datasize
21 21
 22MAKE_ENV+= CLANG_NO_OPT=${CLANG_NO_VALUE_PROPAGATION_PASS:Q}
 23
22SUBST_CLASSES+= pthread 24SUBST_CLASSES+= pthread
23SUBST_FILES.pthread= libqalculate.pc.in 25SUBST_FILES.pthread= libqalculate.pc.in
24SUBST_SED.pthread+= -e 's,@PTHREAD_LIBS@,${PTHREAD_LDFLAGS} ${PTHREAD_LIBS},g' 26SUBST_SED.pthread+= -e 's,@PTHREAD_LIBS@,${PTHREAD_LDFLAGS} ${PTHREAD_LIBS},g'
25SUBST_STAGE.pthread= post-patch 27SUBST_STAGE.pthread= post-patch
26 28
27PTHREAD_AUTO_VARS= yes 29PTHREAD_AUTO_VARS= yes
28 30
29CFLAGS.SunOS+= -D_LCONV_C99 31CFLAGS.SunOS+= -D_LCONV_C99
30 32
31pre-configure: 33pre-configure:
32 ${RUN} cd ${WRKSRC}; autoconf 34 ${RUN} cd ${WRKSRC}; autoconf
33 35
34.include "../../mk/compiler.mk" 
35.if !empty(PKGSRC_COMPILER:Mclang) 
36MAKE_ENV+= CLANG_NO_OPT=-O0 
37.endif 
38 
39.include "../../devel/glib2/buildlink3.mk" 36.include "../../devel/glib2/buildlink3.mk"
40.include "../../devel/readline/buildlink3.mk" 37.include "../../devel/readline/buildlink3.mk"
41.include "../../math/cln/buildlink3.mk" 38.include "../../math/cln/buildlink3.mk"
42.include "../../textproc/libxml2/buildlink3.mk" 39.include "../../textproc/libxml2/buildlink3.mk"
43.include "../../mk/pthread.buildlink3.mk" 40.include "../../mk/pthread.buildlink3.mk"
44 41
45.include "../../mk/bsd.pkg.mk" 42.include "../../mk/bsd.pkg.mk"

cvs diff -r1.14 -r1.15 pkgsrc/mk/compiler/clang.mk (expand / switch to unified diff)

--- pkgsrc/mk/compiler/clang.mk 2014/12/03 14:05:25 1.14
+++ pkgsrc/mk/compiler/clang.mk 2015/03/02 19:59:07 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: clang.mk,v 1.14 2014/12/03 14:05:25 joerg Exp $ 1# $NetBSD: clang.mk,v 1.15 2015/03/02 19:59:07 joerg Exp $
2# 2#
3# This is the compiler definition for the clang compiler. 3# This is the compiler definition for the clang compiler.
4# 4#
5# User-settable variables: 5# User-settable variables:
6# 6#
7# CLANGBASE 7# CLANGBASE
8# The base directory where the compiler is installed. 8# The base directory where the compiler is installed.
9# 9#
10 10
11.if !defined(COMPILER_CLANG_MK) 11.if !defined(COMPILER_CLANG_MK)
12COMPILER_CLANG_MK= defined 12COMPILER_CLANG_MK= defined
13 13
14# Add the dependency on clang 14# Add the dependency on clang
@@ -62,14 +62,16 @@ _LANGUAGES.clang+= ${LANGUAGES.clang:M${ @@ -62,14 +62,16 @@ _LANGUAGES.clang+= ${LANGUAGES.clang:M${
62.endfor 62.endfor
63 63
64PKGSRC_FORTRAN?=g95 64PKGSRC_FORTRAN?=g95
65 65
66.if !empty(PKGSRC_FORTRAN) && (!empty(USE_LANGUAGES:Mfortran) || !empty(USE_LANGUAGES:Mfortran77)) 66.if !empty(PKGSRC_FORTRAN) && (!empty(USE_LANGUAGES:Mfortran) || !empty(USE_LANGUAGES:Mfortran77))
67. include "../../mk/compiler/${PKGSRC_FORTRAN}.mk" 67. include "../../mk/compiler/${PKGSRC_FORTRAN}.mk"
68.endif 68.endif
69 69
70_WRAP_EXTRA_ARGS.CC+= -Qunused-arguments 70_WRAP_EXTRA_ARGS.CC+= -Qunused-arguments
71CWRAPPERS_APPEND.cc+= -Qunused-arguments 71CWRAPPERS_APPEND.cc+= -Qunused-arguments
72_WRAP_EXTRA_ARGS.CXX+= -Qunused-arguments 72_WRAP_EXTRA_ARGS.CXX+= -Qunused-arguments
73CWRAPPERS_APPEND.cxx+= -Qunused-arguments 73CWRAPPERS_APPEND.cxx+= -Qunused-arguments
74 74
 75CLANG_NO_VALUE_PROPAGATION_PASS= -O0
 76
75.endif # COMPILER_CLANG_MK 77.endif # COMPILER_CLANG_MK

cvs diff -r1.72 -r1.73 pkgsrc/multimedia/mkvtoolnix/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/mkvtoolnix/Makefile 2015/01/06 14:59:18 1.72
+++ pkgsrc/multimedia/mkvtoolnix/Makefile 2015/03/02 19:59:07 1.73
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.72 2015/01/06 14:59:18 wiz Exp $ 1# $NetBSD: Makefile,v 1.73 2015/03/02 19:59:07 joerg Exp $
2 2
3DISTNAME= mkvtoolnix-5.0.1 3DISTNAME= mkvtoolnix-5.0.1
4PKGREVISION= 24 4PKGREVISION= 24
5CATEGORIES= multimedia 5CATEGORIES= multimedia
6MASTER_SITES= http://www.bunkus.org/videotools/mkvtoolnix/sources/ 6MASTER_SITES= http://www.bunkus.org/videotools/mkvtoolnix/sources/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.bunkus.org/videotools/mkvtoolnix/ 10HOMEPAGE= http://www.bunkus.org/videotools/mkvtoolnix/
11COMMENT= Set of tools to create, alter and inspect Matroska files 11COMMENT= Set of tools to create, alter and inspect Matroska files
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
@@ -19,26 +19,28 @@ CONFIGURE_ARGS+= --with-boost-libdir=${B @@ -19,26 +19,28 @@ CONFIGURE_ARGS+= --with-boost-libdir=${B
19CONFIGURE_ARGS+= --with-boost_regex=boost_regex 19CONFIGURE_ARGS+= --with-boost_regex=boost_regex
20CONFIGURE_ARGS+= --with-boost-system=boost_system 20CONFIGURE_ARGS+= --with-boost-system=boost_system
21CONFIGURE_ARGS+= --with-boost-filesystem=boost_filesystem 21CONFIGURE_ARGS+= --with-boost-filesystem=boost_filesystem
22 22
23REPLACE_LOCALEDIR_PATTERNS= build-config.in 23REPLACE_LOCALEDIR_PATTERNS= build-config.in
24 24
25LDFLAGS.DragonFly= -lboost_system 25LDFLAGS.DragonFly= -lboost_system
26LDFLAGS.SunOS+= -lintl 26LDFLAGS.SunOS+= -lintl
27 27
28INSTALL_ENV+= SHELL=${SH:Q} 28INSTALL_ENV+= SHELL=${SH:Q}
29 29
30.include "../../mk/bsd.prefs.mk" 30.include "../../mk/bsd.prefs.mk"
31 31
 32CXXFLAGS+= ${CLANG_NO_VALUE_PROPAGATION_PASS}
 33
32.if !empty(MAKE_JOBS) 34.if !empty(MAKE_JOBS)
33DRAKE_ARGS= -j${MAKE_JOBS} 35DRAKE_ARGS= -j${MAKE_JOBS}
34.else 36.else
35DRAKE_ARGS= # empty 37DRAKE_ARGS= # empty
36.endif 38.endif
37 39
38do-build: 40do-build:
39 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ruby drake ${DRAKE_ARGS} 41 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ruby drake ${DRAKE_ARGS}
40 42
41do-install: 43do-install:
42 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ruby drake install 44 cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ruby drake install
43 45
44.include "options.mk" 46.include "options.mk"

cvs diff -r1.52 -r1.53 pkgsrc/textproc/groonga/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/groonga/Makefile 2015/01/29 10:34:14 1.52
+++ pkgsrc/textproc/groonga/Makefile 2015/03/02 19:59:07 1.53
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.52 2015/01/29 10:34:14 obache Exp $ 1# $NetBSD: Makefile,v 1.53 2015/03/02 19:59:07 joerg Exp $
2# 2#
3 3
4DISTNAME= groonga-4.1.1 4DISTNAME= groonga-4.1.1
5CATEGORIES= textproc 5CATEGORIES= textproc
6MASTER_SITES= http://packages.groonga.org/source/groonga/ 6MASTER_SITES= http://packages.groonga.org/source/groonga/
7 7
8MAINTAINER= obache@NetBSD.org 8MAINTAINER= obache@NetBSD.org
9HOMEPAGE= http://groonga.org/ 9HOMEPAGE= http://groonga.org/
10COMMENT= Fulltext search engine and column store 10COMMENT= Fulltext search engine and column store
11LICENSE= gnu-lgpl-v2.1 11LICENSE= gnu-lgpl-v2.1
12 12
13RUBY_VERSION_SUPPORTED= 21 200 193 13RUBY_VERSION_SUPPORTED= 21 200 193
14.include "../../lang/ruby/rubyversion.mk" 14.include "../../lang/ruby/rubyversion.mk"
@@ -17,26 +17,28 @@ DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}: @@ -17,26 +17,28 @@ DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19USE_LIBTOOL= yes 19USE_LIBTOOL= yes
20USE_TOOLS+= gmake pkg-config 20USE_TOOLS+= gmake pkg-config
21# for long file name 21# for long file name
22EXTRACT_USING= bsdtar 22EXTRACT_USING= bsdtar
23 23
24.include "options.mk" 24.include "options.mk"
25 25
26CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} 26CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
27CONFIGURE_ARGS+= --localstatedir=${VARBASE} 27CONFIGURE_ARGS+= --localstatedir=${VARBASE}
28CONFIGURE_ARGS+= --with-ruby=${RUBY} 28CONFIGURE_ARGS+= --with-ruby=${RUBY}
29 29
 30CFLAGS+= ${CLANG_NO_VALUE_PROPAGATION_PASS}
 31
30PKGCONFIG_OVERRIDE+= groonga.pc.in 32PKGCONFIG_OVERRIDE+= groonga.pc.in
31 33
32PKG_SYSCONFSUBDIR= ${PKGBASE} 34PKG_SYSCONFSUBDIR= ${PKGBASE}
33 35
34BUILD_DEFS+= VARBASE 36BUILD_DEFS+= VARBASE
35 37
36INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples 38INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples
37 39
38CONF_FILES+= share/examples/${PKGBASE}/groonga.conf \ 40CONF_FILES+= share/examples/${PKGBASE}/groonga.conf \
39 ${PKG_SYSCONFDIR}/groonga.conf 41 ${PKG_SYSCONFDIR}/groonga.conf
40CONF_FILES+= share/examples/groonga/synonyms.tsv \ 42CONF_FILES+= share/examples/groonga/synonyms.tsv \
41 ${PKG_SYSCONFDIR}/synonyms.tsv 43 ${PKG_SYSCONFDIR}/synonyms.tsv
42 44

File Deleted: pkgsrc/textproc/groonga/Attic/hacks.mk

cvs diff -r1.6 -r1.7 pkgsrc/time/fet/Makefile (expand / switch to unified diff)

--- pkgsrc/time/fet/Makefile 2015/02/21 23:35:42 1.6
+++ pkgsrc/time/fet/Makefile 2015/03/02 19:59:07 1.7
@@ -1,26 +1,29 @@ @@ -1,26 +1,29 @@
1# $NetBSD: Makefile,v 1.6 2015/02/21 23:35:42 ryoon Exp $ 1# $NetBSD: Makefile,v 1.7 2015/03/02 19:59:07 joerg Exp $
2 2
3DISTNAME= fet-5.25.0 3DISTNAME= fet-5.25.0
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= time 5CATEGORIES= time
6MASTER_SITES= http://lalescu.ro/liviu/fet/download/ 6MASTER_SITES= http://lalescu.ro/liviu/fet/download/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://lalescu.ro/liviu/fet/ 10HOMEPAGE= http://lalescu.ro/liviu/fet/
11COMMENT= Automatically schedule timetables 11COMMENT= Automatically schedule timetables
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
 14.include "../../mk/bsd.prefs.mk"
 15CFLAGS+= ${CLANG_NO_VALUE_PROPAGATION_PASS}
 16
14USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
15USE_LIBTOOL= yes 18USE_LIBTOOL= yes
16USE_TOOLS+= bsdtar 19USE_TOOLS+= bsdtar
17EXTRACT_USING= bsdtar 20EXTRACT_USING= bsdtar
18INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/fet 21INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/fet
19 22
20# conflicts with import.h in package itself 23# conflicts with import.h in package itself
21pre-build: 24pre-build:
22 rm -f ${WRKDIR}/.buildlink/include/python*/import.h 25 rm -f ${WRKDIR}/.buildlink/include/python*/import.h
23 cd ${WRKSRC} && ${QTDIR}/bin/qmake 26 cd ${WRKSRC} && ${QTDIR}/bin/qmake
24 27
25do-install: 28do-install:
26 ${INSTALL_PROGRAM} ${WRKSRC}/fet ${DESTDIR}${PREFIX}/bin 29 ${INSTALL_PROGRAM} ${WRKSRC}/fet ${DESTDIR}${PREFIX}/bin