diff --git a/x11/qt/Makefile b/x11/qt/Makefile index 135cb84e1c9..021914d300e 100644 --- a/x11/qt/Makefile +++ b/x11/qt/Makefile @@ -1,15 +1,12 @@ -# $OpenBSD: Makefile,v 1.10 1999/03/02 04:41:10 marc Exp $ -# FreeBSD: Makefile,v 1.18 1998/07/20 16:51:14 andreas Exp -# +# $OpenBSD: Makefile,v 1.11 1999/03/07 02:25:55 brad Exp $ +# $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $ -MAJ= 1 -MIN= 41 -DISTNAME= qt-${MAJ}.${MIN} +DISTNAME= qt-1.42 CATEGORIES= x11 NEED_VERSION= 1.64 -MAINTAINER= form@OpenBSD.ORG +MAINTAINER= brad@OpenBSD.ORG MASTER_SITES= ftp://ftp.troll.no/qt/source/ @@ -20,13 +17,13 @@ MASTER_SITES= ftp://ftp.troll.no/qt/source/ #LIB_DEPENDS= MesaGL\\.2\\.:${PORTSDIR}/graphics/MesaGL #.endif -.if ( ${MACHINE_ARCH} == "sparc" ) -BROKEN= "Currently doesn't build on sparc due to g++ bug" -.endif +#.if ( ${MACHINE_ARCH} == "sparc" ) +#BROKEN= "Currently doesn't build on sparc due to g++ bug" +#.endif USE_GMAKE= yes USE_X11= yes -MAKE_ENV+= QTDIR=${WRKSRC} +MAKE_ENV+= QTDIR=${WRKSRC} CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" MAN1= moc.1 MAN3= QAccel.3qt QApplication.3qt QArray.3qt QAsyncIO.3qt \ @@ -38,26 +35,26 @@ MAN3= QAccel.3qt QApplication.3qt QArray.3qt QAsyncIO.3qt \ QComboBox.3qt QConnection.3qt QCursor.3qt QCustomEvent.3qt \ QDataPump.3qt QDataSink.3qt QDataSource.3qt QDataStream.3qt \ QDate.3qt QDateTime.3qt QDialog.3qt QDict.3qt QDictIterator.3qt \ - QDir.3qt QDoubleValidator.3qt QEvent.3qt QFile.3qt \ - QFileDialog.3qt QFileIconProvider.3qt QFileInfo.3qt \ - QFocusData.3qt QFocusEvent.3qt QFont.3qt QFontInfo.3qt \ - QFontMetrics.3qt QFrame.3qt QGArray.3qt QGCache.3qt \ - QGCacheIterator.3qt QGDict.3qt QGDictIterator.3qt QGIFFormat.3qt \ - QGIFFormatType.3qt QGLContext.3qt QGLFormat.3qt QGLWidget.3qt \ - QGList.3qt QGListIterator.3qt QGManager.3qt QGridLayout.3qt \ - QGroupBox.3qt QHBoxLayout.3qt QHeader.3qt QIODevice.3qt \ - QIODeviceSource.3qt QIconSet.3qt QImage.3qt QImageConsumer.3qt \ - QImageDecoder.3qt QImageDrag.3qt QImageFormat.3qt \ - QImageFormatType.3qt QImageIO.3qt QIntCache.3qt \ - QIntCacheIterator.3qt QIntDict.3qt QIntDictIterator.3qt \ - QIntValidator.3qt QKeyEvent.3qt QLCDNumber.3qt QLNode.3qt \ - QLabel.3qt QLayout.3qt QLineEdit.3qt QList.3qt QListBox.3qt \ - QListBoxItem.3qt QListBoxPixmap.3qt QListBoxText.3qt \ - QListIterator.3qt QListView.3qt QListViewItem.3qt \ - QMainWindow.3qt QMenuBar.3qt QMenuData.3qt QMessageBox.3qt \ - QMouseEvent.3qt QMoveEvent.3qt QMovie.3qt QMultiLineEdit.3qt \ - QNPInstance.3qt QNPStream.3qt QNPWidget.3qt QNPlugin.3qt \ - QObject.3qt QPaintDevice.3qt QPaintDeviceMetrics.3qt \ + QDir.3qt QDoubleValidator.3qt QDragMoveEvent.3qt QDragObject.3qt \ + QDropEvent.3qt QEvent.3qt QFile.3qt QFileDialog.3qt \ + QFileIconProvider.3qt QFileInfo.3qt QFocusData.3qt \ + QFocusEvent.3qt QFont.3qt QFontInfo.3qt QFontMetrics.3qt \ + QFrame.3qt QGArray.3qt QGCache.3qt QGCacheIterator.3qt \ + QGDict.3qt QGDictIterator.3qt QGIFFormat.3qt QGIFFormatType.3qt \ + QGLContext.3qt QGLFormat.3qt QGLWidget.3qt QGList.3qt \ + QGListIterator.3qt QGManager.3qt QGridLayout.3qt QGroupBox.3qt \ + QHBoxLayout.3qt QHeader.3qt QIODevice.3qt QIODeviceSource.3qt \ + QIconSet.3qt QImage.3qt QImageConsumer.3qt QImageDecoder.3qt \ + QImageDrag.3qt QImageFormat.3qt QImageFormatType.3qt \ + QImageIO.3qt QIntCache.3qt QIntCacheIterator.3qt QIntDict.3qt \ + QIntDictIterator.3qt QIntValidator.3qt QKeyEvent.3qt \ + QLCDNumber.3qt QLNode.3qt QLabel.3qt QLayout.3qt QLineEdit.3qt \ + QList.3qt QListBox.3qt QListBoxItem.3qt QListBoxPixmap.3qt \ + QListBoxText.3qt QListIterator.3qt QListView.3qt \ + QListViewItem.3qt QMainWindow.3qt QMenuBar.3qt QMenuData.3qt \ + QMessageBox.3qt QMouseEvent.3qt QMoveEvent.3qt QMovie.3qt \ + QMultiLineEdit.3qt QNPInstance.3qt QNPStream.3qt QNPWidget.3qt \ + QNPlugin.3qt QObject.3qt QPaintDevice.3qt QPaintDeviceMetrics.3qt \ QPaintEvent.3qt QPainter.3qt QPalette.3qt QPen.3qt QPicture.3qt \ QPixmap.3qt QPixmapCache.3qt QPoint.3qt QPointArray.3qt \ QPointVal.3qt QPopupMenu.3qt QPrintDialog.3qt QPrinter.3qt \ @@ -71,19 +68,20 @@ MAN3= QAccel.3qt QApplication.3qt QArray.3qt QAsyncIO.3qt \ QStrList.3qt QString.3qt QTabBar.3qt QTabDialog.3qt \ QTableView.3qt QTextDrag.3qt QTextStream.3qt QTime.3qt \ QTimer.3qt QTimerEvent.3qt QToolBar.3qt QToolButton.3qt \ - QToolTip.3qt QToolTipGroup.3qt QVBoxLayout.3qt QValidator.3qt \ - QWMatrix.3qt QWhatsThis.3qt QWidget.3qt QWidgetStack.3qt \ - QWindow.3qt QXtApplication.3qt QXtWidget.3qt qaccel.3qt \ - qapplication.3qt qarray.3qt qasyncio.3qt qbitarray.3qt \ - qbitmap.3qt qbitval.3qt qboxlayout.3qt qbrush.3qt qbuffer.3qt \ - qbutton.3qt qbuttongroup.3qt qbytearray.3qt qcache.3qt \ - qcacheiterator.3qt qcheckbox.3qt qchecklistitem.3qt \ - qchildevent.3qt qclipboard.3qt qcloseevent.3qt qcollection.3qt \ - qcolor.3qt qcolorgroup.3qt qcombobox.3qt qconnection.3qt \ - qcursor.3qt qcustomevent.3qt qdatapump.3qt qdatasink.3qt \ - qdatasource.3qt qdatastream.3qt qdate.3qt qdatetime.3qt \ - qdialog.3qt qdict.3qt qdictiterator.3qt qdir.3qt \ - qdoublevalidator.3qt qevent.3qt qfile.3qt qfiledialog.3qt \ + QToolTip.3qt QToolTipGroup.3qt QUrlDrag.3qt QVBoxLayout.3qt \ + QValidator.3qt QWMatrix.3qt QWhatsThis.3qt QWidget.3qt \ + QWidgetStack.3qt QWindow.3qt QXtApplication.3qt QXtWidget.3qt \ + qaccel.3qt qapplication.3qt qarray.3qt qasyncio.3qt \ + qbitarray.3qt qbitmap.3qt qbitval.3qt qboxlayout.3qt \ + qbrush.3qt qbuffer.3qt qbutton.3qt qbuttongroup.3qt \ + qbytearray.3qt qcache.3qt qcacheiterator.3qt qcheckbox.3qt \ + qchecklistitem.3qt qchildevent.3qt qclipboard.3qt \ + qcloseevent.3qt qcollection.3qt qcolor.3qt qcolorgroup.3qt \ + qcombobox.3qt qconnection.3qt qcursor.3qt qcustomevent.3qt \ + qdatapump.3qt qdatasink.3qt qdatasource.3qt qdatastream.3qt \ + qdate.3qt qdatetime.3qt qdialog.3qt qdict.3qt qdictiterator.3qt \ + qdir.3qt qdoublevalidator.3qt qdragmoveevent.3qt qdragobject.3qt \ + qdropevent.3qt qevent.3qt qfile.3qt qfiledialog.3qt \ qfileiconprovider.3qt qfileinfo.3qt qfocusdata.3qt \ qfocusevent.3qt qfont.3qt qfontinfo.3qt qfontmetrics.3qt \ qframe.3qt qgarray.3qt qgcache.3qt qgcacheiterator.3qt \ @@ -116,13 +114,13 @@ MAN3= QAccel.3qt QApplication.3qt QArray.3qt QAsyncIO.3qt \ qstring.3qt qstrlist.3qt qtabbar.3qt qtabdialog.3qt \ qtableview.3qt qtextdrag.3qt qtextstream.3qt qtime.3qt \ qtimer.3qt qtimerevent.3qt qtoolbar.3qt qtoolbutton.3qt \ - qtooltip.3qt qtooltipgroup.3qt qvalidator.3qt qvboxlayout.3qt \ - qwhatsthis.3qt qwidget.3qt qwidgetstack.3qt qwindow.3qt \ - qwmatrix.3qt qxtapplication.3qt qxtwidget.3qt + qtooltip.3qt qtooltipgroup.3qt qurldrag.3qt qvalidator.3qt \ + qvboxlayout.3qt qwhatsthis.3qt qwidget.3qt qwidgetstack.3qt \ + qwindow.3qt qwmatrix.3qt qxtapplication.3qt qxtwidget.3qt -EXAMPLES= aclock application biff connect cursor dclock desktop \ - dirview dragdrop drawdemo forever hello layout \ - life menu movies pref progress qdir qmag qwerty \ +EXAMPLES=aclock application biff connect cursor dclock desktop \ + dirview dragdrop drawdemo forever hello layout layouts \ + life menu movies picture pref progress qdir qmag qwerty \ scrollview showimg splitter table tetrix tictac timestmp \ tooltip validator widgets xform @@ -130,26 +128,22 @@ post-configure: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${USE_TARGET} do-install: - ${INSTALL_PROGRAM} $(WRKDIR)/qt-${MAJ}.${MIN}/bin/moc $(X11BASE)/bin -.if exists($(WRKDIR)/qt-${MAJ}.${MIN}/lib/libqt.a) - ${INSTALL_DATA} $(WRKDIR)/qt-${MAJ}.${MIN}/lib/libqt.a $(X11BASE)/lib + ${INSTALL_PROGRAM} ${WRKSRC}/bin/moc ${X11BASE}/bin +.if exists(${WRKSRC}/lib/libqt.a) + ${INSTALL_DATA} ${WRKSRC}/lib/libqt.a ${X11BASE}/lib .endif -.if exists($(WRKDIR)/qt-${MAJ}.${MIN}/lib/libqt.so.${MAJ}.${MIN}) - ${INSTALL_DATA} $(WRKDIR)/qt-${MAJ}.${MIN}/lib/libqt.so.${MAJ}.${MIN} \ - $(X11BASE)/lib - ${LN} -sf $(X11BASE)/lib/libqt.so.${MAJ}.${MIN} $(X11BASE)/lib/libqt.so - ${LDCONFIG} -m $(PREFIX)/lib +.if exists(${WRKSRC}/lib/libqt.so.1.42) + ${INSTALL_DATA} ${WRKSRC}/lib/libqt.so.1.42 ${X11BASE}/lib + ${LN} -sf ${X11BASE}/lib/libqt.so.1.42 ${X11BASE}/lib/libqt.so + ${LDCONFIG} -m ${PREFIX}/lib .endif - ${MKDIR} -p $(PREFIX)/include/X11/qt - ${INSTALL_DATA} $(WRKDIR)/qt-${MAJ}.${MIN}/include/* \ - $(PREFIX)/include/X11/qt - ${INSTALL_MAN} $(WRKDIR)/qt-${MAJ}.${MIN}/man/man1/* $(PREFIX)/man/man1 - ${INSTALL_MAN} $(WRKDIR)/qt-${MAJ}.${MIN}/man/man3/* $(PREFIX)/man/man3 + ${MKDIR} -p ${PREFIX}/include/X11/qt + ${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/include/X11/qt + ${INSTALL_MAN} ${WRKSRC}/man/man1/* ${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/man/man3/* ${PREFIX}/man/man3 ${MKDIR} -p ${PREFIX}/share/doc/qt - ${INSTALL_DATA} ${WRKDIR}/qt-${MAJ}.${MIN}/README \ - ${PREFIX}/share/doc/qt - ${INSTALL_DATA} ${WRKDIR}/qt-${MAJ}.${MIN}/README.QT \ - ${PREFIX}/share/doc/qt + ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/qt + ${INSTALL_DATA} ${WRKSRC}/README.QT ${PREFIX}/share/doc/qt ${MKDIR} -p ${PREFIX}/lib/qt/tutorial @${ECHO} -n "Installing tutorials:" .for n in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 diff --git a/x11/qt/files/md5 b/x11/qt/files/md5 index 6199265c265..d5658eb867c 100644 --- a/x11/qt/files/md5 +++ b/x11/qt/files/md5 @@ -1,3 +1,3 @@ -MD5 (qt-1.41.tar.gz) = a44bc8972a6997c63f5c34820b0f4901 -RMD160 (qt-1.41.tar.gz) = cc4b9d43abc96a0296d6c4802ddf281a50182950 -SHA1 (qt-1.41.tar.gz) = f37b4118f6055640261a3f3100bb588eb1a0b12b +MD5 (qt-1.42.tar.gz) = 0d1b32b6838d33074fe84088a2942028 +RMD160 (qt-1.42.tar.gz) = 713bd67d2d91c76ba63736e4089b56da7ecfd0cc +SHA1 (qt-1.42.tar.gz) = aa8bdda060898a3bbc7cef0fd43d5ba67c938eaa diff --git a/x11/qt/patches/patch-aa b/x11/qt/patches/patch-aa new file mode 100644 index 00000000000..321e2ca38af --- /dev/null +++ b/x11/qt/patches/patch-aa @@ -0,0 +1,39 @@ +--- configs/openbsd-g++-shared.orig Wed Mar 3 23:05:57 1999 ++++ configs/openbsd-g++-shared Wed Mar 3 23:08:56 1999 +@@ -1,30 +1,30 @@ + # Compiling +-SYSCONF_CC = g++ ++SYSCONF_CC = $(CXX) + + # Compiling with support libraries +-SYSCONF_CFLAGS_X11 = -I/usr/X11R6/include ++SYSCONF_CFLAGS_X11 = -I$(X11BASE)/include + SYSCONF_CFLAGS_QT = -I$(QTDIR)/include +-SYSCONF_CFLAGS_OPENGL = -I/usr/X11R6/include ++SYSCONF_CFLAGS_OPENGL = -I$(X11BASE)/include + + # Compiline YACC output + SYSCONF_CFLAGS_YACC = -Wno-unused -Wno-parentheses + + # Linking with support libraries + # X11 +-SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib ++SYSCONF_LFLAGS_X11 = -L$(X11BASE)/lib + SYSCONF_LIBS_X11 = -lX11 -lXext + # Qt, Qt+OpenGL + SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib + SYSCONF_LIBS_QT = -lqt + SYSCONF_LIBS_QT_OPENGL = -lqgl + # OpenGL +-SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib ++SYSCONF_LFLAGS_OPENGL = -L$(X11BASE)/lib + SYSCONF_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu -lXext -lm + # Yacc + SYSCONF_LIBS_YACC = + + # Linking applications +-SYSCONF_LINK = g++ ++SYSCONF_LINK = $(CXX) + SYSCONF_LFLAGS = + SYSCONF_LIBS = + diff --git a/x11/qt/patches/patch-ab b/x11/qt/patches/patch-ab new file mode 100644 index 00000000000..df72504cf61 --- /dev/null +++ b/x11/qt/patches/patch-ab @@ -0,0 +1,39 @@ +--- configs/openbsd-g++-static.orig Wed Mar 3 23:10:09 1999 ++++ configs/openbsd-g++-static Wed Mar 3 23:10:56 1999 +@@ -1,30 +1,30 @@ + # Compiling +-SYSCONF_CC = g++ ++SYSCONF_CC = $(CXX) + + # Compiling with support libraries +-SYSCONF_CFLAGS_X11 = -I/usr/X11R6/include ++SYSCONF_CFLAGS_X11 = -I$(X11BASE)/include + SYSCONF_CFLAGS_QT = -I$(QTDIR)/include +-SYSCONF_CFLAGS_OPENGL = -I/usr/X11R6/include ++SYSCONF_CFLAGS_OPENGL = -I$(X11BASE)/include + + # Compiline YACC output + SYSCONF_CFLAGS_YACC = -Wno-unused -Wno-parentheses + + # Linking with support libraries + # X11 +-SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib ++SYSCONF_LFLAGS_X11 = -L$(X11BASE)/lib + SYSCONF_LIBS_X11 = -lX11 -lXext + # Qt, Qt+OpenGL + SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib + SYSCONF_LIBS_QT = -lqt + SYSCONF_LIBS_QT_OPENGL = -lqgl + # OpenGL +-SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib ++SYSCONF_LFLAGS_OPENGL = -L$(X11BASE)/lib + SYSCONF_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu -lXext -lm + # Yacc + SYSCONF_LIBS_YACC = + + # Linking applications +-SYSCONF_LINK = g++ ++SYSCONF_LINK = $(CXX) + SYSCONF_LFLAGS = + SYSCONF_LIBS = + diff --git a/x11/qt/pkg/PLIST b/x11/qt/pkg/PLIST index 15d979bc3a3..35f3bf10e83 100644 --- a/x11/qt/pkg/PLIST +++ b/x11/qt/pkg/PLIST @@ -190,7 +190,7 @@ include/X11/qt/qwindefs.h include/X11/qt/qwindow.h include/X11/qt/qwindowdefs.h include/X11/qt/qwmatrix.h -lib/libqt.so.1.41 +lib/libqt.so.1.42 lib/libqt.so lib/qt/tutorial/t1 lib/qt/tutorial/t2