[Midnightbsd-cvs] mports [19955] cleanup

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Aug 22 17:45:39 EDT 2015 

Revision: 19955
          http://svnweb.midnightbsd.org/mports/?rev=19955
Author:   laffer1
Date:     2015-08-22 17:45:39 -0400 (Sat, 22 Aug 2015)
Log Message:
-----------
cleanup

Modified Paths:
--------------
    trunk/devel/qt4-libqtassistantclient/Makefile
    trunk/devel/qt4-libqtassistantclient/files/patch-lib__lib.pro
    trunk/devel/qt4-libqtassistantclient/pkg-plist

Property Changed:
----------------
    trunk/devel/qt4-libqtassistantclient/files/QAssistantClient
    trunk/devel/qt4-libqtassistantclient/files/QtAssistant
    trunk/devel/qt4-libqtassistantclient/files/patch-lib__lib.pro

Modified: trunk/devel/qt4-libqtassistantclient/Makefile
===================================================================
--- trunk/devel/qt4-libqtassistantclient/Makefile	2015-08-22 21:44:11 UTC (rev 19954)
+++ trunk/devel/qt4-libqtassistantclient/Makefile	2015-08-22 21:45:39 UTC (rev 19955)
@@ -3,8 +3,9 @@
 
 PORTNAME=	libQtAssistantClient
 PORTVERSION=	4.6.3
-CATEGORIES?=	devel
-MASTER_SITES=	${MASTER_SITE_QT}
+PORTREVISION=	1
+CATEGORIES=	devel
+MASTER_SITES=	QT
 PKGNAMEPREFIX=	qt4-
 DISTNAME=	qt-assistant-qassistantclient-library-compat-src-${PORTVERSION}
 DIST_SUBDIR=	KDE
@@ -13,43 +14,40 @@
 COMMENT=	Qt documentation browser integration library
 LICENSE=	gpl3
 
-USE_QT4=	qmake_build moc_build rcc_build corelib gui network
-MAKE_JOBS_SAFE=	yes
+USE_QT4=	moc_build rcc_build corelib gui network
+USES=		qmake
+QMAKE_ARGS=	CONFIG+="create_prl link_prl" VERSION="${PORTVERSION}"
 
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 
 ALL_TARGET=	first
 
-WRKSRC=		${WRKDIR}/${DISTNAME:C/src/version/}
-BUILD_WRKSRC=	${WRKSRC}/lib
-INSTALL_WRKSRC=	${BUILD_WRKSRC}
+DESCR=		${.CURDIR:H:H}/devel/qt4/pkg-descr
 
+WRKSRC=		${WRKDIR}/${DISTNAME:C/src/version/}/lib
+
 pre-configure:
 	${REINPLACE_CMD} -e 's|$$$$\[QT_INSTALL_HEADERS]|${PREFIX}/${QT_INCDIR_REL}|g' \
 		-e 's|$$$$\[QT_INSTALL_LIBS]|${PREFIX}/${QT_LIBDIR_REL}|g' \
-		${BUILD_WRKSRC}/lib.pro
+		${WRKSRC}/lib.pro
 
-do-configure:
-	@cd ${BUILD_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} -spec ${QMAKESPEC} CONFIG+="create_prl link_prl" \
-		VERSION="${PORTVERSION}" ${QMAKEFLAGS}
-
 post-configure:
