Mon Feb 1 10:28:20 2016 UTC ()
Ensure iconv support is properly pulled in and enabled.  Fixes build on
at least SunOS.


(jperkin)
diff -r1.108 -r1.109 pkgsrc/x11/qt4-libs/Makefile
diff -r1.43 -r1.44 pkgsrc/x11/qt4-libs/buildlink3.mk
cvs diff -r1.108 -r1.109 pkgsrc/x11/qt4-libs/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/Makefile 2015/07/18 11:11:53 1.108
+++ pkgsrc/x11/qt4-libs/Makefile 2016/02/01 10:28:20 1.109
@@ -1,40 +1,42 @@ @@ -1,40 +1,42 @@
1# $NetBSD: Makefile,v 1.108 2015/07/18 11:11:53 adam Exp $ 1# $NetBSD: Makefile,v 1.109 2016/02/01 10:28:20 jperkin Exp $
2 2
3PKGNAME= qt4-libs-${QTVERSION} 3PKGNAME= qt4-libs-${QTVERSION}
4COMMENT= C++ X GUI toolkit 4COMMENT= C++ X GUI toolkit
5 5
6.include "../../x11/qt4-libs/Makefile.common" 6.include "../../x11/qt4-libs/Makefile.common"
7 7
8# XXX this is to test what really gets installed when 'do-install' is disabled 8# XXX this is to test what really gets installed when 'do-install' is disabled
9INSTALL_DIRS+= src 9INSTALL_DIRS+= src
10 10
11BUILD_TARGET= sub-src 11BUILD_TARGET= sub-src
12 12
13PTHREAD_OPTS+= require 13PTHREAD_OPTS+= require
14UNLIMIT_RESOURCES= datasize 14UNLIMIT_RESOURCES= datasize
15BUILDLINK_PASSTHRU_DIRS+=${QTPREFIX} 15BUILDLINK_PASSTHRU_DIRS+=${QTPREFIX}
16 16
17PLIST_SRC= ${WRKDIR}/PLIST ${PKGDIR}/PLIST 17PLIST_SRC= ${WRKDIR}/PLIST ${PKGDIR}/PLIST
18 18
19# built as plugins 19# built as plugins
20CONFIGURE_ARGS+= -no-dbus 20CONFIGURE_ARGS+= -no-dbus
21CONFIGURE_ARGS+= -no-libmng 21CONFIGURE_ARGS+= -no-libmng
22CONFIGURE_ARGS+= -no-libtiff 22CONFIGURE_ARGS+= -no-libtiff
23CONFIGURE_ARGS+= -no-sql-sqlite 23CONFIGURE_ARGS+= -no-sql-sqlite
24 24
25# kdelibs4 requires openssl support! 25# kdelibs4 requires openssl support!
26CONFIGURE_ARGS+= -openssl-linked 26CONFIGURE_ARGS+= -openssl-linked
27 27
 28CONFIGURE_ARGS+= -iconv
 29
28.include "../../mk/compiler.mk" 30.include "../../mk/compiler.mk"
29.if !empty(PKGSRC_COMPILER:Mclang) 31.if !empty(PKGSRC_COMPILER:Mclang)
30CXXFLAGS+= -std=c++11 -Wno-c++11-narrowing 32CXXFLAGS+= -std=c++11 -Wno-c++11-narrowing
31. if empty(MACHINE_PLATFORM:MDarwin-*-*) 33. if empty(MACHINE_PLATFORM:MDarwin-*-*)
32CXXFLAGS+= -D_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC=1 34CXXFLAGS+= -D_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC=1
33. endif 35. endif
34.endif 36.endif
35 37
36INSTALLATION_DIRS= lib/pkgconfig 38INSTALLATION_DIRS= lib/pkgconfig
37INSTALLATION_DIRS+= ${QTPREFIX}/bin 39INSTALLATION_DIRS+= ${QTPREFIX}/bin
38INSTALLATION_DIRS+= ${QTPREFIX}/imports/Qt/labs/folderlistmodel 40INSTALLATION_DIRS+= ${QTPREFIX}/imports/Qt/labs/folderlistmodel
39INSTALLATION_DIRS+= ${QTPREFIX}/imports/Qt/labs/gestures 41INSTALLATION_DIRS+= ${QTPREFIX}/imports/Qt/labs/gestures
40INSTALLATION_DIRS+= ${QTPREFIX}/imports/Qt/labs/particles 42INSTALLATION_DIRS+= ${QTPREFIX}/imports/Qt/labs/particles
@@ -140,22 +142,23 @@ do-install: @@ -140,22 +142,23 @@ do-install:
140 ${WRKSRC}/plugins/inputmethods/libqimsw-multi.la \ 142 ${WRKSRC}/plugins/inputmethods/libqimsw-multi.la \
141 ${DESTDIR}/${QTPREFIX}/plugins/inputmethods/ 143 ${DESTDIR}/${QTPREFIX}/plugins/inputmethods/
142.endif 144.endif
143 145
144.if ${OPSYS} != "Darwin" 146.if ${OPSYS} != "Darwin"
145.include "../../graphics/glu/buildlink3.mk" 147.include "../../graphics/glu/buildlink3.mk"
146.include "../../x11/libSM/buildlink3.mk" 148.include "../../x11/libSM/buildlink3.mk"
147.include "../../x11/libXcursor/buildlink3.mk" 149.include "../../x11/libXcursor/buildlink3.mk"
148.include "../../x11/libXft/buildlink3.mk" 150.include "../../x11/libXft/buildlink3.mk"
149.include "../../x11/libXmu/buildlink3.mk" 151.include "../../x11/libXmu/buildlink3.mk"
150.include "../../x11/libXrandr/buildlink3.mk" 152.include "../../x11/libXrandr/buildlink3.mk"
151.endif 153.endif
152 154
 155.include "../../converters/libiconv/buildlink3.mk"
