[Midnightbsd-cvs] mports [21141] trunk/devel/qt4-qdbusviewer: update plist and icon install

[laffer1 at midnightbsd.org]

Revision: 21141
          http://svnweb.midnightbsd.org/mports/?rev=21141
Author:   laffer1
Date:     2016-03-12 18:28:01 -0500 (Sat, 12 Mar 2016)
Log Message:
-----------
update plist and icon install

Modified Paths:
--------------
    trunk/devel/qt4-qdbusviewer/Makefile
    trunk/devel/qt4-qdbusviewer/pkg-plist

Modified: trunk/devel/qt4-qdbusviewer/Makefile
===================================================================
--- trunk/devel/qt4-qdbusviewer/Makefile	2016-03-12 23:24:48 UTC (rev 21140)
+++ trunk/devel/qt4-qdbusviewer/Makefile	2016-03-12 23:28:01 UTC (rev 21141)
@@ -3,7 +3,7 @@
 
 PORTNAME=	qdbusviewer
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	devel
+CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -13,9 +13,9 @@
 
 LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
 
+USES=		pkgconfig
 USE_QT4=	qmake_build moc_build rcc_build corelib dbus gui xml \
 		clucene
-QT_NONSTANDARD=	yes
 QT_DIST=	yes
 
 HAS_CONFIGURE=	yes
@@ -25,9 +25,10 @@
 MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \
 		PATH=${WRKSRC}/bin:$$PATH
 
-DESKTOP_ENTRIES="Qt D-Bus viewer" "${COMMENT}" \
-		"${PREFIX}/share/pixmaps/qdbusviewer.png" \
-		"${PREFIX}/bin/qdbusviewer" "Development;Qt;" true
+DESKTOP_ENTRIES="Qt 4 D-Bus viewer" "" \
+		"${PREFIX}/share/pixmaps/qdbusviewer-qt4.png" \
+		"${PREFIX}/${QT_BINDIR_REL}/qdbusviewer" \
+		"Development;Qt;" true
 
 DO_NOT_EXTRACT=	demos doc examples mkspecs qmake translations \
 		src/activeqt src/multimedia src/network src/opengl src/openvg \
@@ -51,7 +52,7 @@
 	${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc
 
 post-install:
-	${INSTALL_DATA} ${BUILD_WRKSRC}/images/qdbusviewer-128.png \
-		${PREFIX}/share/pixmaps/qdbusviewer.png
+	${INSTALL_DATA} ${INSTALL_WRKSRC}/images/qdbusviewer-128.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/qdbusviewer-qt4.png
 
 .include <bsd.port.mk>

Modified: trunk/devel/qt4-qdbusviewer/pkg-plist
===================================================================
--- trunk/devel/qt4-qdbusviewer/pkg-plist	2016-03-12 23:24:48 UTC (rev 21140)
+++ trunk/devel/qt4-qdbusviewer/pkg-plist	2016-03-12 23:28:01 UTC (rev 21141)
@@ -1,3 +1,3 @@
-bin/qdbusviewer
-%%DEBUG%%bin/qdbusviewer.debug
-share/pixmaps/qdbusviewer.png
+%%QT_BINDIR%%/qdbusviewer
+%%DEBUG%%%%QT_BINDIR%%/qdbusviewer.debug
+share/pixmaps/qdbusviewer-qt4.png