update to 1.40

This commit is contained in:
form 1998-07-22 12:49:44 +00:00
parent 778005f441
commit 4af899ed18
7 changed files with 1102 additions and 1899 deletions

View File

@ -3,141 +3,172 @@
# Date created: 9 January 1998
# Whom: Don Schmidt
#
# $OpenBSD: Makefile,v 1.3 1998/07/15 05:51:23 marc Exp $
# $OpenBSD: Makefile,v 1.4 1998/07/22 12:49:44 form Exp $
# FreeBSD: Makefile,v 1.18 1998/07/20 16:51:14 andreas Exp
#
# Note: qt-1.40 is available but DOES NOT BUILD.
#
DISTNAME= qt-1.33
MAJ= 1
MIN= 40
DISTNAME= qt-${MAJ}.${MIN}
CATEGORIES= x11
MAINTAINER= marc@OpenBSD.ORG
.if (${MACHINE_ARCH} == "sparc")
BROKEN= "won't build due to g++ bug; reported"
.endif
MASTER_SITES= ftp://ftp.troll.no/qt/source/
MAINTAINER= form@vs.itam.nsc.ru
#
# MesaGL library support is currently in progress...
#
#.if defined(USE_MESAGL)
#LIB_DEPENDS= MesaGL\\.2\\.:${PORTSDIR}/graphics/MesaGL
#.endif
USE_GMAKE= yes
USE_X11= yes
MAKE_ENV+= QTDIR=${WRKSRC}
.if ( ${MACHINE_ARCH} == "alpha" )
USE_TARGET= openbsd-g++-static
.else
USE_TARGET= openbsd-g++-shared
.endif
MAN1= moc.1
MAN3= QAccel.3qt QApplication.3qt QArray.3qt QAsyncIO.3qt \
QBitArray.3qt QBitVal.3qt QBitmap.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 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 \
QProgressBar.3qt QProgressDialog.3qt QPtrDict.3qt \
QPtrDictIterator.3qt QPushButton.3qt QQueue.3qt QRadioButton.3qt \
QRangeControl.3qt QRect.3qt QRegExp.3qt QRegion.3qt \
QResizeEvent.3qt QScrollBar.3qt QScrollView.3qt QSemiModal.3qt \
QShared.3qt QSignal.3qt QSignalMapper.3qt QSize.3qt \
QSlider.3qt QSocketNotifier.3qt QSpinBox.3qt QSplitter.3qt \
QStack.3qt QStatusBar.3qt QStoredDrag.3qt QStrIList.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 \
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 qglist.3qt qglistiterator.3qt \
qglwidget.3qt qgmanager.3qt qgridlayout.3qt qgroupbox.3qt \
qhboxlayout.3qt qheader.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 qiodevice.3qt \
qiodevicesource.3qt qkeyevent.3qt qlabel.3qt qlayout.3qt \
qlcdnumber.3qt qlineedit.3qt qlist.3qt qlistbox.3qt \
qlistboxitem.3qt qlistboxpixmap.3qt qlistboxtext.3qt \
qlistiterator.3qt qlistview.3qt qlistviewitem.3qt qlnode.3qt \
qmainwindow.3qt qmenubar.3qt qmenudata.3qt qmessagebox.3qt \
qmouseevent.3qt qmoveevent.3qt qmovie.3qt qmultilineedit.3qt \
qnpinstance.3qt qnplugin.3qt qnpstream.3qt qnpwidget.3qt \
qobject.3qt qpaintdevice.3qt qpaintdevicemetrics.3qt \
qpainter.3qt qpaintevent.3qt qpalette.3qt qpen.3qt qpicture.3qt \
qpixmap.3qt qpixmapcache.3qt qpoint.3qt qpointarray.3qt \
qpointval.3qt qpopupmenu.3qt qprintdialog.3qt qprinter.3qt \
qprogressbar.3qt qprogressdialog.3qt qptrdict.3qt \
qptrdictiterator.3qt qpushbutton.3qt qqueue.3qt qradiobutton.3qt \
qrangecontrol.3qt qrect.3qt qregexp.3qt qregion.3qt \
qresizeevent.3qt qscrollbar.3qt qscrollview.3qt qsemimodal.3qt \
qshared.3qt qsignal.3qt qsignalmapper.3qt qsize.3qt \
qslider.3qt qsocketnotifier.3qt qspinbox.3qt qsplitter.3qt \
qstack.3qt qstatusbar.3qt qstoreddrag.3qt qstrilist.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
EXAMPLES= aclock application biff connect cursor dclock desktop \
dirview dragdrop drawdemo forever hello layout \
life menu movies pref progress qdir qmag qwerty \
scrollview showimg splitter table tetrix tictac timestmp \
tooltip validator widgets xform
post-configure:
.if (${MACHINE_ARCH} == "alpha")
@(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} openbsd-gcc-static)
.else
@(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} openbsd-gcc-shared)
.endif
# Things to install
#
MAN3= QAccel.3qt QApplication.3qt QArray.3qt QBitArray.3qt \
QBitVal.3qt QBitmap.3qt QBoxLayout.3qt QBrush.3qt \
QBuffer.3qt QButton.3qt QButtonGroup.3qt QByteArray.3qt \
QCheckBox.3qt QClipboard.3qt QCloseEvent.3qt QCollection.3qt \
QColor.3qt QColorGroup.3qt QComboBox.3qt QConnection.3qt \
QCursor.3qt QCustomEvent.3qt QDataStream.3qt QDate.3qt \
QDateTime.3qt QDialog.3qt QDict.3qt QDictIterator.3qt \
QDir.3qt QDoubleValidator.3qt QEvent.3qt QFile.3qt \
QFileDialog.3qt QFileInfo.3qt QFocusEvent.3qt QFont.3qt \
QFontInfo.3qt QFontMetrics.3qt QFrame.3qt QGArray.3qt \
QGCache.3qt QGCacheIterator.3qt QGDict.3qt QGDictIterator.3qt \
QGList.3qt QGListIterator.3qt QGManager.3qt QGridLayout.3qt \
QGroupBox.3qt QHBoxLayout.3qt QIODevice.3qt QImage.3qt \
QImageIO.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 QMenuBar.3qt QMenuData.3qt QMessageBox.3qt \
QMouseEvent.3qt QMoveEvent.3qt QMovie.3qt QMultiLineEdit.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 QPrinter.3qt \
QProgressBar.3qt QProgressDialog.3qt QPtrDict.3qt \
QPtrDictIterator.3qt QPushButton.3qt QQueue.3qt \
QRadioButton.3qt QRangeControl.3qt QRect.3qt QRegExp.3qt \
QRegion.3qt QResizeEvent.3qt QScrollBar.3qt QSemiModal.3qt \
QSenderObject.3qt QShared.3qt QSignal.3qt QSize.3qt \
QSlider.3qt QSocketNotifier.3qt QStack.3qt QStrIList.3qt \
QStrList.3qt QString.3qt QTSManip.3qt QTabBar.3qt \
QTabDialog.3qt QTableView.3qt QTextStream.3qt QTime.3qt \
QTimer.3qt QTimerEvent.3qt QToolTip.3qt QToolTipGroup.3qt \
QVBoxLayout.3qt QValidator.3qt QWMatrix.3qt QWidget.3qt \
QWindow.3qt qaccel.3qt qapplication.3qt qarray.3qt \
qbitarray.3qt qbitmap.3qt qbitval.3qt qboxlayout.3qt \
qbrush.3qt qbuffer.3qt qbutton.3qt qbuttongroup.3qt \
qbytearray.3qt qcheckbox.3qt qclipboard.3qt qcloseevent.3qt \
qcollection.3qt qcolor.3qt qcolorgroup.3qt qcombobox.3qt \
qconnection.3qt qcursor.3qt qcustomevent.3qt qdatastream.3qt \
qdate.3qt qdatetime.3qt qdialog.3qt qdict.3qt \
qdictiterator.3qt qdir.3qt qdoublevalidator.3qt qevent.3qt \
qfile.3qt qfiledialog.3qt qfileinfo.3qt qfocusevent.3qt \
qfont.3qt qfontinfo.3qt qfontmetrics.3qt qframe.3qt \
qgarray.3qt qgcache.3qt qgcacheiterator.3qt qgdict.3qt \
qgdictiterator.3qt qglist.3qt qglistiterator.3qt qgmanager.3qt \
qgridlayout.3qt qgroupbox.3qt qhboxlayout.3qt qimage.3qt \
qimageio.3qt qintdict.3qt qintdictiterator.3qt \
qintvalidator.3qt qiodevice.3qt qkeyevent.3qt qlabel.3qt \
qlayout.3qt qlcdnumber.3qt qlineedit.3qt qlist.3qt \
qlistbox.3qt qlistboxitem.3qt qlistboxpixmap.3qt \
qlistboxtext.3qt qlistiterator.3qt \
qlnode.3qt qmenubar.3qt qmenudata.3qt qmessagebox.3qt \
qmouseevent.3qt qmoveevent.3qt qmovie.3qt qmultilineedit.3qt \
qobject.3qt qpaintdevice.3qt qpaintdevicemetrics.3qt \
qpainter.3qt qpaintevent.3qt qpalette.3qt qpen.3qt \
qpicture.3qt qpixmap.3qt qpixmapcache.3qt qpoint.3qt \
qpointarray.3qt qpointval.3qt qpopupmenu.3qt qprinter.3qt \
qprogressbar.3qt qprogressdialog.3qt qptrdict.3qt \
qptrdictiterator.3qt qpushbutton.3qt qqueue.3qt \
qradiobutton.3qt qrangecontrol.3qt qrect.3qt qregexp.3qt \
qregion.3qt qresizeevent.3qt qscrollbar.3qt qsemimodal.3qt \
qsenderobject.3qt qshared.3qt qsignal.3qt qsize.3qt \
qslider.3qt qsocketnotifier.3qt qstack.3qt qstrilist.3qt \
qstring.3qt qstrlist.3qt qtabbar.3qt qtabdialog.3qt \
qtableview.3qt qtextstream.3qt qtime.3qt qtimer.3qt \
qtimerevent.3qt qtooltip.3qt qtooltipgroup.3qt qtsmanip.3qt \
qvalidator.3qt qvboxlayout.3qt qwidget.3qt qwindow.3qt \
qwmatrix.3qt
EXAMPLES= aclock biff connect cursor dclock desktop drawdemo \
forever hello layout life menu movies pref \
progress qmag qwerty showimg table tetrix tictac \
timestmp tooltip widgets
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${USE_TARGET}
do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/bin/moc ${PREFIX}/bin
@${INSTALL_DATA} ${WRKSRC}/lib/libqt.a ${PREFIX}/lib
@ranlib ${PREFIX}/lib/libqt.a
.if (${MACHINE_ARCH} != "alpha")
@${INSTALL_DATA} ${WRKSRC}/lib/libqt.so.1.33 ${PREFIX}/lib
@${LDCONFIG} -m ${PREFIX}/lib
${INSTALL_PROGRAM} $(WRKDIR)/qt-${MAJ}.${MIN}/bin/moc $(X11BASE)/bin
.if ( ${MACHINE_ARCH} == "alpha" )
${INSTALL_DATA} $(WRKDIR)/qt-${MAJ}.${MIN}/lib/libqt.a $(X11BASE)/lib
.else
${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
.endif
@${MKDIR} ${PREFIX}/include/X11/qt
@${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/include/X11/qt
@${INSTALL_MAN} ${WRKSRC}/man/man1/* ${PREFIX}/man/man1
.for m in ${MAN3}
@${INSTALL_MAN} ${WRKSRC}/man/man3/${m} ${PREFIX}/man/man3/${m:S/qt$//}
.endfor
@${MKDIR} ${PREFIX}/share/doc/qt
@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/qt
@${INSTALL_DATA} ${WRKSRC}/README.QT ${PREFIX}/share/doc/qt
@${MKDIR} ${PREFIX}/share/doc/qt/html
@${INSTALL_DATA} ${WRKSRC}/html/* ${PREFIX}/share/doc/qt/html
@${MKDIR} ${PREFIX}/lib/qt/tutorial
${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}/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
${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
@${ECHO} -n " ${n}"
@${INSTALL_PROGRAM} ${WRKSRC}/tutorial/t${n}/t${n} \
${PREFIX}/lib/qt/tutorial
.endfor
@${MKDIR} ${PREFIX}/lib/qt/examples
@${INSTALL_DATA} ${WRKSRC}/examples/README ${PREFIX}/lib/qt/examples
@${ECHO} "."
${MKDIR} -p ${PREFIX}/lib/qt/examples
@${ECHO} -n "Installing examples:"
.for f in ${EXAMPLES}
@${ECHO} -n " ${f}"
@${INSTALL_PROGRAM} ${WRKSRC}/examples/${f}/${f} \
${PREFIX}/lib/qt/examples
${PREFIX}/lib/qt/examples
.endfor
@${INSTALL_PROGRAM} ${WRKSRC}/examples/picture/makepic \
${PREFIX}/lib/qt/examples
@${INSTALL_PROGRAM} ${WRKSRC}/examples/picture/makepic \
${PREFIX}/lib/qt/examples
@${ECHO} "."
${INSTALL_DATA} ${WRKSRC}/examples/README ${PREFIX}/lib/qt/examples
.include <bsd.port.mk>

View File

@ -1 +1 @@
MD5 (qt-1.33.tar.gz) = 6136b589c0d611f55deae45bc8ee2af7
MD5 (qt-1.40.tar.gz) = 4881987d831c9e285637eb9b23dad934

View File

@ -1,42 +1,51 @@
--- Makefile.~1~ Mon Mar 16 14:52:24 1998
+++ Makefile Tue Jul 14 16:32:59 1998
@@ -66,6 +66,8 @@
@echo " " linux-gcc-static
@echo " " netbsd-gcc-shared
@echo " " netbsd-gcc-static
+ @echo " " openbsd-gcc-shared
+ @echo " " openbsd-gcc-static
@echo " " osf1-cxx-shared
@echo " " osf1-cxx-static
@echo " " osf1-gcc-shared
@@ -356,6 +358,30 @@
YACCCFLAGS="-Wno-unused -Wno-parentheses" \
LFLAGS="-lqt -L/usr/X11R6/lib -lX11" \
SHELL="/bin/sh" PLATFORM=netbsd-gcc-static ./propagate
+ @touch variables
+ @echo
+ @echo Qt is now configured for building. Just run "make" to build it.
+ @echo
+
+openbsd-gcc-shared: Makefile
+ CC="gcc" \
+ CFLAGS="-O2 -fno-strength-reduce -Wall -W -I/usr/X11R6/include" \
+ LIBCFLAGS="-fPIC" \
+ YACCCFLAGS="-Wno-unused -Wno-parentheses" \
+ LFLAGS="-lqt -L/usr/X11R6/lib" \
+ SHELL="/bin/sh" PLATFORM=openbsd-gcc-shared ./propagate
+ @touch variables
+ @echo
+ @echo Qt is now configured for building. Just run "make" to build it.
+ @echo
+
+openbsd-gcc-static: Makefile
+ CC="gcc" \
+ CFLAGS="-O2 -fno-strength-reduce -Wall -W -I/usr/X11R6/include" \
+ LIBCFLAGS="" \
+ YACCCFLAGS="-Wno-unused -Wno-parentheses" \
+ LFLAGS="-lqt -L/usr/X11R6/lib -lX11" \
+ SHELL="/bin/sh" PLATFORM=openbsd-gcc-static ./propagate
@touch variables
@echo
@echo Qt is now configured for building. Just run "make" to build it.
*** configs/openbsd-g++-shared.orig Wed Jul 22 16:58:40 1998
--- configs/openbsd-g++-shared Wed Jul 22 17:04:20 1998
***************
*** 39,45 ****
#
SYSCONF_LINK_SHLIB = ld
SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
! SYSCONF_LINK_LIB_SHARED = $(LINK) $(LFLAGS) -o $(TARGETD) `lorder /usr/lib/c++rt0.o $(OBJECTS) $(OBJMOC) | tsort` $(LIBS)
# Linking static libraries
# - Build the $(TARGET) library, eg. lib$(TARGET).a
--- 39,52 ----
#
SYSCONF_LINK_SHLIB = ld
SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
! SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) $(SYSCONF_LFLAGS_SHOBJ) \
! $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
! `lorder /usr/lib/c++rt0.o $(OBJECTS) $(OBJMOC) | tsort` $(LIBS); \
! mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
! cd $(DESTDIR); \
! rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ); \
! ln -sf $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \
! ln -sf $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ)
# Linking static libraries
# - Build the $(TARGET) library, eg. lib$(TARGET).a
***************
*** 51,61 ****
$(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) \
ranlib $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC)
# Compiling application source
! SYSCONF_CFLAGS = -O2 -fno-strength-reduce
# Compiling library source
! SYSCONF_CFLAGS_LIB = -O2 -fno-strength-reduce -fPIC
# Compiling shared-object source
! SYSCONF_CFLAGS_SHOBJ = -O2 -fno-strength-reduce -fPIC
# Default link type (stati linking is still be used where required)
SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED)
SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_SHARED)
--- 58,68 ----
$(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) \
ranlib $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC)
# Compiling application source
! SYSCONF_CFLAGS = -O2 -pipe -fno-strength-reduce
# Compiling library source
! SYSCONF_CFLAGS_LIB = -O2 -pipe -fno-strength-reduce -fPIC
# Compiling shared-object source
! SYSCONF_CFLAGS_SHOBJ = -O2 -pipe -fno-strength-reduce -fPIC
# Default link type (stati linking is still be used where required)
SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED)
SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_SHARED)

View File

@ -1,55 +1,31 @@
--- src/Makefile.orig Mon Mar 16 14:52:25 1998
+++ src/Makefile Tue Jul 14 20:47:19 1998
@@ -1,11 +1,17 @@
-
-####### This section will soon be automatically generated. At the moment
-####### it is for building with gcc.
-
+####### This section was automatically generated from
+####### /openbsd/ports/x11/qt/work/qt-1.33/Makefile for building on
+####### openbsd-gcc-shared on Tue Jul 14 19:45:35 PDT 1998
+
+INCDIR = /openbsd/ports/x11/qt/work/qt-1.33/include
+CFLAGS = -O2 -fno-strength-reduce -Wall -W -I/usr/X11R6/include
+LIBCFLAGS = -fPIC
+YACCCFLAGS = -Wno-unused -Wno-parentheses
+LFLAGS = -L/openbsd/ports/x11/qt/work/qt-1.33/lib -lqt -L/usr/X11R6/lib
CC = gcc
+MOC = /openbsd/ports/x11/qt/work/qt-1.33/bin/moc
+SHELL = /bin/sh
-####### End of not-yet-automatically generated section
-
+####### End of automatically generated section
#
# $Source: /home/cvs/ports/x11/qt/patches/Attic/patch-ab,v $
#
@@ -65,7 +71,7 @@
VERSION=1.33
-all: unconfigured # will be changed by ../Makefile
+all: link-openbsd-gcc-shared
tools kernel widgets dialogs: FORCE
cd $@; $(MAKE)
@@ -249,6 +255,19 @@
ar q libqt.a $(OBJECTS) $(METAOBJ)
ranlib libqt.a
mv libqt.a ../lib
+
+link-openbsd-gcc-shared: link-openbsd-gcc-static
+ -rm -f ../lib/libqt.so.$(VERSION)
+ ld -Bshareable \
+ -o libqt.so.$(VERSION) \
+ `lorder /usr/lib/c++rt0.o $(OBJECTS) $(METAOBJ) | tsort` \
+ -L/usr/X11R6/lib -lX11
+ mv libqt.so.$(VERSION) ../lib
+
+link-openbsd-gcc-static: tools kernel widgets dialogs
+ ar q libqt.a $(OBJECTS) $(METAOBJ)
+ mv libqt.a ../lib
+ ranlib ../lib/libqt.a
link-osf1-cxx-shared: tools kernel widgets dialogs
-rm -f ../lib/libqt.so.$(VERSION)
*** configs/openbsd-g++-static.orig Fri Jul 10 02:24:41 1998
--- configs/openbsd-g++-static Wed Jul 22 17:54:44 1998
***************
*** 48,60 ****
SYSCONF_AR = ar q
SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a
SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC); \
! $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) \
ranlib $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC)
# Compiling application source
! SYSCONF_CFLAGS = -O2 -fno-strength-reduce
# Compiling library source
! SYSCONF_CFLAGS_LIB = -O2 -fno-strength-reduce -fPIC
# Compiling shared-object source
! SYSCONF_CFLAGS_SHOBJ = -O2 -fno-strength-reduce -fPIC
SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_STATIC)
SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_STATIC)
--- 48,60 ----
SYSCONF_AR = ar q
SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a
SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC); \
! $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC); \
ranlib $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC)
# Compiling application source
! SYSCONF_CFLAGS = -O2 -pipe -fno-strength-reduce
# Compiling library source
! SYSCONF_CFLAGS_LIB = -O2 -pipe -fno-strength-reduce -fPIC
# Compiling shared-object source
! SYSCONF_CFLAGS_SHOBJ = -O2 -pipe -fno-strength-reduce -fPIC
SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_STATIC)
SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_STATIC)

View File

@ -1,19 +0,0 @@
--- src/tools/qglobal.h.~1~ Mon Mar 16 14:52:20 1998
+++ src/tools/qglobal.h Tue Jul 14 16:57:25 1998
@@ -43,6 +43,7 @@
// LINUX - Linux
// FREEBSD - FreeBSD
// NETBSD - NetBSD
+// OPENBSD - OpenBSD
// IRIX - SGI Irix
// OSF - OSF Unix
// BSDI - BSDI Unix
@@ -79,6 +80,8 @@
#define _OS_FREEBSD_
#elif defined(__NetBSD__)
#define _OS_NETBSD_
+#elif defined(__OpenBSD__)
+#define _OS_OPENBSD_
#elif defined(sgi) || defined(__sgi)
#define _OS_IRIX_
#elif defined(__osf__)

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff