summaryrefslogtreecommitdiff
path: root/x11/qt4-libs
diff options
context:
space:
mode:
authoradam <adam>2008-11-03 11:28:21 +0000
committeradam <adam>2008-11-03 11:28:21 +0000
commit39129bb9f67782d8e413f0e5af408e5445826e5f (patch)
tree611f84a743c488918d15ce8797884f1e59fd7989 /x11/qt4-libs
parentb58ce9292057825dd40b9e1b976b688e4cc99a83 (diff)
downloadpkgsrc-39129bb9f67782d8e413f0e5af408e5445826e5f.tar.gz
Fix for #39841:
install libqimsw-multi.la
Diffstat (limited to 'x11/qt4-libs')
-rw-r--r--x11/qt4-libs/Makefile16
-rw-r--r--x11/qt4-libs/PLIST4
2 files changed, 15 insertions, 5 deletions
diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index 3dc83aa54de..06724cb12ef 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.24 2008/07/24 12:55:20 markd Exp $
+# $NetBSD: Makefile,v 1.25 2008/11/03 11:28:21 adam Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../x11/qt4-libs/Makefile.common"
PKGNAME= qt4-libs-${QTVERSION}
+PKGREVISION= 1
COMMENT= C++ X GUI toolkit
BUILD_TARGET= sub-src
@@ -20,9 +21,13 @@ PLIST_SRC= ${WRKDIR}/PLIST ${PKGDIR}/PLIST
CONFIGURE_ARGS+= -no-sql-sqlite
CONFIGURE_ARGS+= -no-libtiff
-INSTALLATION_DIRS= lib/pkgconfig ${QTPREFIX}/bin ${QTPREFIX}/include \
- ${QTPREFIX}/lib ${QTPREFIX}/plugins/accessible \
- ${QTPREFIX}/plugins/imageformats
+INSTALLATION_DIRS= lib/pkgconfig
+INSTALLATION_DIRS+= ${QTPREFIX}/bin
+INSTALLATION_DIRS+= ${QTPREFIX}/include
+INSTALLATION_DIRS+= ${QTPREFIX}/lib
+INSTALLATION_DIRS+= ${QTPREFIX}/plugins/accessible
+INSTALLATION_DIRS+= ${QTPREFIX}/plugins/imageformats
+INSTALLATION_DIRS+= ${QTPREFIX}/plugins/inputmethods
INSTALL_ENV+= INSTALL_ROOT=${DESTDIR:Q}
@@ -56,6 +61,9 @@ do-install:
${WRKSRC}/plugins/imageformats/lib${plug}.la \
${DESTDIR}${QTPREFIX}/plugins/imageformats/
.endfor
+ ${LIBTOOL} --mode=install ${INSTALL_LIB} \
+ ${WRKSRC}/plugins/inputmethods/libqimsw-multi.la \
+ ${DESTDIR}/${QTPREFIX}/plugins/inputmethods/
.if ${OPSYS} == "Darwin" && empty(MACHINE_PLATFORM:MDarwin-[567].*)
SUBST_CLASSES+= socklen
diff --git a/x11/qt4-libs/PLIST b/x11/qt4-libs/PLIST
index 048265f64ea..0450732a7b9 100644
--- a/x11/qt4-libs/PLIST
+++ b/x11/qt4-libs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2008/07/24 12:55:20 markd Exp $
+@comment $NetBSD: PLIST,v 1.8 2008/11/03 11:28:21 adam Exp $
lib/pkgconfig/Qt3Support.pc
lib/pkgconfig/QtCore.pc
lib/pkgconfig/QtGui.pc
@@ -30,7 +30,9 @@ qt4/plugins/accessible/libqtaccessiblewidgets.la
qt4/plugins/imageformats/libqgif.la
qt4/plugins/imageformats/libqjpeg.la
qt4/plugins/imageformats/libqmng.la
+qt4/plugins/inputmethods/libqimsw-multi.la
qt4/q3porting.xml
+@dirrm qt4/plugins/inputmethods
@dirrm qt4/plugins/imageformats
@dirrm qt4/plugins/accessible
@dirrm qt4/plugins