Tue Jul 11 19:41:20 2017 UTC ()
Retire CLANG_NO_VALUE_PROPAGATION_PASS. CVP has been fixed in LLVM to
require much less memory.


(joerg)
diff -r1.8 -r1.9 pkgsrc/cad/klayout/Makefile
diff -r1.12 -r1.13 pkgsrc/lang/qore/Makefile
diff -r1.17 -r1.18 pkgsrc/mk/compiler/clang.mk
diff -r1.45 -r1.46 pkgsrc/print/scribus-qt4/Makefile
diff -r1.11 -r1.12 pkgsrc/print/scribus-qt4/distinfo
diff -r1.1 -r0 pkgsrc/print/scribus-qt4/patches/patch-scribus_plugins_fileloader_scribus134format_CMakeLists.txt
diff -r1.1 -r0 pkgsrc/print/scribus-qt4/patches/patch-scribus_plugins_fileloader_scribus13format_CMakeLists.txt
diff -r1.60 -r1.61 pkgsrc/textproc/groonga/Makefile
diff -r1.21 -r1.22 pkgsrc/time/fet/Makefile
cvs diff -r1.8 -r1.9 pkgsrc/cad/klayout/Makefile (switch to unified diff)

--- pkgsrc/cad/klayout/Makefile 2017/04/08 13:48:52 1.8
+++ pkgsrc/cad/klayout/Makefile 2017/07/11 19:41:20 1.9
@@ -1,63 +1,61 @@ @@ -1,63 +1,61 @@
1# $NetBSD: Makefile,v 1.8 2017/04/08 13:48:52 mef Exp $ 1# $NetBSD: Makefile,v 1.9 2017/07/11 19:41:20 joerg Exp $
2 2
3DISTNAME= klayout-0.24.10 3DISTNAME= klayout-0.24.10
4CATEGORIES= cad 4CATEGORIES= cad
5MASTER_SITES= http://www.klayout.org/downloads/source/ 5MASTER_SITES= http://www.klayout.org/downloads/source/
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://www.klayout.de/ 8HOMEPAGE= http://www.klayout.de/
9COMMENT= Simple GDS and OASIS file viewer and Editor 9COMMENT= Simple GDS and OASIS file viewer and Editor
10LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
11 11
12USE_LANGUAGES= c c++ 12USE_LANGUAGES= c c++
13USE_TOOLS+= gmake 13USE_TOOLS+= gmake
14 14
15CFLAGS+= -I${PREFIX}/include/python${PYVERSUFFIX} 15CFLAGS+= -I${PREFIX}/include/python${PYVERSUFFIX}
16NO_CONFIGURE= yes 16NO_CONFIGURE= yes
17 17
18SUBST_CLASSES+= rpath 18SUBST_CLASSES+= rpath
19SUBST_MESSAGE.rpath= Add COMPILER_RPATH_FLAG and PREFIX to NetBSD specific config file 19SUBST_MESSAGE.rpath= Add COMPILER_RPATH_FLAG and PREFIX to NetBSD specific config file
20SUBST_FILES.rpath+= config/Makefile.conf.netbsd-32-gcc-release 20SUBST_FILES.rpath+= config/Makefile.conf.netbsd-32-gcc-release
21SUBST_STAGE.rpath= post-patch 21SUBST_STAGE.rpath= post-patch
22SUBST_VARS.rpath= COMPILER_RPATH_FLAG PREFIX 22SUBST_VARS.rpath= COMPILER_RPATH_FLAG PREFIX
23SUBST_SED.rpath= -e 's|@@LDFLAGS@@|${LDFLAGS}|' 23SUBST_SED.rpath= -e 's|@@LDFLAGS@@|${LDFLAGS}|'
24 24
25AUTO_MKDIRS= yes 25AUTO_MKDIRS= yes
26INSTALL_BINDIR= ${DESTDIR}${PREFIX}/bin 26INSTALL_BINDIR= ${DESTDIR}${PREFIX}/bin
27INSTALL_LIBDIR= ${DESTDIR}${PREFIX}/lib 27INSTALL_LIBDIR= ${DESTDIR}${PREFIX}/lib
28REL_DIR= build.netbsd-32-gcc-release 28REL_DIR= build.netbsd-32-gcc-release
29 29
30OTHER_BIN= \ 30OTHER_BIN= \
31 strm2cif \ 31 strm2cif \
32 strm2dxf \ 32 strm2dxf \
33 strm2gds \ 33 strm2gds \
34 strm2gdstxt \ 34 strm2gdstxt \
35 strm2oas \ 35 strm2oas \
36 strm2txt \ 36 strm2txt \
37 strmclip \ 37 strmclip \
38 strmcmp \ 38 strmcmp \
39 strmxor 39 strmxor
40 40
41CXXFLAGS+= ${CLANG_NO_VALUE_PROPAGATION_PASS} 
42 
43do-build: 41do-build:
44 cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} sh build.sh -python python${PYVERSSUFFIX} -qt ${PREFIX}/qt4 42 cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} sh build.sh -python python${PYVERSSUFFIX} -qt ${PREFIX}/qt4
45 43
46do-install: 44do-install:
47 (cd ${WRKSRC}; \ 45 (cd ${WRKSRC}; \
48 pwd; \ 46 pwd; \
49 ${INSTALL_PROGRAM} ${REL_DIR}/main/klayout ${INSTALL_BINDIR}; \ 47 ${INSTALL_PROGRAM} ${REL_DIR}/main/klayout ${INSTALL_BINDIR}; \
50 ${INSTALL_LIB} ${REL_DIR}/main/libklayout.so ${INSTALL_LIBDIR} ;\ 48 ${INSTALL_LIB} ${REL_DIR}/main/libklayout.so ${INSTALL_LIBDIR} ;\
51 for bin in ${OTHER_BIN}; do \ 49 for bin in ${OTHER_BIN}; do \
52 ${INSTALL_PROGRAM} ${REL_DIR}/main/$$bin ${INSTALL_BINDIR} ;\ 50 ${INSTALL_PROGRAM} ${REL_DIR}/main/$$bin ${INSTALL_BINDIR} ;\
53 done ;\ 51 done ;\
54 ${CHMOD} 755 ${INSTALL_BINDIR}/* ;\ 52 ${CHMOD} 755 ${INSTALL_BINDIR}/* ;\
55 ) 53 )
56 54
57.include "../../lang/python/pyversion.mk" 55.include "../../lang/python/pyversion.mk"
58.include "../../lang/ruby/buildlink3.mk" 56.include "../../lang/ruby/buildlink3.mk"
59.include "../../x11/qt4-libs/buildlink3.mk" 57.include "../../x11/qt4-libs/buildlink3.mk"
60# libQtDesigner 58# libQtDesigner
61.include "../../x11/qt4-tools/buildlink3.mk" 59.include "../../x11/qt4-tools/buildlink3.mk"
62BUILDLINK_DEPMETHOD.qt4-tools= full 60BUILDLINK_DEPMETHOD.qt4-tools= full
63.include "../../mk/bsd.pkg.mk" 61.include "../../mk/bsd.pkg.mk"
cvs diff -r1.12 -r1.13 pkgsrc/lang/qore/Makefile (switch to unified diff)

--- pkgsrc/lang/qore/Makefile 2017/06/13 19:23:31 1.12
+++ pkgsrc/lang/qore/Makefile 2017/07/11 19:41:20 1.13
@@ -1,58 +1,55 @@ @@ -1,58 +1,55 @@
1# $NetBSD: Makefile,v 1.12 2017/06/13 19:23:31 nros Exp $ 1# $NetBSD: Makefile,v 1.13 2017/07/11 19:41:20 joerg Exp $
2 2
3DISTNAME= qore-0.8.12.10 3DISTNAME= qore-0.8.12.10
4CATEGORIES= lang 4CATEGORIES= lang
5MASTER_SITES= ${MASTER_SITE_GITHUB:=qorelanguage/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=qorelanguage/}
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
7 7
8GITHUB_RELEASE= release-${PKGVERSION_NOREV} 8GITHUB_RELEASE= release-${PKGVERSION_NOREV}
9GITHUB_TYPE= release 9GITHUB_TYPE= release
10 10
11MAINTAINER= nros@NetBSD.org 11MAINTAINER= nros@NetBSD.org
12COMMENT= Qore programming language 12COMMENT= Qore programming language
13HOMEPAGE= http://www.qore.org/ 13HOMEPAGE= http://www.qore.org/
14LICENSE= gnu-gpl-v2 OR gnu-lgpl-v2.1 OR mit 14LICENSE= gnu-gpl-v2 OR gnu-lgpl-v2.1 OR mit
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
18USE_TOOLS+= bash bison flex gmake pax 18USE_TOOLS+= bash bison flex gmake pax
19USE_LANGUAGES= c c99 c++ 19USE_LANGUAGES= c c99 c++
20PTHREAD_OPTS+= native 20PTHREAD_OPTS+= native
21FLEX_REQD= 2.5.31 21FLEX_REQD= 2.5.31
22 22
23PKGCONFIG_OVERRIDE+= qore.pc.in 23PKGCONFIG_OVERRIDE+= qore.pc.in
24REPLACE_QORE= bin/qget bin/rest bin/schema-reverse  24REPLACE_QORE= bin/qget bin/rest bin/schema-reverse
25REPLACE_QORE+= bin/sfrest bin/sqlutil doxygen/qdx 25REPLACE_QORE+= bin/sfrest bin/sqlutil doxygen/qdx
26 26
27CONFIGURE_ARGS+=--with-libsuffix="" 27CONFIGURE_ARGS+=--with-libsuffix=""
28 28
29#pre-configure: 29#pre-configure:
30# set -e; cd ${WRKSRC}; \ 30# set -e; cd ${WRKSRC}; \
31# autoheader; autoconf 31# autoheader; autoconf
32 32
33#This is needed in order to comply the with MIT license and binary distribution 33#This is needed in order to comply the with MIT license and binary distribution
34#Install docs 34#Install docs
35licensedir= share/doc/qore/license 35licensedir= share/doc/qore/license
36INSTALLATION_DIRS+= ${licensedir} 36INSTALLATION_DIRS+= ${licensedir}
37post-install: 37post-install:
38 ${INSTALL_DATA} ${WRKSRC}/COPYING.GPL ${DESTDIR}${PREFIX}/${licensedir} 38 ${INSTALL_DATA} ${WRKSRC}/COPYING.GPL ${DESTDIR}${PREFIX}/${licensedir}
39 ${INSTALL_DATA} ${WRKSRC}/COPYING.LGPL ${DESTDIR}${PREFIX}/${licensedir} 39 ${INSTALL_DATA} ${WRKSRC}/COPYING.LGPL ${DESTDIR}${PREFIX}/${licensedir}
40 ${INSTALL_DATA} ${WRKSRC}/COPYING.MIT ${DESTDIR}${PREFIX}/${licensedir} 40 ${INSTALL_DATA} ${WRKSRC}/COPYING.MIT ${DESTDIR}${PREFIX}/${licensedir}
41 ${INSTALL_DATA} ${WRKSRC}/README-LICENSE ${DESTDIR}${PREFIX}/${licensedir} 41 ${INSTALL_DATA} ${WRKSRC}/README-LICENSE ${DESTDIR}${PREFIX}/${licensedir}
42 cd ${WRKSRC}/docs/ && ${PAX} -wr * ${DESTDIR}${PREFIX}/share/doc/qore 42 cd ${WRKSRC}/docs/ && ${PAX} -wr * ${DESTDIR}${PREFIX}/share/doc/qore
43 ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/share/doc/qore 43 ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/share/doc/qore
44 44
45.include "application.mk" 45.include "application.mk"
46.include "options.mk" 46.include "options.mk"
47 47
48_WRAP_EXTRA_ARGS.CXX+= ${CLANG_NO_VALUE_PROPAGATION_PASS} 
49CWRAPPERS_APPEND.cxx+= ${CLANG_NO_VALUE_PROPAGATION_PASS} 
50 
51.include "../../archivers/bzip2/buildlink3.mk" 48.include "../../archivers/bzip2/buildlink3.mk"
52.include "../../converters/libiconv/buildlink3.mk" 49.include "../../converters/libiconv/buildlink3.mk"
53.include "../../devel/pcre/buildlink3.mk" 50.include "../../devel/pcre/buildlink3.mk"
54.include "../../devel/zlib/buildlink3.mk" 51.include "../../devel/zlib/buildlink3.mk"
55.include "../../mk/pthread.buildlink3.mk" 52.include "../../mk/pthread.buildlink3.mk"
56.include "../../math/mpfr/buildlink3.mk" 53.include "../../math/mpfr/buildlink3.mk"
57.include "../../security/openssl/buildlink3.mk" 54.include "../../security/openssl/buildlink3.mk"
58.include "../../mk/bsd.pkg.mk" 55.include "../../mk/bsd.pkg.mk"
cvs diff -r1.17 -r1.18 pkgsrc/mk/compiler/clang.mk (switch to unified diff)

--- pkgsrc/mk/compiler/clang.mk 2017/05/18 08:14:08 1.17
+++ pkgsrc/mk/compiler/clang.mk 2017/07/11 19:41:20 1.18
@@ -1,84 +1,82 @@ @@ -1,84 +1,82 @@
1# $NetBSD: clang.mk,v 1.17 2017/05/18 08:14:08 jperkin Exp $ 1# $NetBSD: clang.mk,v 1.18 2017/07/11 19:41:20 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
15# TODO: may be installed already, check for this 15# TODO: may be installed already, check for this
16#TOOL_DEPENDS+= clang-[0-9]*:../../lang/clang 16#TOOL_DEPENDS+= clang-[0-9]*:../../lang/clang
17 17
18.include "../../mk/bsd.prefs.mk" 18.include "../../mk/bsd.prefs.mk"
19 19
20CLANGBASE?= ${LOCALBASE} 20CLANGBASE?= ${LOCALBASE}
21LANGUAGES.clang= # empty 21LANGUAGES.clang= # empty
22 22
23.if exists(${CLANGBASE}/bin/clang) 23.if exists(${CLANGBASE}/bin/clang)
24LANGUAGES.clang+= c objc 24LANGUAGES.clang+= c objc
25_COMPILER_STRIP_VARS+= CC 25_COMPILER_STRIP_VARS+= CC
26CCPATH= ${CLANGBASE}/bin/clang 26CCPATH= ${CLANGBASE}/bin/clang
27PKG_CC:= ${CCPATH} 27PKG_CC:= ${CCPATH}
28.endif 28.endif
29 29
30.if exists(${CLANGBASE}/bin/clang++) 30.if exists(${CLANGBASE}/bin/clang++)
31LANGUAGES.clang+= c++ 31LANGUAGES.clang+= c++
32_COMPILER_STRIP_VARS+= CXX 32_COMPILER_STRIP_VARS+= CXX
33CXXPATH= ${CLANGBASE}/bin/clang++ 33CXXPATH= ${CLANGBASE}/bin/clang++
34PKG_CXX:= ${CXXPATH} 34PKG_CXX:= ${CXXPATH}
35.endif 35.endif
36 36
37.if exists(${CLANGBASE}/bin/clang-cpp) 37.if exists(${CLANGBASE}/bin/clang-cpp)
38CPPPATH= ${CLANGBASE}/bin/clang-cpp 38CPPPATH= ${CLANGBASE}/bin/clang-cpp
39PKG_CPP:= ${CPPPATH} 39PKG_CPP:= ${CPPPATH}
40.endif 40.endif
41 41
42.if exists(${CCPATH}) 42.if exists(${CCPATH})
43CC_VERSION_STRING!= ${CCPATH} -v 2>&1 43CC_VERSION_STRING!= ${CCPATH} -v 2>&1
44CC_VERSION!= ${CCPATH} --version 2>&1 | ${SED} -n "s/^.* version /clang-/p"  44CC_VERSION!= ${CCPATH} --version 2>&1 | ${SED} -n "s/^.* version /clang-/p"
45.else 45.else
46CC_VERSION_STRING?= ${CC_VERSION} 46CC_VERSION_STRING?= ${CC_VERSION}
47CC_VERSION?= clang 47CC_VERSION?= clang
48.endif 48.endif
49 49
50_COMPILER_ABI_FLAG.32= -m32 50_COMPILER_ABI_FLAG.32= -m32
51_COMPILER_ABI_FLAG.64= -m64 51_COMPILER_ABI_FLAG.64= -m64
52_COMPILER_LD_FLAG= -Wl, 52_COMPILER_LD_FLAG= -Wl,
53_LINKER_RPATH_FLAG= -R 53_LINKER_RPATH_FLAG= -R
54_COMPILER_RPATH_FLAG= ${_COMPILER_LD_FLAG}${_LINKER_RPATH_FLAG} 54_COMPILER_RPATH_FLAG= ${_COMPILER_LD_FLAG}${_LINKER_RPATH_FLAG}
55 55
56# The user can choose the level of stack smashing protection. 56# The user can choose the level of stack smashing protection.
57.if ${PKGSRC_USE_SSP} == "all" 57.if ${PKGSRC_USE_SSP} == "all"
58_SSP_CFLAGS= -fstack-protector-all 58_SSP_CFLAGS= -fstack-protector-all
59.else 59.else
60_SSP_CFLAGS= -fstack-protector 60_SSP_CFLAGS= -fstack-protector
61.endif 61.endif
62 62
63# _LANGUAGES.<compiler> is ${LANGUAGES.<compiler>} restricted to the 63# _LANGUAGES.<compiler> is ${LANGUAGES.<compiler>} restricted to the
64# ones requested by the package in USE_LANGUAGES. 64# ones requested by the package in USE_LANGUAGES.
65# 65#
66_LANGUAGES.clang= # empty 66_LANGUAGES.clang= # empty
67.for _lang_ in ${USE_LANGUAGES} 67.for _lang_ in ${USE_LANGUAGES}
68_LANGUAGES.clang+= ${LANGUAGES.clang:M${_lang_}} 68_LANGUAGES.clang+= ${LANGUAGES.clang:M${_lang_}}
69.endfor 69.endfor
70 70
71PKGSRC_FORTRAN?=g95 71PKGSRC_FORTRAN?=g95
72 72
73.if !empty(PKGSRC_FORTRAN) && (!empty(USE_LANGUAGES:Mfortran) || !empty(USE_LANGUAGES:Mfortran77)) 73.if !empty(PKGSRC_FORTRAN) && (!empty(USE_LANGUAGES:Mfortran) || !empty(USE_LANGUAGES:Mfortran77))
74. include "../../mk/compiler/${PKGSRC_FORTRAN}.mk" 74. include "../../mk/compiler/${PKGSRC_FORTRAN}.mk"
75.endif 75.endif
76 76
77_WRAP_EXTRA_ARGS.CC+= -Qunused-arguments 77_WRAP_EXTRA_ARGS.CC+= -Qunused-arguments
78CWRAPPERS_APPEND.cc+= -Qunused-arguments 78CWRAPPERS_APPEND.cc+= -Qunused-arguments
79_WRAP_EXTRA_ARGS.CXX+= -Qunused-arguments 79_WRAP_EXTRA_ARGS.CXX+= -Qunused-arguments
80CWRAPPERS_APPEND.cxx+= -Qunused-arguments 80CWRAPPERS_APPEND.cxx+= -Qunused-arguments
81 81
82CLANG_NO_VALUE_PROPAGATION_PASS= -O0 
83 
84.endif # COMPILER_CLANG_MK 82.endif # COMPILER_CLANG_MK
cvs diff -r1.45 -r1.46 pkgsrc/print/scribus-qt4/Makefile (switch to unified diff)

--- pkgsrc/print/scribus-qt4/Makefile 2017/05/19 13:29:04 1.45
+++ pkgsrc/print/scribus-qt4/Makefile 2017/07/11 19:41:20 1.46
@@ -1,58 +1,53 @@ @@ -1,58 +1,53 @@
1# $NetBSD: Makefile,v 1.45 2017/05/19 13:29:04 prlw1 Exp $ 1# $NetBSD: Makefile,v 1.46 2017/07/11 19:41:20 joerg Exp $
2 2
3DISTNAME= scribus-1.4.3 3DISTNAME= scribus-1.4.3
4PKGREVISION= 9 4PKGREVISION= 9
5CATEGORIES= print 5CATEGORIES= print
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scribus/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scribus/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.scribus.net/ 10HOMEPAGE= http://www.scribus.net/
11COMMENT= Publishing layout with graphical interface 11COMMENT= Publishing layout with graphical interface
12 12
13USE_LANGUAGES= c c++ 13USE_LANGUAGES= c c++
14USE_LIBTOOL= YES 14USE_LIBTOOL= YES
15USE_TOOLS+= gmake perl pkg-config 15USE_TOOLS+= gmake perl pkg-config
16PTHREAD_OPTS+= require 16PTHREAD_OPTS+= require
17SHLIBTOOL_OVERRIDE= # empty 17SHLIBTOOL_OVERRIDE= # empty
18USE_CMAKE= yes 18USE_CMAKE= yes
19CMAKE_ARGS+= -DPNG_LIBRARY_RELEASE=${LOCALBASE}/lib 19CMAKE_ARGS+= -DPNG_LIBRARY_RELEASE=${LOCALBASE}/lib
20# XXX not yet 20# XXX not yet
21#CMAKE_ARGS+= -DWANT_HUNSPELL:BOOL=ON 21#CMAKE_ARGS+= -DWANT_HUNSPELL:BOOL=ON
22 22
23PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 1.4.3 23PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 1.4.3
24 24
25INSTALLATION_DIRS+= share/pixmaps 25INSTALLATION_DIRS+= share/pixmaps
26 26
27.include "../../mk/compiler.mk" 
28.if !empty(PKGSRC_COMPILER:Mclang) 
29CMAKE_ARGS+= -DCLANG_NO_OPT=${CLANG_NO_VALUE_PROPAGATION_PASS:Q} 
30.endif 
31 
32post-install: 27post-install:
33 ${INSTALL_DATA} ${WRKSRC}/resources/icons/scribus.png \ 28 ${INSTALL_DATA} ${WRKSRC}/resources/icons/scribus.png \
34 ${DESTDIR}${PREFIX}/share/pixmaps 29 ${DESTDIR}${PREFIX}/share/pixmaps
35 30
36.include "../../devel/boost-headers/buildlink3.mk" 31.include "../../devel/boost-headers/buildlink3.mk"
37.include "../../print/cups/buildlink3.mk" 32.include "../../print/cups/buildlink3.mk"
38.include "../../print/podofo/buildlink3.mk" 33.include "../../print/podofo/buildlink3.mk"
39.include "../../graphics/cairo/buildlink3.mk" 34.include "../../graphics/cairo/buildlink3.mk"
40.include "../../mk/jpeg.buildlink3.mk" 35.include "../../mk/jpeg.buildlink3.mk"
41.include "../../graphics/png/buildlink3.mk" 36.include "../../graphics/png/buildlink3.mk"
42.include "../../graphics/lcms2/buildlink3.mk" 37.include "../../graphics/lcms2/buildlink3.mk"
43BUILDLINK_API_DEPENDS.libart+= libart>=2.3.19nb1 38BUILDLINK_API_DEPENDS.libart+= libart>=2.3.19nb1
44.include "../../graphics/libart/buildlink3.mk" 39.include "../../graphics/libart/buildlink3.mk"
45.include "../../graphics/tiff/buildlink3.mk" 40.include "../../graphics/tiff/buildlink3.mk"
46.include "../../textproc/libxml2/buildlink3.mk" 41.include "../../textproc/libxml2/buildlink3.mk"
47#.include "../../textproc/hunspell/buildlink3.mk" 42#.include "../../textproc/hunspell/buildlink3.mk"
48.include "../../x11/libSM/buildlink3.mk" 43.include "../../x11/libSM/buildlink3.mk"
49.include "../../x11/libX11/buildlink3.mk" 44.include "../../x11/libX11/buildlink3.mk"
50.include "../../x11/libXt/buildlink3.mk" 45.include "../../x11/libXt/buildlink3.mk"
51.include "../../x11/qt4-libs/buildlink3.mk" 46.include "../../x11/qt4-libs/buildlink3.mk"
52.include "../../x11/qt4-tools/buildlink3.mk" 47.include "../../x11/qt4-tools/buildlink3.mk"
53.include "../../mk/pthread.buildlink3.mk" 48.include "../../mk/pthread.buildlink3.mk"
54.include "../../lang/python/application.mk" 49.include "../../lang/python/application.mk"
55.include "../../databases/shared-mime-info/mimedb.mk" 50.include "../../databases/shared-mime-info/mimedb.mk"
56.include "../../sysutils/desktop-file-utils/desktopdb.mk" 51.include "../../sysutils/desktop-file-utils/desktopdb.mk"
57 52
58.include "../../mk/bsd.pkg.mk" 53.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/print/scribus-qt4/distinfo (switch to unified diff)

--- pkgsrc/print/scribus-qt4/distinfo 2016/04/21 09:34:12 1.11
+++ pkgsrc/print/scribus-qt4/distinfo 2017/07/11 19:41:20 1.12
@@ -1,14 +1,12 @@ @@ -1,14 +1,12 @@
1$NetBSD: distinfo,v 1.11 2016/04/21 09:34:12 jperkin Exp $ 1$NetBSD: distinfo,v 1.12 2017/07/11 19:41:20 joerg Exp $
2 2
3SHA1 (scribus-1.4.3.tar.xz) = 30c111762790e4407c13236bbb4b06f04e907f71 3SHA1 (scribus-1.4.3.tar.xz) = 30c111762790e4407c13236bbb4b06f04e907f71
4RMD160 (scribus-1.4.3.tar.xz) = 0c3103536610ca1881d1b65b549886bf9f0d8650 4RMD160 (scribus-1.4.3.tar.xz) = 0c3103536610ca1881d1b65b549886bf9f0d8650
5SHA512 (scribus-1.4.3.tar.xz) = e4841b346803bc096c2e00b2071d03ce3bae6af8d7317353ebf8e724b5a9b6461d95406bee61c2a316bc6ee5d9e302e3fee7b51dd89eae9adc9e69b3aa40454e 5SHA512 (scribus-1.4.3.tar.xz) = e4841b346803bc096c2e00b2071d03ce3bae6af8d7317353ebf8e724b5a9b6461d95406bee61c2a316bc6ee5d9e302e3fee7b51dd89eae9adc9e69b3aa40454e
6Size (scribus-1.4.3.tar.xz) = 70503072 bytes 6Size (scribus-1.4.3.tar.xz) = 70503072 bytes
7SHA1 (patch-ag) = 906fa6305015ec3b2589350d338cf2dcb30d5c58 7SHA1 (patch-ag) = 906fa6305015ec3b2589350d338cf2dcb30d5c58
8SHA1 (patch-ah) = 7640b9509d764323d546cbf958521768965d7ff0 8SHA1 (patch-ah) = 7640b9509d764323d546cbf958521768965d7ff0
9SHA1 (patch-ai) = 6616ce472b9fa7d8aa9bc3677ac5b25799222816 9SHA1 (patch-ai) = 6616ce472b9fa7d8aa9bc3677ac5b25799222816
10SHA1 (patch-ba) = ecddb2304b0ab37fbca41a662773107923df273b 10SHA1 (patch-ba) = ecddb2304b0ab37fbca41a662773107923df273b
11SHA1 (patch-bb) = c39d78679e0cd17a0fe19a98ecabe7eadfc5b881 11SHA1 (patch-bb) = c39d78679e0cd17a0fe19a98ecabe7eadfc5b881
12SHA1 (patch-bc) = 1b93d844b40ebe9b425ac7e6fb6b05189c194b6b 12SHA1 (patch-bc) = 1b93d844b40ebe9b425ac7e6fb6b05189c194b6b
13SHA1 (patch-scribus_plugins_fileloader_scribus134format_CMakeLists.txt) = b0fa6cabcbcdc46d2a662df313b02f61f4926d2b 
14SHA1 (patch-scribus_plugins_fileloader_scribus13format_CMakeLists.txt) = 5d7ee482d4afd8acf2c3741f2660539069c5d5cc 
File Deleted: pkgsrc/print/scribus-qt4/patches/Attic/patch-scribus_plugins_fileloader_scribus134format_CMakeLists.txt
File Deleted: pkgsrc/print/scribus-qt4/patches/Attic/patch-scribus_plugins_fileloader_scribus13format_CMakeLists.txt
cvs diff -r1.60 -r1.61 pkgsrc/textproc/groonga/Makefile (switch to unified diff)

--- pkgsrc/textproc/groonga/Makefile 2016/09/11 16:06:53 1.60
+++ pkgsrc/textproc/groonga/Makefile 2017/07/11 19:41:20 1.61
@@ -1,59 +1,57 @@ @@ -1,59 +1,57 @@
1# $NetBSD: Makefile,v 1.60 2016/09/11 16:06:53 taca Exp $ 1# $NetBSD: Makefile,v 1.61 2017/07/11 19:41:20 joerg Exp $
2# 2#
3 3
4DISTNAME= groonga-6.0.8 4DISTNAME= groonga-6.0.8
5CATEGORIES= textproc 5CATEGORIES= textproc
6MASTER_SITES= http://packages.groonga.org/source/groonga/ 6MASTER_SITES= http://packages.groonga.org/source/groonga/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@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
13DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR} 13DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
14 14
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
18USE_TOOLS+= gmake pkg-config 18USE_TOOLS+= gmake pkg-config
19# for long file name 19# for long file name
20EXTRACT_USING= bsdtar 20EXTRACT_USING= bsdtar
21 21
22.include "options.mk" 22.include "options.mk"
23 23
24CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} 24CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
25CONFIGURE_ARGS+= --localstatedir=${VARBASE} 25CONFIGURE_ARGS+= --localstatedir=${VARBASE}
26CONFIGURE_ARGS+= --with-ruby=${RUBY} 26CONFIGURE_ARGS+= --with-ruby=${RUBY}
27 27
28CFLAGS+= ${CLANG_NO_VALUE_PROPAGATION_PASS} 
29 
30PKGCONFIG_OVERRIDE+= groonga.pc.in 28PKGCONFIG_OVERRIDE+= groonga.pc.in
31 29
32PKG_SYSCONFSUBDIR= ${PKGBASE} 30PKG_SYSCONFSUBDIR= ${PKGBASE}
33 31
34BUILD_DEFS+= VARBASE 32BUILD_DEFS+= VARBASE
35 33
36INSTALL_DIRS= ${BUILD_DIRS} vendor/onigmo-source 34INSTALL_DIRS= ${BUILD_DIRS} vendor/onigmo-source
37INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples 35INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples
38 36
39CONF_FILES+= share/examples/${PKGBASE}/groonga.conf \ 37CONF_FILES+= share/examples/${PKGBASE}/groonga.conf \
40 ${PKG_SYSCONFDIR}/groonga.conf 38 ${PKG_SYSCONFDIR}/groonga.conf
41CONF_FILES+= share/examples/groonga/synonyms.tsv \ 39CONF_FILES+= share/examples/groonga/synonyms.tsv \
42 ${PKG_SYSCONFDIR}/synonyms.tsv 40 ${PKG_SYSCONFDIR}/synonyms.tsv
43 41
44OWN_DIRS+= ${VARBASE}/log/${PKGBASE} 42OWN_DIRS+= ${VARBASE}/log/${PKGBASE}
45 43
46CHECK_WRKREF_SKIP+= bin/groonga 44CHECK_WRKREF_SKIP+= bin/groonga
47CHECK_INTERPRETER_SKIP+= share/groonga/examples/* 45CHECK_INTERPRETER_SKIP+= share/groonga/examples/*
48 46
49REPLACE_RUBY+= data/munin/groonga_cpu_time_ 47REPLACE_RUBY+= data/munin/groonga_cpu_time_
50REPLACE_RUBY+= data/munin/groonga_disk_ 48REPLACE_RUBY+= data/munin/groonga_disk_
51REPLACE_RUBY+= data/munin/groonga_n_records_ 49REPLACE_RUBY+= data/munin/groonga_n_records_
52REPLACE_RUBY+= data/munin/groonga_query_performance_ 50REPLACE_RUBY+= data/munin/groonga_query_performance_
53REPLACE_RUBY+= data/munin/groonga_status_ 51REPLACE_RUBY+= data/munin/groonga_status_
54REPLACE_RUBY+= data/munin/groonga_throughput_ 52REPLACE_RUBY+= data/munin/groonga_throughput_
55 53
56.include "../../lang/ruby/replace.mk" 54.include "../../lang/ruby/replace.mk"
57.include "../../devel/editline/buildlink3.mk" 55.include "../../devel/editline/buildlink3.mk"
58.include "../../devel/glib2/buildlink3.mk" 56.include "../../devel/glib2/buildlink3.mk"
59.include "../../mk/bsd.pkg.mk" 57.include "../../mk/bsd.pkg.mk"
cvs diff -r1.21 -r1.22 pkgsrc/time/fet/Makefile (switch to unified diff)

--- pkgsrc/time/fet/Makefile 2017/04/22 21:03:59 1.21
+++ pkgsrc/time/fet/Makefile 2017/07/11 19:41:20 1.22
@@ -1,37 +1,36 @@ @@ -1,37 +1,36 @@
1# $NetBSD: Makefile,v 1.21 2017/04/22 21:03:59 adam Exp $ 1# $NetBSD: Makefile,v 1.22 2017/07/11 19:41:20 joerg Exp $
2 2
3DISTNAME= fet-5.25.0 3DISTNAME= fet-5.25.0
4PKGREVISION= 15 4PKGREVISION= 15
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" 14.include "../../mk/bsd.prefs.mk"
15CFLAGS+= ${CLANG_NO_VALUE_PROPAGATION_PASS} 
16 15
17USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
18USE_LIBTOOL= yes 17USE_LIBTOOL= yes
19USE_TOOLS+= bsdtar 18USE_TOOLS+= bsdtar
20EXTRACT_USING= bsdtar 19EXTRACT_USING= bsdtar
21INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/fet 20INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/fet
22 21
23# conflicts with import.h in package itself 22# conflicts with import.h in package itself
24pre-build: 23pre-build:
25 rm -f ${WRKDIR}/.buildlink/include/python*/import.h 24 rm -f ${WRKDIR}/.buildlink/include/python*/import.h
26 cd ${WRKSRC} && ${QTDIR}/bin/qmake 25 cd ${WRKSRC} && ${QTDIR}/bin/qmake
27 26
28do-install: 27do-install:
29 ${INSTALL_PROGRAM} ${WRKSRC}/fet ${DESTDIR}${PREFIX}/bin 28 ${INSTALL_PROGRAM} ${WRKSRC}/fet ${DESTDIR}${PREFIX}/bin
30 ${INSTALL_PROGRAM} ${WRKSRC}/fet-cl ${DESTDIR}${PREFIX}/bin 29 ${INSTALL_PROGRAM} ${WRKSRC}/fet-cl ${DESTDIR}${PREFIX}/bin
31 ${INSTALL_DATA} ${WRKSRC}/man/fet.1.gz ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 30 ${INSTALL_DATA} ${WRKSRC}/man/fet.1.gz ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
32 ${INSTALL_DATA} ${WRKSRC}/man/fet-cl.1.gz ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 31 ${INSTALL_DATA} ${WRKSRC}/man/fet-cl.1.gz ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
33 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/fet 32 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/fet
34 33
35.include "../../x11/qt5-qtbase/buildlink3.mk" 34.include "../../x11/qt5-qtbase/buildlink3.mk"
36.include "../../x11/qt5-qttools/buildlink3.mk" 35.include "../../x11/qt5-qttools/buildlink3.mk"
37.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"