153.include "../../devel/zlib/buildlink3.mk" 156.include "../../devel/zlib/buildlink3.mk"
154.include "../../fonts/fontconfig/buildlink3.mk" 157.include "../../fonts/fontconfig/buildlink3.mk"
155.include "../../graphics/freetype2/buildlink3.mk" 158.include "../../graphics/freetype2/buildlink3.mk"
156.include "../../mk/jpeg.buildlink3.mk" 159.include "../../mk/jpeg.buildlink3.mk"
157.include "../../graphics/png/buildlink3.mk" 160.include "../../graphics/png/buildlink3.mk"
158.include "../../security/openssl/buildlink3.mk" 161.include "../../security/openssl/buildlink3.mk"
159 162
160.include "../../mk/pthread.buildlink3.mk" 163.include "../../mk/pthread.buildlink3.mk"
161.include "../../mk/bsd.pkg.mk" 164.include "../../mk/bsd.pkg.mk"
cvs diff -r1.43 -r1.44 pkgsrc/x11/qt4-libs/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/buildlink3.mk 2015/04/25 14:25:16 1.43
+++ pkgsrc/x11/qt4-libs/buildlink3.mk 2016/02/01 10:28:20 1.44
@@ -1,33 +1,34 @@ @@ -1,33 +1,34 @@
1# $NetBSD: buildlink3.mk,v 1.43 2015/04/25 14:25:16 tnn Exp $ 1# $NetBSD: buildlink3.mk,v 1.44 2016/02/01 10:28:20 jperkin Exp $
2 2
3BUILDLINK_TREE+= qt4-libs 3BUILDLINK_TREE+= qt4-libs
4 4
5.if !defined(QT4_LIBS_BUILDLINK3_MK) 5.if !defined(QT4_LIBS_BUILDLINK3_MK)
6QT4_LIBS_BUILDLINK3_MK:= 6QT4_LIBS_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=4.6.1nb2 8BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=4.6.1nb2
9BUILDLINK_ABI_DEPENDS.qt4-libs+= qt4-libs>=4.8.6nb5 9BUILDLINK_ABI_DEPENDS.qt4-libs+= qt4-libs>=4.8.6nb5
10BUILDLINK_PKGSRCDIR.qt4-libs?= ../../x11/qt4-libs 10BUILDLINK_PKGSRCDIR.qt4-libs?= ../../x11/qt4-libs
11 11
12BUILDLINK_INCDIRS.qt4-libs+= qt4/include 12BUILDLINK_INCDIRS.qt4-libs+= qt4/include
13BUILDLINK_LIBDIRS.qt4-libs+= qt4/lib 13BUILDLINK_LIBDIRS.qt4-libs+= qt4/lib
14 14
15QTDIR= ${BUILDLINK_PREFIX.qt4-libs}/qt4 15QTDIR= ${BUILDLINK_PREFIX.qt4-libs}/qt4
16 16
17PTHREAD_OPTS+= require 17PTHREAD_OPTS+= require
18 18
19.include "../../mk/bsd.fast.prefs.mk" 19.include "../../mk/bsd.fast.prefs.mk"
20 20
 21.include "../../converters/libiconv/buildlink3.mk"
21.include "../../fonts/fontconfig/buildlink3.mk" 22.include "../../fonts/fontconfig/buildlink3.mk"
22.include "../../graphics/freetype2/buildlink3.mk" 23.include "../../graphics/freetype2/buildlink3.mk"
23.include "../../mk/jpeg.buildlink3.mk" 24.include "../../mk/jpeg.buildlink3.mk"
24.include "../../graphics/png/buildlink3.mk" 25.include "../../graphics/png/buildlink3.mk"
25.if ${OPSYS} != "Darwin" 26.if ${OPSYS} != "Darwin"
26.include "../../graphics/glu/buildlink3.mk" 27.include "../../graphics/glu/buildlink3.mk"
27.include "../../x11/libSM/buildlink3.mk" 28.include "../../x11/libSM/buildlink3.mk"
28.include "../../x11/libXcursor/buildlink3.mk" 29.include "../../x11/libXcursor/buildlink3.mk"
29.include "../../x11/libXft/buildlink3.mk" 30.include "../../x11/libXft/buildlink3.mk"
30.include "../../x11/libXmu/buildlink3.mk" 31.include "../../x11/libXmu/buildlink3.mk"
31.include "../../x11/libXrandr/buildlink3.mk" 32.include "../../x11/libXrandr/buildlink3.mk"
32. if ${X11_TYPE} == "modular" 33. if ${X11_TYPE} == "modular"
33. include "../../x11/libXinerama/buildlink3.mk" 34. include "../../x11/libXinerama/buildlink3.mk"