[Midnightbsd-cvs] mports [19931] trunk/x11/qt4-inputmethods: fix qt4 input methods

[laffer1 at midnightbsd.org]

Revision: 19931
          http://svnweb.midnightbsd.org/mports/?rev=19931
Author:   laffer1
Date:     2015-08-22 16:12:50 -0400 (Sat, 22 Aug 2015)
Log Message:
-----------
fix qt4 input methods

Modified Paths:
--------------
    trunk/x11/qt4-inputmethods/Makefile
    trunk/x11/qt4-inputmethods/pkg-plist

Removed Paths:
-------------
    trunk/x11/qt4-inputmethods/distinfo

Modified: trunk/x11/qt4-inputmethods/Makefile
===================================================================
--- trunk/x11/qt4-inputmethods/Makefile	2015-08-22 20:09:31 UTC (rev 19930)
+++ trunk/x11/qt4-inputmethods/Makefile	2015-08-22 20:12:50 UTC (rev 19931)
@@ -3,7 +3,7 @@
 
 PORTNAME=	inputmethods
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	x11
+CATEGORIES=	x11
 PKGNAMEPREFIX=	qt4-
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -11,9 +11,7 @@
 LICENSE=	gpl3
 
 USE_QT4=	qmake_build moc_build corelib gui
-QT_NONSTANDARD=	yes
 QT_DIST=	yes
-MAKE_JOBS_SAFE=	yes
 
 HAS_CONFIGURE=	yes
 
@@ -37,11 +35,9 @@
 BUILD_WRKSRC=	${WRKSRC}/src/plugins/${PORTNAME}
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
-EXTRA_PATCHES=	${.CURDIR}/../../devel/qt4/files/patch-configure
-
 pre-configure:
 	${MKDIR} ${WRKSRC}/mkspecs
-	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake
-	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/bin/moc
+	${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake
+	${LN} -sf ${MOC} ${WRKSRC}/bin/moc
 
 .include <bsd.port.mk>

Deleted: trunk/x11/qt4-inputmethods/distinfo
===================================================================
--- trunk/x11/qt4-inputmethods/distinfo	2015-08-22 20:09:31 UTC (rev 19930)
+++ trunk/x11/qt4-inputmethods/distinfo	2015-08-22 20:12:50 UTC (rev 19931)
@@ -1,2 +0,0 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270
-SIZE (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 236593028

Modified: trunk/x11/qt4-inputmethods/pkg-plist
===================================================================
--- trunk/x11/qt4-inputmethods/pkg-plist	2015-08-22 20:09:31 UTC (rev 19930)
+++ trunk/x11/qt4-inputmethods/pkg-plist	2015-08-22 20:12:50 UTC (rev 19931)
@@ -1,4 +1,2 @@
-%%QT_PLUGINDIR_REL%%/inputmethods/libqimsw-multi.so
-%%DEBUG%%%%QT_PLUGINDIR_REL%%/inputmethods/libqimsw-multi.so.debug
- at dirrm %%QT_PLUGINDIR_REL%%/inputmethods
- at dirrmtry %%QT_PLUGINDIR_REL%%
+%%QT_PLUGINDIR%%/inputmethods/libqimsw-multi.so
+%%DEBUG%%%%QT_PLUGINDIR%%/inputmethods/libqimsw-multi.so.debug