Repocopy from qt30. Modified to current status.

NOT TO BE USED AS A DEPENDENCY UNTIL AFTER 5.0 RELEASE!!!!

1 files changed, 52 insertions, 79 deletions

diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index e3591223ae1f..270fed8ff6be 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -1,3 +1,4 @@
+# -*-mode: makefile-*-
 # New ports collection makefile for:	qt-copy
 # Date created:				2 November 2001
 # Whom:					will@cvs.kde.org
@@ -5,115 +6,87 @@
 # $FreeBSD$
 #
 
-PORTNAME?=	qt
-PORTVERSION?=	3.0.5
-PORTREVISION?=  5
+PORTNAME=	qt
+PORTVERSION=	3.1.1
 CATEGORIES?=	x11-toolkits
-MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/ \
-		ftp://ftp.chg.ru/pub/X11/qt/source/
+MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/	\
+		ftp://ftp.silug.org/pub/qt/		\
+		ftp://ftp.bero.org/pub/qt/		\
+		ftp://ftp.planetmirror.com.au/pub/trolltech/qt/
+
 DISTNAME=	qt-x11-free-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
 MAINTAINER?=	kde@FreeBSD.org
 
-LIB_DEPENDS=	mng.1:${PORTSDIR}/graphics/libmng \
+LIB_DEPENDS+=	mng.1:${PORTSDIR}/graphics/libmng \
 		png.5:${PORTSDIR}/graphics/png \
-		jpeg.9:${PORTSDIR}/graphics/jpeg
-
-QT_PREFIX?=		${PREFIX}
-USE_BZIP2=		yes
-USE_GMAKE=		yes
-USE_REINPLACE=		yes
-REINPLACE_ARGS=		-i ""
-USE_X_PREFIX=		yes
-NO_FILTER_SHLIBS=	yes
-HAS_CONFIGURE=		yes
-CONFIGURE_ARGS=	-prefix ${QT_PREFIX} \
-		-shared -qt-gif -system-zlib \
-		-no-g++-exceptions -thread -no-stl \
-		-qt-imgfmt-png \
-		-qt-imgfmt-jpeg \
-		-qt-imgfmt-mng \
-		-system-libpng -system-libjpeg 	-system-libmng \
-		-no-nas-sound -sm \
-		-docdir ${QT_PREFIX}/share/doc/qt \
-		-I${LOCALBASE}/include -L${LOCALBASE}/lib
-
-.if defined(WITH_DEBUG)
-CONFIGURE_ARGS+=-debug
-.endif # defined(WITH_DEBUG)
-
-# backward compatibility
-.if defined(WITH_OPENGL)
-.undef WITHOUT_OPENFL
-.endif # defined(WITH_OPENGL)
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		cups.2:${PORTSDIR}/print/cups-base
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_X_PREFIX=	yes
+HAS_CONFIGURE=	yes
+INSTALLS_SHLIB=	yes
+NO_FILTER_SHLIBS=yes
+CONFIGURE_ARGS=	-system-libpng -system-libjpeg -system-libmng	\
+		-qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng	\
+		-system-zlib -sm -qt-gif -thread -no-fast	\
+		${XINERAMA} -no-g++-exceptions -no-stl ${CUPS}	\
+		-shared -prefix ${PREFIX}
+
+.if defined(DEBUG)
+CONFIGURE_ARGS+= -debug
+.endif
 
 .if !defined(WITHOUT_OPENGL)
 USE_MESA=	yes
-PLIST_SUB+=	OPENGL=""
-.else # WITHOUT_OPENGL
-PLIST_SUB+=	OPENGL="@comment "
+.else
 CONFIGURE_ARGS+=-disable-opengl
 .endif # WITHOUT_OPENGL
 
