[Midnightbsd-cvs] mports: devel/qmake4: Update to qmake 4.3.1.

Fri Dec 14 20:07:42 EST 2007

Log Message:
-----------
Update to qmake 4.3.1.  Port now works.

Modified Files:
--------------
    mports/devel/qmake4:
        Makefile (r1.1 -> r1.2)
        distinfo (r1.1 -> r1.2)
        pkg-plist (r1.1 -> r1.2)
    mports/devel/qmake4/files:
        Makefile.bsd (r1.1 -> r1.2)
        qconfig.cpp (r1.1 -> r1.2)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/devel/qmake4/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/qmake4/pkg-plist -L devel/qmake4/pkg-plist -u -r1.1 -r1.2

--- devel/qmake4/pkg-plist
+++ devel/qmake4/pkg-plist
@@ -23,6 +23,8 @@
 share/qt4/mkspecs/aix-xlc/qplatformdefs.h
 share/qt4/mkspecs/common/g++.conf
 share/qt4/mkspecs/common/linux.conf
+share/qt4/mkspecs/common/mac.conf
+share/qt4/mkspecs/common/mac-g++.conf
 share/qt4/mkspecs/common/unix.conf
 share/qt4/mkspecs/darwin-g++/qmake.conf
 share/qt4/mkspecs/darwin-g++/qplatformdefs.h
@@ -35,11 +37,16 @@
 share/qt4/mkspecs/features/designer.prf
 share/qt4/mkspecs/features/dll.prf
 share/qt4/mkspecs/features/exclusive_builds.prf
+share/qt4/mkspecs/features/incredibuild_xge.prf
+share/qt4/mkspecs/features/lex.prf
 share/qt4/mkspecs/features/link_pkgconfig.prf
 share/qt4/mkspecs/features/qdbus.prf
 share/qt4/mkspecs/features/qt_functions.prf
+share/qt4/mkspecs/features/mac/dwarf2.prf
 share/qt4/mkspecs/features/mac/ppc.prf
+share/qt4/mkspecs/features/mac/ppc64.prf
 share/qt4/mkspecs/features/mac/x86.prf
+share/qt4/mkspecs/features/mac/x86_64.prf
 share/qt4/mkspecs/features/mac/default_post.prf
 share/qt4/mkspecs/features/mac/default_pre.prf
 share/qt4/mkspecs/features/mac/objective_c.prf
@@ -61,6 +68,7 @@
 share/qt4/mkspecs/features/staticlib.prf
 share/qt4/mkspecs/features/uic.prf
 share/qt4/mkspecs/features/uitools.prf
+share/qt4/mkspecs/features/unix/bsymbolic_functions.prf
 share/qt4/mkspecs/features/unix/dylib.prf
 share/qt4/mkspecs/features/unix/hide_symbols.prf
 share/qt4/mkspecs/features/unix/largefile.prf
@@ -91,6 +99,7 @@
 share/qt4/mkspecs/features/win32/thread.prf
 share/qt4/mkspecs/features/win32/thread_off.prf
 share/qt4/mkspecs/features/win32/windows.prf
+share/qt4/mkspecs/features/yacc.prf
 share/qt4/mkspecs/freebsd-g++/qmake.conf
 share/qt4/mkspecs/freebsd-g++/qplatformdefs.h
 share/qt4/mkspecs/freebsd-g++34/qmake.conf
@@ -135,10 +144,14 @@
 share/qt4/mkspecs/linux-g++/qplatformdefs.h
 share/qt4/mkspecs/linux-icc/qmake.conf
 share/qt4/mkspecs/linux-icc/qplatformdefs.h
+share/qt4/mkspecs/linux-icc-32/qmake.conf
+share/qt4/mkspecs/linux-icc-32/qplatformdefs.h
+share/qt4/mkspecs/linux-icc-64/qmake.conf
+share/qt4/mkspecs/linux-icc-64/qplatformdefs.h
 share/qt4/mkspecs/linux-kcc/qmake.conf
 share/qt4/mkspecs/linux-kcc/qplatformdefs.h
-share/qt4/mkspecs/linux-lsb/qmake.conf
-share/qt4/mkspecs/linux-lsb/qplatformdefs.h
+share/qt4/mkspecs/linux-lsb-g++/qmake.conf
+share/qt4/mkspecs/linux-lsb-g++/qplatformdefs.h
 share/qt4/mkspecs/linux-pgcc/qmake.conf
 share/qt4/mkspecs/linux-pgcc/qplatformdefs.h
 share/qt4/mkspecs/lynxos-g++/qmake.conf
@@ -174,6 +187,8 @@
 share/qt4/mkspecs/qws/linux-generic-g++-32/qplatformdefs.h
 share/qt4/mkspecs/qws/linux-ipaq-g++/qmake.conf
 share/qt4/mkspecs/qws/linux-ipaq-g++/qplatformdefs.h
