summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorcheusov <cheusov@pkgsrc.org>2011-08-18 12:34:26 +0000
committercheusov <cheusov@pkgsrc.org>2011-08-18 12:34:26 +0000
commitaf6c1b7a1a7edba0e615aeb70238405df07b6a10 (patch)
tree7d00d78aef724456b24a95765de1b093c8c63281 /x11
parent49437a3456d9a0cc6921bc8e36a7c2677152ac15 (diff)
downloadpkgsrc-af6c1b7a1a7edba0e615aeb70238405df07b6a10.tar.gz
Fix for PR 43816. Build qt4-libs with openssl support. Approved by wiz@.
Diffstat (limited to 'x11')
-rw-r--r--x11/qt4-libs/Makefile7
-rw-r--r--x11/qt4-libs/buildlink3.mk4
-rw-r--r--x11/qt4-tools/Makefile4
3 files changed, 11 insertions, 4 deletions
diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index 6aad475d401..a498fd2c6cf 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.61 2011/05/16 22:13:46 cheusov Exp $
+# $NetBSD: Makefile,v 1.62 2011/08/18 12:34:26 cheusov Exp $
PKG_DESTDIR_SUPPORT= user-destdir
PKGNAME= qt4-libs-${QTVERSION}
+PKGREVISION= 1
COMMENT= C++ X GUI toolkit
.include "../../x11/qt4-libs/Makefile.common"
@@ -24,6 +25,9 @@ CONFIGURE_ARGS+= -no-libmng
CONFIGURE_ARGS+= -no-libtiff
CONFIGURE_ARGS+= -no-sql-sqlite
+# kdelibs4 requires openssl support!
+CONFIGURE_ARGS+= -openssl-linked
+
INSTALLATION_DIRS= lib/pkgconfig
INSTALLATION_DIRS+= ${QTPREFIX}/bin
INSTALLATION_DIRS+= ${QTPREFIX}/imports/Qt/labs/folderlistmodel
@@ -127,6 +131,7 @@ do-install:
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt4-libs/buildlink3.mk b/x11/qt4-libs/buildlink3.mk
index c3b586ef110..e01c4fd3faf 100644
--- a/x11/qt4-libs/buildlink3.mk
+++ b/x11/qt4-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2011/04/22 13:42:20 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2011/08/18 12:34:26 cheusov Exp $
BUILDLINK_TREE+= qt4-libs
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= qt4-libs
QT4_LIBS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=4.6.1nb2
-BUILDLINK_ABI_DEPENDS.qt4-libs+= qt4-libs>=4.7.2nb2
+BUILDLINK_ABI_DEPENDS.qt4-libs+= qt4-libs>=4.7.3nb1
BUILDLINK_PKGSRCDIR.qt4-libs?= ../../x11/qt4-libs
BUILDLINK_INCDIRS.qt4-libs+= qt4/include
diff --git a/x11/qt4-tools/Makefile b/x11/qt4-tools/Makefile
index 250539d6781..644a3cc4c1e 100644
--- a/x11/qt4-tools/Makefile
+++ b/x11/qt4-tools/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.44 2011/05/16 22:13:46 cheusov Exp $
+# $NetBSD: Makefile,v 1.45 2011/08/18 12:34:27 cheusov Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../x11/qt4-libs/Makefile.common"
PKGNAME= qt4-tools-${QTVERSION}
+PKGREVISION= 1
COMMENT= QT GUI (WYSIWYG) builder and other tools
DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base
@@ -78,4 +79,5 @@ do-install:
.include "../../converters/libiconv/buildlink3.mk"
.include "../../x11/qt4-libs/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"