-	${REINPLACE_CMD} -e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
-			-e 's|.*$$(QMAKE).*||g' ${BUILD_WRKSRC}/Makefile
+	${REINPLACE_CMD} -e 's|${PREFIX}/${QT_LIBDIR_REL}/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
+			-e 's|.*$$(QMAKE).*||g' ${WRKSRC}/Makefile
 	${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \
-			-E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \
-		${BUILD_WRKSRC}/lib/pkgconfig/QtAssistantClient.pc
+			-E -e 's|(.*location=).*moc|\1${PREFIX}/${QT_BINDIR_REL}/${MOC:T}|g' \
+		${WRKSRC}/lib/pkgconfig/QtAssistantClient.pc
 
 pre-build:
-	${MKDIR} ${BUILD_WRKSRC}/QtAssistant
-	${CP} ${BUILD_WRKSRC}/qassistantclient_global.h \
-		${BUILD_WRKSRC}/QtAssistant
+	${MKDIR} ${WRKSRC}/QtAssistant
+	${CP} ${WRKSRC}/qassistantclient_global.h \
+		${WRKSRC}/QtAssistant
 
 post-install:
-	${INSTALL_DATA} ${FILESDIR}/QAssistantClient ${PREFIX}/${QT_INCDIR_REL}/QtAssistant
-	${INSTALL_DATA} ${FILESDIR}/QtAssistant ${PREFIX}/${QT_INCDIR_REL}/QtAssistant
-	${MKDIR} ${PREFIX}/share/qt4/mkspecs/features
-	${INSTALL_DATA} ${WRKSRC}/features/assistant.prf ${PREFIX}/share/qt4/mkspecs/features
+	${MKDIR} ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtAssistant
+	${INSTALL_DATA} ${FILESDIR}/QAssistantClient ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtAssistant
+	${INSTALL_DATA} ${FILESDIR}/QtAssistant ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtAssistant
+	${MKDIR} ${STAGEDIR}${PREFIX}/${QT_MKSPECDIR_REL}/features
+	${INSTALL_DATA} ${WRKSRC:H}/features/assistant.prf ${STAGEDIR}${PREFIX}/${QT_MKSPECDIR_REL}/features
 
 .include <bsd.port.mk>

Index: trunk/devel/qt4-libqtassistantclient/files/QAssistantClient
===================================================================
--- trunk/devel/qt4-libqtassistantclient/files/QAssistantClient	2015-08-22 21:44:11 UTC (rev 19954)
+++ trunk/devel/qt4-libqtassistantclient/files/QAssistantClient	2015-08-22 21:45:39 UTC (rev 19955)

Property changes on: trunk/devel/qt4-libqtassistantclient/files/QAssistantClient
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/devel/qt4-libqtassistantclient/files/QtAssistant
===================================================================
--- trunk/devel/qt4-libqtassistantclient/files/QtAssistant	2015-08-22 21:44:11 UTC (rev 19954)
+++ trunk/devel/qt4-libqtassistantclient/files/QtAssistant	2015-08-22 21:45:39 UTC (rev 19955)

Property changes on: trunk/devel/qt4-libqtassistantclient/files/QtAssistant
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/devel/qt4-libqtassistantclient/files/patch-lib__lib.pro
===================================================================
--- trunk/devel/qt4-libqtassistantclient/files/patch-lib__lib.pro	2015-08-22 21:44:11 UTC (rev 19954)
+++ trunk/devel/qt4-libqtassistantclient/files/patch-lib__lib.pro	2015-08-22 21:45:39 UTC (rev 19955)
@@ -1,5 +1,5 @@
---- ./lib/lib.pro.orig	2010-06-18 05:01:10.000000000 -0400
-+++ ./lib/lib.pro	2010-08-13 05:16:02.000000000 -0400
+--- ./lib.pro.orig	2010-06-18 05:01:10.000000000 -0400
++++ ./lib.pro	2010-08-13 05:16:02.000000000 -0400
 @@ -1,11 +1,6 @@
  TEMPLATE        = lib
  QT += network


Property changes on: trunk/devel/qt4-libqtassistantclient/files/patch-lib__lib.pro
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/devel/qt4-libqtassistantclient/pkg-plist
===================================================================
--- trunk/devel/qt4-libqtassistantclient/pkg-plist	2015-08-22 21:44:11 UTC (rev 19954)
+++ trunk/devel/qt4-libqtassistantclient/pkg-plist	2015-08-22 21:45:39 UTC (rev 19955)
@@ -1,17 +1,11 @@
-include/qt4/QtAssistant/QAssistantClient
-include/qt4/QtAssistant/QtAssistant
-include/qt4/QtAssistant/qassistantclient.h
-include/qt4/QtAssistant/qassistantclient_global.h
-lib/qt4/libQtAssistantClient.prl
-lib/qt4/libQtAssistantClient.so
-lib/qt4/libQtAssistantClient.so.4
-lib/qt4/libQtAssistantClient.so.4.6
-lib/qt4/libQtAssistantClient.so.4.6.3
+%%QT_INCDIR%%/QtAssistant/QAssistantClient
+%%QT_INCDIR%%/QtAssistant/QtAssistant
+%%QT_INCDIR%%/QtAssistant/qassistantclient.h
+%%QT_INCDIR%%/QtAssistant/qassistantclient_global.h
+%%QT_LIBDIR%%/libQtAssistantClient.prl
+%%QT_LIBDIR%%/libQtAssistantClient.so
+%%QT_LIBDIR%%/libQtAssistantClient.so.4
+%%QT_LIBDIR%%/libQtAssistantClient.so.4.6
+%%QT_LIBDIR%%/libQtAssistantClient.so.4.6.3
 libdata/pkgconfig/QtAssistantClient.pc
-share/qt4/mkspecs/features/assistant.prf
- at dirrmtry share/qt4/mkspecs/features
- at dirrmtry share/qt4/mkspecs
- at dirrmtry share/qt4
- at dirrmtry lib/qt4
- at dirrm include/qt4/QtAssistant
- at dirrmtry include/qt4
+%%QT_MKSPECDIR%%/features/assistant.prf

More information about the Midnightbsd-cvs mailing list