[Midnightbsd-cvs] mports [19844] trunk/devel: fix build

[laffer1 at midnightbsd.org]

Revision: 19844
          http://svnweb.midnightbsd.org/mports/?rev=19844
Author:   laffer1
Date:     2015-08-20 07:56:52 -0400 (Thu, 20 Aug 2015)
Log Message:
-----------
fix build

Modified Paths:
--------------
    trunk/devel/qt4-assistant/Makefile
    trunk/devel/qt4-assistant-adp/Makefile

Removed Paths:
-------------
    trunk/devel/qt4-assistant/distinfo
    trunk/devel/qt4-assistant-adp/pkg-descr

Modified: trunk/devel/qt4-assistant/Makefile
===================================================================
--- trunk/devel/qt4-assistant/Makefile	2015-08-20 11:56:44 UTC (rev 19843)
+++ trunk/devel/qt4-assistant/Makefile	2015-08-20 11:56:52 UTC (rev 19844)
@@ -14,7 +14,6 @@
 USE_QT4=	qmake_build moc_build rcc_build uic_build \
 		corelib gui help network sql webkit xml \
 		doc_run sql-sqlite3_run
-QT_NONSTANDARD=	yes
 QT_DIST=	yes
 
 HAS_CONFIGURE=	yes
@@ -24,7 +23,7 @@
 MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \
 		PATH=${WRKSRC}/bin:$$PATH
 
-DESKTOP_ENTRIES="Qt Assistant" "${COMMENT}" \
+DESKTOP_ENTRIES="Qt Assistant" "" \
 		"${PREFIX}/share/pixmaps/assistant-qt4.png" \
 		"${PREFIX}/bin/assistant-qt4" "Development;Qt;" true
 

Deleted: trunk/devel/qt4-assistant/distinfo
===================================================================
--- trunk/devel/qt4-assistant/distinfo	2015-08-20 11:56:44 UTC (rev 19843)
+++ trunk/devel/qt4-assistant/distinfo	2015-08-20 11:56:52 UTC (rev 19844)
@@ -1,2 +0,0 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.6.tar.gz) = 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c
-SIZE (KDE/qt-everywhere-opensource-src-4.8.6.tar.gz) = 241623667

Modified: trunk/devel/qt4-assistant-adp/Makefile
===================================================================
--- trunk/devel/qt4-assistant-adp/Makefile	2015-08-20 11:56:44 UTC (rev 19843)
+++ trunk/devel/qt4-assistant-adp/Makefile	2015-08-20 11:56:52 UTC (rev 19844)
@@ -4,9 +4,8 @@
 PORTNAME=	assistant
 PORTVERSION=	4.6.3
 PORTREVISION=	1
-CATEGORIES?=	devel
-MASTER_SITES=	${MASTER_SITE_QT}
-MASTER_SITE_SUBDIR=	archive/qt/${PORTVERSION:R}
+CATEGORIES=	devel
+MASTER_SITES=	QT
 PKGNAMEPREFIX=	qt4-
 PKGNAMESUFFIX=	-adp
 DISTNAME=	qt-assistant-qassistantclient-library-compat-src-${PORTVERSION}
@@ -13,13 +12,17 @@
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde at FreeBSD.org
-COMMENT=	Qt documentation browser, adp compat version
+COMMENT=	Qt *.adp-compatible documentation browser
 
-USE_QT4=	qmake_build moc_build rcc_build uic_build corelib \
+USE_QT4=	moc_build rcc_build uic_build corelib \
 		gui network xml doc dbus
+USES=		qmake
+QMAKE_ARGS=	QT_CONFIG+="dbus" QT_PRODUCT="OpenSource"
 
 ALL_TARGET=	first
 
+DESCR=		${.CURDIR:H:H}/devel/qt4/pkg-descr
+
 WRKSRC=		${WRKDIR}/${DISTNAME:C/src/version/}
 
 PLIST_FILES=	bin/assistant_adp
@@ -28,9 +31,4 @@
 	${REINPLACE_CMD} -e 's|$$$$\[QT_INSTALL_BINS]|${PREFIX}/bin|g' \
 		${WRKSRC}/compat.pro
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} -spec ${QMAKESPEC} QT_CONFIG+="dbus" \
-		QT_PRODUCT="OpenSource" ${QMAKEFLAGS}
-
 .include <bsd.port.mk>

Deleted: trunk/devel/qt4-assistant-adp/pkg-descr
===================================================================
--- trunk/devel/qt4-assistant-adp/pkg-descr	2015-08-20 11:56:44 UTC (rev 19843)
+++ trunk/devel/qt4-assistant-adp/pkg-descr	2015-08-20 11:56:52 UTC (rev 19844)
@@ -1,12 +0,0 @@
-Qt is a C++ toolkit for application development.  It lets application
-developers target all major operating systems with a single application
-source code.
-
-Qt provides a platform-independent API to all central platform functionality:
-GUI, database access, networking, file handling, etc.  The Qt library
-encapsulates the different APIs of different operating systems, providing
-the application programmer with a single, common API for all operating systems.
-The native C APIs are encapsulated in a set of well-designed, fully
-object-oriented C++ classes. 
-
-WWW: http://qt.nokia.com/products/qt/index.html