[Midnightbsd-cvs] mports [19822] trunk/devel: fix some qt ports

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Aug 18 21:57:30 EDT 2015 

Revision: 19822
          http://svnweb.midnightbsd.org/mports/?rev=19822
Author:   laffer1
Date:     2015-08-18 21:57:27 -0400 (Tue, 18 Aug 2015)
Log Message:
-----------
fix some qt ports

Modified Paths:
--------------
    trunk/devel/py-xdg/Makefile
    trunk/devel/qt4-help/Makefile
    trunk/devel/qt4-help/pkg-plist
    trunk/devel/qt4-qdoc3/Makefile
    trunk/devel/qt4-qtestlib/Makefile
    trunk/devel/qt4-qvfb/Makefile
    trunk/devel/qt4-script/Makefile
    trunk/devel/qt4-scripttools/Makefile

Modified: trunk/devel/py-xdg/Makefile
===================================================================
--- trunk/devel/py-xdg/Makefile	2015-08-19 01:54:18 UTC (rev 19821)
+++ trunk/devel/py-xdg/Makefile	2015-08-19 01:57:27 UTC (rev 19822)
@@ -8,11 +8,11 @@
 DISTNAME=	py${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	A python library to access freedesktop.org standards
+COMMENT=	Python 2 library to access freedesktop.org standards
 
 LICENSE=	lgpl
 
-USE_PYTHON=	2
+USES=		python:2
 USE_PYDISTUTILS=yes
 PYDISTUTILS_AUTOPLIST=	yes
 

Modified: trunk/devel/qt4-help/Makefile
===================================================================
--- trunk/devel/qt4-help/Makefile	2015-08-19 01:54:18 UTC (rev 19821)
+++ trunk/devel/qt4-help/Makefile	2015-08-19 01:57:27 UTC (rev 19822)
@@ -14,7 +14,6 @@
 		gui sql sql-sqlite3_run xml network
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
-MAKE_JOBS_SAFE=	yes
 
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/qt4
@@ -39,8 +38,6 @@
 BUILD_WRKSRC=	${WRKSRC}/tools/assistant/lib
 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

Modified: trunk/devel/qt4-help/pkg-plist
===================================================================
--- trunk/devel/qt4-help/pkg-plist	2015-08-19 01:54:18 UTC (rev 19821)
+++ trunk/devel/qt4-help/pkg-plist	2015-08-19 01:57:27 UTC (rev 19822)
@@ -1,42 +1,37 @@
-include/qt4/Qt/QtHelp
-include/qt4/Qt/qhelp_global.h
-include/qt4/Qt/qhelpcontentwidget.h
-include/qt4/Qt/qhelpengine.h
-include/qt4/Qt/qhelpenginecore.h
-include/qt4/Qt/qhelpindexwidget.h
-include/qt4/Qt/qhelpsearchengine.h
-include/qt4/Qt/qhelpsearchquerywidget.h
-include/qt4/Qt/qhelpsearchresultwidget.h
-include/qt4/QtHelp/QHelpContentItem
-include/qt4/QtHelp/QHelpContentModel
-include/qt4/QtHelp/QHelpContentWidget
-include/qt4/QtHelp/QHelpGlobal
-include/qt4/QtHelp/QHelpEngine
-include/qt4/QtHelp/QHelpEngineCore
-include/qt4/QtHelp/QHelpIndexModel
-include/qt4/QtHelp/QHelpIndexWidget
-include/qt4/QtHelp/QHelpSearchEngine
-include/qt4/QtHelp/QHelpSearchQuery
-include/qt4/QtHelp/QHelpSearchQueryWidget
-include/qt4/QtHelp/QHelpSearchResultWidget
-include/qt4/QtHelp/QtHelp
-include/qt4/QtHelp/qhelp_global.h
-include/qt4/QtHelp/qhelpcontentwidget.h
-include/qt4/QtHelp/qhelpengine.h
-include/qt4/QtHelp/qhelpenginecore.h
-include/qt4/QtHelp/qhelpindexwidget.h
-include/qt4/QtHelp/qhelpsearchengine.h
-include/qt4/QtHelp/qhelpsearchquerywidget.h
-include/qt4/QtHelp/qhelpsearchresultwidget.h
-lib/qt4/libQtHelp.la
-lib/qt4/libQtHelp.prl
-lib/qt4/libQtHelp.so
-lib/qt4/libQtHelp.so.4
-lib/qt4/libQtHelp.so.%%SHLIB_SHVER%%
-lib/qt4/libQtHelp.so.%%SHLIB_VER%%
-%%DEBUG%%lib/qt4/libQtHelp.so.%%SHLIB_VER%%.debug
+%%QT_INCDIR%%/Qt/QtHelp
+%%QT_INCDIR%%/Qt/qhelp_global.h
+%%QT_INCDIR%%/Qt/qhelpcontentwidget.h
+%%QT_INCDIR%%/Qt/qhelpengine.h
+%%QT_INCDIR%%/Qt/qhelpenginecore.h
+%%QT_INCDIR%%/Qt/qhelpindexwidget.h
+%%QT_INCDIR%%/Qt/qhelpsearchengine.h
+%%QT_INCDIR%%/Qt/qhelpsearchquerywidget.h
+%%QT_INCDIR%%/Qt/qhelpsearchresultwidget.h
+%%QT_INCDIR%%/QtHelp/QHelpContentItem
+%%QT_INCDIR%%/QtHelp/QHelpContentModel
+%%QT_INCDIR%%/QtHelp/QHelpContentWidget
+%%QT_INCDIR%%/QtHelp/QHelpGlobal
+%%QT_INCDIR%%/QtHelp/QHelpEngine
+%%QT_INCDIR%%/QtHelp/QHelpEngineCore
+%%QT_INCDIR%%/QtHelp/QHelpIndexModel
+%%QT_INCDIR%%/QtHelp/QHelpIndexWidget
+%%QT_INCDIR%%/QtHelp/QHelpSearchEngine
+%%QT_INCDIR%%/QtHelp/QHelpSearchQuery
+%%QT_INCDIR%%/QtHelp/QHelpSearchQueryWidget
+%%QT_INCDIR%%/QtHelp/QHelpSearchResultWidget
+%%QT_INCDIR%%/QtHelp/QtHelp
+%%QT_INCDIR%%/QtHelp/qhelp_global.h
+%%QT_INCDIR%%/QtHelp/qhelpcontentwidget.h
+%%QT_INCDIR%%/QtHelp/qhelpengine.h
+%%QT_INCDIR%%/QtHelp/qhelpenginecore.h
+%%QT_INCDIR%%/QtHelp/qhelpindexwidget.h
+%%QT_INCDIR%%/QtHelp/qhelpsearchengine.h
+%%QT_INCDIR%%/QtHelp/qhelpsearchquerywidget.h
+%%QT_INCDIR%%/QtHelp/qhelpsearchresultwidget.h
+%%QT_LIBDIR%%/libQtHelp.prl
+%%QT_LIBDIR%%/libQtHelp.so
+%%QT_LIBDIR%%/libQtHelp.so.4
+%%QT_LIBDIR%%/libQtHelp.so.%%SHORTVER%%
+%%QT_LIBDIR%%/libQtHelp.so.%%FULLVER%%
+%%DEBUG%%%%QT_LIBDIR%%/libQtHelp.so.%%FULLVER%%.debug
 libdata/pkgconfig/QtHelp.pc
- at dirrmtry lib/qt4
- at dirrm include/qt4/QtHelp
- at dirrmtry include/qt4/Qt
- at dirrmtry include/qt4

Modified: trunk/devel/qt4-qdoc3/Makefile
===================================================================
--- trunk/devel/qt4-qdoc3/Makefile	2015-08-19 01:54:18 UTC (rev 19821)
+++ trunk/devel/qt4-qdoc3/Makefile	2015-08-19 01:57:27 UTC (rev 19822)
@@ -27,8 +27,6 @@
 EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 .endfor
 
-EXTRA_PATCHES=	${.CURDIR}/../../devel/qt4/files/patch-configure
-
 BUILD_WRKSRC=	${WRKSRC}/tools/${PORTNAME}
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 

Modified: trunk/devel/qt4-qtestlib/Makefile
===================================================================
--- trunk/devel/qt4-qtestlib/Makefile	2015-08-19 01:54:18 UTC (rev 19821)
+++ trunk/devel/qt4-qtestlib/Makefile	2015-08-19 01:57:27 UTC (rev 19822)
@@ -38,8 +38,6 @@
 BUILD_WRKSRC=	${WRKSRC}/src/testlib
 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

Modified: trunk/devel/qt4-qvfb/Makefile
===================================================================
--- trunk/devel/qt4-qvfb/Makefile	2015-08-19 01:54:18 UTC (rev 19821)
+++ trunk/devel/qt4-qvfb/Makefile	2015-08-19 01:57:27 UTC (rev 19822)
@@ -44,8 +44,6 @@
 
 CONFIGURE_ARGS+=	-I../../include/Qt -I../../include
 
-EXTRA_PATCHES=	${.CURDIR}/../../devel/qt4/files/patch-configure
-
 pre-configure:
 	${MKDIR} ${WRKSRC}/mkspecs
 	${REINPLACE_CMD} -e 's|^TARGET.*|TARGET=qvfb-qt4|g' \

Modified: trunk/devel/qt4-script/Makefile
===================================================================
--- trunk/devel/qt4-script/Makefile	2015-08-19 01:54:18 UTC (rev 19821)
+++ trunk/devel/qt4-script/Makefile	2015-08-19 01:57:27 UTC (rev 19822)
@@ -38,8 +38,6 @@
 BUILD_WRKSRC=	${WRKSRC}/src/${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

Modified: trunk/devel/qt4-scripttools/Makefile
===================================================================
--- trunk/devel/qt4-scripttools/Makefile	2015-08-19 01:54:18 UTC (rev 19821)
+++ trunk/devel/qt4-scripttools/Makefile	2015-08-19 01:57:27 UTC (rev 19822)
@@ -38,8 +38,6 @@
 BUILD_WRKSRC=	${WRKSRC}/src/${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

More information about the Midnightbsd-cvs mailing list