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 (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,51 +1,49 @@ @@ -1,51 +1,49 @@
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
34 32
35.include "../../converters/libiconv/buildlink3.mk" 33.include "../../converters/libiconv/buildlink3.mk"
36.include "../../devel/eet/buildlink3.mk" 34.include "../../devel/eet/buildlink3.mk"
37.include "../../graphics/evas-buffer/buildlink3.mk" 35.include "../../graphics/evas-buffer/buildlink3.mk"
38.include "../../graphics/evas-software-x11/buildlink3.mk" 36.include "../../graphics/evas-software-x11/buildlink3.mk"
39.include "../../graphics/evas/buildlink3.mk" 37.include "../../graphics/evas/buildlink3.mk"
40.include "../../security/openssl/buildlink3.mk" 38.include "../../security/openssl/buildlink3.mk"
41.include "../../www/curl/buildlink3.mk" 39.include "../../www/curl/buildlink3.mk"
42.include "../../x11/libXScrnSaver/buildlink3.mk" 40.include "../../x11/libXScrnSaver/buildlink3.mk"
43.include "../../x11/libXcomposite/buildlink3.mk" 41.include "../../x11/libXcomposite/buildlink3.mk"
44.include "../../x11/libXcursor/buildlink3.mk" 42.include "../../x11/libXcursor/buildlink3.mk"
45.include "../../x11/libXdamage/buildlink3.mk" 43.include "../../x11/libXdamage/buildlink3.mk"
46.include "../../x11/libXinerama/buildlink3.mk" 44.include "../../x11/libXinerama/buildlink3.mk"
47.include "../../x11/libXp/buildlink3.mk" 45.include "../../x11/libXp/buildlink3.mk"
48.include "../../x11/libXrandr/buildlink3.mk" 46.include "../../x11/libXrandr/buildlink3.mk"
49.include "../../x11/libXrender/buildlink3.mk" 47.include "../../x11/libXrender/buildlink3.mk"
50.include "../../x11/libXtst/buildlink3.mk" 48.include "../../x11/libXtst/buildlink3.mk"
51.include "../../mk/bsd.pkg.mk" 49.include "../../mk/bsd.pkg.mk"
cvs diff -r1.13 -r1.14 pkgsrc/devel/libev/Makefile (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 (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 (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 (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 (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,37 +1,36 @@ @@ -1,37 +1,36 @@
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/@' \
33 < ${WRKSRC}/server/maps.list.bak > ${WRKSRC}/server/maps.list 32 < ${WRKSRC}/server/maps.list.bak > ${WRKSRC}/server/maps.list
34 33
35.include "../../x11/libXmu/buildlink3.mk" 34.include "../../x11/libXmu/buildlink3.mk"
36.include "../../x11/libXpm/buildlink3.mk" 35.include "../../x11/libXpm/buildlink3.mk"
37.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"
cvs diff -r1.40 -r1.41 pkgsrc/graphics/jasper/Makefile (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 (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,54 +1,53 @@ @@ -1,54 +1,53 @@
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++
15USE_PKGLOCALEDIR= yes 15USE_PKGLOCALEDIR= yes
16USE_TOOLS+= gmake pkg-config 16USE_TOOLS+= gmake pkg-config
17 17
18INSTALLATION_DIRS+= share/doc/opencv/papers 18INSTALLATION_DIRS+= share/doc/opencv/papers
19INSTALLATION_DIRS+= share/doc/opencv/ref/pics 19INSTALLATION_DIRS+= share/doc/opencv/ref/pics
20INSTALLATION_DIRS+= share/OpenCV/haarcascades 20INSTALLATION_DIRS+= share/OpenCV/haarcascades
21 21
22PKGCONFIG_OVERRIDE+= opencv.pc.cmake.in 22PKGCONFIG_OVERRIDE+= opencv.pc.cmake.in
23 23
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"
51.include "../../math/py-numpy/buildlink3.mk" 50.include "../../math/py-numpy/buildlink3.mk"
52.include "../../mk/jpeg.buildlink3.mk" 51.include "../../mk/jpeg.buildlink3.mk"
53.include "../../x11/gtk2/buildlink3.mk" 52.include "../../x11/gtk2/buildlink3.mk"
54.include "../../mk/bsd.pkg.mk" 53.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/graphics/opencv-contrib-face/Makefile (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,88 +1,87 @@ @@ -1,88 +1,87 @@
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
15DISTFILES= ${DEFAULT_DISTFILES} opencv-${PKGVERSION_NOREV}.zip 15DISTFILES= ${DEFAULT_DISTFILES} opencv-${PKGVERSION_NOREV}.zip
16 16
17USE_CMAKE= yes 17USE_CMAKE= yes
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19USE_LIBTOOL= yes 19USE_LIBTOOL= yes
20USE_PKGLOCALEDIR= yes 20USE_PKGLOCALEDIR= yes
21USE_TOOLS+= gmake pkg-config 21USE_TOOLS+= gmake pkg-config
22 22
23INSTALL_DIRS= modules/face 23INSTALL_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
51CMAKE_ARGS+= -DBUILD_opencv_matlab=OFF 50CMAKE_ARGS+= -DBUILD_opencv_matlab=OFF
52CMAKE_ARGS+= -DBUILD_opencv_optflow=OFF 51CMAKE_ARGS+= -DBUILD_opencv_optflow=OFF
53CMAKE_ARGS+= -DBUILD_opencv_reg=OFF 52CMAKE_ARGS+= -DBUILD_opencv_reg=OFF
54CMAKE_ARGS+= -DBUILD_opencv_rgbd=OFF 53CMAKE_ARGS+= -DBUILD_opencv_rgbd=OFF
55CMAKE_ARGS+= -DBUILD_opencv_saliency=OFF 54CMAKE_ARGS+= -DBUILD_opencv_saliency=OFF
56CMAKE_ARGS+= -DBUILD_opencv_surface_matching=OFF 55CMAKE_ARGS+= -DBUILD_opencv_surface_matching=OFF
57CMAKE_ARGS+= -DBUILD_opencv_text=OFF 56CMAKE_ARGS+= -DBUILD_opencv_text=OFF
58CMAKE_ARGS+= -DBUILD_opencv_tracking=OFF 57CMAKE_ARGS+= -DBUILD_opencv_tracking=OFF
59CMAKE_ARGS+= -DBUILD_opencv_xfeatures2d=OFF 58CMAKE_ARGS+= -DBUILD_opencv_xfeatures2d=OFF
60CMAKE_ARGS+= -DBUILD_opencv_ximgproc=OFF 59CMAKE_ARGS+= -DBUILD_opencv_ximgproc=OFF
61CMAKE_ARGS+= -DBUILD_opencv_xobjdetect=OFF 60CMAKE_ARGS+= -DBUILD_opencv_xobjdetect=OFF
62CMAKE_ARGS+= -DBUILD_opencv_xphoto=OFF 61CMAKE_ARGS+= -DBUILD_opencv_xphoto=OFF
63 62
64CMAKE_ARGS+= -DBUILD_opencv_flann=OFF 63CMAKE_ARGS+= -DBUILD_opencv_flann=OFF
65CMAKE_ARGS+= -DBUILD_opencv_photo=OFF 64CMAKE_ARGS+= -DBUILD_opencv_photo=OFF
66CMAKE_ARGS+= -DBUILD_opencv_video=OFF 65CMAKE_ARGS+= -DBUILD_opencv_video=OFF
67CMAKE_ARGS+= -DBUILD_opencv_videoio=OFF 66CMAKE_ARGS+= -DBUILD_opencv_videoio=OFF
68CMAKE_ARGS+= -DBUILD_opencv_highgui=OFF 67CMAKE_ARGS+= -DBUILD_opencv_highgui=OFF
69CMAKE_ARGS+= -DBUILD_opencv_superres=OFF 68CMAKE_ARGS+= -DBUILD_opencv_superres=OFF
70CMAKE_ARGS+= -DBUILD_opencv_ts=OFF 69CMAKE_ARGS+= -DBUILD_opencv_ts=OFF
71CMAKE_ARGS+= -DBUILD_opencv_features2d=OFF 70CMAKE_ARGS+= -DBUILD_opencv_features2d=OFF
72CMAKE_ARGS+= -DBUILD_opencv_calib3d=OFF 71CMAKE_ARGS+= -DBUILD_opencv_calib3d=OFF
73CMAKE_ARGS+= -DBUILD_opencv_stitching=OFF 72CMAKE_ARGS+= -DBUILD_opencv_stitching=OFF
74CMAKE_ARGS+= -DBUILD_opencv_videostab=OFF 73CMAKE_ARGS+= -DBUILD_opencv_videostab=OFF
75CMAKE_ARGS+= -DBUILD_opencv_python2=OFF 74CMAKE_ARGS+= -DBUILD_opencv_python2=OFF
76 75
77CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} 76CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
78 77
79.include "../../devel/zlib/buildlink3.mk" 78.include "../../devel/zlib/buildlink3.mk"
80.include "../../graphics/jasper/buildlink3.mk" 79.include "../../graphics/jasper/buildlink3.mk"
81.include "../../graphics/libwebp/buildlink3.mk" 80.include "../../graphics/libwebp/buildlink3.mk"
82BUILDLINK_API_DEPENDS.opencv+= opencv>=${PKGVERSION_NOREV} 81BUILDLINK_API_DEPENDS.opencv+= opencv>=${PKGVERSION_NOREV}
83.include "../../graphics/opencv/buildlink3.mk" 82.include "../../graphics/opencv/buildlink3.mk"
84.include "../../graphics/openexr/buildlink3.mk" 83.include "../../graphics/openexr/buildlink3.mk"
85.include "../../graphics/png/buildlink3.mk" 84.include "../../graphics/png/buildlink3.mk"
86.include "../../graphics/tiff/buildlink3.mk" 85.include "../../graphics/tiff/buildlink3.mk"
87.include "../../mk/jpeg.buildlink3.mk" 86.include "../../mk/jpeg.buildlink3.mk"
88.include "../../mk/bsd.pkg.mk" 87.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/graphics/opencv2/Attic/Makefile (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,57 +1,56 @@ @@ -1,57 +1,56 @@
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
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_PKGLOCALEDIR= yes 17USE_PKGLOCALEDIR= yes
18USE_TOOLS+= gmake pkg-config 18USE_TOOLS+= gmake pkg-config
19 19
20INSTALLATION_DIRS+= share/doc/opencv/papers 20INSTALLATION_DIRS+= share/doc/opencv/papers
21INSTALLATION_DIRS+= share/doc/opencv/ref/pics 21INSTALLATION_DIRS+= share/doc/opencv/ref/pics
22INSTALLATION_DIRS+= share/OpenCV/haarcascades 22INSTALLATION_DIRS+= share/OpenCV/haarcascades
23 23
24PKGCONFIG_OVERRIDE+= opencv.pc.cmake.in 24PKGCONFIG_OVERRIDE+= opencv.pc.cmake.in
25 25
26REPLACE_PYTHON+= samples/python/*.py 26REPLACE_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"
54.include "../../graphics/tiff/buildlink3.mk" 53.include "../../graphics/tiff/buildlink3.mk"
55.include "../../mk/jpeg.buildlink3.mk" 54.include "../../mk/jpeg.buildlink3.mk"
56.include "../../x11/gtk2/buildlink3.mk" 55.include "../../x11/gtk2/buildlink3.mk"
57.include "../../mk/bsd.pkg.mk" 56.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/inputmethod/qt5-uim/Attic/Makefile (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,53 +1,51 @@ @@ -1,53 +1,51 @@
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
15HOMEPAGE= http://code.google.com/p/uim/ 15HOMEPAGE= 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 &&\
44 ${CP} -r ../uim-1.8.7pre1/qt4 . 42 ${CP} -r ../uim-1.8.7pre1/qt4 .
45 cd ${WRKSRC} && \ 43 cd ${WRKSRC} && \
46 ${CP} ../uim-1.8.7pre1/configure . 44 ${CP} ../uim-1.8.7pre1/configure .
47 45
48.include "../../converters/libiconv/buildlink3.mk" 46.include "../../converters/libiconv/buildlink3.mk"
49.include "../../devel/gettext-lib/buildlink3.mk" 47.include "../../devel/gettext-lib/buildlink3.mk"
50.include "../../devel/libgcroots/buildlink3.mk" 48.include "../../devel/libgcroots/buildlink3.mk"
51.include "../../inputmethod/uim/buildlink3.mk" 49.include "../../inputmethod/uim/buildlink3.mk"
52.include "../../x11/qt5-qtbase/buildlink3.mk" 50.include "../../x11/qt5-qtbase/buildlink3.mk"
53.include "../../mk/bsd.pkg.mk" 51.include "../../mk/bsd.pkg.mk"
cvs diff -r1.29 -r1.30 pkgsrc/inputmethod/scim-python/Attic/Makefile (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,43 +1,41 @@ @@ -1,43 +1,41 @@
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
38 36
39.include "../../inputmethod/scim/buildlink3.mk" 37.include "../../inputmethod/scim/buildlink3.mk"
40.include "../../x11/py-gtk2/buildlink3.mk" 38.include "../../x11/py-gtk2/buildlink3.mk"
41.include "../../lang/python/extension.mk" 39.include "../../lang/python/extension.mk"
42.include "../../lang/python/application.mk" 40.include "../../lang/python/application.mk"
43.include "../../mk/bsd.pkg.mk" 41.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/lang/LuaJIT/Attic/Makefile (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 (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,82 +1,80 @@ @@ -1,82 +1,80 @@
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
38DOVENULL_GROUP?= dovenull 36DOVENULL_GROUP?= dovenull
39PKG_GROUPS= ${DOVECOT_GROUP} ${DOVENULL_GROUP} 37PKG_GROUPS= ${DOVECOT_GROUP} ${DOVENULL_GROUP}
40PKG_USERS= ${DOVECOT_USER}:${DOVECOT_GROUP} \ 38PKG_USERS= ${DOVECOT_USER}:${DOVECOT_GROUP} \
41 ${DOVENULL_USER}:${DOVENULL_GROUP} 39 ${DOVENULL_USER}:${DOVENULL_GROUP}
42PKG_GROUPS_VARS= DOVECOT_GROUP DOVENULL_GROUP 40PKG_GROUPS_VARS= DOVECOT_GROUP DOVENULL_GROUP
43PKG_USERS_VARS= DOVECOT_USER DOVENULL_USER 41PKG_USERS_VARS= DOVECOT_USER DOVENULL_USER
44 42
45PKG_GECOS.${DOVECOT_USER}= Dovecot IMAP/POP3 user 43PKG_GECOS.${DOVECOT_USER}= Dovecot IMAP/POP3 user
46PKG_GECOS.${DOVENULL_USER}= Dovecot login user 44PKG_GECOS.${DOVENULL_USER}= Dovecot login user
47 45
48SUBST_CLASSES+= ssldir 46SUBST_CLASSES+= ssldir
49SUBST_MESSAGE.ssldir= Fixing SSLDIR 47SUBST_MESSAGE.ssldir= Fixing SSLDIR
50SUBST_FILES.ssldir= doc/example-config/conf.d/10-ssl.conf 48SUBST_FILES.ssldir= doc/example-config/conf.d/10-ssl.conf
51SUBST_STAGE.ssldir= pre-configure 49SUBST_STAGE.ssldir= pre-configure
52SUBST_SED.ssldir= -e 's,/etc/ssl,${SSLDIR},' 50SUBST_SED.ssldir= -e 's,/etc/ssl,${SSLDIR},'
53 51
54EGDIR= ${PREFIX}/share/examples/dovecot 52EGDIR= ${PREFIX}/share/examples/dovecot
55 53
56CNFS_cmd= ${SED} -ne "s,^share/examples/dovecot/,,p" PLIST 54CNFS_cmd= ${SED} -ne "s,^share/examples/dovecot/,,p" PLIST
57CNFS= ${CNFS_cmd:sh} 55CNFS= ${CNFS_cmd:sh}
58CONF_FILES= ${EGDIR}/dovecot.conf ${PKG_SYSCONFDIR}/dovecot/dovecot-example.conf 56CONF_FILES= ${EGDIR}/dovecot.conf ${PKG_SYSCONFDIR}/dovecot/dovecot-example.conf
59.for file in ${CNFS} 57.for file in ${CNFS}
60CONF_FILES+= ${EGDIR}/${file:Q} ${PKG_SYSCONFDIR}/dovecot/${file:Q} 58CONF_FILES+= ${EGDIR}/${file:Q} ${PKG_SYSCONFDIR}/dovecot/${file:Q}
61.endfor 59.endfor
62 60
63INSTALLATION_DIRS+= libexec/dovecot sbin share/doc/dovecot 61INSTALLATION_DIRS+= libexec/dovecot sbin share/doc/dovecot
64INSTALLATION_DIRS+= share/examples/dovecot share/examples/dovecot/conf.d 62INSTALLATION_DIRS+= share/examples/dovecot share/examples/dovecot/conf.d
65OWN_DIRS= ${PKG_SYSCONFDIR}/dovecot/ 63OWN_DIRS= ${PKG_SYSCONFDIR}/dovecot/
66OWN_DIRS+= ${PKG_SYSCONFDIR}/dovecot/conf.d 64OWN_DIRS+= ${PKG_SYSCONFDIR}/dovecot/conf.d
67 65
68BUILD_DEFS+= VARBASE 66BUILD_DEFS+= VARBASE
69 67
70post-install: 68post-install:
71 ${INSTALL_DATA} ${WRKSRC}/doc/dovecot-openssl.cnf ${DESTDIR}${EGDIR} 69 ${INSTALL_DATA} ${WRKSRC}/doc/dovecot-openssl.cnf ${DESTDIR}${EGDIR}
72 ${INSTALL_SCRIPT} ${WRKSRC}/doc/mkcert.sh ${DESTDIR}${EGDIR} 70 ${INSTALL_SCRIPT} ${WRKSRC}/doc/mkcert.sh ${DESTDIR}${EGDIR}
73 71
74.include "options.mk" 72.include "options.mk"
75 73
76# Don't compress manual pages as they include each other. 74# Don't compress manual pages as they include each other.
77.undef MANZ 75.undef MANZ
78 76
79.include "../../archivers/bzip2/buildlink3.mk" 77.include "../../archivers/bzip2/buildlink3.mk"
80.include "../../archivers/xz/buildlink3.mk" 78.include "../../archivers/xz/buildlink3.mk"
81.include "../../devel/zlib/buildlink3.mk" 79.include "../../devel/zlib/buildlink3.mk"
82.include "../../mk/bsd.pkg.mk" 80.include "../../mk/bsd.pkg.mk"
cvs diff -r1.141 -r1.142 pkgsrc/mail/imap-uw/Makefile (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,173 +1,170 @@ @@ -1,173 +1,170 @@
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
15CATEGORIES= mail 15CATEGORIES= mail
16MASTER_SITES= ftp://ftp.cac.washington.edu/imap/ 16MASTER_SITES= ftp://ftp.cac.washington.edu/imap/
17EXTRACT_SUFX= .tar.Z 17EXTRACT_SUFX= .tar.Z
18 18
19MAINTAINER= pkgsrc-users@NetBSD.org 19MAINTAINER= pkgsrc-users@NetBSD.org
20HOMEPAGE= http://www.washington.edu/imap/ 20HOMEPAGE= http://www.washington.edu/imap/
21COMMENT= University of Washington's IMAP, POP2, and POP3 servers 21COMMENT= University of Washington's IMAP, POP2, and POP3 servers
22LICENSE= apache-2.0 22LICENSE= apache-2.0
23 23
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
53. if exists(/usr/include/pam/pam_appl.h) 50. if exists(/usr/include/pam/pam_appl.h)
54BUILD_TARGET.Darwin= oxp 51BUILD_TARGET.Darwin= oxp
55. else 52. else
56BUILD_TARGET.Darwin= osx 53BUILD_TARGET.Darwin= osx
57. endif 54. endif
58.endif 55.endif
59.if ${OPSYS} == "IRIX" 56.if ${OPSYS} == "IRIX"
60. if ${OS_VERSION} >= 6.5 57. if ${OS_VERSION} >= 6.5
61BUILD_TARGET.IRIX= sg6 58BUILD_TARGET.IRIX= sg6
62. else 59. else
63BUILD_TARGET.IRIX= sgi 60BUILD_TARGET.IRIX= sgi
64. endif 61. endif
65.endif 62.endif
66BUILD_TARGET.OSF1= osf 63BUILD_TARGET.OSF1= osf
67BUILD_TARGET.OpenBSD= bso 64BUILD_TARGET.OpenBSD= bso
68BUILD_TARGET.*= neb 65BUILD_TARGET.*= neb
69.if ${OS_VARIANT} == "SCOOSR5" 66.if ${OS_VARIANT} == "SCOOSR5"
70BUILD_TARGET.SCO_SV= sc5 67BUILD_TARGET.SCO_SV= sc5
71.endif 68.endif
72MESSAGE_SRC= ${PKGDIR}/MESSAGE 69MESSAGE_SRC= ${PKGDIR}/MESSAGE
73 70
74# XXX this is not the right approach - should either depend on pam or 71# XXX this is not the right approach - should either depend on pam or
75# not, or make it an option. 72# not, or make it an option.
76.if ${OPSYS} == NetBSD && !exists(/usr/include/security/pam_appl.h) 73.if ${OPSYS} == NetBSD && !exists(/usr/include/security/pam_appl.h)
77.include "../../mk/pam.buildlink3.mk" 74.include "../../mk/pam.buildlink3.mk"
78.endif 75.endif
79 76
80.include "options.mk" 77.include "options.mk"
81 78
82# The defaults for these values are set in pkgsrc/mk/defaults/mk.conf. 79# The defaults for these values are set in pkgsrc/mk/defaults/mk.conf.
83#IMAP_UW_CCLIENT_MBOX_FMT?= unix 80#IMAP_UW_CCLIENT_MBOX_FMT?= unix
84#IMAP_UW_MAILSPOOLHOME?= .Mailbox 81#IMAP_UW_MAILSPOOLHOME?= .Mailbox
85BUILD_DEFS+= IMAP_UW_CCLIENT_MBOX_FMT IMAP_UW_MAILSPOOLHOME 82BUILD_DEFS+= IMAP_UW_CCLIENT_MBOX_FMT IMAP_UW_MAILSPOOLHOME
86 83
87CCLIENT_LIB= libc-client.la 84CCLIENT_LIB= libc-client.la
88CCLIENT_PICLIB= libc-client_pic.a 85CCLIENT_PICLIB= libc-client_pic.a
89CCLIENT_MAJOR= 5 86CCLIENT_MAJOR= 5
90CCLIENT_MINOR= 0 87CCLIENT_MINOR= 0
91MAKE_ENV+= CCLIENT_MAJOR=${CCLIENT_MAJOR:Q} 88MAKE_ENV+= CCLIENT_MAJOR=${CCLIENT_MAJOR:Q}
92MAKE_ENV+= CCLIENT_MINOR=${CCLIENT_MINOR:Q} 89MAKE_ENV+= CCLIENT_MINOR=${CCLIENT_MINOR:Q}
93 90
94EXTRASPECIALS+= CREATEPROTO=${IMAP_UW_CCLIENT_MBOX_FMT:Q}proto 91EXTRASPECIALS+= CREATEPROTO=${IMAP_UW_CCLIENT_MBOX_FMT:Q}proto
95 92
96MAKE_FLAGS+= EXTRALDFLAGS=${LDFLAGS:Q} 93MAKE_FLAGS+= EXTRALDFLAGS=${LDFLAGS:Q}
97MAKE_FLAGS+= EXTRACFLAGS=${CFLAGS:Q} 94MAKE_FLAGS+= EXTRACFLAGS=${CFLAGS:Q}
98MAKE_FLAGS+= EXTRASPECIALS=${EXTRASPECIALS:Q} 95MAKE_FLAGS+= EXTRASPECIALS=${EXTRASPECIALS:Q}
99 96
100SUBST_CLASSES+= mbox 97SUBST_CLASSES+= mbox
101SUBST_STAGE.mbox= do-configure 98SUBST_STAGE.mbox= do-configure
102SUBST_FILES.mbox= src/osdep/unix/env_unix.c 99SUBST_FILES.mbox= src/osdep/unix/env_unix.c
103.if defined(IMAP_USE_MAILSPOOLHOME) 100.if defined(IMAP_USE_MAILSPOOLHOME)
104SUBST_SED.mbox= -e 's|@SPOOLDIR@|myhomedir ()|' 101SUBST_SED.mbox= -e 's|@SPOOLDIR@|myhomedir ()|'
105SUBST_SED.mbox+= -e 's|@MAILBOX@|"${IMAP_UW_MAILSPOOLHOME}"|' 102SUBST_SED.mbox+= -e 's|@MAILBOX@|"${IMAP_UW_MAILSPOOLHOME}"|'
106.else 103.else
107SUBST_SED.mbox= -e 's|@SPOOLDIR@|MAILSPOOL|' 104SUBST_SED.mbox= -e 's|@SPOOLDIR@|MAILSPOOL|'
108SUBST_SED.mbox+= -e 's|@MAILBOX@|myusername ()|' 105SUBST_SED.mbox+= -e 's|@MAILBOX@|myusername ()|'
109.endif 106.endif
110 107
111SUBST_CLASSES+= man 108SUBST_CLASSES+= man
112SUBST_STAGE.man= post-build 109SUBST_STAGE.man= post-build
113SUBST_FILES.man= src/imapd/imapd.8 src/ipopd/ipopd.8 110SUBST_FILES.man= src/imapd/imapd.8 src/ipopd/ipopd.8
114SUBST_SED.man= -e "s|/usr/etc/imapd|${PREFIX}/libexec/imapd|g" 111SUBST_SED.man= -e "s|/usr/etc/imapd|${PREFIX}/libexec/imapd|g"
115SUBST_SED.man+= -e "s|/etc/rimapd|${PREFIX}/sbin/rimapd|g" 112SUBST_SED.man+= -e "s|/etc/rimapd|${PREFIX}/sbin/rimapd|g"
116SUBST_SED.man+= -e "s|/usr/etc/ipop2d|${PREFIX}/libexec/ipop2d|g" 113SUBST_SED.man+= -e "s|/usr/etc/ipop2d|${PREFIX}/libexec/ipop2d|g"
117SUBST_SED.man+= -e "s|/usr/etc/ipop3d|${PREFIX}/libexec/ipop3d|g" 114SUBST_SED.man+= -e "s|/usr/etc/ipop3d|${PREFIX}/libexec/ipop3d|g"
118 115
119INSTALLATION_DIRS+= bin lib libexec sbin \ 116INSTALLATION_DIRS+= bin lib libexec sbin \
120 ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 117 ${PKGMANDIR}/man1 ${PKGMANDIR}/man8
121 118
122# Generate _pic.a library from shared objects. 119# Generate _pic.a library from shared objects.
123post-build: 120post-build:
124 cd ${WRKSRC}/c-client; \ 121 cd ${WRKSRC}/c-client; \
125 ${LIBTOOL} --mode=link ${CC} -o ${CCLIENT_PICLIB:.a=.la} *.lo 122 ${LIBTOOL} --mode=link ${CC} -o ${CCLIENT_PICLIB:.a=.la} *.lo
126 123
127do-install: install-headers install-lib install-doc 124do-install: install-headers install-lib install-doc
128 ${LTINSTALL_PROGRAM} ${WRKSRC}/imapd/imapd ${DESTDIR}${PREFIX}/libexec 125 ${LTINSTALL_PROGRAM} ${WRKSRC}/imapd/imapd ${DESTDIR}${PREFIX}/libexec
129 ${LTINSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop2d ${DESTDIR}${PREFIX}/libexec 126 ${LTINSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop2d ${DESTDIR}${PREFIX}/libexec
130 ${LTINSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop3d ${DESTDIR}${PREFIX}/libexec 127 ${LTINSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop3d ${DESTDIR}${PREFIX}/libexec
131 ${LTINSTALL_PROGRAM} ${WRKSRC}/mtest/mtest ${DESTDIR}${PREFIX}/sbin 128 ${LTINSTALL_PROGRAM} ${WRKSRC}/mtest/mtest ${DESTDIR}${PREFIX}/sbin
132 ${LN} -sf ../libexec/imapd ${DESTDIR}${PREFIX}/sbin/rimapd 129 ${LN} -sf ../libexec/imapd ${DESTDIR}${PREFIX}/sbin/rimapd
133 ${INSTALL_MAN} ${WRKSRC}/src/imapd/imapd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 130 ${INSTALL_MAN} ${WRKSRC}/src/imapd/imapd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
134 ${INSTALL_MAN} ${WRKSRC}/src/ipopd/ipopd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 131 ${INSTALL_MAN} ${WRKSRC}/src/ipopd/ipopd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
135 ${LN} -sf ipopd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/ipop2d.8 132 ${LN} -sf ipopd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/ipop2d.8
136 ${LN} -sf ipopd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/ipop3d.8 133 ${LN} -sf ipopd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/ipop3d.8
137 ${LTINSTALL_PROGRAM} ${WRKSRC}/mailutil/mailutil ${DESTDIR}${PREFIX}/bin 134 ${LTINSTALL_PROGRAM} ${WRKSRC}/mailutil/mailutil ${DESTDIR}${PREFIX}/bin
138 ${INSTALL_MAN} ${WRKSRC}/src/mailutil/mailutil.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 135 ${INSTALL_MAN} ${WRKSRC}/src/mailutil/mailutil.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
139 ${LTINSTALL_PROGRAM} ${WRKSRC}/dmail/dmail ${DESTDIR}${PREFIX}/bin 136 ${LTINSTALL_PROGRAM} ${WRKSRC}/dmail/dmail ${DESTDIR}${PREFIX}/bin
140 ${INSTALL_MAN} ${WRKSRC}/src/dmail/dmail.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 137 ${INSTALL_MAN} ${WRKSRC}/src/dmail/dmail.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
141 ${LTINSTALL_PROGRAM} ${WRKSRC}/mlock/mlock ${DESTDIR}${PREFIX}/bin 138 ${LTINSTALL_PROGRAM} ${WRKSRC}/mlock/mlock ${DESTDIR}${PREFIX}/bin
142 ${LTINSTALL_PROGRAM} ${WRKSRC}/tmail/tmail ${DESTDIR}${PREFIX}/bin 139 ${LTINSTALL_PROGRAM} ${WRKSRC}/tmail/tmail ${DESTDIR}${PREFIX}/bin
143 ${INSTALL_MAN} ${WRKSRC}/src/tmail/tmail.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 140 ${INSTALL_MAN} ${WRKSRC}/src/tmail/tmail.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
144 141
145.PHONY: install-headers install-lib install-doc 142.PHONY: install-headers install-lib install-doc
146install-headers: 143install-headers:
147 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/c-client 144 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/c-client
148 ${CAT} ${PKGDIR}/PLIST | \ 145 ${CAT} ${PKGDIR}/PLIST | \
149 while read entry; do \ 146 while read entry; do \
150 case "$$entry" in \ 147 case "$$entry" in \
151 include/c-client/*) \ 148 include/c-client/*) \
152 src="${WRKSRC}/c-client/`${BASENAME} $$entry`"; \ 149 src="${WRKSRC}/c-client/`${BASENAME} $$entry`"; \
153 dest="${DESTDIR}${PREFIX}/$$entry"; \ 150 dest="${DESTDIR}${PREFIX}/$$entry"; \
154 ${INSTALL_DATA} $$src $$dest; \ 151 ${INSTALL_DATA} $$src $$dest; \
155 esac; \ 152 esac; \
156 done 153 done
157 154
158install-lib: 155install-lib:
159 ${LTINSTALL_LIB} ${WRKSRC}/c-client/${CCLIENT_LIB} ${DESTDIR}${PREFIX}/lib 156 ${LTINSTALL_LIB} ${WRKSRC}/c-client/${CCLIENT_LIB} ${DESTDIR}${PREFIX}/lib
160 ${INSTALL_LIB} ${WRKSRC}/c-client/.libs/${CCLIENT_PICLIB} ${DESTDIR}${PREFIX}/lib 157 ${INSTALL_LIB} ${WRKSRC}/c-client/.libs/${CCLIENT_PICLIB} ${DESTDIR}${PREFIX}/lib
161 ${RANLIB} ${DESTDIR}${PREFIX}/lib/${CCLIENT_PICLIB} 158 ${RANLIB} ${DESTDIR}${PREFIX}/lib/${CCLIENT_PICLIB}
162 159
163DOCDIR= ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} 160DOCDIR= ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
164install-doc: 161install-doc:
165 ${INSTALL_DATA_DIR} ${DOCDIR} 162 ${INSTALL_DATA_DIR} ${DOCDIR}
166 ${CP} -R ${WRKSRC}/docs/* ${DOCDIR} 163 ${CP} -R ${WRKSRC}/docs/* ${DOCDIR}
167 ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCDIR} 164 ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCDIR}
168 ${FIND} ${DOCDIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE} 165 ${FIND} ${DOCDIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
169 ${FIND} ${DOCDIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE} 166 ${FIND} ${DOCDIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
170 167
171.include "../../devel/sysexits/buildlink3.mk" 168.include "../../devel/sysexits/buildlink3.mk"
172 169
173.include "../../mk/bsd.pkg.mk" 170.include "../../mk/bsd.pkg.mk"
cvs diff -r1.60 -r1.61 pkgsrc/net/libIDL/Makefile (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 (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,63 +1,61 @@ @@ -1,63 +1,61 @@
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#
38CHECK_BUILTIN.editline:= yes 36CHECK_BUILTIN.editline:= yes
39.include "../../devel/editline/builtin.mk" 37.include "../../devel/editline/builtin.mk"
40CHECK_BUILTIN.editline:= no 38CHECK_BUILTIN.editline:= no
41 39
42.if !empty(USE_BUILTIN.editline:M[yY][eE][sS]) 40.if !empty(USE_BUILTIN.editline:M[yY][eE][sS])
43USE_BUILTIN.termcap?= yes 41USE_BUILTIN.termcap?= yes
44.endif 42.endif
45 43
46# Check usability of builtin termcap if FETCH_USING=ftp 44# Check usability of builtin termcap if FETCH_USING=ftp
47# to avoid circular dependency with termcap from pkgsrc (devel/ncurses). 45# to avoid circular dependency with termcap from pkgsrc (devel/ncurses).
48CHECK_BUILTIN.termcap:= yes 46CHECK_BUILTIN.termcap:= yes
49.include "../../mk/termcap.builtin.mk" 47.include "../../mk/termcap.builtin.mk"
50CHECK_BUILTIN.termcap:= no 48CHECK_BUILTIN.termcap:= no
51 49
52.if !empty(FETCH_USING:Mftp) && !empty(USE_BUILTIN.termcap:M[Nn][Oo]) 50.if !empty(FETCH_USING:Mftp) && !empty(USE_BUILTIN.termcap:M[Nn][Oo])
53CONFIGURE_ARGS+= --disable-editcomplete 51CONFIGURE_ARGS+= --disable-editcomplete
54.else 52.else
55.include "../../mk/termcap.buildlink3.mk" 53.include "../../mk/termcap.buildlink3.mk"
56.endif 54.endif
57 55
58post-install: 56post-install:
59 ${MV} -f ${DESTDIR}${PREFIX}/bin/tnftp ${DESTDIR}${PREFIX}/bin/ftp 57 ${MV} -f ${DESTDIR}${PREFIX}/bin/tnftp ${DESTDIR}${PREFIX}/bin/ftp
60 ${MV} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/tnftp.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ftp.1 58 ${MV} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/tnftp.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ftp.1
61 59
62 60
63.include "../../mk/bsd.pkg.mk" 61.include "../../mk/bsd.pkg.mk"
cvs diff -r1.25 -r1.26 pkgsrc/net/tnftpd/Makefile (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 (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,125 +1,124 @@ @@ -1,125 +1,124 @@
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]*
15CONFLICTS+= openafs-[0-9]* 15CONFLICTS+= openafs-[0-9]*
16CONFLICTS+= gss-[0-9]* 16CONFLICTS+= gss-[0-9]*
17CONFLICTS+= kth-krb4-[0-9]* 17CONFLICTS+= kth-krb4-[0-9]*
18 18
19MAKE_JOBS_SAFE= no 19MAKE_JOBS_SAFE= no
20 20
21USE_LIBTOOL= yes 21USE_LIBTOOL= yes
22USE_TOOLS+= bison flex:run 22USE_TOOLS+= bison flex:run
23PKGCONFIG_OVERRIDE+= tools/heimdal-gssapi.pc.in 23PKGCONFIG_OVERRIDE+= tools/heimdal-gssapi.pc.in
24MAKE_ENV+= INSTALL_CATPAGES=no 24MAKE_ENV+= INSTALL_CATPAGES=no
25 25
26.include "../../mk/bsd.prefs.mk" 26.include "../../mk/bsd.prefs.mk"
27.include "options.mk" 27.include "options.mk"
28 28
29HEIMDAL_HDB_DIR= ${VARBASE}/heimdal 29HEIMDAL_HDB_DIR= ${VARBASE}/heimdal
30 30
31GNU_CONFIGURE= yes 31GNU_CONFIGURE= yes
32CONFIGURE_ARGS+= --enable-kcm 32CONFIGURE_ARGS+= --enable-kcm
33CONFIGURE_ARGS+= --enable-pthread-support 33CONFIGURE_ARGS+= --enable-pthread-support
34CONFIGURE_ARGS+= --includedir=${PREFIX}/include/krb5 34CONFIGURE_ARGS+= --includedir=${PREFIX}/include/krb5
35CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 35CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
36CONFIGURE_ARGS+= --with-hdbdir=${HEIMDAL_HDB_DIR} 36CONFIGURE_ARGS+= --with-hdbdir=${HEIMDAL_HDB_DIR}
37CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} 37CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q}
38CONFIGURE_ARGS+= --with-sqlite3=${BUILDLINK_PREFIX.sqlite3} 38CONFIGURE_ARGS+= --with-sqlite3=${BUILDLINK_PREFIX.sqlite3}
39CONFIGURE_ARGS+= --without-x 39CONFIGURE_ARGS+= --without-x
40CONFIGURE_ARGS+= ${ABI:D--with-mips-abi=${ABI}} 40CONFIGURE_ARGS+= ${ABI:D--with-mips-abi=${ABI}}
41CONFIGURE_ENV+= COMPILE_ET=no # build Heimdal's compile_et(1) 41CONFIGURE_ENV+= COMPILE_ET=no # build Heimdal's compile_et(1)
42# XXX Grand Central Dispatch is broken in 1.4 42# XXX Grand Central Dispatch is broken in 1.4
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
70PLIST.glob= yes 69PLIST.glob= yes
71.endif 70.endif
72 71
73# Linux does not have include/vis.h and expected include/glob.h. 72# Linux does not have include/vis.h and expected include/glob.h.
74.if ${OPSYS} == "Linux" 73.if ${OPSYS} == "Linux"
75PLIST.vis= yes 74PLIST.vis= yes
76PLIST.glob= yes 75PLIST.glob= yes
77.endif 76.endif
78 77
79PLIST_VARS+= afskauth hcrypto 78PLIST_VARS+= afskauth hcrypto
80.if ${OPSYS} == "IRIX" 79.if ${OPSYS} == "IRIX"
81PLIST.afskauth= yes 80PLIST.afskauth= yes
82.endif 81.endif
83 82
84OWN_DIRS_PERMS= ${HEIMDAL_HDB_DIR} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700 83OWN_DIRS_PERMS= ${HEIMDAL_HDB_DIR} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
85SPECIAL_PERMS+= ${PREFIX}/bin/otp ${SETUID_ROOT_PERMS} 84SPECIAL_PERMS+= ${PREFIX}/bin/otp ${SETUID_ROOT_PERMS}
86SPECIAL_PERMS= ${PREFIX}/bin/${KRB5_PREFIX}su ${SETUID_ROOT_PERMS} 85SPECIAL_PERMS= ${PREFIX}/bin/${KRB5_PREFIX}su ${SETUID_ROOT_PERMS}
87RCD_SCRIPTS= kadmind kcm kdc kpasswdd 86RCD_SCRIPTS= kadmind kcm kdc kpasswdd
88INFO_FILES= yes 87INFO_FILES= yes
89 88
90TEST_TARGET= check 89TEST_TARGET= check
91 90
92# remove manpages conficting with OpenSSL keeping only the important ones 91# remove manpages conficting with OpenSSL keeping only the important ones
93pre-configure: 92pre-configure:
94 cd ${WRKSRC}/doc/doxyout/hcrypto && \ 93 cd ${WRKSRC}/doc/doxyout/hcrypto && \
95 ${GREP} -e /hcrypto_ -e /page_ manpages > manpages.new && \ 94 ${GREP} -e /hcrypto_ -e /page_ manpages > manpages.new && \
96 mv manpages.new manpages 95 mv manpages.new manpages
97 96
98# Avoid 'cat: cannot open ./localefiles: No such file or directory' 97# Avoid 'cat: cannot open ./localefiles: No such file or directory'
99pre-build: 98pre-build:
100 ${TOUCH} ${WRKSRC}/po/localefiles 99 ${TOUCH} ${WRKSRC}/po/localefiles
101 100
102.include "../../databases/sqlite3/buildlink3.mk" 101.include "../../databases/sqlite3/buildlink3.mk"
103.include "../../security/openssl/buildlink3.mk" 102.include "../../security/openssl/buildlink3.mk"
104CHECK_BUILTIN.openssl:= yes 103CHECK_BUILTIN.openssl:= yes
105.include "../../security/openssl/builtin.mk" 104.include "../../security/openssl/builtin.mk"
106CHECK_BUILTIN.openssl:=no 105CHECK_BUILTIN.openssl:=no
107.if ${MACHINE_PLATFORM:MNetBSD-[1-3]*} != "" || \ 106.if ${MACHINE_PLATFORM:MNetBSD-[1-3]*} != "" || \
108 (${OPSYS} == "SunOS" && !empty(USE_BUILTIN.openssl:Myes) && \ 107 (${OPSYS} == "SunOS" && !empty(USE_BUILTIN.openssl:Myes) && \
109 !empty(BUILTIN_LIB_FOUND.crypto:M[Nn][Oo])) 108 !empty(BUILTIN_LIB_FOUND.crypto:M[Nn][Oo]))
110PLIST.hcrypto= yes 109PLIST.hcrypto= yes
111.endif 110.endif
112 111
113.if ${OPSYS} == "MirBSD" 112.if ${OPSYS} == "MirBSD"
114.if !empty(USE_BUILTIN.openssl:Myes) 113.if !empty(USE_BUILTIN.openssl:Myes)
115PLIST.hcrypto= yes 114PLIST.hcrypto= yes
116.endif 115.endif
117PLIST.vis= yes 116PLIST.vis= yes
118# all of the tools need to link against pthread, force it. 117# all of the tools need to link against pthread, force it.
119PTHREAD_AUTO_VARS= yes 118PTHREAD_AUTO_VARS= yes
120.endif 119.endif
121 120
122.include "../../mk/termcap.buildlink3.mk" 121.include "../../mk/termcap.buildlink3.mk"
123.include "../../mk/pthread.buildlink3.mk" 122.include "../../mk/pthread.buildlink3.mk"
124.include "../../mk/readline.buildlink3.mk" 123.include "../../mk/readline.buildlink3.mk"
125.include "../../mk/bsd.pkg.mk" 124.include "../../mk/bsd.pkg.mk"
cvs diff -r1.75 -r1.76 pkgsrc/sysutils/hal/Makefile (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,126 +1,125 @@ @@ -1,126 +1,125 @@
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
15 15
16BUILD_DEFS+= VARBASE PKG_SYSCONFBASE 16BUILD_DEFS+= VARBASE PKG_SYSCONFBASE
17 17
18GNU_CONFIGURE= YES 18GNU_CONFIGURE= YES
19USE_PKGLOCALEDIR= YES 19USE_PKGLOCALEDIR= YES
20USE_TOOLS+= gmake intltool msgfmt perl pkg-config 20USE_TOOLS+= gmake intltool msgfmt perl pkg-config
21USE_TOOLS+= autoconf automake autoreconf 21USE_TOOLS+= autoconf automake autoreconf
22USE_LIBTOOL= YES 22USE_LIBTOOL= YES
23 23
24MAKE_DIRS+= /media 24MAKE_DIRS+= /media
25MAKE_DIRS+= ${VARBASE}/cache/hald 25MAKE_DIRS+= ${VARBASE}/cache/hald
26SPECIAL_PERMS+= ${VARBASE}/cache/hald ${HAL_USER} ${HAL_GROUP} 0644 26SPECIAL_PERMS+= ${VARBASE}/cache/hald ${HAL_USER} ${HAL_GROUP} 0644
27 27
28EGDIR= ${PREFIX}/share/examples/hal 28EGDIR= ${PREFIX}/share/examples/hal
29 29
30CONF_FILES= ${EGDIR}/hal.conf ${PKG_SYSCONFBASE}/dbus-1/system.d/hal.conf 30CONF_FILES= ${EGDIR}/hal.conf ${PKG_SYSCONFBASE}/dbus-1/system.d/hal.conf
31 31
32CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} 32CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
33CONFIGURE_ARGS+= --localstatedir=${VARBASE} 33CONFIGURE_ARGS+= --localstatedir=${VARBASE}
34CONFIGURE_ARGS+= --with-pci-ids=${PREFIX}/share/pciids 34CONFIGURE_ARGS+= --with-pci-ids=${PREFIX}/share/pciids
35CONFIGURE_ARGS+= --with-usb-ids=${PREFIX}/share/usbids 35CONFIGURE_ARGS+= --with-usb-ids=${PREFIX}/share/usbids
36CONFIGURE_ARGS+= --without-os-type 36CONFIGURE_ARGS+= --without-os-type
37 37
38.include "../../mk/bsd.prefs.mk" 38.include "../../mk/bsd.prefs.mk"
39 39
40.if ${OPSYS} == "DragonFly" 40.if ${OPSYS} == "DragonFly"
41.include "../../devel/libvolume_id/buildlink3.mk" 41.include "../../devel/libvolume_id/buildlink3.mk"
42CONFIGURE_ARGS+= --with-eject=/usr/sbin/cdcontrol 42CONFIGURE_ARGS+= --with-eject=/usr/sbin/cdcontrol
43CONFIGURE_ARGS+= --with-backend=freebsd 43CONFIGURE_ARGS+= --with-backend=freebsd
44PLIST_SRC= PLIST.DragonFly PLIST 44PLIST_SRC= PLIST.DragonFly PLIST
45 45
46.elif ${OPSYS} == "FreeBSD" 46.elif ${OPSYS} == "FreeBSD"
47.include "../../devel/libvolume_id/buildlink3.mk" 47.include "../../devel/libvolume_id/buildlink3.mk"
48CONFIGURE_ARGS+= --with-eject=/usr/sbin/cdcontrol 48CONFIGURE_ARGS+= --with-eject=/usr/sbin/cdcontrol
49CONFIGURE_ARGS+= --with-backend=freebsd 49CONFIGURE_ARGS+= --with-backend=freebsd
50PLIST_SRC= PLIST.FreeBSD PLIST 50PLIST_SRC= PLIST.FreeBSD PLIST
51 51
52.elif !empty(MACHINE_PLATFORM:MNetBSD-[5-9]*) 52.elif !empty(MACHINE_PLATFORM:MNetBSD-[5-9]*)
53.include "../../devel/libvolume_id/buildlink3.mk" 53.include "../../devel/libvolume_id/buildlink3.mk"
54CONFIGURE_ARGS+= --with-backend=netbsd 54CONFIGURE_ARGS+= --with-backend=netbsd
55HAL_GROUP= operator 55HAL_GROUP= operator
56 56
57.elif ${OPSYS} == "Linux" 57.elif ${OPSYS} == "Linux"
58.include "../../devel/gperf/buildlink3.mk" 58.include "../../devel/gperf/buildlink3.mk"
59.include "../../devel/libblkid/buildlink3.mk" 59.include "../../devel/libblkid/buildlink3.mk"
60.include "../../devel/libvolume_id/buildlink3.mk" 60.include "../../devel/libvolume_id/buildlink3.mk"
61.include "../../sysutils/pciutils/buildlink3.mk" 61.include "../../sysutils/pciutils/buildlink3.mk"
62CONFIGURE_ARGS+= --with-backend=linux 62CONFIGURE_ARGS+= --with-backend=linux
63MAKE_DIRS+= /etc/udev 63MAKE_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}
91CONFIGURE_ARGS+= --with-hal-group=${HAL_GROUP} 90CONFIGURE_ARGS+= --with-hal-group=${HAL_GROUP}
92CONFIGURE_ARGS+= --disable-pmu 91CONFIGURE_ARGS+= --disable-pmu
93 92
94RCD_SCRIPTS= hal 93RCD_SCRIPTS= hal
95SMF_METHODS= hal 94SMF_METHODS= hal
96 95
97.if ${HAL_GROUP} != "operator" 96.if ${HAL_GROUP} != "operator"
98PKG_GROUPS= ${HAL_GROUP} 97PKG_GROUPS= ${HAL_GROUP}
99.endif 98.endif
100PKG_USERS= ${HAL_USER}:${HAL_GROUP} 99PKG_USERS= ${HAL_USER}:${HAL_GROUP}
101PKG_HOME.haldaemon= ${VARBASE}/run/hald 100PKG_HOME.haldaemon= ${VARBASE}/run/hald
102 101
103FILES_SUBST+= HAL_USER=${HAL_USER} 102FILES_SUBST+= HAL_USER=${HAL_USER}
104FILES_SUBST+= HAL_GROUP=${HAL_GROUP} 103FILES_SUBST+= HAL_GROUP=${HAL_GROUP}
105FILES_SUBST+= PKG_HOME.haldaemon=${PKG_HOME.haldaemon} 104FILES_SUBST+= PKG_HOME.haldaemon=${PKG_HOME.haldaemon}
106 105
107PLIST_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} 106PLIST_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
108 107
109TEST_TARGET= check 108TEST_TARGET= check
110 109
111post-extract: 110post-extract:
112 ${CP} -r ${FILESDIR}/hald-netbsd ${WRKSRC}/hald/netbsd 111 ${CP} -r ${FILESDIR}/hald-netbsd ${WRKSRC}/hald/netbsd
113 ${CP} -r ${FILESDIR}/tools-netbsd ${WRKSRC}/tools/netbsd 112 ${CP} -r ${FILESDIR}/tools-netbsd ${WRKSRC}/tools/netbsd
114 113
115pre-configure: 114pre-configure:
116 cd ${WRKSRC} && autoreconf -vi ${AUTORECONF_ARGS} 115 cd ${WRKSRC} && autoreconf -vi ${AUTORECONF_ARGS}
117 116
118.include "../../devel/GConf/schemas.mk" 117.include "../../devel/GConf/schemas.mk"
119.include "../../devel/glib2/buildlink3.mk" 118.include "../../devel/glib2/buildlink3.mk"
120.include "../../misc/usbids/buildlink3.mk" 119.include "../../misc/usbids/buildlink3.mk"
121.include "../../security/policykit/buildlink3.mk" 120.include "../../security/policykit/buildlink3.mk"
122.include "../../sysutils/dbus/buildlink3.mk" 121.include "../../sysutils/dbus/buildlink3.mk"
123.include "../../sysutils/dbus-glib/buildlink3.mk" 122.include "../../sysutils/dbus-glib/buildlink3.mk"
124.include "../../sysutils/hal-info/buildlink3.mk" 123.include "../../sysutils/hal-info/buildlink3.mk"
125.include "../../textproc/expat/buildlink3.mk" 124.include "../../textproc/expat/buildlink3.mk"
126.include "../../mk/bsd.pkg.mk" 125.include "../../mk/bsd.pkg.mk"
cvs diff -r1.15 -r1.16 pkgsrc/sysutils/ipmitool/Makefile (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 (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 (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 (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,51 +1,50 @@ @@ -1,51 +1,50 @@
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
39 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/surfer.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/surfer.1 38 ${MV} ${DESTDIR}${PREFIX}/share/man/man1/surfer.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/surfer.1
40 ${RMDIR} ${DESTDIR}${PREFIX}/share/man/html1 39 ${RMDIR} ${DESTDIR}${PREFIX}/share/man/html1
41 ${RMDIR} ${DESTDIR}${PREFIX}/share/man/man1 40 ${RMDIR} ${DESTDIR}${PREFIX}/share/man/man1
42 ${RMDIR} ${DESTDIR}${PREFIX}/share/man 41 ${RMDIR} ${DESTDIR}${PREFIX}/share/man
43.endif 42.endif
44 43
45.include "options.mk" 44.include "options.mk"
46 45
47.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 46.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
48.include "../../www/webkit24-gtk/buildlink3.mk" 47.include "../../www/webkit24-gtk/buildlink3.mk"
49.include "../../x11/deforaos-libdesktop/buildlink3.mk" 48.include "../../x11/deforaos-libdesktop/buildlink3.mk"
50.include "../../sysutils/desktop-file-utils/desktopdb.mk" 49.include "../../sysutils/desktop-file-utils/desktopdb.mk"
51.include "../../mk/bsd.pkg.mk" 50.include "../../mk/bsd.pkg.mk"
cvs diff -r1.25 -r1.26 pkgsrc/www/libproxy/Makefile (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 (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,98 +1,97 @@ @@ -1,98 +1,97 @@
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
15#CONF_FILES+= ${PREFIX}/share/examples/gnome-panel/org.gnome.ClockApplet.Mechanism.conf \ 15#CONF_FILES+= ${PREFIX}/share/examples/gnome-panel/org.gnome.ClockApplet.Mechanism.conf \
16# ${PKG_SYSCONFDIR}/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf 16# ${PKG_SYSCONFDIR}/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
17 17
18GNU_CONFIGURE= YES 18GNU_CONFIGURE= YES
19USE_TOOLS+= gmake intltool msgfmt perl:run pkg-config 19USE_TOOLS+= gmake intltool msgfmt perl:run pkg-config
20USE_PKGLOCALEDIR= YES 20USE_PKGLOCALEDIR= YES
21USE_LIBTOOL= YES 21USE_LIBTOOL= YES
22PKGCONFIG_OVERRIDE+= bonobo/libpanel-applet/libpanelapplet-2.0.pc.in 22PKGCONFIG_OVERRIDE+= bonobo/libpanel-applet/libpanelapplet-2.0.pc.in
23PKGCONFIG_OVERRIDE+= libpanel-applet/libpanelapplet-3.0.pc.in 23PKGCONFIG_OVERRIDE+= libpanel-applet/libpanelapplet-3.0.pc.in
24CONFIGURE_ENV+= PYTHON=${PYTHONBIN} 24CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
25PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-ORBit via py-gnome2 25PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-ORBit via py-gnome2
26 26
27# XXX this pkg installs a gio module to ${PREFIX}/lib/gnome-panel/modules 27# XXX this pkg installs a gio module to ${PREFIX}/lib/gnome-panel/modules
28# but there are two problems with this: 28# but there are two problems with this:
29# - this is not the standard module location, glib2/modules.mk 29# - this is not the standard module location, glib2/modules.mk
30# does not deal with this yet 30# does not deal with this yet
31# - even if called with the correct path, the resulting "giomodule.cache" 31# - even if called with the correct path, the resulting "giomodule.cache"
32# is empty, due to missing symbols in dynamic loading, see 32# is empty, due to missing symbols in dynamic loading, see
33# https://bugzilla.gnome.org/show_bug.cgi?id=636255 33# https://bugzilla.gnome.org/show_bug.cgi?id=636255
34# XXX so for now, just disable "giomodule.cache" creation to fix the 34# XXX so for now, just disable "giomodule.cache" creation to fix the
35# PLIST problem reported in PR pkg/44181, until the issue is fixed 35# PLIST problem reported in PR pkg/44181, until the issue is fixed
36TOOLS_NOOP+= gio-querymodules 36TOOLS_NOOP+= gio-querymodules
37 37
38GCONF_SCHEMAS= clock.schemas 38GCONF_SCHEMAS= clock.schemas
39GCONF_SCHEMAS+= fish.schemas 39GCONF_SCHEMAS+= fish.schemas
40GCONF_SCHEMAS+= panel-global.schemas 40GCONF_SCHEMAS+= panel-global.schemas
41GCONF_SCHEMAS+= panel-general.schemas 41GCONF_SCHEMAS+= panel-general.schemas
42GCONF_SCHEMAS+= panel-toplevel.schemas 42GCONF_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"
70.include "../../devel/libwnck/buildlink3.mk" 69.include "../../devel/libwnck/buildlink3.mk"
71BUILDLINK_API_DEPENDS.libgweather+= libgweather>=2.24.1 70BUILDLINK_API_DEPENDS.libgweather+= libgweather>=2.24.1
72.include "../../devel/libgweather/buildlink3.mk" 71.include "../../devel/libgweather/buildlink3.mk"
73.include "../../devel/pango/buildlink3.mk" 72.include "../../devel/pango/buildlink3.mk"
74.include "../../graphics/cairo/buildlink3.mk" 73.include "../../graphics/cairo/buildlink3.mk"
75.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 74.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
76.include "../../graphics/librsvg/buildlink3.mk" 75.include "../../graphics/librsvg/buildlink3.mk"
77.if !empty(PKG_OPTIONS:Mevolution) 76.if !empty(PKG_OPTIONS:Mevolution)
78.include "../../mail/evolution-data-server/buildlink3.mk" 77.include "../../mail/evolution-data-server/buildlink3.mk"
79.endif 78.endif
80.include "../../net/ORBit2/buildlink3.mk" 79.include "../../net/ORBit2/buildlink3.mk"
81# pkgsrc policykit is too old 80# pkgsrc policykit is too old
82#.include "../../security/policykit/buildlink3.mk" 81#.include "../../security/policykit/buildlink3.mk"
83#.include "../../security/policykit-gnome/buildlink3.mk" 82#.include "../../security/policykit-gnome/buildlink3.mk"
84.include "../../sysutils/dbus-glib/buildlink3.mk" 83.include "../../sysutils/dbus-glib/buildlink3.mk"
85.include "../../sysutils/desktop-file-utils/desktopdb.mk" 84.include "../../sysutils/desktop-file-utils/desktopdb.mk"
86BUILDLINK_API_DEPENDS.gnome-menus+= gnome-menus>=2.28.0 85BUILDLINK_API_DEPENDS.gnome-menus+= gnome-menus>=2.28.0
87.include "../../sysutils/gnome-menus/buildlink3.mk" 86.include "../../sysutils/gnome-menus/buildlink3.mk"
88.include "../../textproc/gnome-doc-utils/buildlink3.mk" 87.include "../../textproc/gnome-doc-utils/buildlink3.mk"
89.include "../../mk/omf-scrollkeeper.mk" 88.include "../../mk/omf-scrollkeeper.mk"
90.include "../../x11/gnome-desktop/buildlink3.mk" 89.include "../../x11/gnome-desktop/buildlink3.mk"
91.include "../../x11/py-gnome2/buildlink3.mk" 90.include "../../x11/py-gnome2/buildlink3.mk"
92.include "../../x11/gtk2/buildlink3.mk" 91.include "../../x11/gtk2/buildlink3.mk"
93.include "../../x11/libSM/buildlink3.mk" 92.include "../../x11/libSM/buildlink3.mk"
94.include "../../x11/libX11/buildlink3.mk" 93.include "../../x11/libX11/buildlink3.mk"
95BUILDLINK_DEPMETHOD.libXt?= build 94BUILDLINK_DEPMETHOD.libXt?= build
96.include "../../x11/libXt/buildlink3.mk" 95.include "../../x11/libXt/buildlink3.mk"
97.include "../../audio/libcanberra/buildlink3.mk" 96.include "../../audio/libcanberra/buildlink3.mk"
98.include "../../mk/bsd.pkg.mk" 97.include "../../mk/bsd.pkg.mk"
cvs diff -r1.33 -r1.34 pkgsrc/x11/kactivities/Makefile (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,29 +1,28 @@ @@ -1,29 +1,28 @@
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"
28.include "../../x11/kdelibs4/buildlink3.mk" 27.include "../../x11/kdelibs4/buildlink3.mk"
29.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
cvs diff -r1.12 -r1.13 pkgsrc/x11/libxkbcommon/Makefile (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 (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,166 +1,165 @@ @@ -1,166 +1,165 @@
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
15 15
16.include "../../x11/qt4/Makefile.common" 16.include "../../x11/qt4/Makefile.common"
17 17
18DISTINFO_FILE= ${.CURDIR}/../../x11/qt4-libs/distinfo 18DISTINFO_FILE= ${.CURDIR}/../../x11/qt4-libs/distinfo
19FILESDIR= ${.CURDIR}/../../x11/qt4-libs/files 19FILESDIR= ${.CURDIR}/../../x11/qt4-libs/files
20PATCHDIR= ${.CURDIR}/../../x11/qt4-libs/patches 20PATCHDIR= ${.CURDIR}/../../x11/qt4-libs/patches
21 21
22HAS_CONFIGURE= yes 22HAS_CONFIGURE= yes
23USE_LANGUAGES= c c++ 23USE_LANGUAGES= c c++
24USE_LIBTOOL= yes 24USE_LIBTOOL= yes
25USE_TOOLS+= gmake 25USE_TOOLS+= gmake
26 26
27.if empty(PKGNAME:U:Mqt4-libs-*) 27.if empty(PKGNAME:U:Mqt4-libs-*)
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"
55PLIST.mac= yes 54PLIST.mac= yes
56QMAKE_CONF= qmake.conf.mac 55QMAKE_CONF= qmake.conf.mac
57QMAKE_RANLIB= ${RANLIB} 56QMAKE_RANLIB= ${RANLIB}
58.else 57.else
59PLIST.unix= yes 58PLIST.unix= yes
60QMAKE_CONF= qmake.conf 59QMAKE_CONF= qmake.conf
61QMAKE_RANLIB= ${TRUE} 60QMAKE_RANLIB= ${TRUE}
62.endif 61.endif
63 62
64# avoid creating a .qt directory in the users home directory 63# avoid creating a .qt directory in the users home directory
65SCRIPTS_ENV+= HOME=${WRKDIR} 64SCRIPTS_ENV+= HOME=${WRKDIR}
66 65
67.include "../../mk/compiler.mk" 66.include "../../mk/compiler.mk"
68 67
69.if ${OPSYS} == "SunOS" 68.if ${OPSYS} == "SunOS"
70. if !empty(CC_VERSION:Mgcc*) 69. if !empty(CC_VERSION:Mgcc*)
71. if ${ABI:U} == "64" 70. if ${ABI:U} == "64"
72CONFIGURE_ARGS+= -platform solaris-g++-64 71CONFIGURE_ARGS+= -platform solaris-g++-64
73. else 72. else
74CONFIGURE_ARGS+= -platform solaris-g++ 73CONFIGURE_ARGS+= -platform solaris-g++
75. endif 74. endif
76. else 75. else
77. if ${ABI:U} == "64" 76. if ${ABI:U} == "64"
78CONFIGURE_ARGS+= -platform solaris-cc-64 77CONFIGURE_ARGS+= -platform solaris-cc-64
79. else 78. else
80CONFIGURE_ARGS+= -platform solaris-cc 79CONFIGURE_ARGS+= -platform solaris-cc
81. endif 80. endif
82. endif 81. endif
83SYS_LIBS= -lresolv -lsocket -lnsl -lrt 82SYS_LIBS= -lresolv -lsocket -lnsl -lrt
84.elif ${OPSYS} == "Interix" 83.elif ${OPSYS} == "Interix"
85CONFIGURE_ARGS+= -platform interix-g++ 84CONFIGURE_ARGS+= -platform interix-g++
86CFLAGS+= -I/usr/local/include/bind 85CFLAGS+= -I/usr/local/include/bind
87LDFLAGS+= -L/usr/local/lib/bind -lbind 86LDFLAGS+= -L/usr/local/lib/bind -lbind
88BUILDLINK_PASSTHRU_DIRS+=/usr/local/include/bind /usr/local/lib/bind 87BUILDLINK_PASSTHRU_DIRS+=/usr/local/include/bind /usr/local/lib/bind
89SYS_LIBS= -lbind -ldb -ldl 88SYS_LIBS= -lbind -ldb -ldl
90.elif ${OPSYS} == "DragonFly" 89.elif ${OPSYS} == "DragonFly"
91CONFIGURE_ARGS+= -platform freebsd-g++ 90CONFIGURE_ARGS+= -platform freebsd-g++
92.elif ${OPSYS} == "Darwin" 91.elif ${OPSYS} == "Darwin"
93. if !empty(PKGSRC_COMPILER:Mclang) 92. if !empty(PKGSRC_COMPILER:Mclang)
94CONFIGURE_ARGS+= -platform macx-llvm 93CONFIGURE_ARGS+= -platform macx-llvm
95. else 94. else
96CONFIGURE_ARGS+= -platform macx-g++ 95CONFIGURE_ARGS+= -platform macx-g++
97. endif 96. endif
98CONFIGURE_ARGS+= -no-dwarf2 97CONFIGURE_ARGS+= -no-dwarf2
99CONFIGURE_ARGS+= -no-framework 98CONFIGURE_ARGS+= -no-framework
100. if exists(/usr/lib/libresolv.dylib) 99. if exists(/usr/lib/libresolv.dylib)
101LDFLAGS+= -lresolv 100LDFLAGS+= -lresolv
102. endif 101. endif
103.elif ${OPSYS} == "Linux" 102.elif ${OPSYS} == "Linux"
104LDFLAGS+= -ldl 103LDFLAGS+= -ldl
105.endif 104.endif
106 105
107.if ${OPSYS} != "Darwin" && ${X11_TYPE} != "native" 106.if ${OPSYS} != "Darwin" && ${X11_TYPE} != "native"
108.include "../../x11/libXinerama/buildlink3.mk" 107.include "../../x11/libXinerama/buildlink3.mk"
109.elif !exists(${X11BASE}/lib/libXinerama.so) && \ 108.elif !exists(${X11BASE}/lib/libXinerama.so) && \
110 !exists(${X11BASE}/lib/libXinerama.dylib) 109 !exists(${X11BASE}/lib/libXinerama.dylib)
111CONFIGURE_ARGS+= -no-xinerama 110CONFIGURE_ARGS+= -no-xinerama
112.endif 111.endif
113 112
114SUBST_CLASSES+= dnr 113SUBST_CLASSES+= dnr
115SUBST_MESSAGE.dnr= Disabling debug_and_release. 114SUBST_MESSAGE.dnr= Disabling debug_and_release.
116SUBST_STAGE.dnr= pre-configure 115SUBST_STAGE.dnr= pre-configure
117SUBST_FILES.dnr= mkspecs/features/debug_and_release.prf 116SUBST_FILES.dnr= mkspecs/features/debug_and_release.prf
118SUBST_SED.dnr= -e 's,^,\#\#\#,' 117SUBST_SED.dnr= -e 's,^,\#\#\#,'
119 118
120SUBST_CLASSES+= nib 119SUBST_CLASSES+= nib
121SUBST_MESSAGE.nib= Fixing nib loading on Mac OS X. 120SUBST_MESSAGE.nib= Fixing nib loading on Mac OS X.
122SUBST_STAGE.nib= pre-configure 121SUBST_STAGE.nib= pre-configure
123SUBST_FILES.nib= src/gui/kernel/qapplication_mac.mm 122SUBST_FILES.nib= src/gui/kernel/qapplication_mac.mm
124SUBST_VARS.nib= QTPREFIX 123SUBST_VARS.nib= QTPREFIX
125 124
126SUBST_CLASSES+= lt 125SUBST_CLASSES+= lt
127SUBST_MESSAGE.lt= Enabling libtool. 126SUBST_MESSAGE.lt= Enabling libtool.
128SUBST_STAGE.lt= pre-configure 127SUBST_STAGE.lt= pre-configure
129SUBST_FILES.lt= src/gui/gui.pro 128SUBST_FILES.lt= src/gui/gui.pro
130SUBST_SED.lt= -e 's,$$$$QMAKE_CXX -c -W,$${LIBTOOL} --mode=compile &,' 129SUBST_SED.lt= -e 's,$$$$QMAKE_CXX -c -W,$${LIBTOOL} --mode=compile &,'
131SUBST_SED.lt+= -e 's,$$$${first(QMAKE_EXT_OBJ)},.lo,' 130SUBST_SED.lt+= -e 's,$$$${first(QMAKE_EXT_OBJ)},.lo,'
132 131
133.include "options.mk" 132.include "options.mk"
134 133
135# Reverse the change to how templates are handled made between 3.0.4 134# Reverse the change to how templates are handled made between 3.0.4
136# and 3.0.5 for older toolchains. Removing inline for newer toolchains 135# and 3.0.5 for older toolchains. Removing inline for newer toolchains
137# produces smaller code. Removing inline for older toolchains prod- 136# produces smaller code. Removing inline for older toolchains prod-
138# uces buggy code. 137# uces buggy code.
139.if !empty(CC_VERSION:Mgcc-2.8*) 138.if !empty(CC_VERSION:Mgcc-2.8*)
140CXXFLAGS+= -DQ_INLINE_TEMPLATES=inline 139CXXFLAGS+= -DQ_INLINE_TEMPLATES=inline
141.endif 140.endif
142 141
143pre-configure: 142pre-configure:
144 sed -e 's:@LOCALBASE@:${LOCALBASE}:g' \ 143 sed -e 's:@LOCALBASE@:${LOCALBASE}:g' \
145 -e 's:@X11BASE@:${X11BASE}:g' \ 144 -e 's:@X11BASE@:${X11BASE}:g' \
146 -e 's:@LIBTOOL@:${LIBTOOL:Q}:g' \ 145 -e 's:@LIBTOOL@:${LIBTOOL:Q}:g' \
147 -e 's:@CC@:${CC:Q}:g' \ 146 -e 's:@CC@:${CC:Q}:g' \
148 -e 's:@CXX@:${CXX:Q}:g' \ 147 -e 's:@CXX@:${CXX:Q}:g' \
149 -e 's:@LDFLAGS@:${LDFLAGS:Q}:g' \ 148 -e 's:@LDFLAGS@:${LDFLAGS:Q}:g' \
150 -e 's:@CFLAGS@:${CFLAGS:Q}:g' \ 149 -e 's:@CFLAGS@:${CFLAGS:Q}:g' \
151 -e 's:@CXXFLAGS@:${CXXFLAGS:Q}:g' \ 150 -e 's:@CXXFLAGS@:${CXXFLAGS:Q}:g' \
152 -e 's:@SYS_LIBS@:${SYS_LIBS:Q}:g' \ 151 -e 's:@SYS_LIBS@:${SYS_LIBS:Q}:g' \
153 -e 's:@LEX@:${LEX}:g' \ 152 -e 's:@LEX@:${LEX}:g' \
154 -e 's:@YACC@:${TOOLS_CMDLINE_YACC:Q}:g' \ 153 -e 's:@YACC@:${TOOLS_CMDLINE_YACC:Q}:g' \
155 -e 's:@AR@:${AR:Q}:g' \ 154 -e 's:@AR@:${AR:Q}:g' \
156 -e 's:@MKDIR@:${MKDIR}:g' \ 155 -e 's:@MKDIR@:${MKDIR}:g' \
157 -e 's:@LIBQT@:${LIBQT:Q}:g' \ 156 -e 's:@LIBQT@:${LIBQT:Q}:g' \
158 -e 's:@PTHREAD_LDFLAGS@:${PTHREAD_LDFLAGS:Q}:g' \ 157 -e 's:@PTHREAD_LDFLAGS@:${PTHREAD_LDFLAGS:Q}:g' \
159 -e 's:@PTHREAD_LIBS@:${PTHREAD_LIBS:Q}:g' \ 158 -e 's:@PTHREAD_LIBS@:${PTHREAD_LIBS:Q}:g' \
160 -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' \ 159 -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' \
161 -e 's:@QMAKE_RANLIB@:${QMAKE_RANLIB:Q}:g' \ 160 -e 's:@QMAKE_RANLIB@:${QMAKE_RANLIB:Q}:g' \
162 ${FILESDIR}/${QMAKE_CONF} > ${WRKSRC}/qmake.conf 161 ${FILESDIR}/${QMAKE_CONF} > ${WRKSRC}/qmake.conf
163 for dir in ${WRKSRC}/mkspecs/*; do \ 162 for dir in ${WRKSRC}/mkspecs/*; do \
164 cp ${WRKSRC}/qmake.conf $${dir}; \ 163 cp ${WRKSRC}/qmake.conf $${dir}; \
165 rm -f $${dir}/*.orig; \ 164 rm -f $${dir}/*.orig; \
166 done 165 done
cvs diff -r1.30 -r1.31 pkgsrc/x11/qt5-qtbase/Makefile (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,224 +1,223 @@ @@ -1,224 +1,223 @@
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
15HAS_CONFIGURE= yes 15HAS_CONFIGURE= yes
16CONFIGURE_ARGS+= -optimized-qmake 16CONFIGURE_ARGS+= -optimized-qmake
17CONFIGURE_ARGS+= -prefix "${QTPREFIX}" 17CONFIGURE_ARGS+= -prefix "${QTPREFIX}"
18CONFIGURE_ARGS+= ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-l*} 18CONFIGURE_ARGS+= ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-l*}
19CONFIGURE_ARGS+= -opensource -confirm-license 19CONFIGURE_ARGS+= -opensource -confirm-license
20CONFIGURE_ARGS+= -sysconfdir "${PKG_SYSCONFDIR}/xdg" 20CONFIGURE_ARGS+= -sysconfdir "${PKG_SYSCONFDIR}/xdg"
21CONFIGURE_ARGS+= -accessibility 21CONFIGURE_ARGS+= -accessibility
22CONFIGURE_ARGS+= -dbus-linked 22CONFIGURE_ARGS+= -dbus-linked
23CONFIGURE_ARGS+= -fontconfig 23CONFIGURE_ARGS+= -fontconfig
24CONFIGURE_ARGS+= -force-pkg-config 24CONFIGURE_ARGS+= -force-pkg-config
25CONFIGURE_ARGS+= -icu 25CONFIGURE_ARGS+= -icu
26CONFIGURE_ARGS+= -openssl-linked 26CONFIGURE_ARGS+= -openssl-linked
27CONFIGURE_ARGS+= -nomake examples 27CONFIGURE_ARGS+= -nomake examples
28CONFIGURE_ARGS+= -nomake tests 28CONFIGURE_ARGS+= -nomake tests
29CONFIGURE_ARGS+= -no-pch 29CONFIGURE_ARGS+= -no-pch
30CONFIGURE_ARGS+= -no-sql-db2 30CONFIGURE_ARGS+= -no-sql-db2
31CONFIGURE_ARGS+= -no-sql-ibase 31CONFIGURE_ARGS+= -no-sql-ibase
32CONFIGURE_ARGS+= -no-sql-mysql 32CONFIGURE_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
60 59
61PLIST_VARS+= egl 60PLIST_VARS+= egl
62 61
63.include "../../mk/compiler.mk" 62.include "../../mk/compiler.mk"
64 63
65.if ${OPSYS} == "SunOS" 64.if ${OPSYS} == "SunOS"
66. if !empty(CC_VERSION:Mgcc*) 65. if !empty(CC_VERSION:Mgcc*)
67. if ${ABI:U} == "64" 66. if ${ABI:U} == "64"
68CONFIGURE_ARGS+= -platform solaris-g++-64 67CONFIGURE_ARGS+= -platform solaris-g++-64
69. else 68. else
70CONFIGURE_ARGS+= -platform solaris-g++ 69CONFIGURE_ARGS+= -platform solaris-g++
71. endif 70. endif
72. else 71. else
73. if ${ABI:U} == "64" 72. if ${ABI:U} == "64"
74CONFIGURE_ARGS+= -platform solaris-cc-64 73CONFIGURE_ARGS+= -platform solaris-cc-64
75. else 74. else
76CONFIGURE_ARGS+= -platform solaris-cc 75CONFIGURE_ARGS+= -platform solaris-cc
77. endif 76. endif
78. endif 77. endif
79SYS_LIBS= -lresolv -lsocket -lnsl -lrt 78SYS_LIBS= -lresolv -lsocket -lnsl -lrt
80.elif ${OPSYS} == "Interix" 79.elif ${OPSYS} == "Interix"
81CONFIGURE_ARGS+= -platform interix-g++ 80CONFIGURE_ARGS+= -platform interix-g++
82CFLAGS+= -I/usr/local/include/bind 81CFLAGS+= -I/usr/local/include/bind
83LDFLAGS+= -L/usr/local/lib/bind -lbind 82LDFLAGS+= -L/usr/local/lib/bind -lbind
84BUILDLINK_PASSTHRU_DIRS+=/usr/local/include/bind /usr/local/lib/bind 83BUILDLINK_PASSTHRU_DIRS+=/usr/local/include/bind /usr/local/lib/bind
85SYS_LIBS= -lbind -ldb -ldl 84SYS_LIBS= -lbind -ldb -ldl
86.elif ${OPSYS} == "DragonFly" 85.elif ${OPSYS} == "DragonFly"
87CONFIGURE_ARGS+= -platform freebsd-g++ 86CONFIGURE_ARGS+= -platform freebsd-g++
88.elif ${OPSYS} == "Darwin" 87.elif ${OPSYS} == "Darwin"
89CONFIGURE_ARGS+= -platform macx-clang 88CONFIGURE_ARGS+= -platform macx-clang
90CONFIGURE_ARGS+= -no-framework 89CONFIGURE_ARGS+= -no-framework
91. if exists(/usr/lib/libresolv.dylib) 90. if exists(/usr/lib/libresolv.dylib)
92LDFLAGS+= -lresolv 91LDFLAGS+= -lresolv
93. endif 92. endif
94.elif ${OPSYS} == "Linux" 93.elif ${OPSYS} == "Linux"
95LDFLAGS+= -ldl 94LDFLAGS+= -ldl
96.elif ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" 95.elif ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD"
97. if exists(/usr/lib/libexecinfo.so) 96. if exists(/usr/lib/libexecinfo.so)
98LDFLAGS+= -lexecinfo 97LDFLAGS+= -lexecinfo
99. endif 98. endif
100.endif 99.endif
101.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" 100.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
102LDFLAGS+= -lkvm # see patch-src_corelib_io_qlockfile__unix.cpp 101LDFLAGS+= -lkvm # see patch-src_corelib_io_qlockfile__unix.cpp
103.endif 102.endif
104 103
105REPLACE_PERL+= bin/syncqt.pl 104REPLACE_PERL+= bin/syncqt.pl
106 105
107PTHREAD_OPTS+= require 106PTHREAD_OPTS+= require
108UNLIMIT_RESOURCES= datasize 107UNLIMIT_RESOURCES= datasize
109 108
110BUILDLINK_PASSTHRU_DIRS+= ${QTPREFIX} 109BUILDLINK_PASSTHRU_DIRS+= ${QTPREFIX}
111 110
112BUILD_TARGET= sub-src 111BUILD_TARGET= sub-src
113INSTALLATION_DIRS= ${QTPREFIX}/bin lib/pkgconfig 112INSTALLATION_DIRS= ${QTPREFIX}/bin lib/pkgconfig
114INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 113INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
115 114
116CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/echoplugin/echoplugin.pro 115CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/echoplugin/echoplugin.pro
117CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/echoplugin/plugin/plugin.pro 116CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/echoplugin/plugin/plugin.pro
118CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaint/plugandpaint.pro 117CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaint/plugandpaint.pro
119CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaintplugins/basictools/basictools.pro 118CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaintplugins/basictools/basictools.pro
120CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.pro 119CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.pro
121CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/styleplugin/plugin/plugin.pro 120CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/styleplugin/plugin/plugin.pro
122CHECK_INTERPRETER_SKIP+=qt5/mkspecs/macx-ios-clang/rename_main.sh 121CHECK_INTERPRETER_SKIP+=qt5/mkspecs/macx-ios-clang/rename_main.sh
123 122
124SUBST_CLASSES+= opt path 123SUBST_CLASSES+= opt path
125SUBST_STAGE.opt= pre-configure 124SUBST_STAGE.opt= pre-configure
126SUBST_MESSAGE.opt= Removing some Qt5 default compiler flags. 125SUBST_MESSAGE.opt= Removing some Qt5 default compiler flags.
127SUBST_FILES.opt= mkspecs/common/gcc-base.conf 126SUBST_FILES.opt= mkspecs/common/gcc-base.conf
128SUBST_SED.opt= -e 's,-O[23],,' 127SUBST_SED.opt= -e 's,-O[23],,'
129SUBST_SED.opt+= -e 's,-fvisibility=hidden,,' 128SUBST_SED.opt+= -e 's,-fvisibility=hidden,,'
130 129
131SUBST_STAGE.path= pre-configure 130SUBST_STAGE.path= pre-configure
132SUBST_MESSAGE.path= Add to default XDG path. 131SUBST_MESSAGE.path= Add to default XDG path.
133SUBST_FILES.path= src/corelib/io/qstandardpaths_unix.cpp 132SUBST_FILES.path= src/corelib/io/qstandardpaths_unix.cpp
134SUBST_VARS.path= LOCALBASE 133SUBST_VARS.path= LOCALBASE
135 134
136BROKEN_FILES= qt5/mkspecs/modules/qt_lib_bootstrap_private.pri 135BROKEN_FILES= qt5/mkspecs/modules/qt_lib_bootstrap_private.pri
137 136
138PC_FILES= Qt5Bootstrap.pc Qt5Concurrent.pc Qt5Core.pc \ 137PC_FILES= Qt5Bootstrap.pc Qt5Concurrent.pc Qt5Core.pc \
139 Qt5Gui.pc Qt5Network.pc Qt5OpenGL.pc \ 138 Qt5Gui.pc Qt5Network.pc Qt5OpenGL.pc \
140 Qt5OpenGLExtensions.pc Qt5PlatformSupport.pc \ 139 Qt5OpenGLExtensions.pc Qt5PlatformSupport.pc \
141 Qt5PrintSupport.pc Qt5Sql.pc Qt5Test.pc \ 140 Qt5PrintSupport.pc Qt5Sql.pc Qt5Test.pc \
142 Qt5Widgets.pc Qt5Xml.pc 141 Qt5Widgets.pc Qt5Xml.pc
143 142
144pre-configure: 143pre-configure:
145 ${SED} -e 's:@LOCALBASE@:${LOCALBASE}:g' \ 144 ${SED} -e 's:@LOCALBASE@:${LOCALBASE}:g' \
146 -e 's:@X11BASE@:${X11BASE}:g' \ 145 -e 's:@X11BASE@:${X11BASE}:g' \
147 -e 's:@LIBTOOL@:${LIBTOOL:Q}:g' \ 146 -e 's:@LIBTOOL@:${LIBTOOL:Q}:g' \
148 -e 's:@CC@:${CC:Q}:g' \ 147 -e 's:@CC@:${CC:Q}:g' \
149 -e 's:@CXX@:${CXX:Q}:g' \ 148 -e 's:@CXX@:${CXX:Q}:g' \
150 -e 's:@LDFLAGS@:${LDFLAGS:Q}:g' \ 149 -e 's:@LDFLAGS@:${LDFLAGS:Q}:g' \
151 -e 's:@CFLAGS@:${CFLAGS:Q}:g' \ 150 -e 's:@CFLAGS@:${CFLAGS:Q}:g' \
152 -e 's:@CXXFLAGS@:${CXXFLAGS:Q}:g' \ 151 -e 's:@CXXFLAGS@:${CXXFLAGS:Q}:g' \
153 -e 's:@SYS_LIBS@:${SYS_LIBS:Q}:g' \ 152 -e 's:@SYS_LIBS@:${SYS_LIBS:Q}:g' \
154 -e 's:@LEX@:${LEX}:g' \ 153 -e 's:@LEX@:${LEX}:g' \
155 -e 's:@YACC@:${TOOLS_CMDLINE_YACC:Q}:g' \ 154 -e 's:@YACC@:${TOOLS_CMDLINE_YACC:Q}:g' \
156 -e 's:@AR@:${AR:Q}:g' \ 155 -e 's:@AR@:${AR:Q}:g' \
157 -e 's:@MKDIR@:${MKDIR}:g' \ 156 -e 's:@MKDIR@:${MKDIR}:g' \
158 -e 's:@LIBQT@:${LIBQT:Q}:g' \ 157 -e 's:@LIBQT@:${LIBQT:Q}:g' \
159 -e 's:@PTHREAD_LDFLAGS@:${PTHREAD_LDFLAGS:Q}:g' \ 158 -e 's:@PTHREAD_LDFLAGS@:${PTHREAD_LDFLAGS:Q}:g' \
160 -e 's:@PTHREAD_LIBS@:${PTHREAD_LIBS:Q}:g' \ 159 -e 's:@PTHREAD_LIBS@:${PTHREAD_LIBS:Q}:g' \
161 -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' \ 160 -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' \
162 -e 's:@QMAKE_RANLIB@:${QMAKE_RANLIB:Q}:g' \ 161 -e 's:@QMAKE_RANLIB@:${QMAKE_RANLIB:Q}:g' \
163 ${FILESDIR}/${QMAKE_CONF} > ${WRKSRC}/qmake.conf 162 ${FILESDIR}/${QMAKE_CONF} > ${WRKSRC}/qmake.conf
164 for dir in ${WRKSRC}/mkspecs/*; do \ 163 for dir in ${WRKSRC}/mkspecs/*; do \
165 cp ${WRKSRC}/qmake.conf $${dir}; \ 164 cp ${WRKSRC}/qmake.conf $${dir}; \
166 rm -f $${dir}/*.orig; \ 165 rm -f $${dir}/*.orig; \
167 done 166 done
168 ${RM} -f ${WRKSRC}/mkspecs/features/mac/default_pre.prf 167 ${RM} -f ${WRKSRC}/mkspecs/features/mac/default_pre.prf
169 ${RM} -f ${WRKSRC}/mkspecs/features/mac/objective_c.prf.orig 168 ${RM} -f ${WRKSRC}/mkspecs/features/mac/objective_c.prf.orig
170 169
171post-configure: 170post-configure:
172 cd ${WRKSRC} && ./bin/qmake -o Makefile 171 cd ${WRKSRC} && ./bin/qmake -o Makefile
173 172
174post-install: 173post-install:
175.for i in ${PC_FILES} 174.for i in ${PC_FILES}
176 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ 175 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
177 ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} 176 ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
178.endfor 177.endfor
179 cd ${WRKSRC} && env ${MAKE_ENV} ${INSTALL_ENV} \ 178 cd ${WRKSRC} && env ${MAKE_ENV} ${INSTALL_ENV} \
180 ${MAKE_PROGRAM} install_mkspecs 179 ${MAKE_PROGRAM} install_mkspecs
181# The pri file has WRKSRC in it. 180# The pri file has WRKSRC in it.
182 ${SED} -e 's,${WRKSRC}/bin/qmake,${QTDIR}/bin/qmake,g' \ 181 ${SED} -e 's,${WRKSRC}/bin/qmake,${QTDIR}/bin/qmake,g' \
183 ${DESTDIR}${PREFIX}/${BROKEN_FILES} \ 182 ${DESTDIR}${PREFIX}/${BROKEN_FILES} \
184 > ${DESTDIR}${PREFIX}/${BROKEN_FILES}.1 183 > ${DESTDIR}${PREFIX}/${BROKEN_FILES}.1
185 ${MV} -f ${DESTDIR}${PREFIX}/${BROKEN_FILES}.1 \ 184 ${MV} -f ${DESTDIR}${PREFIX}/${BROKEN_FILES}.1 \
186 ${DESTDIR}${PREFIX}/${BROKEN_FILES} 185 ${DESTDIR}${PREFIX}/${BROKEN_FILES}
187 186
188.include "../../converters/libiconv/buildlink3.mk" 187.include "../../converters/libiconv/buildlink3.mk"
189.include "../../devel/gettext-lib/buildlink3.mk" 188.include "../../devel/gettext-lib/buildlink3.mk"
190.include "../../devel/glib2/buildlink3.mk" 189.include "../../devel/glib2/buildlink3.mk"
191.include "../../devel/pcre/buildlink3.mk" 190.include "../../devel/pcre/buildlink3.mk"
192.include "../../devel/zlib/buildlink3.mk" 191.include "../../devel/zlib/buildlink3.mk"
193.include "../../fonts/fontconfig/buildlink3.mk" 192.include "../../fonts/fontconfig/buildlink3.mk"
194.include "../../fonts/harfbuzz/buildlink3.mk" 193.include "../../fonts/harfbuzz/buildlink3.mk"
195.include "../../graphics/freetype2/buildlink3.mk" 194.include "../../graphics/freetype2/buildlink3.mk"
196.include "../../graphics/png/buildlink3.mk" 195.include "../../graphics/png/buildlink3.mk"
197.include "../../security/openssl/buildlink3.mk" 196.include "../../security/openssl/buildlink3.mk"
198# Use lib/dbus-1.0/include/dbus/dbus-arch-deps.h from sysutils/dbus 197# Use lib/dbus-1.0/include/dbus/dbus-arch-deps.h from sysutils/dbus
199USE_DBUS-ARCH-DEPS_H= yes 198USE_DBUS-ARCH-DEPS_H= yes
200.include "../../sysutils/dbus/buildlink3.mk" 199.include "../../sysutils/dbus/buildlink3.mk"
201.include "../../textproc/icu/buildlink3.mk" 200.include "../../textproc/icu/buildlink3.mk"
202.if ${OPSYS} != "Darwin" 201.if ${OPSYS} != "Darwin"
203.include "../../graphics/glu/buildlink3.mk" 202.include "../../graphics/glu/buildlink3.mk"
204. if !empty(MESALIB_SUPPORTS_EGL:Myes) 203. if !empty(MESALIB_SUPPORTS_EGL:Myes)
205PLIST.egl= yes 204PLIST.egl= yes
206. endif 205. endif
207.include "../../x11/libxcb/buildlink3.mk" 206.include "../../x11/libxcb/buildlink3.mk"
208.include "../../x11/xcb-util/buildlink3.mk" 207.include "../../x11/xcb-util/buildlink3.mk"
209.include "../../x11/xcb-util-image/buildlink3.mk" 208.include "../../x11/xcb-util-image/buildlink3.mk"
210.include "../../x11/xcb-util-keysyms/buildlink3.mk" 209.include "../../x11/xcb-util-keysyms/buildlink3.mk"
211.include "../../x11/xcb-util-wm/buildlink3.mk" 210.include "../../x11/xcb-util-wm/buildlink3.mk"
212.include "../../x11/libSM/buildlink3.mk" 211.include "../../x11/libSM/buildlink3.mk"
213.include "../../x11/libX11/buildlink3.mk" 212.include "../../x11/libX11/buildlink3.mk"
214.include "../../x11/libXext/buildlink3.mk" 213.include "../../x11/libXext/buildlink3.mk"
215.include "../../x11/libXcursor/buildlink3.mk" 214.include "../../x11/libXcursor/buildlink3.mk"
216.include "../../x11/libXft/buildlink3.mk" 215.include "../../x11/libXft/buildlink3.mk"
217.include "../../x11/libXmu/buildlink3.mk" 216.include "../../x11/libXmu/buildlink3.mk"
218.include "../../x11/libXrandr/buildlink3.mk" 217.include "../../x11/libXrandr/buildlink3.mk"
219.include "../../x11/libXrender/buildlink3.mk" 218.include "../../x11/libXrender/buildlink3.mk"
220.include "../../x11/libxkbcommon/buildlink3.mk" 219.include "../../x11/libxkbcommon/buildlink3.mk"
221.endif 220.endif
222.include "../../mk/jpeg.buildlink3.mk" 221.include "../../mk/jpeg.buildlink3.mk"
223.include "../../mk/pthread.buildlink3.mk" 222.include "../../mk/pthread.buildlink3.mk"
224.include "../../mk/bsd.pkg.mk" 223.include "../../mk/bsd.pkg.mk"