Thu Feb 25 08:27:05 2016 UTC ()
Remove manual OPSYSVARS additions which are now part of the default set.


(jperkin)
diff -r1.11 -r1.12 pkgsrc/devel/ecore/Makefile
diff -r1.13 -r1.14 pkgsrc/devel/libev/Makefile
diff -r1.6 -r1.7 pkgsrc/devel/libmowgli/Makefile
diff -r1.19 -r1.20 pkgsrc/devel/p5-EV/Makefile
diff -r1.24 -r1.25 pkgsrc/editors/scite/Makefile
diff -r1.20 -r1.21 pkgsrc/games/tanked/Makefile
diff -r1.40 -r1.41 pkgsrc/graphics/jasper/Makefile
diff -r1.60 -r1.61 pkgsrc/graphics/opencv/Makefile
diff -r1.4 -r1.5 pkgsrc/graphics/opencv-contrib-face/Makefile
diff -r1.2 -r1.3 pkgsrc/graphics/opencv2/Makefile
diff -r1.11 -r1.12 pkgsrc/inputmethod/qt5-uim/Makefile
diff -r1.29 -r1.30 pkgsrc/inputmethod/scim-python/Makefile
diff -r1.4 -r1.5 pkgsrc/lang/LuaJIT/Makefile
diff -r1.81 -r1.82 pkgsrc/mail/dovecot2/Makefile
diff -r1.141 -r1.142 pkgsrc/mail/imap-uw/Makefile
diff -r1.60 -r1.61 pkgsrc/net/libIDL/Makefile
diff -r1.39 -r1.40 pkgsrc/net/tnftp/Makefile
diff -r1.25 -r1.26 pkgsrc/net/tnftpd/Makefile
diff -r1.116 -r1.117 pkgsrc/security/heimdal/Makefile
diff -r1.75 -r1.76 pkgsrc/sysutils/hal/Makefile
diff -r1.15 -r1.16 pkgsrc/sysutils/ipmitool/Makefile
diff -r1.11 -r1.12 pkgsrc/sysutils/logrot/Makefile
diff -r1.4 -r1.5 pkgsrc/textproc/libpinyin/Makefile
diff -r1.29 -r1.30 pkgsrc/www/deforaos-surfer/Makefile
diff -r1.25 -r1.26 pkgsrc/www/libproxy/Makefile
diff -r1.180 -r1.181 pkgsrc/x11/gnome-panel/Makefile
diff -r1.33 -r1.34 pkgsrc/x11/kactivities/Makefile
diff -r1.12 -r1.13 pkgsrc/x11/libxkbcommon/Makefile
diff -r1.40 -r1.41 pkgsrc/x11/qt4-libs/Makefile.common
diff -r1.30 -r1.31 pkgsrc/x11/qt5-qtbase/Makefile
cvs diff -r1.11 -r1.12 pkgsrc/devel/ecore/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ecore/Makefile 2015/04/23 09:18:57 1.11
+++ pkgsrc/devel/ecore/Makefile 2016/02/25 08:27:02 1.12
@@ -1,33 +1,31 @@ @@ -1,33 +1,31 @@
1# $NetBSD: Makefile,v 1.11 2015/04/23 09:18:57 jperkin Exp $ 1# $NetBSD: Makefile,v 1.12 2016/02/25 08:27:02 jperkin Exp $
2# 2#
3 3
4DISTNAME= ecore-1.7.7 4DISTNAME= ecore-1.7.7
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= http://download.enlightenment.org/releases/ 7MASTER_SITES= http://download.enlightenment.org/releases/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= joerg@NetBSD.org 10MAINTAINER= joerg@NetBSD.org
11HOMEPAGE= http://enlightenment.org/ 11HOMEPAGE= http://enlightenment.org/
12COMMENT= Event Abstraction and Modular Convenience Library 12COMMENT= Event Abstraction and Modular Convenience Library
13LICENSE= 2-clause-bsd 13LICENSE= 2-clause-bsd
14 14
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= pkg-config 17USE_TOOLS+= pkg-config
18 18
19OPSYSVARS+= CONFIGURE_ARGS 
20 
21CONFIGURE_ARGS+= --disable-ecore-directfb \ 19CONFIGURE_ARGS+= --disable-ecore-directfb \
22 --enable-ecore-desktop \ 20 --enable-ecore-desktop \
23 --disable-ecore-evas-sdl 21 --disable-ecore-evas-sdl
24 22
25# Explicitly disable epoll/inotify on illumos, provided for Linux compat only. 23# Explicitly disable epoll/inotify on illumos, provided for Linux compat only.
26CONFIGURE_ARGS.SunOS+= --disable-epoll 24CONFIGURE_ARGS.SunOS+= --disable-epoll
27CONFIGURE_ARGS.SunOS+= --disable-inotify 25CONFIGURE_ARGS.SunOS+= --disable-inotify
28 26
29INSTALLATION_DIRS= share/doc/ecore 27INSTALLATION_DIRS= share/doc/ecore
30 28
31post-install: 29post-install:
32 ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${WRKSRC}/COPYING \ 30 ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${WRKSRC}/COPYING \
33 ${DESTDIR}${PREFIX}/share/doc/ecore 31 ${DESTDIR}${PREFIX}/share/doc/ecore
cvs diff -r1.13 -r1.14 pkgsrc/devel/libev/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/libev/Makefile 2015/10/17 09:53:31 1.13
+++ pkgsrc/devel/libev/Makefile 2016/02/25 08:27:03 1.14
@@ -1,23 +1,20 @@ @@ -1,23 +1,20 @@
1# $NetBSD: Makefile,v 1.13 2015/10/17 09:53:31 adam Exp $ 1# $NetBSD: Makefile,v 1.14 2016/02/25 08:27:03 jperkin Exp $
2 2
3DISTNAME= libev-4.20 3DISTNAME= libev-4.20
4CATEGORIES= devel 4CATEGORIES= devel
5MASTER_SITES= http://dist.schmorp.de/libev/ 5MASTER_SITES= http://dist.schmorp.de/libev/
6 6
7MAINTAINER= tonio@NetBSD.org 7MAINTAINER= tonio@NetBSD.org
8HOMEPAGE= http://software.schmorp.de/pkg/libev.html 8HOMEPAGE= http://software.schmorp.de/pkg/libev.html
9COMMENT= Full-featured and high-performance event loop 9COMMENT= Full-featured and high-performance event loop
10LICENSE= 2-clause-bsd OR gnu-gpl-v2 10LICENSE= 2-clause-bsd OR gnu-gpl-v2
11 11
12USE_LIBTOOL= yes 12USE_LIBTOOL= yes
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14GNU_CONFIGURE_LIBSUBDIR=ev 14GNU_CONFIGURE_LIBSUBDIR=ev
15CONFIGURE_ARGS+= --includedir=${PREFIX}/include/ev 15CONFIGURE_ARGS+= --includedir=${PREFIX}/include/ev
16# Explicitly disable inotify on SunOS, assumes Linux statfs. 16# Explicitly disable inotify on SunOS, assumes Linux statfs.
17CONFIGURE_ENV.SunOS+= ac_cv_header_sys_inotify_h=no 17CONFIGURE_ENV.SunOS+= ac_cv_header_sys_inotify_h=no
18#TEST_TARGET= verify 18#TEST_TARGET= verify
19 19
20OPSYSVARS+= CONFIGURE_ENV 
21 
22#.include "../../mk/bsd.prefs.mk" 
23.include "../../mk/bsd.pkg.mk" 20.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/devel/libmowgli/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/libmowgli/Makefile 2015/04/23 09:24:56 1.6
+++ pkgsrc/devel/libmowgli/Makefile 2016/02/25 08:27:03 1.7
@@ -1,26 +1,24 @@ @@ -1,26 +1,24 @@
1# $NetBSD: Makefile,v 1.6 2015/04/23 09:24:56 jperkin Exp $ 1# $NetBSD: Makefile,v 1.7 2016/02/25 08:27:03 jperkin Exp $
2# 2#
3 3
4DISTNAME= libmowgli-0.7.1 4DISTNAME= libmowgli-0.7.1
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= http://distfiles.atheme.org/ \ 6MASTER_SITES= http://distfiles.atheme.org/ \
7 http://mirror.billymays.us/libmowgli/ 7 http://mirror.billymays.us/libmowgli/
8EXTRACT_SUFX= .tgz 8EXTRACT_SUFX= .tgz
9 9
10MAINTAINER= jfranz@bsdprojects.net 10MAINTAINER= jfranz@bsdprojects.net
11HOMEPAGE= http://www.atheme.org/projects/mowgli 11HOMEPAGE= http://www.atheme.org/projects/mowgli
12COMMENT= Development framework for C (like GLib) 12COMMENT= Development framework for C (like GLib)
13 13
14PREV_PKGPATH= devel/mowgli 14PREV_PKGPATH= devel/mowgli
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17USE_TOOLS+= pkg-config 17USE_TOOLS+= pkg-config
18 18
19PKGCONFIG_OVERRIDE+= libmowgli.pc.in 19PKGCONFIG_OVERRIDE+= libmowgli.pc.in
20 20
21OPSYSVARS+= CONFIGURE_ENV 
22 
23# Explicitly disable epoll on illumos, provided for Linux compat only. 21# Explicitly disable epoll on illumos, provided for Linux compat only.
24CONFIGURE_ENV.SunOS+= ac_cv_func_epoll_ctl=no 22CONFIGURE_ENV.SunOS+= ac_cv_func_epoll_ctl=no
25 23
26.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.19 -r1.20 pkgsrc/devel/p5-EV/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/p5-EV/Makefile 2015/07/27 14:30:34 1.19
+++ pkgsrc/devel/p5-EV/Makefile 2016/02/25 08:27:03 1.20
@@ -1,25 +1,23 @@ @@ -1,25 +1,23 @@
1# $NetBSD: Makefile,v 1.19 2015/07/27 14:30:34 mef Exp $ 1# $NetBSD: Makefile,v 1.20 2016/02/25 08:27:03 jperkin Exp $
2 2
3DISTNAME= EV-4.21 3DISTNAME= EV-4.21
4PKGNAME= p5-${DISTNAME} 4PKGNAME= p5-${DISTNAME}
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/M/ML/MLEHMANN/} 6MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/M/ML/MLEHMANN/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://search.cpan.org/dist/EV/ 9HOMEPAGE= http://search.cpan.org/dist/EV/
10COMMENT= Perl interface to libev, a high performance full-featured event loop 10COMMENT= Perl interface to libev, a high performance full-featured event loop
11LICENSE= ${PERL5_LICENSE} 11LICENSE= ${PERL5_LICENSE}
12 12
13DEPENDS+= p5-common-sense-[0-9]*:../../devel/p5-common-sense 13DEPENDS+= p5-common-sense-[0-9]*:../../devel/p5-common-sense
14DEPENDS+= p5-Canary-Stability-[0-9]*:../../devel/p5-Canary-Stability 14DEPENDS+= p5-Canary-Stability-[0-9]*:../../devel/p5-Canary-Stability
15 15
16MAKE_ENV+= PERL_MM_USE_DEFAULT=1 16MAKE_ENV+= PERL_MM_USE_DEFAULT=1
17PERL5_PACKLIST= auto/EV/.packlist 17PERL5_PACKLIST= auto/EV/.packlist
18 18
19OPSYSVARS+= MAKE_ENV 
20 
21# Explicitly disable epoll and inotify on illumos, assumes Linux statfs. 19# Explicitly disable epoll and inotify on illumos, assumes Linux statfs.
22MAKE_ENV.SunOS+= EV_EPOLL=0 EV_INOTIFY=0 20MAKE_ENV.SunOS+= EV_EPOLL=0 EV_INOTIFY=0
23 21
24.include "../../lang/perl5/module.mk" 22.include "../../lang/perl5/module.mk"
25.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"
cvs diff -r1.24 -r1.25 pkgsrc/editors/scite/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/scite/Makefile 2015/04/25 14:20:43 1.24
+++ pkgsrc/editors/scite/Makefile 2016/02/25 08:27:03 1.25
@@ -1,37 +1,35 @@ @@ -1,37 +1,35 @@
1# $NetBSD: Makefile,v 1.24 2015/04/25 14:20:43 tnn Exp $ 1# $NetBSD: Makefile,v 1.25 2016/02/25 08:27:03 jperkin Exp $
2# 2#
3 3
4DISTNAME= scite339 4DISTNAME= scite339
5PKGNAME= scite-3.3.9 5PKGNAME= scite-3.3.9
6PKGREVISION= 2 6PKGREVISION= 2
7CATEGORIES= editors 7CATEGORIES= editors
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scintilla/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scintilla/}
9EXTRACT_SUFX= .tgz 9EXTRACT_SUFX= .tgz
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://scintilla.sourceforge.net/ 12HOMEPAGE= http://scintilla.sourceforge.net/
13COMMENT= Source code editor 13COMMENT= Source code editor
14#LICENSE= # TODO: (see mk/license.mk) 14#LICENSE= # TODO: (see mk/license.mk)
15 15
16WRKSRC= ${WRKDIR}/scite 16WRKSRC= ${WRKDIR}/scite
17USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
18BUILD_DIRS+= gtk 18BUILD_DIRS+= gtk
19USE_TOOLS+= gmake pkg-config 19USE_TOOLS+= gmake pkg-config
20MAKE_FILE= makefile 20MAKE_FILE= makefile
21INSTALLATION_DIRS= share/applications share/pixmaps 21INSTALLATION_DIRS= share/applications share/pixmaps
22 22
23OPSYSVARS+= BUILDLINK_TRANSFORM 
24 
25BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script=lua.vers 23BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script=lua.vers
26 24
27post-extract: 25post-extract:
28 ${RM} -r ${WRKDIR}/scintilla 26 ${RM} -r ${WRKDIR}/scintilla
29 ${RM} ${WRKSRC}/gtk/deps.mak 27 ${RM} ${WRKSRC}/gtk/deps.mak
30 ${TOUCH} ${WRKSRC}/gtk/deps.mak 28 ${TOUCH} ${WRKSRC}/gtk/deps.mak
31 29
32.include "../../devel/glib2/buildlink3.mk" 30.include "../../devel/glib2/buildlink3.mk"
33.include "../../x11/gtk2/buildlink3.mk" 31.include "../../x11/gtk2/buildlink3.mk"
34BUILDLINK_API_DEPENDS.scintilla+= scintilla>=3.2.4 32BUILDLINK_API_DEPENDS.scintilla+= scintilla>=3.2.4
35.include "../../devel/scintilla/buildlink3.mk" 33.include "../../devel/scintilla/buildlink3.mk"
36.include "../../sysutils/desktop-file-utils/desktopdb.mk" 34.include "../../sysutils/desktop-file-utils/desktopdb.mk"
37.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"
cvs diff -r1.20 -r1.21 pkgsrc/games/tanked/Makefile (expand / switch to unified diff)

