[Midnightbsd-cvs] mports: devel/qmake4: cleanup to work with the new extension stuff.

[ctriv at midnightbsd.org]

Log Message:
-----------
cleanup to work with the new extension stuff.

Modified Files:
--------------
    mports/devel/qmake4:
        Makefile (r1.6 -> r1.7)
    mports/devel/qmake4/files:
        Makefile.bsd (r1.5 -> r1.6)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/qmake4/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -L devel/qmake4/Makefile -L devel/qmake4/Makefile -u -r1.6 -r1.7
--- devel/qmake4/Makefile
+++ devel/qmake4/Makefile
@@ -14,11 +14,17 @@
 COMMENT=	The build utility of the Qt project
 LICENSE=	gpl2
 
-QT_NONSTANDARD=	yes
+EXTENSIONS=		qt
+QT_NONSTANDARD=		yes
+QT_BUILD_ENV_ONLY=	yes
+
 REINPLACE_ARGS=	-i ""
 WRKSRC=		${WRKDIR}/${DISTNAME}/qmake
 MAKEFILE=	${FILESDIR}/Makefile.bsd
-MAKE_ENV+=	FILESDIR="${FILESDIR}" ${FAKE_MAKEARGS} destdir=${FAKE_DESTDIR}
+MAKE_ENV+=	FILESDIR="${FILESDIR}" 
+
+FAKE_OPTS=	trueprefix
+
 #USE_BZIP2=	yes
 
 EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
@@ -60,7 +66,6 @@
 	${LN} ${WRKSRC}/qconfig.h ${WRKSRC}/../include/QtCore/qconfig.h
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../Mk/bsd.qt.mk"
 
 .if ${ARCH} == "amd64"
 CXXFLAGS+=	-fno-gcse
Index: Makefile.bsd
===================================================================
RCS file: /home/cvs/mports/devel/qmake4/files/Makefile.bsd,v
retrieving revision 1.5
retrieving revision 1.6
diff -L devel/qmake4/files/Makefile.bsd -L devel/qmake4/files/Makefile.bsd -u -r1.5 -r1.6
--- devel/qmake4/files/Makefile.bsd
+++ devel/qmake4/files/Makefile.bsd
@@ -42,10 +42,10 @@
 BINDIR=	${PREFIX}/bin
 SHAREDIR=${PREFIX}/share/qt4
 
-${SHAREDIR}:
-	mkdir -p "$@"
+${DESTDIR}${SHAREDIR}:
+	mkdir -p $@
 
-beforeinstall: ${SHAREDIR}
-	cp -Rp ${.CURDIR:H}/mkspecs ${DESTDIR}${SHAREDIR}
+beforeinstall: ${DESTDIR}${SHAREDIR}
+	cp -vRp ${.CURDIR:H}/mkspecs ${DESTDIR}${SHAREDIR}
 
 .include <bsd.prog.mk>