diff options
Diffstat (limited to 'x11-toolkits/qt23')
| -rw-r--r-- | x11-toolkits/qt23/Makefile | 14 | ||||
| -rw-r--r-- | x11-toolkits/qt23/files/patch-aa | 20 | ||||
| -rw-r--r-- | x11-toolkits/qt23/pkg-plist | 77 |
3 files changed, 101 insertions, 10 deletions
diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile index 123a74a86382..a6a6b1fda7da 100644 --- a/x11-toolkits/qt23/Makefile +++ b/x11-toolkits/qt23/Makefile @@ -3,7 +3,7 @@ # Date created: 30 Jul 1996 # Whom: searle@longacre.demon.co.uk # -# $Id: Makefile,v 1.22 1998/08/11 13:19:14 andreas Exp $ +# $Id: Makefile,v 1.23 1998/09/27 16:06:59 steve Exp $ # DISTNAME= qt-${MAJ}.${MIN} @@ -117,10 +117,10 @@ post-configure: do-install: ${INSTALL_PROGRAM} $(WRKDIR)/qt-${MAJ}.${MIN}/bin/moc $(PREFIX)/bin - ${INSTALL_DATA} $(WRKDIR)/qt-${MAJ}.${MIN}/lib/libqt.so.${MAJ}.${MIN} \ + ${INSTALL_DATA} $(WRKDIR)/qt-${MAJ}.${MIN}/lib/libqt.so.${VERSION} \ $(PREFIX)/lib - ${LN} -sf $(PREFIX)/lib/libqt.so.${MAJ}.${MIN} $(PREFIX)/lib/libqt.so - ${LDCONFIG} -m $(PREFIX)/lib + ${LN} -sf $(PREFIX)/lib/libqt.so.$(VERSION) $(PREFIX)/lib/libqt.so + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m $(PREFIX)/lib ${MKDIR} $(PREFIX)/include/X11/qt ${INSTALL_DATA} $(WRKDIR)/qt-${MAJ}.${MIN}/include/* \ $(PREFIX)/include/X11/qt @@ -133,3 +133,9 @@ do-install: ${PREFIX}/share/doc/qt .include <bsd.port.mk> + +.if ${PORTOBJFORMAT} == "elf" +VERSION= ${MAJ} +.else +VERSION= ${MAJ}.${MIN} +.endif diff --git a/x11-toolkits/qt23/files/patch-aa b/x11-toolkits/qt23/files/patch-aa index 41d6ae4c62b0..02f30cdd53cc 100644 --- a/x11-toolkits/qt23/files/patch-aa +++ b/x11-toolkits/qt23/files/patch-aa @@ -1,8 +1,19 @@ ---- configs/freebsd-g++-shared.orig Thu Jul 9 21:24:33 1998 -+++ configs/freebsd-g++-shared Sun Jul 19 13:31:29 1998 -@@ -39,7 +39,14 @@ +--- configs/freebsd-g++-shared.orig Thu Jul 9 14:24:33 1998 ++++ configs/freebsd-g++-shared Sun Sep 27 11:46:29 1998 +@@ -38,8 +38,26 @@ + # - Usually needs to incorporate $(VER_MAJ) and $(VER_MIN) # SYSCONF_LINK_SHLIB = ld ++ifeq ($(PORTOBJFORMAT),elf) ++SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ) ++SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared -soname \ ++ $(SYSCONF_LINK_TARGET_SHARED) $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ ++ `lorder $(OBJECTS) $(OBJMOC) | tsort` $(LIBS); \ ++ mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ ++ cd $(DESTDIR); \ ++ rm -f lib$(TARGET).so; \ ++ ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; ++else SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN) -SYSCONF_LINK_LIB_SHARED = $(LINK) -Bshareable $(LFLAGS) -o $(TARGETD) `lorder /usr/lib/c++rt0.o $(OBJECTS) $(OBJMOC) | tsort` $(LIBS) +SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -Bshareable \ @@ -13,10 +24,11 @@ + rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ); \ + ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \ + ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ) ++endif # Linking static libraries # - Build the $(TARGET) library, eg. lib$(TARGET).a -@@ -50,11 +57,11 @@ +@@ -50,11 +68,11 @@ SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC); \ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) # Compiling application source diff --git a/x11-toolkits/qt23/pkg-plist b/x11-toolkits/qt23/pkg-plist index 76668919f076..2d8dd6e1da43 100644 --- a/x11-toolkits/qt23/pkg-plist +++ b/x11-toolkits/qt23/pkg-plist @@ -1,42 +1,67 @@ lib/libqt.so lib/libqt.so.1.40 -@exec /sbin/ldconfig -m %B -@unexec /sbin/ldconfig -R +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R bin/moc +include/X11/qt/jri.h +include/X11/qt/jri_md.h +include/X11/qt/jritypes.h +include/X11/qt/npapi.h +include/X11/qt/npupp.h include/X11/qt/qaccel.h include/X11/qt/qapp.h +include/X11/qt/qapplication.h include/X11/qt/qarray.h include/X11/qt/qasyncimageio.h include/X11/qt/qasyncio.h +include/X11/qt/qbitarray.h include/X11/qt/qbitarry.h include/X11/qt/qbitmap.h include/X11/qt/qbrush.h include/X11/qt/qbttngrp.h include/X11/qt/qbuffer.h include/X11/qt/qbutton.h +include/X11/qt/qbuttongroup.h include/X11/qt/qcache.h +include/X11/qt/qcheckbox.h include/X11/qt/qchkbox.h +include/X11/qt/qclipboard.h include/X11/qt/qclipbrd.h include/X11/qt/qcollect.h +include/X11/qt/qcollection.h include/X11/qt/qcolor.h include/X11/qt/qcombo.h +include/X11/qt/qcombobox.h include/X11/qt/qconnect.h +include/X11/qt/qconnection.h include/X11/qt/qcursor.h +include/X11/qt/qdatastream.h +include/X11/qt/qdatetime.h include/X11/qt/qdatetm.h include/X11/qt/qdialog.h include/X11/qt/qdict.h include/X11/qt/qdir.h +include/X11/qt/qdragobject.h +include/X11/qt/qdrawutil.h include/X11/qt/qdrawutl.h +include/X11/qt/qdropsite.h include/X11/qt/qdstream.h include/X11/qt/qevent.h include/X11/qt/qfile.h include/X11/qt/qfiledef.h +include/X11/qt/qfiledefs.h +include/X11/qt/qfiledialog.h include/X11/qt/qfiledlg.h include/X11/qt/qfileinf.h +include/X11/qt/qfileinfo.h +include/X11/qt/qfocusdata.h include/X11/qt/qfont.h +include/X11/qt/qfontdata.h include/X11/qt/qfontdta.h include/X11/qt/qfontinf.h +include/X11/qt/qfontinfo.h include/X11/qt/qfontmet.h +include/X11/qt/qfontmetrics.h include/X11/qt/qframe.h include/X11/qt/qgarray.h include/X11/qt/qgcache.h @@ -45,81 +70,129 @@ include/X11/qt/qgeneric.h include/X11/qt/qgl.h include/X11/qt/qglist.h include/X11/qt/qglobal.h +include/X11/qt/qgmanager.h include/X11/qt/qgmanagr.h +include/X11/qt/qgroupbox.h include/X11/qt/qgrpbox.h include/X11/qt/qgvector.h +include/X11/qt/qheader.h +include/X11/qt/qiconset.h include/X11/qt/qimage.h include/X11/qt/qimageio.h include/X11/qt/qintcach.h +include/X11/qt/qintcache.h include/X11/qt/qintdict.h include/X11/qt/qiodev.h +include/X11/qt/qiodevice.h include/X11/qt/qjpegio.h include/X11/qt/qkeycode.h include/X11/qt/qlabel.h include/X11/qt/qlayout.h include/X11/qt/qlcdnum.h +include/X11/qt/qlcdnumber.h include/X11/qt/qlined.h +include/X11/qt/qlineedit.h include/X11/qt/qlist.h include/X11/qt/qlistbox.h +include/X11/qt/qlistview.h +include/X11/qt/qmainwindow.h include/X11/qt/qmenubar.h +include/X11/qt/qmenudata.h include/X11/qt/qmenudta.h +include/X11/qt/qmessagebox.h include/X11/qt/qmetaobj.h +include/X11/qt/qmetaobject.h include/X11/qt/qmlined.h include/X11/qt/qmovie.h include/X11/qt/qmsgbox.h +include/X11/qt/qmultilinedit.h include/X11/qt/qnp.h include/X11/qt/qobjcoll.h include/X11/qt/qobjdefs.h include/X11/qt/qobject.h +include/X11/qt/qobjectdefs.h +include/X11/qt/qobjectdict.h +include/X11/qt/qobjectlist.h include/X11/qt/qpaintd.h include/X11/qt/qpaintdc.h +include/X11/qt/qpaintdevice.h +include/X11/qt/qpaintdevicedefs.h +include/X11/qt/qpaintdevicemetrics.h include/X11/qt/qpainter.h include/X11/qt/qpalette.h include/X11/qt/qpdevmet.h include/X11/qt/qpen.h include/X11/qt/qpicture.h include/X11/qt/qpixmap.h +include/X11/qt/qpixmapcache.h include/X11/qt/qpmcache.h include/X11/qt/qpngio.h include/X11/qt/qpntarry.h include/X11/qt/qpoint.h +include/X11/qt/qpointarray.h include/X11/qt/qpopmenu.h +include/X11/qt/qpopupmenu.h +include/X11/qt/qprintdialog.h include/X11/qt/qprinter.h include/X11/qt/qprndlg.h include/X11/qt/qprogbar.h include/X11/qt/qprogdlg.h +include/X11/qt/qprogressbar.h +include/X11/qt/qprogressdialog.h +include/X11/qt/qpsprinter.h include/X11/qt/qpsprn.h include/X11/qt/qptrdict.h include/X11/qt/qpushbt.h +include/X11/qt/qpushbutton.h include/X11/qt/qqueue.h include/X11/qt/qradiobt.h +include/X11/qt/qradiobutton.h +include/X11/qt/qrangecontrol.h include/X11/qt/qrangect.h include/X11/qt/qrect.h include/X11/qt/qregexp.h include/X11/qt/qregion.h include/X11/qt/qscrbar.h +include/X11/qt/qscrollbar.h +include/X11/qt/qscrollview.h include/X11/qt/qsemimodal.h include/X11/qt/qshared.h include/X11/qt/qsignal.h +include/X11/qt/qsignalmapper.h include/X11/qt/qsize.h include/X11/qt/qslider.h +include/X11/qt/qsocketnotifier.h include/X11/qt/qsocknot.h +include/X11/qt/qspinbox.h +include/X11/qt/qsplitter.h include/X11/qt/qstack.h +include/X11/qt/qstatusbar.h include/X11/qt/qstring.h include/X11/qt/qstrlist.h include/X11/qt/qstrvec.h include/X11/qt/qtabbar.h +include/X11/qt/qtabdialog.h include/X11/qt/qtabdlg.h +include/X11/qt/qtableview.h include/X11/qt/qtablevw.h +include/X11/qt/qtextstream.h include/X11/qt/qtimer.h +include/X11/qt/qtoolbar.h +include/X11/qt/qtoolbutton.h include/X11/qt/qtooltip.h include/X11/qt/qtstream.h include/X11/qt/qvalidator.h include/X11/qt/qvector.h +include/X11/qt/qwellarray.h +include/X11/qt/qwhatsthis.h include/X11/qt/qwidcoll.h include/X11/qt/qwidget.h +include/X11/qt/qwidgetintdict.h +include/X11/qt/qwidgetlist.h +include/X11/qt/qwidgetstack.h include/X11/qt/qwindefs.h include/X11/qt/qwindow.h +include/X11/qt/qwindowdefs.h include/X11/qt/qwmatrix.h share/doc/qt/README share/doc/qt/README.QT |