+share/qt4/mkspecs/qws/linux-lsb-g++/qmake.conf
+share/qt4/mkspecs/qws/linux-lsb-g++/qplatformdefs.h
 share/qt4/mkspecs/qws/linux-mips-g++/qmake.conf
 share/qt4/mkspecs/qws/linux-mips-g++/qplatformdefs.h
 share/qt4/mkspecs/qws/linux-sharp-g++/qmake.conf
@@ -228,6 +243,7 @@
 @dirrm share/qt4/mkspecs/qws/linux-x86-g++
 @dirrm share/qt4/mkspecs/qws/linux-sharp-g++
 @dirrm share/qt4/mkspecs/qws/linux-mips-g++
+ at dirrm share/qt4/mkspecs/qws/linux-lsb-g++
 @dirrm share/qt4/mkspecs/qws/linux-ipaq-g++
 @dirrm share/qt4/mkspecs/qws/linux-generic-g++
 @dirrm share/qt4/mkspecs/qws/linux-generic-g++-32
@@ -244,8 +260,10 @@
 @dirrm share/qt4/mkspecs/macx-icc
 @dirrm share/qt4/mkspecs/lynxos-g++
 @dirrm share/qt4/mkspecs/linux-pgcc
- at dirrm share/qt4/mkspecs/linux-lsb
+ at dirrm share/qt4/mkspecs/linux-lsb-g++
 @dirrm share/qt4/mkspecs/linux-kcc
+ at dirrm share/qt4/mkspecs/linux-icc-64
+ at dirrm share/qt4/mkspecs/linux-icc-32
 @dirrm share/qt4/mkspecs/linux-icc
 @dirrm share/qt4/mkspecs/linux-g++-64
 @dirrm share/qt4/mkspecs/linux-g++-32
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/qmake4/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/qmake4/Makefile -L devel/qmake4/Makefile -u -r1.1 -r1.2
--- devel/qmake4/Makefile
+++ devel/qmake4/Makefile
@@ -1,22 +1,20 @@
-# New ports collection makefile for:	qmake-4
-# Date created:				Tue Jul 12 16:04:29 UTC 2005
-# Whom:					lofi at freebsd.org,
-#					mi at aldan.algebra.com
 #
 # $MidnightBSD$
-# $FreeBSD: ports/devel/qmake4/Makefile,v 1.3 2007/02/06 12:49:16 lofi Exp $
+#
 
 PORTNAME=	qmake
-PORTVERSION=	4.2.2
+PORTVERSION=	${QT4_VERSION}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
+PKGNAMEPREFIX=	qt4-
 DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
 DIST_SUBDIR=	KDE
-LATEST_LINK=	qmake4
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	The build utility of the Qt project
+LICENSE=	gpl2
 
+QT_NONSTANDARD=	yes
 REINPLACE_ARGS=	-i ""
 WRKSRC=		${WRKDIR}/${DISTNAME}/qmake
 MAKEFILE=	${FILESDIR}/Makefile.bsd
@@ -33,7 +31,10 @@
 	'${DISTNAME}/src/corelib/global' \
 	'${DISTNAME}/src/corelib/plugin' \
 	'${DISTNAME}/src/corelib/kernel' \
-	'${DISTNAME}/src/3rdparty/md5'
+	'${DISTNAME}/src/script' \
+	'${DISTNAME}/src/3rdparty/md4' \
+	'${DISTNAME}/src/3rdparty/md5' \
+	'${DISTNAME}/src/3rdparty/sha1'
 
 .if !defined(NOPORTDOCS)
 EXTRACT_AFTER_ARGS+='${DISTNAME}/doc/html/qmake*'
@@ -53,8 +54,8 @@
 		-e 's|release|release thread|' \
 		-e 's|-pthread -D_THREAD_SAFE|${PTHREAD_CFLAGS}|' \
 		-e 's|-pthread|${PTHREAD_LIBS}|' \
-		-e 's|uic|uic4|' \
-		-e 's|moc|moc4|' \
+		-e 's|uic|uic-qt4|' \
+		-e 's|moc|moc-qt4|' \
 		${WRKSRC}/../mkspecs/freebsd-g++/qmake.conf \
 		${WRKSRC}/../mkspecs/freebsd-g++34/qmake.conf
 	@${REINPLACE_CMD} -e 's|@QMAKE_QTOBJS@||g' ${WRKSRC}/Makefile.unix
