[Midnightbsd-cvs] mports [19952] trunk/devel/qt4-linguist: fix plist and build

[laffer1 at midnightbsd.org]

Revision: 19952
          http://svnweb.midnightbsd.org/mports/?rev=19952
Author:   laffer1
Date:     2015-08-22 17:42:57 -0400 (Sat, 22 Aug 2015)
Log Message:
-----------
fix plist and build

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

Added Paths:
-----------
    trunk/devel/qt4-linguist/files/patch-tools_linguist_linguist.pro

Modified: trunk/devel/qt4-linguist/Makefile
===================================================================
--- trunk/devel/qt4-linguist/Makefile	2015-08-22 21:40:19 UTC (rev 19951)
+++ trunk/devel/qt4-linguist/Makefile	2015-08-22 21:42:57 UTC (rev 19952)
@@ -3,7 +3,8 @@
 
 PORTNAME=	linguist
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	devel
+PORTREVISION=	1
+CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -12,8 +13,7 @@
 LICENSE=	gpl3
 
 USE_QT4=	qmake_build designer_build moc_build rcc_build uic_build \
-		assistant_run gui network xml
-QT_NONSTANDARD=	yes
+		assistant_run gui linguisttools_run network xml
 QT_DIST=	yes
 
 HAS_CONFIGURE=	yes
@@ -23,9 +23,10 @@
 MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \
 		PATH=${WRKSRC}/bin:$$PATH
 
-DESKTOP_ENTRIES="Qt Linguist" "${COMMENT}" \
+DESKTOP_ENTRIES="Qt 4 Linguist" "" \
 		"${PREFIX}/share/pixmaps/linguist-qt4.png" \
-		"${PREFIX}/bin/linguist-qt4" "Development;Qt;" true
+		"${PREFIX}/${QT_BINDIR_REL}/linguist${_QT_BINSUFX}" \
+		"Development;Qt;" true
 
 DO_NOT_EXTRACT=	demos doc examples mkspecs qmake translations \
 		src/activeqt src/dbus src/multimedia src/network src/opengl \
@@ -42,17 +43,15 @@
 BUILD_WRKSRC=	${WRKSRC}/tools/${PORTNAME}
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
-EXTRA_PATCHES=	${.CURDIR}/../../devel/qt4/files/patch-configure
-
 pre-configure:
 	${REINPLACE_CMD} -E -e 's|^TARGET[[:blank:]]*=[[:blank:]]*([a-z]+)|TARGET=\1-qt4|g' \
 		${BUILD_WRKSRC}/${PORTNAME}.pro ${BUILD_WRKSRC}/${PORTNAME}/${PORTNAME}.pro \
 		${BUILD_WRKSRC}/lrelease/lrelease.pro ${BUILD_WRKSRC}/lupdate/lupdate.pro
 	${MKDIR} ${WRKSRC}/mkspecs
-	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake
-	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/bin/moc
-	${LN} -sf ${LOCALBASE}/bin/uic-qt4 ${WRKSRC}/bin/uic
-	${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc
+	${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake
+	${LN} -sf ${MOC} ${WRKSRC}/bin/moc
+	${LN} -sf ${UIC} ${WRKSRC}/bin/uic
+	${LN} -sf ${RCC} ${WRKSRC}/bin/rcc
 
 post-install:
 	${INSTALL_DATA} ${BUILD_WRKSRC}/linguist/images/icons/linguist-128-32.png \

Added: trunk/devel/qt4-linguist/files/patch-tools_linguist_linguist.pro
===================================================================
--- trunk/devel/qt4-linguist/files/patch-tools_linguist_linguist.pro	                        (rev 0)
+++ trunk/devel/qt4-linguist/files/patch-tools_linguist_linguist.pro	2015-08-22 21:42:57 UTC (rev 19952)
@@ -0,0 +1,10 @@
+--- tools/linguist/linguist.pro.orig	2015-02-23 21:20:45 UTC
++++ tools/linguist/linguist.pro
+@@ -1,6 +1,2 @@
+ TEMPLATE = subdirs
+-SUBDIRS  = \
+-    lrelease \
+-    lupdate \
+-    lconvert
+-!no-png:!contains(QT_CONFIG, no-gui):SUBDIRS += linguist
++SUBDIRS  = linguist


Property changes on: trunk/devel/qt4-linguist/files/patch-tools_linguist_linguist.pro
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/devel/qt4-linguist/pkg-plist
===================================================================
--- trunk/devel/qt4-linguist/pkg-plist	2015-08-22 21:40:19 UTC (rev 19951)
+++ trunk/devel/qt4-linguist/pkg-plist	2015-08-22 21:42:57 UTC (rev 19952)
@@ -1,24 +1,16 @@
-bin/lconvert
-%%DEBUG%%bin/lconvert.debug
-bin/linguist-qt4
-%%DEBUG%%bin/linguist-qt4.debug
-bin/lrelease-qt4
-%%DEBUG%%bin/lrelease-qt4.debug
-bin/lupdate-qt4
-%%DEBUG%%bin/lupdate-qt4.debug
+%%QT_BINDIR%%/linguist-qt4
+%%DEBUG%%%%QT_BINDIR%%/linguist-qt4.debug
 share/pixmaps/linguist-qt4.png
-share/qt4/phrasebooks/danish.qph
-share/qt4/phrasebooks/dutch.qph
-share/qt4/phrasebooks/finnish.qph
-share/qt4/phrasebooks/french.qph
-share/qt4/phrasebooks/german.qph
-share/qt4/phrasebooks/hungarian.qph
-share/qt4/phrasebooks/italian.qph
-share/qt4/phrasebooks/japanese.qph
-share/qt4/phrasebooks/norwegian.qph
-share/qt4/phrasebooks/polish.qph
-share/qt4/phrasebooks/russian.qph
-share/qt4/phrasebooks/spanish.qph
-share/qt4/phrasebooks/swedish.qph
- at dirrm share/qt4/phrasebooks
- at dirrmtry share/qt4
+%%QT_DATADIR%%/phrasebooks/danish.qph
+%%QT_DATADIR%%/phrasebooks/dutch.qph
+%%QT_DATADIR%%/phrasebooks/finnish.qph
+%%QT_DATADIR%%/phrasebooks/french.qph
+%%QT_DATADIR%%/phrasebooks/german.qph
+%%QT_DATADIR%%/phrasebooks/hungarian.qph
+%%QT_DATADIR%%/phrasebooks/italian.qph
+%%QT_DATADIR%%/phrasebooks/japanese.qph
+%%QT_DATADIR%%/phrasebooks/norwegian.qph
+%%QT_DATADIR%%/phrasebooks/polish.qph
+%%QT_DATADIR%%/phrasebooks/russian.qph
+%%QT_DATADIR%%/phrasebooks/spanish.qph
+%%QT_DATADIR%%/phrasebooks/swedish.qph