From owner-freebsd-ports Sat Mar 17 7:36: 6 2001 Delivered-To: freebsd-ports@freebsd.org Received: from flood.ping.uio.no (flood.ping.uio.no [129.240.78.31]) by hub.freebsd.org (Postfix) with ESMTP id 4422637B719; Sat, 17 Mar 2001 07:35:58 -0800 (PST) (envelope-from des@ofug.org) Received: (from des@localhost) by flood.ping.uio.no (8.9.3/8.9.3) id QAA73456; Sat, 17 Mar 2001 16:35:56 +0100 (CET) (envelope-from des@ofug.org) X-URL: http://www.ofug.org/~des/ X-Disclaimer: The views expressed in this message do not necessarily coincide with those of any organisation or company with which I am or have been affiliated. To: ports@freebsd.org, wca@freebsd.org Subject: Qt 2 breakage From: Dag-Erling Smorgrav Date: 17 Mar 2001 16:35:56 +0100 Message-ID: Lines: 29 User-Agent: Gnus/5.0802 (Gnus v5.8.2) Emacs/20.4 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org --=-=-= Blah. Where do I start? First of all, it is necesasry to realize that Qt 2.2 4 and 2.3.0 are not, as their ports claim, beta-quality software. They're production versions of Qt. There isn't a single port left in the tree that still depends on Qt 1.4.5 instead of 2.2.4. The qt22 and qt23 ports jump through hoops to install libqt2 and moc2 instead of libqt and moc. This had a purpose back when you wanted 1.4.x for production code and 2.x for bleeding-edge development, but no longer. It forces every port that *depends* on Qt 2 to jump through even more hoops to find the headers, libraries and meta-object compiler. The qt22 and qt23 ports should not be kept separate; the 2.2.4 port should be removed, and the qt23 port should be renamed to qt. The hacks used to rename the library etc. are bogus and should be removed. The endless strings of CONFIGURE_ARGS in Qt-using ports should be removed, as configure will now be able to find Qt on its own. A patch for the qt23 port is attached. I'll submit patches for kde2 and friends later. DES -- Dag-Erling Smorgrav - des@ofug.org --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=qt.diff Index: Makefile =================================================================== RCS file: /home/ncvs/ports/x11-toolkits/qt23/Makefile,v retrieving revision 1.79 diff -u -r1.79 Makefile --- Makefile 2001/03/14 01:29:15 1.79 +++ Makefile 2001/03/17 15:34:39 @@ -54,28 +54,12 @@ CFLAGS+= -O0 .endif -pre-fetch: -.if exists(${X11BASE}/lib/libqt2.so.3) -.if !defined(WANT_STATIC) - @${ECHO} "An older version of QT2 is installed. To avoid clobbering" - @${ECHO} "that installation, deinstall it and then install this port." - @${ECHO} "Note that this port contains beta-quality source code and" - @${ECHO} "must be used only wherever absolutely needed, such as for" - @${ECHO} "KDE 2.0 and later." - @${FALSE} -.endif -.endif - pre-configure: ${PERL} -pi -e "s,gcc,${CC},g; s,g\+\+,${CXX},g; \ s,/usr/X11R6,${X11BASE},g; \ s,-pipe -O2,${CXXFLAGS} -frerun-cse-after-loop,g" ${CONFIG} - ${PERL} -pi -e "s,VER_MAJ = 2,VER_MAJ = 4,g; \ - s,TARGET = qt,TARGET = qt2,g" ${WRKSRC}/src/Makefile.in - ${PERL} -pi -e "s@TARGET\t= moc@TARGET = moc2@g" ${WRKSRC}/src/moc/Makefile.in - ${PERL} -pi -e "s,rm -f bin/moc,rm -f bin/moc2,g; \ - s,cp src/moc/moc bin/moc,cp src/moc/moc2 bin/moc2,g; \ - s,symlinks src-moc src-mt sub-src sub-tools sub-tutorial sub-examples,symlinks src-moc src-mt sub-src sub-tools,g" \ + ${PERL} -pi -e "s,VER_MAJ = 2,VER_MAJ = 4,g" ${WRKSRC}/src/Makefile.in + ${PERL} -pi -e "s,symlinks src-moc src-mt sub-src sub-tools sub-tutorial sub-examples,symlinks src-moc src-mt sub-src sub-tools,g" \ ${WRKSRC}/Makefile post-configure: @@ -84,8 +68,8 @@ # XXX: This target looks like crap now. do-install: .if (${PORTNAME} == "qt") - ${MKDIR} ${PREFIX}/include/qt2 -.for BIN in moc2 uic + ${MKDIR} ${PREFIX}/include/qt +.for BIN in moc uic ${INSTALL_PROGRAM} ${WRKSRC}/bin/${BIN} ${PREFIX}/bin .endfor .for SCRIPT in findtr qt20fix qtrename140 @@ -93,28 +77,28 @@ .endfor ${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2 .if !defined(WANT_STATIC) -.for LIB in qt2 qt2-mt +.for LIB in qt qt-mt ${INSTALL_PROGRAM} ${WRKSRC}/lib/lib${LIB}.so.4 ${PREFIX}/lib ${LN} -sf ${PREFIX}/lib/lib${LIB}.so.4 ${PREFIX}/lib/lib${LIB}.so .endfor ${INSTALL_PROGRAM} ${WRKSRC}/lib/libqutil.so.1 ${PREFIX}/lib ${LN} -sf ${PREFIX}/lib/libqutil.so.1 ${PREFIX}/lib/libqutil.so .else -.for LIB in qt2 qutil +.for LIB in qt qutil ${INSTALL_DATA} ${WRKSRC}/lib/lib${LIB}.a ${PREFIX}/lib .endfor .endif .if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/qt2/html + ${MKDIR} ${PREFIX}/share/doc/qt/html .for FILE in ANNOUNCE FAQ PORTING README README.QT - ${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/share/doc/qt2 + ${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/share/doc/qt .endfor .for SUFFIX in g1n html png (for FILE in ${WRKSRC}/doc/html/*.${SUFFIX}; do \ - ${INSTALL_DATA} $$FILE ${PREFIX}/share/doc/qt2/html; done) + ${INSTALL_DATA} $$FILE ${PREFIX}/share/doc/qt/html; done) .endfor .for FILE in index titleindex propertyindex whatsthis - ${INSTALL_DATA} ${WRKSRC}/doc/html/${FILE} ${PREFIX}/share/doc/qt2/html + ${INSTALL_DATA} ${WRKSRC}/doc/html/${FILE} ${PREFIX}/share/doc/qt/html .endfor ${INSTALL_MAN} ${WRKSRC}/doc/man/man3/q* ${PREFIX}/man/man3 .endif @@ -124,7 +108,7 @@ .if (${PORTNAME} == "qt") post-install: ${CP} ${TMPPLIST} ${TMPPLIST}.new - ${SED} -e "s/libqt2\/.so/libqt2\.a/" -e "s/.*libqt2\.a\.\d\n//" \ + ${SED} -e "s/libqt\/.so/libqt\.a/" -e "s/.*libqt\.a\.\d\n//" \ -e "s/libqutil\.so/libqutil.a/" -e "s/.*libqutil\.a\.\d\n//" \ ${TMPPLIST}.new > ${TMPPLIST} .endif Index: files/patch-aa =================================================================== RCS file: /home/ncvs/ports/x11-toolkits/qt23/files/patch-aa,v retrieving revision 1.13 diff -u -r1.13 patch-aa --- files/patch-aa 2001/03/14 01:29:16 1.13 +++ files/patch-aa 2001/03/17 15:20:18 @@ -5,28 +5,10 @@ # Compiling with support libraries SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include -SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include -+SYSCONF_CXXFLAGS_QT= -I$(QTDIR)/include $(SYSCONF_CXXFLAGS_THREAD) ++SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include $(SYSCONF_CXXFLAGS_THREAD) SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include # Compiling YACC output -@@ -23,7 +23,7 @@ - SYSCONF_LIBS_X11 = -lXext -lX11 -lm - # Qt, Qt+OpenGL - SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib --SYSCONF_LIBS_QT = -lqt$(QT_THREAD_SUFFIX) -+SYSCONF_LIBS_QT = -lqt2$(QT_THREAD_SUFFIX) $(SYSCONF_LFLAGS_THREAD) - SYSCONF_LIBS_QT_OPENGL = - # OpenGL - SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib -@@ -46,7 +46,7 @@ - SYSCONF_LIBS_THREAD = - - # Meta-object compiler --SYSCONF_MOC = $(QTDIR)/bin/moc -+SYSCONF_MOC = $(QTDIR)/bin/moc2 - - # UI compiler - SYSCONF_UIC = $(QTDIR)/bin/uic @@ -57,16 +57,14 @@ # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) # Index: files/patch-af =================================================================== RCS file: /home/ncvs/ports/x11-toolkits/qt23/files/patch-af,v retrieving revision 1.3 diff -u -r1.3 patch-af --- files/patch-af 2001/03/14 01:29:17 1.3 +++ files/patch-af 2001/03/17 15:19:51 @@ -1,23 +1,5 @@ --- configs/freebsd-g++-static.orig Wed Oct 4 12:55:09 2000 +++ configs/freebsd-g++-static Sat Nov 18 20:02:46 2000 -@@ -23,7 +23,7 @@ - SYSCONF_LIBS_X11 = -lXext -lX11 -lm - # Qt, Qt+OpenGL - SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib --SYSCONF_LIBS_QT = -lqt$(QT_THREAD_SUFFIX) -+SYSCONF_LIBS_QT = -lqt2$(QT_THREAD_SUFFIX) - SYSCONF_LIBS_QT_OPENGL = - # OpenGL - SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib -@@ -46,7 +46,7 @@ - SYSCONF_LIBS_THREAD = - - # Meta-object compiler --SYSCONF_MOC = $(QTDIR)/bin/moc -+SYSCONF_MOC = $(QTDIR)/bin/moc2 - - # UI compiler - SYSCONF_UIC = $(QTDIR)/bin/uic @@ -77,8 +77,8 @@ SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) --=-=-=-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message