[Midnightbsd-cvs] mports [15538] trunk/devel/qt4-corelib/Makefile: fix fake

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Oct 5 12:06:37 EDT 2013


Revision: 15538
          http://svnweb.midnightbsd.org/mports/?rev=15538
Author:   laffer1
Date:     2013-10-05 12:06:36 -0400 (Sat, 05 Oct 2013)
Log Message:
-----------
fix fake

Modified Paths:
--------------
    trunk/devel/qt4-corelib/Makefile

Modified: trunk/devel/qt4-corelib/Makefile
===================================================================
--- trunk/devel/qt4-corelib/Makefile	2013-10-02 23:14:02 UTC (rev 15537)
+++ trunk/devel/qt4-corelib/Makefile	2013-10-05 16:06:36 UTC (rev 15538)
@@ -2,22 +2,22 @@
 
 PORTNAME=	corelib
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES?=	devel
 PKGNAMEPREFIX=	qt4-
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Qt core library
+
 LICENSE=	gpl3
 
 LIB_DEPENDS=	icui18n:${PORTSDIR}/devel/icu
 
 USES=		pkgconfig
-USE_GNOME=	_glib20
+USE_GNOME=	glib20
 USE_QT4=	qmake_build moc_build
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
-MAKE_JOBS_SAFE=	yes
 
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/qt4
@@ -25,8 +25,8 @@
 ALL_TARGET=	first
 CONFIGURE_ENV?=	QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
 MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \
-		PATH=${WRKSRC}/bin:$$PATH DESTDIR=${FAKE_DESTDIR}
-FAKE_MAKEENV+= DESTDIR=${FAKE_DESTDIR}
+		PATH=${WRKSRC}/bin:$$PATH INSTALL_ROOT=${FAKE_DESTDIR}
+FAKE_MAKEENV+= INSTALL_ROOT=${FAKE_DESTDIR}
 
 DO_NOT_EXTRACT=	demos doc examples mkspecs qmake tools translations \
 		src/activeqt src/dbus src/gui src/multimedia src/network \
@@ -36,9 +36,9 @@
 		src/xmlpatterns src/3rdparty/clucene src/3rdparty/freetype \
 		src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \
 		src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit
-#.for dne in ${DO_NOT_EXTRACT}
-#EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
-#.endfor
+.for dne in ${DO_NOT_EXTRACT}
+EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
+.endfor
 
 BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
@@ -65,6 +65,7 @@
 pre-configure:
 	${MKDIR} ${FAKE_DESTDIR}${TRUE_PREFIX}/share/qt4/mkspecs/
 	${MKDIR} ${WRKSRC}/mkspecs
+	${MKDIR} ${FAKE_DESTDIR}${LOCALBASE}/bin
 	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake
 	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/bin/moc
 	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${FAKE_DESTDIR}${LOCALBASE}/bin/qmake
@@ -74,7 +75,6 @@
 post-configure:
 	${REINPLACE_CMD} -e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
 		-e 's|.*$$(QMAKE).*||g' \
-		-e 's|${LOCALBASE}|${FAKE_DESTDIR}${LOCALBASE}|g' \
 		${BUILD_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' \



More information about the Midnightbsd-cvs mailing list