-CONFIGURE_ENV=	${ECHO} yes | QTDIR="${WRKSRC}" \
-		CFLAGS="${CXXFLAGS}"
-MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib
-ALL_TARGET=	symlinks sub-src sub-tools
+.if defined(WITH_XINERAMA)
+XINERAMA=	-xinerama
+PKGNAMESUFFIX=	-xinerama
+.else
+XINERAMA=	-no-xinerama
+.endif # defined(WITH_XINERAMA)
+
+CUPS=	-cups -L/usr/local/lib -I/usr/local/include
+
+CONFIGURE_ENV=	${ECHO} yes | QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
+MAKE_ENV?=	QTDIR=${WRKSRC} \
+		LD_LIBRARY_PATH=${WRKSRC}/lib \
+		PATH=${WRKSRC}/bin:$$PATH
+ALL_TARGET=	sub-tools
 
 .include <bsd.port.pre.mk>
 
 .if ${MACHINE_ARCH} == "alpha"
 CFLAGS+=	-O0
-.endif # ${MACHINE_ARCH} == "alpha"
+.endif
 
 .if ${XFREE86_VERSION} < 4
-BROKEN=		"The QT 3.x port does not support any XFree86 < 4.x"
+BROKEN=	"The QT ${PORTVERSION} port does not support any XFree86 < 4.x"
 .endif # ${XFREE86_VERSION} < 4
 
-pre-fetch:
 .if exists(${X11BASE}/include/qt2/qapp.h)
-	@${ECHO}
-	@${ECHO} "			NOTICE"
-	@${ECHO}
-	@${ECHO} "You have QT2 headers installed!  Installing this port"
-	@${ECHO} "will result in conflicts between QT3 and QT2!"
-	@${FALSE}
+BROKEN=	"You have QT2 headers installed!  Installing this port"
+BROKEN+="will result in conflicts between QT3 and QT2!"
 .endif
 
-# Remove unneeded dirs (speedup) and netscape files (build barfs).
-post-patch:
-	@${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -fr
-	@${RM} -fr ${WRKSRC}/examples ${WRKSRC}/tutorial
-	@cd ${WRKSRC}/include; \
-		${RM} -f jri.h jri_md.h jritypes.h npapi.h npupp.h
-	@cd ${WRKSRC}/extensions/nsplugin/src; \
-		${RM} -f jri.h jri_md.h jritypes.h npapi.h npupp.h \
-			npunix.c npwin.cpp
-	${REINPLACE_CMD} -e 's,-O2,${CXXFLAGS},' \
-		${WRKSRC}/mkspecs/freebsd-g++/qmake.conf
-	@${REINPLACE_CMD} -e 's,gcc,${CC},' \
-		${WRKSRC}/mkspecs/freebsd-g++/qmake.conf
-	@${REINPLACE_CMD} -e 's,g++,${CXX},' \
-		${WRKSRC}/mkspecs/freebsd-g++/qmake.conf
-	@${REINPLACE_CMD} -e  's,release,release thread,' \
-		${WRKSRC}/mkspecs/freebsd-g++/qmake.conf
-
 post-build:
-	cd ${WRKSRC}/tools/makeqpf/; ${SETENV} ${MAKE_ENV} ${MAKE}
-	cd ${WRKSRC}/tools/mergetr/; ${SETENV} ${MAKE_ENV} ${MAKE}
-	cd ${WRKSRC}/tools/msg2qm/; ${SETENV} ${MAKE_ENV} ${MAKE}
-	cd ${WRKSRC}/tools/qembed/; ${SETENV} ${MAKE_ENV} ${MAKE}
-	cd ${WRKSRC}/tools/qvfb/; ${SETENV} ${MAKE_ENV} ${MAKE}
+.for tool in makeqpf mergetr msg2qm qembed qvfb
+	cd ${WRKSRC}/tools/${tool}; ${SETENV} ${MAKE_ENV} ${MAKE}
+.endfor
 
 # Work around qmake generated dependencies
 pre-install:
 	@${INSTALL_DATA} ${WRKSRC}/lib/*.prl ${PREFIX}/lib
-	${INSTALL_PROGRAM} ${WRKSRC}/tools/makeqpf/makeqpf ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/tools/mergetr/mergetr ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/tools/msg2qm/msg2qm ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/tools/qembed/qembed ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/tools/qvfb/qvfb ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/findtr ${PREFIX}/bin
+.for tool in makeqpf mergetr msg2qm qembed qvfb
+	${INSTALL_PROGRAM} ${WRKSRC}/tools/${tool}/${tool} ${PREFIX}/bin
+.endfor
 
 .include <bsd.port.post.mk>