--- pkgsrc/games/tanked/Makefile 2014/09/23 18:55:24 1.20
+++ pkgsrc/games/tanked/Makefile 2016/02/25 08:27:03 1.21
@@ -1,32 +1,31 @@ @@ -1,32 +1,31 @@
1# $NetBSD: Makefile,v 1.20 2014/09/23 18:55:24 jperkin Exp $ 1# $NetBSD: Makefile,v 1.21 2016/02/25 08:27:03 jperkin Exp $
2# 2#
3 3
4DISTNAME= tanked-0.90 4DISTNAME= tanked-0.90
5PKGREVISION= 3 5PKGREVISION= 3
6CATEGORIES= games x11 6CATEGORIES= games x11
7MASTER_SITES= # empty 7MASTER_SITES= # empty
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10#HOMEPAGE= http://ogresoft.dyn.ml.org/tanked.html 10#HOMEPAGE= http://ogresoft.dyn.ml.org/tanked.html
11COMMENT= Multiplayer internet tank game for X11 11COMMENT= Multiplayer internet tank game for X11
12 12
13MAKE_JOBS_SAFE= no 13MAKE_JOBS_SAFE= no
14 14
15USE_TOOLS= imake 15USE_TOOLS= imake
16SETGIDGAME= yes 16SETGIDGAME= yes
17INSTALLATION_DIRS+= bin 17INSTALLATION_DIRS+= bin
18 18
19OPSYSVARS+= MAKE_ENV 
20MAKE_ENV.SunOS+= EXTRALIBS="-lsocket -lnsl" 19MAKE_ENV.SunOS+= EXTRALIBS="-lsocket -lnsl"
21 20
22SPECIAL_PERMS= bin/tanked ${SETGID_GAMES_PERMS} 21SPECIAL_PERMS= bin/tanked ${SETGID_GAMES_PERMS}
23 22
24.for dir in maps logs 23.for dir in maps logs
25OWN_DIRS_PERMS+= share/tanked/${dir} \ 24OWN_DIRS_PERMS+= share/tanked/${dir} \
26 ${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE} 25 ${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
27.endfor 26.endfor
28 27
29post-patch: 28post-patch:
30 @${TOUCH} ${WRKSRC}/client/tanked.man 29 @${TOUCH} ${WRKSRC}/client/tanked.man
31 @${MV} ${WRKSRC}/server/maps.list ${WRKSRC}/server/maps.list.bak 30 @${MV} ${WRKSRC}/server/maps.list ${WRKSRC}/server/maps.list.bak
32 @${SED} -e 's@XXX@${PREFIX}/share/tanked/@' \ 31 @${SED} -e 's@XXX@${PREFIX}/share/tanked/@' \
cvs diff -r1.40 -r1.41 pkgsrc/graphics/jasper/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/jasper/Makefile 2015/02/08 23:04:22 1.40
+++ pkgsrc/graphics/jasper/Makefile 2016/02/25 08:27:03 1.41
@@ -1,31 +1,30 @@ @@ -1,31 +1,30 @@
1# $NetBSD: Makefile,v 1.40 2015/02/08 23:04:22 snj Exp $ 1# $NetBSD: Makefile,v 1.41 2016/02/25 08:27:03 jperkin Exp $
2 2
3DISTNAME= jasper-1.900.1 3DISTNAME= jasper-1.900.1
4PKGREVISION= 10 4PKGREVISION= 10
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= http://www.ece.uvic.ca/~mdadams/jasper/software/ 6MASTER_SITES= http://www.ece.uvic.ca/~mdadams/jasper/software/
7EXTRACT_SUFX= .zip 7EXTRACT_SUFX= .zip
8 8
9MAINTAINER= adam@NetBSD.org 9MAINTAINER= adam@NetBSD.org
10HOMEPAGE= http://www.ece.uvic.ca/~mdadams/jasper/ 10HOMEPAGE= http://www.ece.uvic.ca/~mdadams/jasper/
11COMMENT= Software-based reference implementation of the JPEG-2000 codec 11COMMENT= Software-based reference implementation of the JPEG-2000 codec
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14USE_LANGUAGES= c99 14USE_LANGUAGES= c99
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17CONFIGURE_ARGS+= --enable-shared --without-x --disable-opengl 17CONFIGURE_ARGS+= --enable-shared --without-x --disable-opengl
18 18
19# The solaris stdbool.h requires c99 which is fine for jasper, but 19# The solaris stdbool.h requires c99 which is fine for jasper, but
20# not so good for things that depend upon jasper. See PR#43901 20# not so good for things that depend upon jasper. See PR#43901
21OPSYSVARS+= CONFIGURE_ENV 
22CONFIGURE_ENV.SunOS+= ac_cv_header_stdbool_h=no 21CONFIGURE_ENV.SunOS+= ac_cv_header_stdbool_h=no
23 22
24INSTALLATION_DIRS+= share/doc/jasper 23INSTALLATION_DIRS+= share/doc/jasper
25 24
26post-install: 25post-install:
27 ${INSTALL_DATA} ${WRKSRC}/doc/jasper.pdf ${DESTDIR}${PREFIX}/share/doc/jasper 26 ${INSTALL_DATA} ${WRKSRC}/doc/jasper.pdf ${DESTDIR}${PREFIX}/share/doc/jasper
28 ${INSTALL_DATA} ${WRKSRC}/doc/jpeg2000.pdf ${DESTDIR}${PREFIX}/share/doc/jasper 27 ${INSTALL_DATA} ${WRKSRC}/doc/jpeg2000.pdf ${DESTDIR}${PREFIX}/share/doc/jasper
29 28
30.include "../../mk/jpeg.buildlink3.mk" 29.include "../../mk/jpeg.buildlink3.mk"
31.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"
cvs diff -r1.60 -r1.61 pkgsrc/graphics/opencv/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/opencv/Makefile 2016/02/21 14:10:46 1.60
+++ pkgsrc/graphics/opencv/Makefile 2016/02/25 08:27:03 1.61
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.60 2016/02/21 14:10:46 fhajny Exp $ 1# $NetBSD: Makefile,v 1.61 2016/02/25 08:27:03 jperkin Exp $
2 2
3DISTNAME= opencv-3.1.0 3DISTNAME= opencv-3.1.0
4CATEGORIES= graphics devel 4CATEGORIES= graphics devel
5MASTER_SITES= ${MASTER_SITE_GITHUB:=Itseez/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=Itseez/}
6EXTRACT_SUFX= .zip 6EXTRACT_SUFX= .zip
7 7
8MAINTAINER= anthony.mallet@laas.fr 8MAINTAINER= anthony.mallet@laas.fr
9HOMEPAGE= http://code.opencv.org/projects/OpenCV/wiki/WikiStart 9HOMEPAGE= http://code.opencv.org/projects/OpenCV/wiki/WikiStart
10COMMENT= Library for computer vision problems 10COMMENT= Library for computer vision problems
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
13USE_CMAKE= yes 13USE_CMAKE= yes
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
@@ -24,27 +24,26 @@ PKGCONFIG_OVERRIDE+= opencv.pc.cmake.in @@ -24,27 +24,26 @@ PKGCONFIG_OVERRIDE+= opencv.pc.cmake.in
24PY_PATCHPLIST= yes 24PY_PATCHPLIST= yes
25REPLACE_PYTHON+= samples/python/*.py 25REPLACE_PYTHON+= samples/python/*.py
26 26
27# includes configure output and paths to gmake etc. 27# includes configure output and paths to gmake etc.
28CHECK_WRKREF_SKIP= ${PREFIX}/lib/libopencv_core.* 28CHECK_WRKREF_SKIP= ${PREFIX}/lib/libopencv_core.*
29 29
30.include "options.mk" 30.include "options.mk"
31 31
32.include "../../mk/compiler.mk" 32.include "../../mk/compiler.mk"
33.if !empty(PKGSRC_COMPILER:Mclang) 33.if !empty(PKGSRC_COMPILER:Mclang)
34CXXFLAGS+= -std=c++11 34CXXFLAGS+= -std=c++11
35.endif 35.endif
36 36
37OPSYSVARS+= CMAKE_ARGS 
38CMAKE_ARGS+= -DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN} 37CMAKE_ARGS+= -DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN}
39CMAKE_ARGS+= -DZLIB_ROOT=${BUILDLINK_PREFIX.zlib} 38CMAKE_ARGS+= -DZLIB_ROOT=${BUILDLINK_PREFIX.zlib}
40CMAKE_ARGS.SunOS+= -DENABLE_PRECOMPILED_HEADERS=NO 39CMAKE_ARGS.SunOS+= -DENABLE_PRECOMPILED_HEADERS=NO
41 40
42CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} 41CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
43 42
44.include "../../devel/zlib/buildlink3.mk" 43.include "../../devel/zlib/buildlink3.mk"
45.include "../../graphics/jasper/buildlink3.mk" 44.include "../../graphics/jasper/buildlink3.mk"
46.include "../../graphics/libwebp/buildlink3.mk" 45.include "../../graphics/libwebp/buildlink3.mk"
47.include "../../graphics/openexr/buildlink3.mk" 46.include "../../graphics/openexr/buildlink3.mk"
48.include "../../graphics/png/buildlink3.mk" 47.include "../../graphics/png/buildlink3.mk"
49.include "../../graphics/tiff/buildlink3.mk" 48.include "../../graphics/tiff/buildlink3.mk"
50.include "../../lang/python/extension.mk" 49.include "../../lang/python/extension.mk"
cvs diff -r1.4 -r1.5 pkgsrc/graphics/opencv-contrib-face/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/opencv-contrib-face/Makefile 2016/02/24 17:33:48 1.4
+++ pkgsrc/graphics/opencv-contrib-face/Makefile 2016/02/25 08:27:03 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.4 2016/02/24 17:33:48 fhajny Exp $ 1# $NetBSD: Makefile,v 1.5 2016/02/25 08:27:03 jperkin Exp $
2 2
3DISTNAME= opencv_contrib-3.1.0 3DISTNAME= opencv_contrib-3.1.0
4PKGNAME= ${DISTNAME:S/_contrib/-contrib-face/} 4PKGNAME= ${DISTNAME:S/_contrib/-contrib-face/}
5CATEGORIES= graphics devel 5CATEGORIES= graphics devel
6MASTER_SITES= ${MASTER_SITE_GITHUB:=Itseez/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=Itseez/}
7EXTRACT_SUFX= .zip 7EXTRACT_SUFX= .zip
8GITHUB_PROJECT= opencv_contrib 8GITHUB_PROJECT= opencv_contrib
9 9
10MAINTAINER= markd@NetBSD.org 10MAINTAINER= markd@NetBSD.org
11HOMEPAGE= http://code.opencv.org/projects/OpenCV/wiki/WikiStart 11HOMEPAGE= http://code.opencv.org/projects/OpenCV/wiki/WikiStart
12COMMENT= OpenCV face recognition contributed module 12COMMENT= OpenCV face recognition contributed module
13LICENSE= modified-bsd 13LICENSE= modified-bsd
14 14
@@ -24,27 +24,26 @@ INSTALL_DIRS= modules/face @@ -24,27 +24,26 @@ INSTALL_DIRS= modules/face
24 24
25WRKSRC= ${WRKDIR}/opencv-${PKGVERSION_NOREV}/ 25WRKSRC= ${WRKDIR}/opencv-${PKGVERSION_NOREV}/
26 26
27PATCHDIR= ${.CURDIR}/../../graphics/opencv/patches 27PATCHDIR= ${.CURDIR}/../../graphics/opencv/patches
28 28
29CMAKE_ARGS+= -D WITH_FFMPEG=OFF 29CMAKE_ARGS+= -D WITH_FFMPEG=OFF
30CMAKE_ARGS+= -D BUILD_DOCS=OFF 30CMAKE_ARGS+= -D BUILD_DOCS=OFF
31 31
32.include "../../mk/compiler.mk" 32.include "../../mk/compiler.mk"
33.if !empty(PKGSRC_COMPILER:Mclang) 33.if !empty(PKGSRC_COMPILER:Mclang)
34CXXFLAGS+= -std=c++11 34CXXFLAGS+= -std=c++11
35.endif 35.endif
36 36
37OPSYSVARS+= CMAKE_ARGS 
38CMAKE_ARGS+= -DZLIB_ROOT=${BUILDLINK_PREFIX.zlib} 37CMAKE_ARGS+= -DZLIB_ROOT=${BUILDLINK_PREFIX.zlib}
39CMAKE_ARGS.SunOS+= -DENABLE_PRECOMPILED_HEADERS=NO 38CMAKE_ARGS.SunOS+= -DENABLE_PRECOMPILED_HEADERS=NO
40 39
41CMAKE_ARGS+= -DOPENCV_EXTRA_MODULES_PATH=${WRKDIR}/${DISTNAME}/modules 40CMAKE_ARGS+= -DOPENCV_EXTRA_MODULES_PATH=${WRKDIR}/${DISTNAME}/modules
42CMAKE_ARGS+= -DBUILD_opencv_adas=OFF 41CMAKE_ARGS+= -DBUILD_opencv_adas=OFF
43CMAKE_ARGS+= -DBUILD_opencv_bgsegm=OFF 42CMAKE_ARGS+= -DBUILD_opencv_bgsegm=OFF
44CMAKE_ARGS+= -DBUILD_opencv_bioinspired=OFF 43CMAKE_ARGS+= -DBUILD_opencv_bioinspired=OFF
45CMAKE_ARGS+= -DBUILD_opencv_ccalib=OFF 44CMAKE_ARGS+= -DBUILD_opencv_ccalib=OFF
46CMAKE_ARGS+= -DBUILD_opencv_contrib_world=OFF 45CMAKE_ARGS+= -DBUILD_opencv_contrib_world=OFF
47CMAKE_ARGS+= -DBUILD_opencv_cvv=OFF 46CMAKE_ARGS+= -DBUILD_opencv_cvv=OFF
48CMAKE_ARGS+= -DBUILD_opencv_datasets=OFF 47CMAKE_ARGS+= -DBUILD_opencv_datasets=OFF
49CMAKE_ARGS+= -DBUILD_opencv_latentsvm=OFF 48CMAKE_ARGS+= -DBUILD_opencv_latentsvm=OFF
50CMAKE_ARGS+= -DBUILD_opencv_line_descriptor=OFF 49CMAKE_ARGS+= -DBUILD_opencv_line_descriptor=OFF
cvs diff -r1.2 -r1.3 pkgsrc/graphics/opencv2/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/opencv2/Attic/Makefile 2015/11/18 14:19:50 1.2
+++ pkgsrc/graphics/opencv2/Attic/Makefile 2016/02/25 08:27:03 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.2 2015/11/18 14:19:50 ryoon Exp $ 1# $NetBSD: Makefile,v 1.3 2016/02/25 08:27:03 jperkin Exp $
2 2
3DISTNAME= opencv-2.4.11 3DISTNAME= opencv-2.4.11
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= graphics devel 5CATEGORIES= graphics devel
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opencvlibrary/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opencvlibrary/}
7EXTRACT_SUFX= .zip 7EXTRACT_SUFX= .zip
8 8
9MAINTAINER= anthony.mallet@laas.fr 9MAINTAINER= anthony.mallet@laas.fr
10HOMEPAGE= http://code.opencv.org/projects/OpenCV/wiki/WikiStart 10HOMEPAGE= http://code.opencv.org/projects/OpenCV/wiki/WikiStart
11COMMENT= Library for computer vision problems 11COMMENT= Library for computer vision problems
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14USE_CMAKE= yes 14USE_CMAKE= yes
@@ -27,27 +27,26 @@ REPLACE_PYTHON+= samples/python/*.py @@ -27,27 +27,26 @@ REPLACE_PYTHON+= samples/python/*.py
27 27
28WRKSRC= ${WRKDIR}/${DISTNAME:S/a$//} 28WRKSRC= ${WRKDIR}/${DISTNAME:S/a$//}
29 29
30# includes configure output and paths to gmake etc. 30# includes configure output and paths to gmake etc.
31CHECK_WRKREF_SKIP= ${PREFIX}/lib/libopencv_core.* 31CHECK_WRKREF_SKIP= ${PREFIX}/lib/libopencv_core.*
32 32
33.include "options.mk" 33.include "options.mk"
34 34
35.include "../../mk/compiler.mk" 35.include "../../mk/compiler.mk"
36.if !empty(PKGSRC_COMPILER:Mclang) 36.if !empty(PKGSRC_COMPILER:Mclang)
37CXXFLAGS+= -std=c++11 37CXXFLAGS+= -std=c++11
38.endif 38.endif
39 39
40OPSYSVARS+= CMAKE_ARGS 
41CMAKE_ARGS+= -DZLIB_ROOT=${BUILDLINK_PREFIX.zlib} 40CMAKE_ARGS+= -DZLIB_ROOT=${BUILDLINK_PREFIX.zlib}
42CMAKE_ARGS.SunOS+= -DENABLE_PRECOMPILED_HEADERS=NO 41CMAKE_ARGS.SunOS+= -DENABLE_PRECOMPILED_HEADERS=NO
43 42
44PLIST_VARS+= opencl 43PLIST_VARS+= opencl
45 44
46.if ${OPSYS} == "Darwin" || ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS" || ${OPSYS} == "Linux" || ${OPSYS} == "FreeBSD" 45.if ${OPSYS} == "Darwin" || ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS" || ${OPSYS} == "Linux" || ${OPSYS} == "FreeBSD"
47PLIST.opencl= yes 46PLIST.opencl= yes
48.endif 47.endif
49 48
50.include "../../devel/zlib/buildlink3.mk" 49.include "../../devel/zlib/buildlink3.mk"
51.include "../../graphics/jasper/buildlink3.mk" 50.include "../../graphics/jasper/buildlink3.mk"
52.include "../../graphics/openexr/buildlink3.mk" 51.include "../../graphics/openexr/buildlink3.mk"
53.include "../../graphics/png/buildlink3.mk" 52.include "../../graphics/png/buildlink3.mk"
cvs diff -r1.11 -r1.12 pkgsrc/inputmethod/qt5-uim/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/qt5-uim/Attic/Makefile 2015/10/10 01:58:10 1.11
+++ pkgsrc/inputmethod/qt5-uim/Attic/Makefile 2016/02/25 08:27:03 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.11 2015/10/10 01:58:10 ryoon Exp $ 1# $NetBSD: Makefile,v 1.12 2016/02/25 08:27:03 jperkin Exp $
2 2
3.include "../../x11/qt5/Makefile.common" 3.include "../../x11/qt5/Makefile.common"
4 4
5DISTNAME= uim-1.8.6 5DISTNAME= uim-1.8.6
6PKGNAME= qt5-${DISTNAME} 6PKGNAME= qt5-${DISTNAME}
7PKGREVISION= 9 7PKGREVISION= 9
8CATEGORIES= x11 8CATEGORIES= x11
9MASTER_SITES= http://uim.googlecode.com/files/ 9MASTER_SITES= http://uim.googlecode.com/files/
10EXTRACT_SUFX= .tar.bz2 10EXTRACT_SUFX= .tar.bz2
11DISTFILES= ${DEFAULT_DISTFILES} uim-1.8.7pre1.tar.gz 11DISTFILES= ${DEFAULT_DISTFILES} uim-1.8.7pre1.tar.gz
12SITES.uim-1.8.7pre1.tar.gz= ${MASTER_SITE_LOCAL} 12SITES.uim-1.8.7pre1.tar.gz= ${MASTER_SITE_LOCAL}
13 13
14MAINTAINER= ryoon@NetBSD.org 14MAINTAINER= ryoon@NetBSD.org
@@ -16,28 +16,26 @@ HOMEPAGE= http://code.google.com/p/uim/ @@ -16,28 +16,26 @@ HOMEPAGE= http://code.google.com/p/uim/
16COMMENT= Qt5 input module for uim 16COMMENT= Qt5 input module for uim
17LICENSE= modified-bsd 17LICENSE= modified-bsd
18 18
19GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
20USE_LIBTOOL= yes 20USE_LIBTOOL= yes
21USE_TOOLS+= gmake gsed intltool pkg-config xgettext 21USE_TOOLS+= gmake gsed intltool pkg-config xgettext
22BUILDLINK_DEPMETHOD.gtk2= build 22BUILDLINK_DEPMETHOD.gtk2= build
23 23
24USE_LANGUAGES= c c++ 24USE_LANGUAGES= c c++
25 25
26PKGCONFIG_OVERRIDE+= uim.pc.in 26PKGCONFIG_OVERRIDE+= uim.pc.in
27 27
28CONFIGURE_ENV+= QMAKE5=${QTPREFIX}/bin/qmake 28CONFIGURE_ENV+= QMAKE5=${QTPREFIX}/bin/qmake
29 
30OPSYSVARS+= CONFIGURE_ENV 
31CONFIGURE_ENV.SunOS+= ac_cv_func_strcasecmp=yes 29CONFIGURE_ENV.SunOS+= ac_cv_func_strcasecmp=yes
32 30
33CONFIGURE_ARGS+= --with-qt5-immodule 31CONFIGURE_ARGS+= --with-qt5-immodule
34CONFIGURE_ARGS+= --disable-emacs 32CONFIGURE_ARGS+= --disable-emacs
35CONFIGURE_ARGS+= --with-libgcroots=installed 33CONFIGURE_ARGS+= --with-libgcroots=installed
36 34
37INSTALL_DIRS+= qt5 35INSTALL_DIRS+= qt5
38 36
39post-extract: 37post-extract:
40 cd ${WRKSRC} && \ 38 cd ${WRKSRC} && \
41 ${CP} -r ../uim-1.8.7pre1/qt5 . 39 ${CP} -r ../uim-1.8.7pre1/qt5 .
42 cd ${WRKSRC} && \ 40 cd ${WRKSRC} && \
43 ${RM} -fr qt4 &&\ 41 ${RM} -fr qt4 &&\
cvs diff -r1.29 -r1.30 pkgsrc/inputmethod/scim-python/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/scim-python/Attic/Makefile 2015/12/05 21:25:47 1.29
+++ pkgsrc/inputmethod/scim-python/Attic/Makefile 2016/02/25 08:27:03 1.30
@@ -1,37 +1,35 @@ @@ -1,37 +1,35 @@
1# $NetBSD: Makefile,v 1.29 2015/12/05 21:25:47 adam Exp $ 1# $NetBSD: Makefile,v 1.30 2016/02/25 08:27:03 jperkin Exp $
2 2
3DISTNAME= scim-python-0.1.13rc1 3DISTNAME= scim-python-0.1.13rc1
4PKGREVISION= 23 4PKGREVISION= 23
5CATEGORIES= inputmethod python 5CATEGORIES= inputmethod python
6MASTER_SITES= http://scim-python.googlecode.com/files/ 6MASTER_SITES= http://scim-python.googlecode.com/files/
7DISTFILES= ${DEFAULT_DISTFILES} ${DBTAR} 7DISTFILES= ${DEFAULT_DISTFILES} ${DBTAR}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://code.google.com/p/scim-python/ 10HOMEPAGE= http://code.google.com/p/scim-python/
11COMMENT= Python wrapper for Smart Common Input Method platform 11COMMENT= Python wrapper for Smart Common Input Method platform
12LICENSE= gnu-lgpl-v2 AND gnu-gpl-v2 12LICENSE= gnu-lgpl-v2 AND gnu-gpl-v2
13 13
14DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 14DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
15DEPENDS+= ${PYPKGPREFIX}-enchant-[0-9]*:../../textproc/py-enchant 15DEPENDS+= ${PYPKGPREFIX}-enchant-[0-9]*:../../textproc/py-enchant
16 16
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
19USE_PKGLOCALEDIR= yes 19USE_PKGLOCALEDIR= yes
20USE_LANGUAGES= c c++ 20USE_LANGUAGES= c c++
21USE_TOOLS+= pkg-config msgfmt 21USE_TOOLS+= pkg-config msgfmt
22 22
23OPSYSVARS+= BUILDLINK_TRANSFORM 
24 
25BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script=./scim.version-script 23BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script=./scim.version-script
26 24
27# taken from ${WRKSRC}/python/engine/PinYin/Makefile.in 25# taken from ${WRKSRC}/python/engine/PinYin/Makefile.in
28DBVER= 0.1.10.5 26DBVER= 0.1.10.5
29DBTAR= pinyin-database-${DBVER}.tar.bz2 27DBTAR= pinyin-database-${DBVER}.tar.bz2
30 28
31post-extract: 29post-extract:
32 ${TOUCH} ${WRKSRC}/python/engine/PinYin/${DBTAR} 30 ${TOUCH} ${WRKSRC}/python/engine/PinYin/${DBTAR}
33 ${CP} ${WRKDIR}/py.db ${WRKSRC}/python/engine/PinYin/py.db 31 ${CP} ${WRKDIR}/py.db ${WRKSRC}/python/engine/PinYin/py.db
34 32
35PY_PATCHPLIST= yes 33PY_PATCHPLIST= yes
36PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-gtk2 34PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-gtk2
37REPLACE_PYTHON+= python/engine/XingMa/XMCreateDB.py 35REPLACE_PYTHON+= python/engine/XingMa/XMCreateDB.py
cvs diff -r1.4 -r1.5 pkgsrc/lang/LuaJIT/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/LuaJIT/Attic/Makefile 2015/01/04 08:03:50 1.4
+++ pkgsrc/lang/LuaJIT/Attic/Makefile 2016/02/25 08:27:03 1.5
@@ -1,32 +1,29 @@ @@ -1,32 +1,29 @@
1# $NetBSD: Makefile,v 1.4 2015/01/04 08:03:50 dholland Exp $ 1# $NetBSD: Makefile,v 1.5 2016/02/25 08:27:03 jperkin Exp $
2# 2#
3 3
4DISTNAME= LuaJIT-1.1.5 4DISTNAME= LuaJIT-1.1.5
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= http://luajit.org/download/ 6MASTER_SITES= http://luajit.org/download/
7 7
8MAINTAINER= pho@cielonegro.org 8MAINTAINER= pho@cielonegro.org
9HOMEPAGE= http://luajit.org/ 9HOMEPAGE= http://luajit.org/
10COMMENT= Just-In-Time Compiler for the Lua programming language 10COMMENT= Just-In-Time Compiler for the Lua programming language
11 11
12# Only supports 32-bit x86. Try lang/LuaJIT2 instead... 12# Only supports 32-bit x86. Try lang/LuaJIT2 instead...
13ONLY_FOR_PLATFORM= *-*-i386 13ONLY_FOR_PLATFORM= *-*-i386
14 14
15LICENSE= mit 15LICENSE= mit
16 16
17USE_TOOLS+= gmake 17USE_TOOLS+= gmake
18 18
19MAKE_FLAGS+= INSTALL_TOP=${PREFIX} 19MAKE_FLAGS+= INSTALL_TOP=${PREFIX}
20 20
21.include "../../mk/bsd.prefs.mk" 
22 
23OPSYSVARS+= BUILD_TARGET 
24BUILD_TARGET.Linux= linux 21BUILD_TARGET.Linux= linux
25BUILD_TARGET.FreeBSD= bsd 22BUILD_TARGET.FreeBSD= bsd
26BUILD_TARGET.NetBSD= bsd 23BUILD_TARGET.NetBSD= bsd
27BUILD_TARGET.OpenBSD= bsd 24BUILD_TARGET.OpenBSD= bsd
28BUILD_TARGET.Darwin= macosx 25BUILD_TARGET.Darwin= macosx
29BUILD_TARGET.SunOS= solaris 26BUILD_TARGET.SunOS= solaris
30BUILD_TARGET.*= posix 27BUILD_TARGET.*= posix
31 28
32.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"
cvs diff -r1.81 -r1.82 pkgsrc/mail/dovecot2/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/dovecot2/Makefile 2015/12/27 12:36:37 1.81
+++ pkgsrc/mail/dovecot2/Makefile 2016/02/25 08:27:03 1.82
@@ -1,37 +1,35 @@ @@ -1,37 +1,35 @@
1# $NetBSD: Makefile,v 1.81 2015/12/27 12:36:37 adam Exp $ 1# $NetBSD: Makefile,v 1.82 2016/02/25 08:27:03 jperkin Exp $
2# 2#
3# when updating to a new release, update ABI depends in 3# when updating to a new release, update ABI depends in
4# the buildlink3.mk file as well, since the plugins' version 4# the buildlink3.mk file as well, since the plugins' version
5# must match (see PR 49563). 5# must match (see PR 49563).
6 6
7DISTNAME= dovecot-2.2.21 7DISTNAME= dovecot-2.2.21
8CATEGORIES= mail 8CATEGORIES= mail
9MASTER_SITES= http://www.dovecot.org/releases/${PKGVERSION_NOREV:R}/ 9MASTER_SITES= http://www.dovecot.org/releases/${PKGVERSION_NOREV:R}/
10 10
11MAINTAINER= adam@NetBSD.org 11MAINTAINER= adam@NetBSD.org
12HOMEPAGE= http://www.dovecot.org/ 12HOMEPAGE= http://www.dovecot.org/
13COMMENT= Secure IMAP and POP3 server 13COMMENT= Secure IMAP and POP3 server
14LICENSE= mit AND gnu-lgpl-v2.1 AND modified-bsd 14LICENSE= mit AND gnu-lgpl-v2.1 AND modified-bsd
15 15
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= gmake pkg-config rpcgen 17USE_TOOLS+= gmake pkg-config rpcgen
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19CONFIGURE_ARGS+= --localstatedir=${VARBASE} 19CONFIGURE_ARGS+= --localstatedir=${VARBASE}
20CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 20CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
21CONFIGURE_ARGS+= --with-ssldir=${SSLDIR} 21CONFIGURE_ARGS+= --with-ssldir=${SSLDIR}
22 22
23OPSYSVARS+= CONFIGURE_ENV 
24 
25TEST_TARGET= check 23TEST_TARGET= check
26 24
27# Explicitly disable inotify on illumos, it is provided for Linux compat only. 25# Explicitly disable inotify on illumos, it is provided for Linux compat only.
28CONFIGURE_ENV.SunOS+= ac_cv_func_inotify_init=no 26CONFIGURE_ENV.SunOS+= ac_cv_func_inotify_init=no
29 27
30.include "../../mk/bsd.prefs.mk" 28.include "../../mk/bsd.prefs.mk"
31 29
32RCD_SCRIPTS= dovecot 30RCD_SCRIPTS= dovecot
33SMF_NAME= dovecot 31SMF_NAME= dovecot
34 32
35DOVECOT_USER?= dovecot 33DOVECOT_USER?= dovecot
36DOVECOT_GROUP?= dovecot 34DOVECOT_GROUP?= dovecot
37DOVENULL_USER?= dovenull 35DOVENULL_USER?= dovenull
cvs diff -r1.141 -r1.142 pkgsrc/mail/imap-uw/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/imap-uw/Makefile 2014/07/18 10:40:28 1.141
+++ pkgsrc/mail/imap-uw/Makefile 2016/02/25 08:27:04 1.142
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.141 2014/07/18 10:40:28 ryoon Exp $ 1# $NetBSD: Makefile,v 1.142 2016/02/25 08:27:04 jperkin Exp $
2# 2#
3# ATTENTION: 3# ATTENTION:
4# The Kerberos support in this software is known to be problematic. If you 4# The Kerberos support in this software is known to be problematic. If you
5# upgrade this package you *must* test it on a system with Kerberos libraries 5# upgrade this package you *must* test it on a system with Kerberos libraries
6# but not running Kerberos before committing the changes. 6# but not running Kerberos before committing the changes.
7# 7#
8# NOTE ALSO: 8# NOTE ALSO:
9# The most common reason to install this package is as a prerequisite for pine. 9# The most common reason to install this package is as a prerequisite for pine.
10# If you upgrade this package, you *must* test mail/pine with the new version. 10# If you upgrade this package, you *must* test mail/pine with the new version.
11 11
12DISTNAME= imap-2007f 12DISTNAME= imap-2007f
13PKGNAME= ${DISTNAME:S/-/-uw-/} 13PKGNAME= ${DISTNAME:S/-/-uw-/}
14PKGREVISION= 2 14PKGREVISION= 2
@@ -24,29 +24,26 @@ LICENSE= apache-2.0 @@ -24,29 +24,26 @@ LICENSE= apache-2.0
24USE_LIBTOOL= yes 24USE_LIBTOOL= yes
25MAKE_ENV+= LIBTOOL=libtool 25MAKE_ENV+= LIBTOOL=libtool
26MAKE_ENV+= LTCOMPILE="libtool --tag=CC --mode=compile" 26MAKE_ENV+= LTCOMPILE="libtool --tag=CC --mode=compile"
27MAKE_ENV+= LTLINK="libtool --tag=CC --mode=link" 27MAKE_ENV+= LTLINK="libtool --tag=CC --mode=link"
28LTINSTALL_PROGRAM= ${SETENV} ${MAKE_ENV} ${LIBTOOL} --tag=CC --mode=install ${INSTALL_PROGRAM} 28LTINSTALL_PROGRAM= ${SETENV} ${MAKE_ENV} ${LIBTOOL} --tag=CC --mode=install ${INSTALL_PROGRAM}
29LTINSTALL_LIB= ${SETENV} ${MAKE_ENV} ${LIBTOOL} --tag=CC --mode=install ${INSTALL_LIB} 29LTINSTALL_LIB= ${SETENV} ${MAKE_ENV} ${LIBTOOL} --tag=CC --mode=install ${INSTALL_LIB}
30 30
31WRKSRC= ${WRKDIR}/${DISTNAME:S/2$//} 31WRKSRC= ${WRKDIR}/${DISTNAME:S/2$//}
32 32
33MAKE_JOBS_SAFE= no 33MAKE_JOBS_SAFE= no
34 34
35.include "../../mk/bsd.prefs.mk" 35.include "../../mk/bsd.prefs.mk"
36 36
37# Each platform has its own special target in the imap Makefiles. 
38OPSYSVARS+= BUILD_TARGET 
39 
40.include "../../mk/compiler.mk" 37.include "../../mk/compiler.mk"
41. if empty(CC_VERSION:Mgcc-) 38. if empty(CC_VERSION:Mgcc-)
42BUILD_TARGET.SunOS= soc 39BUILD_TARGET.SunOS= soc
43. else 40. else
44BUILD_TARGET.SunOS= gso 41BUILD_TARGET.SunOS= gso
45. endif 42. endif
46.if ${OPSYS} == Linux && exists(/usr/include/security/pam_appl.h) 43.if ${OPSYS} == Linux && exists(/usr/include/security/pam_appl.h)
47BUILD_TARGET.Linux= lnp 44BUILD_TARGET.Linux= lnp
48.else 45.else
49BUILD_TARGET.Linux= slx 46BUILD_TARGET.Linux= slx
50.endif 47.endif
51.if ${OPSYS} == Darwin 48.if ${OPSYS} == Darwin
52LDFLAGS+= -flat_namespace 49LDFLAGS+= -flat_namespace
cvs diff -r1.60 -r1.61 pkgsrc/net/libIDL/Makefile (expand / switch to unified diff)

--- pkgsrc/net/libIDL/Makefile 2014/10/09 14:06:45 1.60
+++ pkgsrc/net/libIDL/Makefile 2016/02/25 08:27:04 1.61
@@ -1,31 +1,30 @@ @@ -1,31 +1,30 @@
1# $NetBSD: Makefile,v 1.60 2014/10/09 14:06:45 wiz Exp $ 1# $NetBSD: Makefile,v 1.61 2016/02/25 08:27:04 jperkin Exp $
2 2
3DISTNAME= libIDL-0.8.14 3DISTNAME= libIDL-0.8.14
4PKGREVISION= 4 4PKGREVISION= 4
5CATEGORIES= net gnome 5CATEGORIES= net gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libIDL/0.8/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libIDL/0.8/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.gnome.org/ 9HOMEPAGE= http://www.gnome.org/
10COMMENT= CORBA Interface Definition Language parser 10COMMENT= CORBA Interface Definition Language parser
11LICENSE= gnu-lgpl-v2 11LICENSE= gnu-lgpl-v2
12 12
13USE_LIBTOOL= yes 13USE_LIBTOOL= yes
14USE_TOOLS+= bison flex pkg-config 14USE_TOOLS+= bison flex pkg-config
15PKGCONFIG_OVERRIDE= libIDL-2.0.pc.in 15PKGCONFIG_OVERRIDE= libIDL-2.0.pc.in
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17CONFIGURE_ENV+= HAVE_YACC=yes 17CONFIGURE_ENV+= HAVE_YACC=yes
18INFO_FILES= yes 18INFO_FILES= yes
19 19
20.include "../../mk/compiler.mk" 20.include "../../mk/compiler.mk"
21 21
22.if !empty(PKGSRC_COMPILER:Msunpro) 22.if !empty(PKGSRC_COMPILER:Msunpro)
23OPSYSVARS+= CONFIGURE_ENV 
24CONFIGURE_ENV.SunOS+= CPP=/usr/lib/cpp 23CONFIGURE_ENV.SunOS+= CPP=/usr/lib/cpp
25.endif 24.endif
26 25
27TEST_TARGET= check 26TEST_TARGET= check
28 27
29.include "../../devel/gettext-lib/buildlink3.mk" 28.include "../../devel/gettext-lib/buildlink3.mk"
30.include "../../devel/glib2/buildlink3.mk" 29.include "../../devel/glib2/buildlink3.mk"
31.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"
cvs diff -r1.39 -r1.40 pkgsrc/net/tnftp/Makefile (expand / switch to unified diff)

--- pkgsrc/net/tnftp/Makefile 2015/10/04 14:44:06 1.39
+++ pkgsrc/net/tnftp/Makefile 2016/02/25 08:27:04 1.40
@@ -1,37 +1,35 @@ @@ -1,37 +1,35 @@
1# $NetBSD: Makefile,v 1.39 2015/10/04 14:44:06 tnn Exp $ 1# $NetBSD: Makefile,v 1.40 2016/02/25 08:27:04 jperkin Exp $
2 2
3DISTNAME= tnftp-20151004 3DISTNAME= tnftp-20151004
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= # empty 5MASTER_SITES= # empty
6DISTFILES= # empty 6DISTFILES= # empty
7 7
8# distfile obtained from: ftp://ftp.NetBSD.org/pub/NetBSD/misc/tnftp 8# distfile obtained from: ftp://ftp.NetBSD.org/pub/NetBSD/misc/tnftp
9 9
10CONFLICTS+= kth-krb4-[0-9]* 10CONFLICTS+= kth-krb4-[0-9]*
11CONFLICTS+= lukemftp-[0-9]* 11CONFLICTS+= lukemftp-[0-9]*
12 12
13MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
14COMMENT= The enhanced FTP client in NetBSD 14COMMENT= The enhanced FTP client in NetBSD
15LICENSE= original-bsd 15LICENSE= original-bsd
16 16
17BOOTSTRAP_PKG= yes 17BOOTSTRAP_PKG= yes
18 18
19GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
20CHECK_PERMS= no 20CHECK_PERMS= no
21 21
22OPSYSVARS+= MAKE_ENV 
23MAKE_ENV.SunOS+= CPPFLAGS="" 22MAKE_ENV.SunOS+= CPPFLAGS=""
24 
25MAKE_ENV+= CATMAN_SECTION_SUFFIX=${CATMAN_SECTION_SUFFIX:Q} 23MAKE_ENV+= CATMAN_SECTION_SUFFIX=${CATMAN_SECTION_SUFFIX:Q}
26MAKE_ENV+= MANINSTALL=${MANINSTALL:Q} 24MAKE_ENV+= MANINSTALL=${MANINSTALL:Q}
27 25
28.include "options.mk" 26.include "options.mk"
29 27
30do-extract: 28do-extract:
31 @${CP} -R ${FILESDIR} ${WRKSRC} 29 @${CP} -R ${FILESDIR} ${WRKSRC}
32 @${RM} -f ${WRKSRC}/INSTALL 30 @${RM} -f ${WRKSRC}/INSTALL
33 31
34# Use mk/readline.builtin.mk to check for an editline library on the 32# Use mk/readline.builtin.mk to check for an editline library on the
35# system. If we use the system editline library, then use the built-in 33# system. If we use the system editline library, then use the built-in
36# termcap library. 34# termcap library.
37# 35#
cvs diff -r1.25 -r1.26 pkgsrc/net/tnftpd/Makefile (expand / switch to unified diff)

--- pkgsrc/net/tnftpd/Makefile 2015/02/24 08:58:56 1.25
+++ pkgsrc/net/tnftpd/Makefile 2016/02/25 08:27:04 1.26
@@ -1,35 +1,34 @@ @@ -1,35 +1,34 @@
1# $NetBSD: Makefile,v 1.25 2015/02/24 08:58:56 wiz Exp $ 1# $NetBSD: Makefile,v 1.26 2016/02/25 08:27:04 jperkin Exp $
2 2
3DISTNAME= tnftpd-20130325 3DISTNAME= tnftpd-20130325
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/tnftp/ 5MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/tnftp/
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8COMMENT= The NetBSD FTP Daemon 8COMMENT= The NetBSD FTP Daemon
9LICENSE= 2-clause-bsd 9LICENSE= 2-clause-bsd
10 10
11CONFLICTS= wu-ftpd-[0-9]* 11CONFLICTS= wu-ftpd-[0-9]*
12CONFLICTS+= kth-krb4-[0-9]* 12CONFLICTS+= kth-krb4-[0-9]*
13CONFLICTS+= lukemftpd-[0-9]* 13CONFLICTS+= lukemftpd-[0-9]*
14CONFLICTS= man-pages-[0-9]* 14CONFLICTS= man-pages-[0-9]*
15 15
16GNU_CONFIGURE= YES 16GNU_CONFIGURE= YES
17MANCOMPRESSED_IF_MANZ= YES 17MANCOMPRESSED_IF_MANZ= YES
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
19USE_TOOLS+= yacc 19USE_TOOLS+= yacc
20 20
21CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 21CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
22 22
23CONF_FILES+= ${EXAMPLEDIR}/ftpd.conf ${PKG_SYSCONFDIR}/ftpd.conf 23CONF_FILES+= ${EXAMPLEDIR}/ftpd.conf ${PKG_SYSCONFDIR}/ftpd.conf
24CONF_FILES+= ${EXAMPLEDIR}/ftpusers ${PKG_SYSCONFDIR}/ftpusers 24CONF_FILES+= ${EXAMPLEDIR}/ftpusers ${PKG_SYSCONFDIR}/ftpusers
25 25
26.include "options.mk" 26.include "options.mk"
27 27
28OPSYSVARS+= MAKE_ENV 
29MAKE_ENV.SunOS+= CPPFLAGS="" 28MAKE_ENV.SunOS+= CPPFLAGS=""
30 29
31EXAMPLEDIR= ${PREFIX}/share/examples/tnftpd 30EXAMPLEDIR= ${PREFIX}/share/examples/tnftpd
32INSTALLATION_DIRS= libexec ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 \ 31INSTALLATION_DIRS= libexec ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 \
33 ${EXAMPLEDIR} 32 ${EXAMPLEDIR}
34 33
35.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"
cvs diff -r1.116 -r1.117 pkgsrc/security/heimdal/Makefile (expand / switch to unified diff)

--- pkgsrc/security/heimdal/Makefile 2015/10/10 01:57:55 1.116
+++ pkgsrc/security/heimdal/Makefile 2016/02/25 08:27:04 1.117
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.116 2015/10/10 01:57:55 ryoon Exp $ 1# $NetBSD: Makefile,v 1.117 2016/02/25 08:27:04 jperkin Exp $
2 2
3DISTNAME= heimdal-1.5.3 3DISTNAME= heimdal-1.5.3
4PKGREVISION= 10 4PKGREVISION= 10
5CATEGORIES= security 5CATEGORIES= security
6MASTER_SITES= http://www.h5l.org/dist/src/ 6MASTER_SITES= http://www.h5l.org/dist/src/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.h5l.org/ 9HOMEPAGE= http://www.h5l.org/
10COMMENT= Kerberos 5 implementation 10COMMENT= Kerberos 5 implementation
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
13CONFLICTS+= arla-[0-9]* 13CONFLICTS+= arla-[0-9]*
14CONFLICTS+= mit-krb5-[0-9]* 14CONFLICTS+= mit-krb5-[0-9]*
@@ -43,27 +43,26 @@ CONFIGURE_ENV+= COMPILE_ET=no # build H @@ -43,27 +43,26 @@ CONFIGURE_ENV+= COMPILE_ET=no # build H
43CONFIGURE_ENV+= ac_cv_funclib_dispatch_async_f=no 43CONFIGURE_ENV+= ac_cv_funclib_dispatch_async_f=no
44 44
45.include "../../mk/bdb.buildlink3.mk" 45.include "../../mk/bdb.buildlink3.mk"
46 46
47# XXX Don't detect db1 when a newer version is available; otherwise build fails 47# XXX Don't detect db1 when a newer version is available; otherwise build fails
48.if ${BDB_TYPE} != "db1" 48.if ${BDB_TYPE} != "db1"
49CONFIGURE_ENV+= ac_cv_funclib_dbopen=no 49CONFIGURE_ENV+= ac_cv_funclib_dbopen=no
50.endif 50.endif
51 51
52CFLAGS.Darwin+= -DBIND_8_COMPAT 52CFLAGS.Darwin+= -DBIND_8_COMPAT
53 53
54# Though Solaris has a <vis.h> header, it does something very unrelated 54# Though Solaris has a <vis.h> header, it does something very unrelated
55# to the BSD <vis.h> header. 55# to the BSD <vis.h> header.
56OPSYSVARS+= CONFIGURE_ENV 
57CONFIGURE_ENV.SunOS+= ac_cv_header_vis_h=no 56CONFIGURE_ENV.SunOS+= ac_cv_header_vis_h=no
58 57
59.include "../../mk/readline.buildlink3.mk" 58.include "../../mk/readline.buildlink3.mk"
60 59
61.if ${READLINE_TYPE} == "readline" 60.if ${READLINE_TYPE} == "readline"
62CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.editlinereadline} 61CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.editlinereadline}
63.elif ${READLINE_TYPE} == "editline" 62.elif ${READLINE_TYPE} == "editline"
64CONFIGURE_ARGS+= --with-libedit=${BUILDLINK_PREFIX.editlinereadline} 63CONFIGURE_ARGS+= --with-libedit=${BUILDLINK_PREFIX.editlinereadline}
65.endif 64.endif
66 65
67PLIST_VARS+= glob vis 66PLIST_VARS+= glob vis
68.if ${OPSYS} == "SunOS" 67.if ${OPSYS} == "SunOS"
69PLIST.vis= yes 68PLIST.vis= yes
cvs diff -r1.75 -r1.76 pkgsrc/sysutils/hal/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/hal/Makefile 2015/09/25 16:26:15 1.75
+++ pkgsrc/sysutils/hal/Makefile 2016/02/25 08:27:04 1.76
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.75 2015/09/25 16:26:15 richard Exp $ 1# $NetBSD: Makefile,v 1.76 2016/02/25 08:27:04 jperkin Exp $
2 2
3DISTNAME= hal-0.5.14 3DISTNAME= hal-0.5.14
4PKGREVISION= 17 4PKGREVISION= 17
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6MASTER_SITES= http://hal.freedesktop.org/releases/ 6MASTER_SITES= http://hal.freedesktop.org/releases/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://hal.freedesktop.org/ 10HOMEPAGE= http://hal.freedesktop.org/
11COMMENT= FreeDesktop hardware abstraction layer 11COMMENT= FreeDesktop hardware abstraction layer
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DEPENDS+= pciids-[0-9]*:../../misc/pciids 14DEPENDS+= pciids-[0-9]*:../../misc/pciids
@@ -64,27 +64,26 @@ MAKE_DIRS+= /etc/udev @@ -64,27 +64,26 @@ MAKE_DIRS+= /etc/udev
64MAKE_DIRS+= /etc/udev/rules.d 64MAKE_DIRS+= /etc/udev/rules.d
65CONF_FILES+= ${EGDIR}/90-hal.rules \ 65CONF_FILES+= ${EGDIR}/90-hal.rules \
66 /etc/udev/rules.d/90-hal.rules 66 /etc/udev/rules.d/90-hal.rules
67 67
68.else # Unsupported systems 68.else # Unsupported systems
69# Pull in the dummy backend 69# Pull in the dummy backend
70.include "../../devel/libvolume_id/buildlink3.mk" 70.include "../../devel/libvolume_id/buildlink3.mk"
71CONFIGURE_ARGS+= --with-backend=dummy 71CONFIGURE_ARGS+= --with-backend=dummy
72PLIST_SRC= PLIST 72PLIST_SRC= PLIST
73.endif 73.endif
74 74
75CFLAGS.SunOS+= -Du_int32_t=uint32_t 75CFLAGS.SunOS+= -Du_int32_t=uint32_t
76 76
77OPSYSVARS+= BUILDLINK_TRANSFORM 
78BUILDLINK_TRANSFORM.Darwin+= rm:-Wl,--as-needed 77BUILDLINK_TRANSFORM.Darwin+= rm:-Wl,--as-needed
79BUILDLINK_TRANSFORM.SunOS+= opt:-Wl,--as-needed:-Wl,-zignore 78BUILDLINK_TRANSFORM.SunOS+= opt:-Wl,--as-needed:-Wl,-zignore
80 79
81REPLACE_INTERPRETER+= bash 80REPLACE_INTERPRETER+= bash
82REPLACE.bash.old= /bin/bash 81REPLACE.bash.old= /bin/bash
83REPLACE.bash.new= ${SH} 82REPLACE.bash.new= ${SH}
84.for halscript in luks-remove luks-setup luks-teardown system-wol-enable system-wol-enabled system-wol-supported 83.for halscript in luks-remove luks-setup luks-teardown system-wol-enable system-wol-enabled system-wol-supported
85REPLACE_FILES.bash+= tools/hal-${halscript} 84REPLACE_FILES.bash+= tools/hal-${halscript}
86.endfor 85.endfor
87 86
88HAL_USER?= haldaemon 87HAL_USER?= haldaemon
89HAL_GROUP?= haldaemon 88HAL_GROUP?= haldaemon
90CONFIGURE_ARGS+= --with-hal-user=${HAL_USER} 89CONFIGURE_ARGS+= --with-hal-user=${HAL_USER}
cvs diff -r1.15 -r1.16 pkgsrc/sysutils/ipmitool/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/ipmitool/Makefile 2014/10/09 14:06:57 1.15
+++ pkgsrc/sysutils/ipmitool/Makefile 2016/02/25 08:27:04 1.16
@@ -1,24 +1,23 @@ @@ -1,24 +1,23 @@
1# $NetBSD: Makefile,v 1.15 2014/10/09 14:06:57 wiz Exp $ 1# $NetBSD: Makefile,v 1.16 2016/02/25 08:27:04 jperkin Exp $
2# 2#
3 3
4DISTNAME= ipmitool-1.8.11 4DISTNAME= ipmitool-1.8.11
5PKGREVISION= 3 5PKGREVISION= 3
6CATEGORIES= sysutils 6CATEGORIES= sysutils
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ipmitool/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ipmitool/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://ipmitool.sourceforge.net/ 10HOMEPAGE= http://ipmitool.sourceforge.net/
11COMMENT= Command-line utility for managing IPMI devices 11COMMENT= Command-line utility for managing IPMI devices
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14INSTALLATION_DIRS+= share/examples/ipmitool share/doc/ipmitool 14INSTALLATION_DIRS+= share/examples/ipmitool share/doc/ipmitool
15 15
16OPSYSVARS+= CONFIGURE_ARGS 16CONFIGURE_ARGS.NetBSD+= --disable-intf-open --disable-intf-imb
17CONFIGURE_ARGS.NetBSD+= --disable-intf-open --disable-intf-imb 17CONFIGURE_ARGS.DragonFly+= --disable-intf-open --disable-intf-imb
18CONFIGURE_ARGS.DragonFly+= --disable-intf-open --disable-intf-imb 18CONFIGURE_ARGS.SunOS+= --enable-solaris-opt
19CONFIGURE_ARGS.SunOS+= --enable-solaris-opt 
20 19
21# ipmitool uses rl_event_hook 20# ipmitool uses rl_event_hook
22.include "../../devel/readline/buildlink3.mk" 21.include "../../devel/readline/buildlink3.mk"
23.include "../../security/openssl/buildlink3.mk" 22.include "../../security/openssl/buildlink3.mk"
24.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/sysutils/logrot/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/logrot/Makefile 2015/02/24 08:58:57 1.11
+++ pkgsrc/sysutils/logrot/Makefile 2016/02/25 08:27:04 1.12
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.11 2015/02/24 08:58:57 wiz Exp $ 1# $NetBSD: Makefile,v 1.12 2016/02/25 08:27:04 jperkin Exp $
2 2
3DISTNAME= logrot-1.7 3DISTNAME= logrot-1.7
4CATEGORIES= sysutils 4CATEGORIES= sysutils
5MASTER_SITES= http://www.mewburn.net/luke/src/ 5MASTER_SITES= http://www.mewburn.net/luke/src/
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://www.mewburn.net/luke/software.html 8HOMEPAGE= http://www.mewburn.net/luke/software.html
9COMMENT= Rotate log files in a safe and configurable manner 9COMMENT= Rotate log files in a safe and configurable manner
10 10
11GNU_CONFIGURE= YES 11GNU_CONFIGURE= YES
12 12
13OPSYSVARS+= CONFIGURE_ARGS 
14CONFIGURE_ARGS.NetBSD+= --with-pidfile=/var/run/syslogd.pid 13CONFIGURE_ARGS.NetBSD+= --with-pidfile=/var/run/syslogd.pid
15 14
16INSTALL_MAKE_FLAGS+= bindir=${DESTDIR}${PREFIX}/bin \ 15INSTALL_MAKE_FLAGS+= bindir=${DESTDIR}${PREFIX}/bin \
17 mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 16 mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
18 17
19.include "../../mk/bsd.pkg.mk" 18.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/textproc/libpinyin/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/libpinyin/Makefile 2015/03/15 19:51:08 1.4
+++ pkgsrc/textproc/libpinyin/Makefile 2016/02/25 08:27:04 1.5
@@ -1,26 +1,24 @@ @@ -1,26 +1,24 @@
1# $NetBSD: Makefile,v 1.4 2015/03/15 19:51:08 hiramatsu Exp $ 1# $NetBSD: Makefile,v 1.5 2016/02/25 08:27:04 jperkin Exp $
2 2
3DISTNAME= libpinyin-1.0.0 3DISTNAME= libpinyin-1.0.0
4CATEGORIES= textproc chinese 4CATEGORIES= textproc chinese
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpinyin/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpinyin/}
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= https://github.com/libpinyin/libpinyin/ 8HOMEPAGE= https://github.com/libpinyin/libpinyin/
9COMMENT= Library to deal with pinyin 9COMMENT= Library to deal with pinyin
10LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
11 11
12GNU_CONFIGURE= yes 12GNU_CONFIGURE= yes
13USE_TOOLS+= gmake pkg-config 13USE_TOOLS+= gmake pkg-config
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16 16
17PKGCONFIG_OVERRIDE+= libpinyin.pc.in 17PKGCONFIG_OVERRIDE+= libpinyin.pc.in
18 18
19OPSYSVARS+= BUILDLINK_TRANSFORM 
20 
21BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script=./libpinyin.ver 19BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script=./libpinyin.ver
22 20
23.include "../../databases/db4/buildlink3.mk" 21.include "../../databases/db4/buildlink3.mk"
24BUILDLINK_TRANSFORM+= l:db:db4 22BUILDLINK_TRANSFORM+= l:db:db4
25.include "../../devel/glib2/buildlink3.mk" 23.include "../../devel/glib2/buildlink3.mk"
26.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.29 -r1.30 pkgsrc/www/deforaos-surfer/Makefile (expand / switch to unified diff)

--- pkgsrc/www/deforaos-surfer/Makefile 2016/02/21 12:39:35 1.29
+++ pkgsrc/www/deforaos-surfer/Makefile 2016/02/25 08:27:04 1.30
@@ -1,38 +1,37 @@ @@ -1,38 +1,37 @@
1# $NetBSD: Makefile,v 1.29 2016/02/21 12:39:35 khorben Exp $ 1# $NetBSD: Makefile,v 1.30 2016/02/25 08:27:04 jperkin Exp $
2 2
3DISTNAME= Surfer-0.2.10 3DISTNAME= Surfer-0.2.10
4PKGNAME= deforaos-surfer-0.2.10 4PKGNAME= deforaos-surfer-0.2.10
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= http://www.defora.org/os/download/download/4430/ 6MASTER_SITES= http://www.defora.org/os/download/download/4430/
7 7
8MAINTAINER= khorben@defora.org 8MAINTAINER= khorben@defora.org
9HOMEPAGE= http://www.defora.org/ 9HOMEPAGE= http://www.defora.org/
10COMMENT= DeforaOS desktop web browser 10COMMENT= DeforaOS desktop web browser
11LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
12 12
13USE_TOOLS+= pkg-config 13USE_TOOLS+= pkg-config
14USE_TOOLS+= xgettext 14USE_TOOLS+= xgettext
15 15
16BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 16BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
17BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl 17BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
18 18
19MAKE_FLAGS+= DESTDIR=${DESTDIR} 19MAKE_FLAGS+= DESTDIR=${DESTDIR}
20MAKE_FLAGS+= PREFIX=${PREFIX} 20MAKE_FLAGS+= PREFIX=${PREFIX}
21MAKE_FLAGS+= CFLAGS=${CFLAGS:Q} 21MAKE_FLAGS+= CFLAGS=${CFLAGS:Q}
22MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q} 22MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q}
23AUTO_MKDIRS= yes 23AUTO_MKDIRS= yes
24 24
25OPSYSVARS+= MAKE_ENV 
26MAKE_ENV.SunOS+= LDFLAGSF="-lnsl -lresolv" 25MAKE_ENV.SunOS+= LDFLAGSF="-lnsl -lresolv"
27 26
28.include "../../mk/bsd.prefs.mk" 27.include "../../mk/bsd.prefs.mk"
29 28
30.if ${PKGMANDIR} != "share/man" 29.if ${PKGMANDIR} != "share/man"
31post-install: 30post-install:
32 ${MV} ${DESTDIR}${PREFIX}/share/man/html1/download.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/download.html 31 ${MV} ${DESTDIR}${PREFIX}/share/man/html1/download.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/download.html
33 ${MV} ${DESTDIR}${PREFIX}/share/man/html1/htmlapp.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/htmlapp.html 32 ${MV} ${DESTDIR}${PREFIX}/share/man/html1/htmlapp.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/htmlapp.html
34 ${MV} ${DESTDIR}${PREFIX}/share/man/html1/helper.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/helper.html 33 ${MV} ${DESTDIR}${PREFIX}/share/man/html1/helper.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/helper.html
35 ${MV} ${DESTDIR}${PREFIX}/share/man/html1/surfer.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/surfer.html 34 ${MV} ${DESTDIR}${PREFIX}/share/man/html1/surfer.html ${DESTDIR}${PREFIX}/${PKGMANDIR}/html1/surfer.html
36 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/download.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/download.1 35 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/download.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/download.1
37 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/helper.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/helper.1 36 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/helper.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/helper.1
38 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/htmlapp.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/htmlapp.1 37 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/htmlapp.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/htmlapp.1
cvs diff -r1.25 -r1.26 pkgsrc/www/libproxy/Makefile (expand / switch to unified diff)

--- pkgsrc/www/libproxy/Makefile 2016/02/01 15:02:16 1.25
+++ pkgsrc/www/libproxy/Makefile 2016/02/25 08:27:04 1.26
@@ -1,31 +1,29 @@ @@ -1,31 +1,29 @@
1# $NetBSD: Makefile,v 1.25 2016/02/01 15:02:16 leot Exp $ 1# $NetBSD: Makefile,v 1.26 2016/02/25 08:27:04 jperkin Exp $
2 2
3DISTNAME= libproxy-0.4.12 3DISTNAME= libproxy-0.4.12
4CATEGORIES= www gnome 4CATEGORIES= www gnome
5MASTER_SITES= ${MASTER_SITE_GITHUB:=libproxy/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=libproxy/}
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://libproxy.github.io/libproxy/ 8HOMEPAGE= http://libproxy.github.io/libproxy/
9COMMENT= Library that provides automatic proxy configuration management 9COMMENT= Library that provides automatic proxy configuration management
10LICENSE= gnu-lgpl-v2.1 10LICENSE= gnu-lgpl-v2.1
11 11
12USE_CMAKE= yes 12USE_CMAKE= yes
13USE_LIBTOOL= yes 13USE_LIBTOOL= yes
14USE_TOOLS+= pkg-config gmake 14USE_TOOLS+= pkg-config gmake
15USE_LANGUAGES= c99 c++ 15USE_LANGUAGES= c99 c++
16CMAKE_ARGS+= -DWITH_PYTHON:BOOL=OFF 16CMAKE_ARGS+= -DWITH_PYTHON:BOOL=OFF
17CMAKE_ARGS+= -DWITH_KDE4=OFF 17CMAKE_ARGS+= -DWITH_KDE4=OFF
18 18
19OPSYSVARS+= CMAKE_ARGS 
20 
21# Need socket libraries on SunOS for both the shared library and test programs. 19# Need socket libraries on SunOS for both the shared library and test programs.
22CMAKE_ARGS.SunOS+= -DCMAKE_EXE_LINKER_FLAGS:STRING="-lnsl -lsocket -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib" 20CMAKE_ARGS.SunOS+= -DCMAKE_EXE_LINKER_FLAGS:STRING="-lnsl -lsocket -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib"
23CMAKE_ARGS.SunOS+= -DCMAKE_SHARED_LINKER_FLAGS:STRING="-lnsl -lsocket -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib" 21CMAKE_ARGS.SunOS+= -DCMAKE_SHARED_LINKER_FLAGS:STRING="-lnsl -lsocket -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib"
24 22
25PKGCONFIG_OVERRIDE+= bindings/csharp/libproxy-sharp-1.0.pc.cmake 23PKGCONFIG_OVERRIDE+= bindings/csharp/libproxy-sharp-1.0.pc.cmake
26PKGCONFIG_OVERRIDE+= libproxy/libproxy-1.0.pc.in 24PKGCONFIG_OVERRIDE+= libproxy/libproxy-1.0.pc.in
27 25
28.include "../../devel/zlib/buildlink3.mk" 26.include "../../devel/zlib/buildlink3.mk"
29.include "../../mk/dlopen.buildlink3.mk" 27.include "../../mk/dlopen.buildlink3.mk"
30.include "../../mk/pthread.buildlink3.mk" 28.include "../../mk/pthread.buildlink3.mk"
31.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"
cvs diff -r1.180 -r1.181 pkgsrc/x11/gnome-panel/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/gnome-panel/Attic/Makefile 2016/02/22 16:13:31 1.180
+++ pkgsrc/x11/gnome-panel/Attic/Makefile 2016/02/25 08:27:04 1.181
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.180 2016/02/22 16:13:31 jperkin Exp $ 1# $NetBSD: Makefile,v 1.181 2016/02/25 08:27:04 jperkin Exp $
2 2
3DISTNAME= gnome-panel-2.32.1 3DISTNAME= gnome-panel-2.32.1
4PKGREVISION= 45 4PKGREVISION= 45
5CATEGORIES= x11 gnome 5CATEGORIES= x11 gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-panel/2.32/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-panel/2.32/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= drochner@NetBSD.org 9MAINTAINER= drochner@NetBSD.org
10HOMEPAGE= http://www.gnome.org/ 10HOMEPAGE= http://www.gnome.org/
11COMMENT= GNOME2 panel application 11COMMENT= GNOME2 panel application
12 12
13# depends on policykit 13# depends on policykit
14#EGDIR= ${PREFIX}/share/examples/gnome-panel 14#EGDIR= ${PREFIX}/share/examples/gnome-panel
@@ -43,27 +43,26 @@ GCONF_SCHEMAS+= panel-toplevel.schemas @@ -43,27 +43,26 @@ GCONF_SCHEMAS+= panel-toplevel.schemas
43GCONF_SCHEMAS+= panel-object.schemas 43GCONF_SCHEMAS+= panel-object.schemas
44GCONF_SCHEMAS+= panel-compatibility.schemas 44GCONF_SCHEMAS+= panel-compatibility.schemas
45GCONF_SCHEMAS+= workspace-switcher.schemas 45GCONF_SCHEMAS+= workspace-switcher.schemas
46GCONF_SCHEMAS+= window-list.schemas 46GCONF_SCHEMAS+= window-list.schemas
47GCONF_ENTRIES= panel-default-setup.entries 47GCONF_ENTRIES= panel-default-setup.entries
48 48
49BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.15.1 49BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.15.1
50BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.13.0 50BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.13.0
51 51
52PKG_OPTIONS_VAR= PKG_OPTIONS.gnome-panel 52PKG_OPTIONS_VAR= PKG_OPTIONS.gnome-panel
53PKG_SUPPORTED_OPTIONS= evolution 53PKG_SUPPORTED_OPTIONS= evolution
54PKG_SUGGESTED_OPTIONS= evolution 54PKG_SUGGESTED_OPTIONS= evolution
55 55
56OPSYSVARS+= SUBST_CLASSES 
57SUBST_CLASSES.Darwin+= noundef 56SUBST_CLASSES.Darwin+= noundef
58SUBST_STAGE.noundef= pre-configure 57SUBST_STAGE.noundef= pre-configure
59SUBST_FILES.noundef= bonobo/panel-module/Makefile.in 58SUBST_FILES.noundef= bonobo/panel-module/Makefile.in
60SUBST_SED.noundef= -e 's/ -no-undefined//g' 59SUBST_SED.noundef= -e 's/ -no-undefined//g'
61 60
62.include "../../mk/bsd.options.mk" 61.include "../../mk/bsd.options.mk"
63 62
64.include "../../devel/GConf/schemas.mk" 63.include "../../devel/GConf/schemas.mk"
65.include "../../devel/gettext-lib/buildlink3.mk" 64.include "../../devel/gettext-lib/buildlink3.mk"
66.include "../../devel/libbonobo/buildlink3.mk" 65.include "../../devel/libbonobo/buildlink3.mk"
67.include "../../devel/libbonoboui/buildlink3.mk" 66.include "../../devel/libbonoboui/buildlink3.mk"
68.include "../../devel/libgnome/buildlink3.mk" 67.include "../../devel/libgnome/buildlink3.mk"
69.include "../../devel/libgnomeui/buildlink3.mk" 68.include "../../devel/libgnomeui/buildlink3.mk"
cvs diff -r1.33 -r1.34 pkgsrc/x11/kactivities/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/kactivities/Makefile 2016/02/22 19:59:27 1.33
+++ pkgsrc/x11/kactivities/Makefile 2016/02/25 08:27:05 1.34
@@ -1,27 +1,26 @@ @@ -1,27 +1,26 @@
1# $NetBSD: Makefile,v 1.33 2016/02/22 19:59:27 jperkin Exp $ 1# $NetBSD: Makefile,v 1.34 2016/02/25 08:27:05 jperkin Exp $
2 2
3DISTNAME= kactivities-4.13.3 3DISTNAME= kactivities-4.13.3
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= x11 5CATEGORIES= x11
6COMMENT= KDE Activity Manager 6COMMENT= KDE Activity Manager
7MASTER_SITES= ${MASTER_SITE_KDE:=4.13.3/src/} 7MASTER_SITES= ${MASTER_SITE_KDE:=4.13.3/src/}
8 8
9.include "../../meta-pkgs/kde4/Makefile.kde4" 9.include "../../meta-pkgs/kde4/Makefile.kde4"
10 10
11# Needs C++11 features for kactivitymanager 11# Needs C++11 features for kactivitymanager
12GCC_REQD+= 4.5 12GCC_REQD+= 4.5
13 13
14OPSYSVARS+= CMAKE_ARGS 
15CMAKE_ARGS+= -DWITH_NepomukCore:BOOL=OFF 14CMAKE_ARGS+= -DWITH_NepomukCore:BOOL=OFF
16 15
17# The default MACOSX_DEPLOYMENT_TARGET is incompatible with the C++11 tests. 16# The default MACOSX_DEPLOYMENT_TARGET is incompatible with the C++11 tests.
18CMAKE_ARGS.Darwin+= -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${OSX_VERSION} 17CMAKE_ARGS.Darwin+= -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${OSX_VERSION}
19 18
20PKGCONFIG_OVERRIDE+= lib/libkactivities.pc.cmake 19PKGCONFIG_OVERRIDE+= lib/libkactivities.pc.cmake
21 20
22INSTALLATION_DIRS= share/kde/config 21INSTALLATION_DIRS= share/kde/config
23 22
24post-install: 23post-install:
25 ${INSTALL_DATA} ${FILESDIR}/activitymanagerrc ${DESTDIR}${PREFIX}/share/kde/config 24 ${INSTALL_DATA} ${FILESDIR}/activitymanagerrc ${DESTDIR}${PREFIX}/share/kde/config
26 25
27.include "../../meta-pkgs/kde4/kde4.mk" 26.include "../../meta-pkgs/kde4/kde4.mk"
cvs diff -r1.12 -r1.13 pkgsrc/x11/libxkbcommon/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/libxkbcommon/Makefile 2014/12/02 09:53:31 1.12
+++ pkgsrc/x11/libxkbcommon/Makefile 2016/02/25 08:27:05 1.13
@@ -1,29 +1,27 @@ @@ -1,29 +1,27 @@
1# $NetBSD: Makefile,v 1.12 2014/12/02 09:53:31 jperkin Exp $ 1# $NetBSD: Makefile,v 1.13 2016/02/25 08:27:05 jperkin Exp $
2 2
3DISTNAME= libxkbcommon-0.5.0 3DISTNAME= libxkbcommon-0.5.0
4CATEGORIES= x11 4CATEGORIES= x11
5MASTER_SITES= http://xkbcommon.org/download/ 5MASTER_SITES= http://xkbcommon.org/download/
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= ryoon@NetBSD.org 8MAINTAINER= ryoon@NetBSD.org
9HOMEPAGE= http://xkbcommon.org/ 9HOMEPAGE= http://xkbcommon.org/
10COMMENT= Library to handle keyboard descriptions 10COMMENT= Library to handle keyboard descriptions
11LICENSE= mit 11LICENSE= mit
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14USE_TOOLS+= bison gmake pkg-config 14USE_TOOLS+= bison gmake pkg-config
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16 16
17PKGCONFIG_OVERRIDE+= xkbcommon.pc.in 17PKGCONFIG_OVERRIDE+= xkbcommon.pc.in
18 18
19OPSYSVARS+= BUILDLINK_TRANSFORM 
20 
21BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script=./xkbcommon.map 19BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script=./xkbcommon.map
22BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script=./xkbcommon-x11.map 20BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script=./xkbcommon-x11.map
23 21
24.include "options.mk" 22.include "options.mk"
25.include "../../devel/xorg-util-macros/buildlink3.mk" 23.include "../../devel/xorg-util-macros/buildlink3.mk"
26BUILDLINK_API_DEPENDS.libxcb+= libxcb>=1.10 24BUILDLINK_API_DEPENDS.libxcb+= libxcb>=1.10
27.include "../../x11/libxcb/buildlink3.mk" 25.include "../../x11/libxcb/buildlink3.mk"
28.include "../../x11/xkeyboard-config/buildlink3.mk" 26.include "../../x11/xkeyboard-config/buildlink3.mk"
29.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
cvs diff -r1.40 -r1.41 pkgsrc/x11/qt4-libs/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/Makefile.common 2015/07/04 16:18:42 1.40
+++ pkgsrc/x11/qt4-libs/Makefile.common 2016/02/25 08:27:05 1.41
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.40 2015/07/04 16:18:42 joerg Exp $ 1# $NetBSD: Makefile.common,v 1.41 2016/02/25 08:27:05 jperkin Exp $
2# used by x11/qt4-docs/Makefile 2# used by x11/qt4-docs/Makefile
3# used by x11/qt4-libs/Makefile 3# used by x11/qt4-libs/Makefile
4# used by x11/qt4-mng/Makefile 4# used by x11/qt4-mng/Makefile
5# used by x11/qt4-mysql/Makefile 5# used by x11/qt4-mysql/Makefile
6# used by x11/qt4-pgsql/Makefile 6# used by x11/qt4-pgsql/Makefile
7# used by x11/qt4-qdbus/Makefile 7# used by x11/qt4-qdbus/Makefile
8# used by x11/qt4-sqlite3/Makefile 8# used by x11/qt4-sqlite3/Makefile
9# used by x11/qt4-tiff/Makefile 9# used by x11/qt4-tiff/Makefile
10 10
11DISTNAME= qt-everywhere-opensource-src-${QTVERSION} 11DISTNAME= qt-everywhere-opensource-src-${QTVERSION}
12CATEGORIES= x11 12CATEGORIES= x11
13MASTER_SITES= http://download.qt-project.org/official_releases/qt/${QTVERSION:R}/${QTVERSION}/ 13MASTER_SITES= http://download.qt-project.org/official_releases/qt/${QTVERSION:R}/${QTVERSION}/
14EXTRACT_USING= bsdtar 14EXTRACT_USING= bsdtar
@@ -28,27 +28,26 @@ USE_TOOLS+= gmake @@ -28,27 +28,26 @@ USE_TOOLS+= gmake
28BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=${QTVERSION} 28BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=${QTVERSION}
29.endif 29.endif
30 30
31QTPREFIX= ${PREFIX}/qt4 31QTPREFIX= ${PREFIX}/qt4
32 32
33# libphonon is available in multimedia/phonon 33# libphonon is available in multimedia/phonon
34CONFIGURE_ARGS+= -no-phonon 34CONFIGURE_ARGS+= -no-phonon
35CONFIGURE_ARGS+= -no-phonon-backend 35CONFIGURE_ARGS+= -no-phonon-backend
36CONFIGURE_ARGS+= -optimized-qmake 36CONFIGURE_ARGS+= -optimized-qmake
37CONFIGURE_ARGS+= -prefix "${QTPREFIX}" 37CONFIGURE_ARGS+= -prefix "${QTPREFIX}"
38CONFIGURE_ARGS+= ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-l*} 38CONFIGURE_ARGS+= ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-l*}
39CONFIGURE_ARGS+= -opensource -confirm-license 39CONFIGURE_ARGS+= -opensource -confirm-license
40CONFIGURE_ARGS+= -sysconfdir "${PKG_SYSCONFDIR}/xdg" 40CONFIGURE_ARGS+= -sysconfdir "${PKG_SYSCONFDIR}/xdg"
41OPSYSVARS+= CONFIGURE_ARGS 
42 41
43.include "../../mk/bsd.prefs.mk" 42.include "../../mk/bsd.prefs.mk"
44 43
45.if !empty(MAKE_JOBS) 44.if !empty(MAKE_JOBS)
46CONFIGURE_ENV+= MAKE_FLAGS=-j${MAKE_JOBS:Q} 45CONFIGURE_ENV+= MAKE_FLAGS=-j${MAKE_JOBS:Q}
47.endif 46.endif
48 47
49LIBQT?= -lQtCore -lQtGui 48LIBQT?= -lQtCore -lQtGui
50 49
51MAKE_ENV+= QTPREFIX=${QTPREFIX:Q} 50MAKE_ENV+= QTPREFIX=${QTPREFIX:Q}
52MAKE_ENV+= QTDIR=${WRKSRC} 51MAKE_ENV+= QTDIR=${WRKSRC}
53PLIST_VARS+= mac unix 52PLIST_VARS+= mac unix
54.if ${OPSYS} == "Darwin" 53.if ${OPSYS} == "Darwin"
cvs diff -r1.30 -r1.31 pkgsrc/x11/qt5-qtbase/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtbase/Makefile 2016/02/04 10:41:12 1.30
+++ pkgsrc/x11/qt5-qtbase/Makefile 2016/02/25 08:27:05 1.31
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.30 2016/02/04 10:41:12 markd Exp $ 1# $NetBSD: Makefile,v 1.31 2016/02/25 08:27:05 jperkin Exp $
2 2
3DISTNAME= qtbase-opensource-src-${QTVERSION} 3DISTNAME= qtbase-opensource-src-${QTVERSION}
4PKGNAME= qt5-qtbase-${QTVERSION} 4PKGNAME= qt5-qtbase-${QTVERSION}
5PKGREVISION= 2 5PKGREVISION= 2
6COMMENT= C++ X GUI toolkit 6COMMENT= C++ X GUI toolkit
7 7
8.include "../../x11/qt5-qtbase/Makefile.common" 8.include "../../x11/qt5-qtbase/Makefile.common"
9 9
10.if defined(MAKE_JOBS) 10.if defined(MAKE_JOBS)
11. if !defined(MAKE_JOBS_SAFE) || empty(MAKE_JOBS_SAFE:M[nN][oO]) 11. if !defined(MAKE_JOBS_SAFE) || empty(MAKE_JOBS_SAFE:M[nN][oO])
12CONFIGURE_ENV+= MAKE_FLAGS=-j${MAKE_JOBS:Q} 12CONFIGURE_ENV+= MAKE_FLAGS=-j${MAKE_JOBS:Q}
13. endif 13. endif
14.endif 14.endif
@@ -33,27 +33,26 @@ CONFIGURE_ARGS+= -no-sql-mysql @@ -33,27 +33,26 @@ CONFIGURE_ARGS+= -no-sql-mysql
33CONFIGURE_ARGS+= -no-sql-oci 33CONFIGURE_ARGS+= -no-sql-oci
34CONFIGURE_ARGS+= -no-sql-odbc 34CONFIGURE_ARGS+= -no-sql-odbc
35CONFIGURE_ARGS+= -no-sql-psql 35CONFIGURE_ARGS+= -no-sql-psql
36CONFIGURE_ARGS+= -no-sql-sqlite 36CONFIGURE_ARGS+= -no-sql-sqlite
37CONFIGURE_ARGS+= -no-sql-sqlite2 37CONFIGURE_ARGS+= -no-sql-sqlite2
38CONFIGURE_ARGS+= -no-sql-tds 38CONFIGURE_ARGS+= -no-sql-tds
39CONFIGURE_ARGS+= -no-strip 39CONFIGURE_ARGS+= -no-strip
40CONFIGURE_ARGS+= -system-harfbuzz 40CONFIGURE_ARGS+= -system-harfbuzz
41CONFIGURE_ARGS+= -system-libjpeg 41CONFIGURE_ARGS+= -system-libjpeg
42CONFIGURE_ARGS+= -system-libpng 42CONFIGURE_ARGS+= -system-libpng
43CONFIGURE_ARGS+= -system-pcre 43CONFIGURE_ARGS+= -system-pcre
44CONFIGURE_ARGS+= -system-sqlite 44CONFIGURE_ARGS+= -system-sqlite
45CONFIGURE_ARGS+= -system-zlib 45CONFIGURE_ARGS+= -system-zlib
46OPSYSVARS+= CONFIGURE_ARGS 
47 46
48.include "../../mk/bsd.prefs.mk" 47.include "../../mk/bsd.prefs.mk"
49 48
50.if ${OPSYS} != "Darwin" 49.if ${OPSYS} != "Darwin"
51CONFIGURE_ARGS+= -iconv 50CONFIGURE_ARGS+= -iconv
52QMAKE_CONF= qmake.conf 51QMAKE_CONF= qmake.conf
53. if ${OPSYS} != "SunOS" && \ 52. if ${OPSYS} != "SunOS" && \
54 (!empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64)) 53 (!empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64))
55CONFIGURE_ARGS+= -reduce-relocations 54CONFIGURE_ARGS+= -reduce-relocations
56. endif 55. endif
57.else 56.else
58QMAKE_CONF= qmake.conf.mac 57QMAKE_CONF= qmake.conf.mac
59.endif 58.endif