@@ -66,4 +67,12 @@
 	${ECHO} '/* empty */' > ${WRKSRC}/qconfig.h
 	${LN} ${WRKSRC}/qconfig.h ${WRKSRC}/../include/QtCore/qconfig.h
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${.CURDIR}/../../Mk/bsd.qt.mk"
+
+
+.if ${ARCH} == "amd64"
+CXXFLAGS+=	-fno-gcse
+.endif
+
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/devel/qmake4/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/qmake4/distinfo -L devel/qmake4/distinfo -u -r1.1 -r1.2
--- devel/qmake4/distinfo
+++ devel/qmake4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.2.tar.gz) = 19f6374fe7924e33775cb87ee02669cb
-SHA256 (KDE/qt-x11-opensource-src-4.2.2.tar.gz) = e790d227fa7958f2b0c0b0facd8ca880190121ed2b9c99ca70643baf7a0cd24c
-SIZE (KDE/qt-x11-opensource-src-4.2.2.tar.gz) = 37636491
+MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13
+SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661
+SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858
Index: qconfig.cpp
===================================================================
RCS file: /home/cvs/mports/devel/qmake4/files/qconfig.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/qmake4/files/qconfig.cpp -L devel/qmake4/files/qconfig.cpp -u -r1.1 -r1.2
--- devel/qmake4/files/qconfig.cpp
+++ devel/qmake4/files/qconfig.cpp
@@ -1,5 +1,6 @@
 /*
- * $FreeBSD: ports/devel/qmake4/files/qconfig.cpp,v 1.2 2007/02/06 12:49:16 lofi Exp $
+ * $FreeBSD: ports/devel/qmake4/files/qconfig.cpp,v 1.6 2007/09/02 06:23:21 lofi Exp $
+ * $MidnightBSD$
  * Hand-crafted...
  * The default prefix (/ usr / local) is dynamicly replaced
  * at configure time.
@@ -11,7 +12,7 @@
 #define QT_CONFIGURE_HEADERS_PATH "/usr/local/include";
 #define QT_CONFIGURE_LIBRARIES_PATH "/usr/local/lib";
 #define QT_CONFIGURE_BINARIES_PATH "/usr/local/bin";
-#define QT_CONFIGURE_PLUGINS_PATH "/usr/local/lib/plugins";
+#define QT_CONFIGURE_PLUGINS_PATH "/usr/local/lib/qt4/plugins";
 #define QT_CONFIGURE_DATA_PATH "/usr/local/share/qt4";
 #define QT_CONFIGURE_TRANSLATIONS_PATH "/usr/local/share/qt4/translations";
 #define QT_CONFIGURE_SETTINGS_PATH "/usr/local/etc/xdg";
Index: Makefile.bsd
===================================================================
RCS file: /home/cvs/mports/devel/qmake4/files/Makefile.bsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/qmake4/files/Makefile.bsd -L devel/qmake4/files/Makefile.bsd -u -r1.1 -r1.2
--- devel/qmake4/files/Makefile.bsd
+++ devel/qmake4/files/Makefile.bsd
@@ -1,19 +1,24 @@
-# $FreeBSD: ports/devel/qmake4/files/Makefile.bsd,v 1.2 2007/02/06 12:49:16 lofi Exp $
+# $FreeBSD: ports/devel/qmake4/files/Makefile.bsd,v 1.6 2007/08/11 10:27:36 lofi Exp $
+# $MidnightBSD$
 
 _OBJS!=	${MAKE} -f Makefile.unix -V OBJS -V QOBJS
 # We'd like to avoid using qconfig.cpp, but can't -- see the comment
 # next to -DHAVE_CONFIG_CPP below: 
 #_OBJS:=	${_OBJS:S/qconfig.o//}
 SRCS:=	${_OBJS:.o=.cpp}
-NOMAN=	true	# qmake.1 anyone?
+NO_MAN=	true	# qmake.1 anyone?
 
 .PATH:	${.CURDIR} ${.CURDIR:H}/src/corelib/tools ${.CURDIR:H}/src/corelib/io \
 	${.CURDIR:H}/src/corelib/global ${.CURDIR:H}/src/corelib/plugin \
-	${.CURDIR:H}/src/corelib/kernel ${.CURDIR:H}/src/3rdparty/md5
+	${.CURDIR:H}/src/corelib/kernel ${.CURDIR:H}/src/3rdparty/md5 \
+	${.CURDIR:H}/src/3rdparty/md4 ${.CURDIR:H}/src/3rdparty/sha1 \
+	${.CURDIR:H}/src/script
+
 CXXFLAGS+=-I${.CURDIR:H}/mkspecs/freebsd-g++
 
 .for s in src/corelib/arch/generic src/global src/tools src/kernel src/codecs \
-		src/3rdparty/md5 include/QtCore include
+		src/3rdparty/md5 src/3rdparty/md4 src/3rdparty/sha1 \
+		src/script include/QtCore include
 CXXFLAGS+=-I${.CURDIR:H}/$s
 .endfor
 
@@ -35,13 +40,13 @@
 # -DHAVE_QCONFIG_CPP
 
 PROG_CXX=	qmake-qt4
-BINDIR=	${PREFIX}/bin
-SHAREDIR=${PREFIX}/share/qt4
+BINDIR=		${PREFIX}/bin
+SHAREDIR= 	${PREFIX}/share/qt4
 
 ${SHAREDIR}:
-	mkdir -p "$@"
+	mkdir -p "$@/mkspecs"
 
 beforeinstall: ${SHAREDIR}
-	cp -Rp ${.CURDIR:H}/mkspecs ${SHAREDIR}
+	cp -Rp ${.CURDIR:H}/mkspecs ${DESTDIR}${SHAREDIR}/
 
 .include <bsd.prog.mk>
