diff options
| author | wiz <wiz> | 2008-09-16 16:07:31 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2008-09-16 16:07:31 +0000 |
| commit | bbf1c9c3e18126fb6dd3cc586221a81cdf59c624 (patch) | |
| tree | 7b6b2def327eb43899f5093b61bb8bbf1a8c83de /x11/qt2-libs | |
| parent | 73fbc2ef323a112471fc8572096008565576b3b9 (diff) | |
| download | pkgsrc-bbf1c9c3e18126fb6dd3cc586221a81cdf59c624.tar.gz | |
Remove remaining qt1 and qt2 packages, as announced on pkgsrc-users
on Sep 7 2008. No complaints received.
Diffstat (limited to 'x11/qt2-libs')
25 files changed, 0 insertions, 1243 deletions
diff --git a/x11/qt2-libs/DESCR b/x11/qt2-libs/DESCR deleted file mode 100644 index 3356f5fb0a1..00000000000 --- a/x11/qt2-libs/DESCR +++ /dev/null @@ -1,10 +0,0 @@ -Qt(TM) is a GUI software toolkit. Qt simplifies the task of writing and -maintaining GUI (graphical user interface) applications. -Qt is written in C++ and is fully object-oriented. It has everything you need -to create professional GUI applications. And it enables you to create them -quickly. -Qt is a multi-platform toolkit. When developing software with Qt, you can run -it on the X Window System (Unix/X11) or Microsoft Windows NT and Windows 95/98. -Simply recompile your source code on the platform you want. -Qt cuts down the complexity in implementing large and complex systems. Its -ingenious signal-slot technology enables true component programming. diff --git a/x11/qt2-libs/MESSAGE b/x11/qt2-libs/MESSAGE deleted file mode 100644 index 0a004fdd192..00000000000 --- a/x11/qt2-libs/MESSAGE +++ /dev/null @@ -1,20 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.2 2002/09/24 12:30:53 wiz Exp $ - -To allow this package to coexist with other versions of Qt -it has been installed in ${PREFIX}/qt2/{bin,include,lib,doc}. - -You should be able to select this version of Qt when compiling -programs which use it by ensuring that - -1) QTDIR is set to ${PREFIX}/qt2 - -2) Use the "configure" argument "--with-qt-dir=${PREFIX}/qt2" - -3) you may also have to put ${PREFIX}/qt2/bin in your PATH - -To access Qt-2 man pages add ${PREFIX}/qt2/doc/man to your MANPATH -environment variable. Note that the Qt-2 man pages are installed -here to avoid conflicts with man pages of other Qt versions. - -=========================================================================== diff --git a/x11/qt2-libs/Makefile b/x11/qt2-libs/Makefile deleted file mode 100644 index 09400dba19d..00000000000 --- a/x11/qt2-libs/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# $NetBSD: Makefile,v 1.33 2007/01/13 18:26:54 joerg Exp $ - -PKGNAME= qt2-libs-${QTVERSION} -PKGREVISION= 9 -COMMENT= C++ X GUI toolkit - - -.include "../../x11/qt2-libs/Makefile.common" - -CONFIGURE_ENV+= QTDIR=${WRKSRC:Q} -MAKE_ENV+= QTDIR=${WRKSRC:Q} -MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH:Q} - -BUILD_TARGET= sub-src - -do-install: - ${INSTALL_DATA_DIR} ${QTPREFIX} - ${INSTALL_PROGRAM_DIR} ${QTPREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/bin/moc ${QTPREFIX}/bin - ${INSTALL_DATA_DIR} ${QTPREFIX}/lib - ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/src/libqt.la ${QTPREFIX}/lib - ${INSTALL_DATA_DIR} ${QTPREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/include/* ${QTPREFIX}/include - -.include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/MesaLib/buildlink3.mk" -.include "../../graphics/glu/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" -.include "../../graphics/mng/buildlink3.mk" -.include "../../graphics/png/buildlink3.mk" -.include "../../x11/libSM/buildlink3.mk" -.include "../../x11/libXext/buildlink3.mk" -.include "../../x11/libXft/buildlink3.mk" -.include "../../x11/libXmu/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/qt2-libs/Makefile.common b/x11/qt2-libs/Makefile.common deleted file mode 100644 index 17e8741060a..00000000000 --- a/x11/qt2-libs/Makefile.common +++ /dev/null @@ -1,56 +0,0 @@ -# $NetBSD: Makefile.common,v 1.28 2007/01/13 18:26:54 joerg Exp $ -# - -DISTNAME= qt-x11-${QTVERSION} -CATEGORIES= x11 -MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \ - ftp://ftp.fu-berlin.de/unix/X11/gui/Qt/source/ - -.include "../../x11/qt2/Makefile.common" - -WRKSRC= ${WRKDIR}/qt-${QTVERSION} -HAS_CONFIGURE= yes -USE_X11BASE= yes -USE_TOOLS+= gmake -USE_LANGUAGES= c c++ -USE_LIBTOOL= yes -CONFIGURE_ARGS+= -static -sm -no-thread \ - -system-zlib -system-libpng \ - -system-libmng -system-jpeg -CONFIGURE_ARGS+= -gif # qt2 does not write compressed GIFs - -CONFIGURE_ARGS+= < ${FILESDIR}/license-acceptance - -QTPREFIX= ${PREFIX}/qt2 - -MAKE_ENV+= QTPREFIX=${QTPREFIX:Q} - -MAKE_ENV+= SYSCONF_CXXFLAGS=${CXXFLAGS:M*:Q} -MAKE_ENV+= SYSCONF_CFLAGS=${CFLAGS:M*:Q} -MAKE_ENV+= SYSCONF_CXXFLAGS_LIB=${CXXFLAGS:M*:Q} -MAKE_ENV+= SYSCONF_CFLAGS_LIB=${CFLAGS:M*:Q} - -DISTINFO_FILE= ${.CURDIR}/../../x11/qt2-libs/distinfo -FILESDIR= ${.CURDIR}/../../x11/qt2-libs/files -PATCHDIR= ${.CURDIR}/../../x11/qt2-libs/patches - -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -CONFIGURE_ARGS+= -platform solaris-g++ -.elif ${OPSYS} == "DragonFly" -CONFIGURE_ARGS+= -xft -platform freebsd-g++ -.endif - -SUBST_CLASSES+= paths -SUBST_FILES.paths= configs/netbsd-g++-static configs/solaris-g++-static -SUBST_FILES.paths+= configs/freebsd-g++-static -SUBST_SED.paths= -e 's,@X11BASE@,${X11BASE},g' -SUBST_SED.paths+= -e 's,@LOCALBASE@,${LOCALBASE},g' -SUBST_SED.paths+= -e 's,@QTDIR@,${QTPREFIX},g' -SUBST_STAGE.paths= post-patch - -.include "../../x11/libX11/buildlink3.mk" - -pre-build: - @${TOUCH} ${WRKSRC}/.buildopts diff --git a/x11/qt2-libs/PLIST b/x11/qt2-libs/PLIST deleted file mode 100644 index dff6de544ba..00000000000 --- a/x11/qt2-libs/PLIST +++ /dev/null @@ -1,288 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:10:07 jlam Exp $ -qt2/bin/moc -qt2/include/jri.h -qt2/include/jritypes.h -qt2/include/npapi.h -qt2/include/npupp.h -qt2/include/q1xcompatibility.h -qt2/include/qabstractlayout.h -qt2/include/qaccel.h -qt2/include/qaction.h -qt2/include/qapp.h -qt2/include/qapplication.h -qt2/include/qarray.h -qt2/include/qasciicache.h -qt2/include/qasciidict.h -qt2/include/qasyncimageio.h -qt2/include/qasyncio.h -qt2/include/qbig5codec.h -qt2/include/qbitarray.h -qt2/include/qbitarry.h -qt2/include/qbitmap.h -qt2/include/qbrush.h -qt2/include/qbttngrp.h -qt2/include/qbuffer.h -qt2/include/qbutton.h -qt2/include/qbuttongroup.h -qt2/include/qcache.h -qt2/include/qcanvas.h -qt2/include/qcdestyle.h -qt2/include/qcheckbox.h -qt2/include/qchkbox.h -qt2/include/qclipboard.h -qt2/include/qclipbrd.h -qt2/include/qcollect.h -qt2/include/qcollection.h -qt2/include/qcolor.h -qt2/include/qcolordialog.h -qt2/include/qcombo.h -qt2/include/qcombobox.h -qt2/include/qcommonstyle.h -qt2/include/qconfig-dist.h -qt2/include/qconfig-large.h -qt2/include/qconfig-medium.h -qt2/include/qconfig-minimal.h -qt2/include/qconfig-small.h -qt2/include/qconfig.h -qt2/include/qconnect.h -qt2/include/qconnection.h -qt2/include/qcstring.h -qt2/include/qcursor.h -qt2/include/qdatastream.h -qt2/include/qdatetime.h -qt2/include/qdatetm.h -qt2/include/qdial.h -qt2/include/qdialog.h -qt2/include/qdict.h -qt2/include/qdir.h -qt2/include/qdns.h -qt2/include/qdom.h -qt2/include/qdragobject.h -qt2/include/qdrawutil.h -qt2/include/qdrawutl.h -qt2/include/qdropsite.h -qt2/include/qdstream.h -qt2/include/qeucjpcodec.h -qt2/include/qeuckrcodec.h -qt2/include/qevent.h -qt2/include/qfeatures.h -qt2/include/qfile.h -qt2/include/qfiledef.h -qt2/include/qfiledialog.h -qt2/include/qfiledlg.h -qt2/include/qfileinf.h -qt2/include/qfileinfo.h -qt2/include/qfocusdata.h -qt2/include/qfont.h -qt2/include/qfontdatabase.h -qt2/include/qfontdialog.h -qt2/include/qfontdta.h -qt2/include/qfontinf.h -qt2/include/qfontinfo.h -qt2/include/qfontmet.h -qt2/include/qfontmetrics.h -qt2/include/qframe.h -qt2/include/qftp.h -qt2/include/qgarray.h -qt2/include/qgbkcodec.h -qt2/include/qgcache.h -qt2/include/qgdict.h -qt2/include/qgeneric.h -qt2/include/qgif.h -qt2/include/qgl.h -qt2/include/qglist.h -qt2/include/qglobal.h -qt2/include/qgrid.h -qt2/include/qgroupbox.h -qt2/include/qgrpbox.h -qt2/include/qguardedptr.h -qt2/include/qgvector.h -qt2/include/qhbox.h -qt2/include/qhbuttongroup.h -qt2/include/qheader.h -qt2/include/qhgroupbox.h -qt2/include/qhostaddress.h -qt2/include/qiconset.h -qt2/include/qiconview.h -qt2/include/qimage.h -qt2/include/qinputdialog.h -qt2/include/qintcach.h -qt2/include/qintcache.h -qt2/include/qintdict.h -qt2/include/qinterlacestyle.h -qt2/include/qiodev.h -qt2/include/qiodevice.h -qt2/include/qjiscodec.h -qt2/include/qjpegio.h -qt2/include/qjpunicode.h -qt2/include/qkeycode.h -qt2/include/qkoi8codec.h -qt2/include/qlabel.h -qt2/include/qlayout.h -qt2/include/qlcdnum.h -qt2/include/qlcdnumber.h -qt2/include/qlined.h -qt2/include/qlineedit.h -qt2/include/qlist.h -qt2/include/qlistbox.h -qt2/include/qlistview.h -qt2/include/qlocalfs.h -qt2/include/qmainwindow.h -qt2/include/qmap.h -qt2/include/qmenubar.h -qt2/include/qmenudata.h -qt2/include/qmenudta.h -qt2/include/qmessagebox.h -qt2/include/qmetaobj.h -qt2/include/qmetaobject.h -qt2/include/qmime.h -qt2/include/qmlined.h -qt2/include/qmngio.h -qt2/include/qmodules.h -qt2/include/qmotifplusstyle.h -qt2/include/qmotifstyle.h -qt2/include/qmovie.h -qt2/include/qmsgbox.h -qt2/include/qmultilinedit.h -qt2/include/qmultilineedit.h -qt2/include/qnamespace.h -qt2/include/qnetwork.h -qt2/include/qnetworkprotocol.h -qt2/include/qnp.h -qt2/include/qobjcoll.h -qt2/include/qobjdefs.h -qt2/include/qobject.h -qt2/include/qobjectdefs.h -qt2/include/qobjectdict.h -qt2/include/qobjectlist.h -qt2/include/qpaintd.h -qt2/include/qpaintdc.h -qt2/include/qpaintdevice.h -qt2/include/qpaintdevicedefs.h -qt2/include/qpaintdevicemetrics.h -qt2/include/qpainter.h -qt2/include/qpalette.h -qt2/include/qpdevmet.h -qt2/include/qpen.h -qt2/include/qpicture.h -qt2/include/qpixmap.h -qt2/include/qpixmapcache.h -qt2/include/qplatinumstyle.h -qt2/include/qpmcache.h -qt2/include/qpngio.h -qt2/include/qpntarry.h -qt2/include/qpoint.h -qt2/include/qpointarray.h -qt2/include/qpolygonscanner.h -qt2/include/qpopmenu.h -qt2/include/qpopupmenu.h -qt2/include/qprintdialog.h -qt2/include/qprinter.h -qt2/include/qprndlg.h -qt2/include/qprogbar.h -qt2/include/qprogdlg.h -qt2/include/qprogressbar.h -qt2/include/qprogressdialog.h -qt2/include/qpsprn.h -qt2/include/qptrdict.h -qt2/include/qpushbt.h -qt2/include/qpushbutton.h -qt2/include/qqueue.h -qt2/include/qradiobt.h -qt2/include/qradiobutton.h -qt2/include/qrangecontrol.h -qt2/include/qrangect.h -qt2/include/qrect.h -qt2/include/qregexp.h -qt2/include/qregion.h -qt2/include/qrtlcodec.h -qt2/include/qscrbar.h -qt2/include/qscrollbar.h -qt2/include/qscrollview.h -qt2/include/qsemimodal.h -qt2/include/qserversocket.h -qt2/include/qsession.h -qt2/include/qsessionmanager.h -qt2/include/qsgistyle.h -qt2/include/qshared.h -qt2/include/qsignal.h -qt2/include/qsignalmapper.h -qt2/include/qsignalslotimp.h -qt2/include/qsimplerichtext.h -qt2/include/qsize.h -qt2/include/qsizegrip.h -qt2/include/qsizepolicy.h -qt2/include/qsjiscodec.h -qt2/include/qslider.h -qt2/include/qsmartptr.h -qt2/include/qsocket.h -qt2/include/qsocketdevice.h -qt2/include/qsocketnotifier.h -qt2/include/qsocknot.h -qt2/include/qsortedlist.h -qt2/include/qsound.h -qt2/include/qspinbox.h -qt2/include/qsplitter.h -qt2/include/qstack.h -qt2/include/qstatusbar.h -qt2/include/qstring.h -qt2/include/qstringlist.h -qt2/include/qstrlist.h -qt2/include/qstrvec.h -qt2/include/qstyle.h -qt2/include/qstylesheet.h -qt2/include/qt.h -qt2/include/qt_x11.h -qt2/include/qtabbar.h -qt2/include/qtabdialog.h -qt2/include/qtabdlg.h -qt2/include/qtable.h -qt2/include/qtableview.h -qt2/include/qtablevw.h -qt2/include/qtabwidget.h -qt2/include/qtextbrowser.h -qt2/include/qtextcodec.h -qt2/include/qtextstream.h -qt2/include/qtextview.h -qt2/include/qthread.h -qt2/include/qtimer.h -qt2/include/qtl.h -qt2/include/qtoolbar.h -qt2/include/qtoolbutton.h -qt2/include/qtooltip.h -qt2/include/qtranslator.h -qt2/include/qtsciicodec.h -qt2/include/qtstream.h -qt2/include/qurl.h -qt2/include/qurlinfo.h -qt2/include/qurloperator.h -qt2/include/qutfcodec.h -qt2/include/qvalidator.h -qt2/include/qvaluelist.h -qt2/include/qvaluestack.h -qt2/include/qvariant.h -qt2/include/qvbox.h -qt2/include/qvbuttongroup.h -qt2/include/qvector.h -qt2/include/qvfbhdr.h -qt2/include/qvgroupbox.h -qt2/include/qwhatsthis.h -qt2/include/qwidcoll.h -qt2/include/qwidget.h -qt2/include/qwidgetintdict.h -qt2/include/qwidgetlist.h -qt2/include/qwidgetstack.h -qt2/include/qwindefs.h -qt2/include/qwindow.h -qt2/include/qwindowdefs.h -qt2/include/qwindowsstyle.h -qt2/include/qwizard.h -qt2/include/qwmatrix.h -qt2/include/qworkspace.h -qt2/include/qxml.h -qt2/include/qxt.h -qt2/lib/libqt.la -@dirrm qt2/lib -@dirrm qt2/include -@dirrm qt2/bin -@dirrm qt2 diff --git a/x11/qt2-libs/buildlink3.mk b/x11/qt2-libs/buildlink3.mk deleted file mode 100644 index ac47ed4e4bf..00000000000 --- a/x11/qt2-libs/buildlink3.mk +++ /dev/null @@ -1,40 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.13 2007/01/13 18:26:54 joerg Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -QT2_LIBS_BUILDLINK3_MK:= ${QT2_LIBS_BUILDLINK3_MK}+ - -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= qt2-libs -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nqt2-libs} -BUILDLINK_PACKAGES+= qt2-libs -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qt2-libs - -.if !empty(QT2_LIBS_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.qt2-libs+= qt2-libs>=2.3.1nb2 -BUILDLINK_ABI_DEPENDS.qt2-libs+= qt2-libs>=2.3.1nb9 -BUILDLINK_PKGSRCDIR.qt2-libs?= ../../x11/qt2-libs -BUILDLINK_INCDIRS.qt2-libs= qt2/include -BUILDLINK_LIBDIRS.qt2-libs= qt2/lib -.endif # QT2_LIBS_BUILDLINK3_MK - -.include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/MesaLib/buildlink3.mk" -.include "../../graphics/glu/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" -.include "../../graphics/mng/buildlink3.mk" -.include "../../graphics/png/buildlink3.mk" -.include "../../x11/libSM/buildlink3.mk" -.include "../../x11/libXext/buildlink3.mk" -.include "../../x11/libXft/buildlink3.mk" -.include "../../x11/libXmu/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" - -QTDIR= ${BUILDLINK_PREFIX.qt2-libs}/qt2 -CONFIGURE_ENV+= QTDIR=${QTDIR:Q} -CONFIGURE_ENV+= MOC="${QTDIR}/bin/moc" -MAKE_ENV+= QTDIR=${QTDIR:Q} -MAKE_ENV+= MOC="${QTDIR}/bin/moc" - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/qt2-libs/distinfo b/x11/qt2-libs/distinfo deleted file mode 100644 index 5f3fcff9e77..00000000000 --- a/x11/qt2-libs/distinfo +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: distinfo,v 1.17 2007/09/28 13:11:29 drochner Exp $ - -SHA1 (qt-x11-2.3.1.tar.gz) = f1403700fe80fbfb125ec84731d0dfe9c576c823 -RMD160 (qt-x11-2.3.1.tar.gz) = b579018cfa5782d2f8b94b0846c35bce3a09dfa4 -Size (qt-x11-2.3.1.tar.gz) = 8967271 bytes -SHA1 (patch-aa) = 10f4cea8c2719c3c70becff88022e910778c4538 -SHA1 (patch-ab) = 1f5b23c519d011c3c96d7ebd68120351a6edc203 -SHA1 (patch-ac) = f230f0729397d642ccf6d511fb16df8800d495ba -SHA1 (patch-ad) = eead0ed591c575ef542052bd233981dda954eb67 -SHA1 (patch-ae) = e1ef4bde84473d6b84dbd226dbd7f8802abc6b4b -SHA1 (patch-af) = ea8b1c3f7a099a5492301281476ea831134ad97b -SHA1 (patch-ag) = 85a6376bc780c7aad88879c70fb86542f7e738ae -SHA1 (patch-ah) = aed767e01998aa5093e3932f6ab1032d0a35b9bb -SHA1 (patch-ai) = 20a61cefe445fdc8cac90da9800d0836ac57caf8 -SHA1 (patch-aj) = ed0cd262eca3ff190c221421a62ce2970121a4d4 -SHA1 (patch-ak) = 3eac0d921f3535231aab9ff1f6738f9541b8b564 -SHA1 (patch-al) = 32f6b13393b115c56a4ca75f62f5916034189174 -SHA1 (patch-am) = ebbc184b095e2adcf81461472f4723d515167a9e -SHA1 (patch-ao) = 9e9be92054f4b73c973f63d4a8524ac30a4bbb44 -SHA1 (patch-ap) = 1895d85163bcb8246cf4b8a4a692d16e7d876506 -SHA1 (patch-aq) = cf7ece73766d43f68343f45b984516bae21822ad -SHA1 (patch-ar) = e595c7a5aeba6730294412db4d85fe1ff9ac3f79 diff --git a/x11/qt2-libs/files/license-acceptance b/x11/qt2-libs/files/license-acceptance deleted file mode 100644 index 7cfab5b05d6..00000000000 --- a/x11/qt2-libs/files/license-acceptance +++ /dev/null @@ -1 +0,0 @@ -yes diff --git a/x11/qt2-libs/patches/patch-aa b/x11/qt2-libs/patches/patch-aa deleted file mode 100644 index bd8413a661c..00000000000 --- a/x11/qt2-libs/patches/patch-aa +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2001/06/17 19:10:39 drochner Exp $ - ---- Makefile.orig Wed Jun 13 10:56:52 2001 -+++ Makefile Fri Jun 15 20:23:04 2001 -@@ -25,8 +25,14 @@ - -rm -f bin/moc - cp src/moc/moc bin/moc - --sub-tools: sub-src FORCE -+sub-tools: FORCE - cd tools; $(MAKE) -+ -+sub-designer: FORCE -+ cd tools; $(MAKE) designer -+ -+sub-designer-utils: FORCE -+ cd tools; $(MAKE) designer-utils - - symlinks: .buildopts - @cd include; rm -f q*.h; for i in $(QTDIR)/src/*/q*.h $(QTDIR)/extensions/*/src/q*.h; do ln -s $$i .; done; rm -f q*_p.h diff --git a/x11/qt2-libs/patches/patch-ab b/x11/qt2-libs/patches/patch-ab deleted file mode 100644 index 4c38c43602e..00000000000 --- a/x11/qt2-libs/patches/patch-ab +++ /dev/null @@ -1,106 +0,0 @@ -$NetBSD: patch-ab,v 1.9 2006/01/05 21:22:14 joerg Exp $ - ---- configs/netbsd-g++-static.orig Wed Jun 13 04:56:48 2001 -+++ configs/netbsd-g++-static -@@ -1,44 +1,42 @@ - # Compiling - INTERFACE_DECL_PATH = . --SYSCONF_CXX = g++ --SYSCONF_CC = gcc -+SYSCONF_CXX = c++ -+SYSCONF_CC = cc -+SYSCONF_CXX_LIB = ${LIBTOOL} --mode=compile c++ - DASHCROSS = - - # Compiling with support libraries --SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include -+SYSCONF_CXXFLAGS_X11 = -I@X11BASE@/include - SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include --SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include -+SYSCONF_CXXFLAGS_OPENGL = -I@LOCALBASE@/include -I@X11BASE@/include - - # Compiling YACC output - SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses - - # Linking with support libraries --SYSCONF_RPATH_X11 = --SYSCONF_RPATH_QT = --SYSCONF_RPATH_OPENGL = -+SYSCONF_RPATH_X11 = -Wl,-R@X11BASE@/lib -+SYSCONF_RPATH_QT = -Wl,-R@QTDIR@/lib -+SYSCONF_RPATH_OPENGL = -Wl,-R@X11BASE@/lib -Wl,-R@LOCALBASE@/lib - - # Linking with support libraries - # X11 --SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib -+SYSCONF_LFLAGS_X11 = -L@X11BASE@/lib - 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_OPENGL = - # OpenGL --SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib -+SYSCONF_LFLAGS_OPENGL = -L@LOCALBASE@/lib -L@X11BASE@/lib - SYSCONF_LIBS_OPENGL = -lGLU -lGL -lXmu - # Yacc - SYSCONF_LIBS_YACC = - - # Linking applications --SYSCONF_LINK = g++ -+SYSCONF_LINK = $(LIBTOOL) --mode=link c++ - SYSCONF_LFLAGS = - SYSCONF_LIBS = - --# Link flags for shared objects --SYSCONF_LFLAGS_SHOBJ = -Bshareable -- - # Flags for threading - SYSCONF_CFLAGS_THREAD = - SYSCONF_CXXFLAGS_THREAD = -@@ -51,34 +49,24 @@ - # UI compiler - SYSCONF_UIC = $(QTDIR)/bin/uic - --# Linking shared libraries --# - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2 -+# Linking libtool libraries -+# - Build the $(TARGET) library, eg. lib$(TARGET).la - # - Place target in $(DESTDIR) - which has a trailing / - # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) - # --SYSCONF_LINK_SHLIB = ld --SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) --SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -Bshareable $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) `lorder /usr/lib/c++rt0.o $(OBJECTS) $(OBJMOC) | tsort` $(LIBS) -+SYSCONF_LINK_TARGET = lib$(TARGET).la -+SYSCONF_LINK_LIB = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET); \ -+ $(SYSCONF_LINK) $(LFLAGS) -rpath $(QTPREFIX)/lib \ -+ -version-info $(VER_MAJ):$(VER_MIN) -o $(SYSCONF_LINK_TARGET) \ -+ $(OBJECTS:.o=.lo) $(OBJMOC:.o=.lo) $(LIBS) - --# Linking static libraries --# - Build the $(TARGET) library, eg. lib$(TARGET).a --# - Place target in $(DESTDIR) - which has a trailing / --# --SYSCONF_AR = ar cqs --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) - # Compiling application source --SYSCONF_CXXFLAGS = -O2 --SYSCONF_CFLAGS = -O2 --SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_STATIC) --SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_STATIC) -+#SYSCONF_CXXFLAGS = -O2 -+#SYSCONF_CFLAGS = -O2 - # Compiling library source --SYSCONF_CXXFLAGS_LIB = --SYSCONF_CFLAGS_LIB = -+#SYSCONF_CXXFLAGS_LIB = -+#SYSCONF_CFLAGS_LIB = - # Compiling shared-object source --SYSCONF_CXXFLAGS_SHOBJ = -fPIC --SYSCONF_CFLAGS_SHOBJ = -fPIC - # Linking Qt - SYSCONF_LIBS_QTLIB = $(SYSCONF_CXXFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT) - # Linking Qt applications diff --git a/x11/qt2-libs/patches/patch-ac b/x11/qt2-libs/patches/patch-ac deleted file mode 100644 index 811d34d6827..00000000000 --- a/x11/qt2-libs/patches/patch-ac +++ /dev/null @@ -1,103 +0,0 @@ -$NetBSD: patch-ac,v 1.7 2006/01/05 21:22:14 joerg Exp $ - ---- configs/solaris-g++-static.orig Wed Jun 13 10:56:50 2001 -+++ configs/solaris-g++-static Thu Oct 17 18:28:26 2002 -@@ -2,24 +2,25 @@ - INTERFACE_DECL_PATH = . - SYSCONF_CXX = g++ - SYSCONF_CC = gcc -+SYSCONF_CXX_LIB = $(LIBTOOL) --mode=compile g++ - DASHCROSS = - - # Compiling with support libraries --SYSCONF_CXXFLAGS_X11 = -I/usr/openwin/include -+SYSCONF_CXXFLAGS_X11 = -I@X11BASE@/include - SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include --SYSCONF_CXXFLAGS_OPENGL = -+SYSCONF_CXXFLAGS_OPENGL = -I@LOCALBASE@/include -I@X11BASE@/include - - # Compiling YACC output - SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses - - # Linking with support libraries --SYSCONF_RPATH_X11 = -Wl,-R,/usr/openwin/lib --SYSCONF_RPATH_QT = -Wl,-R,$(QTDIR)/lib --SYSCONF_RPATH_OPENGL = -+SYSCONF_RPATH_X11 = -Wl,-R,@X11BASE@/lib -+SYSCONF_RPATH_QT = -Wl,-R,@QTDIR@/lib -+SYSCONF_RPATH_OPENGL = -Wl,-R@X11BASE@/lib -Wl,-R@LOCALBASE@/lib - - # Linking with support libraries - # X11 --SYSCONF_LFLAGS_X11 = -L/usr/openwin/lib -+SYSCONF_LFLAGS_X11 = -L@X11BASE@/lib - SYSCONF_LIBS_X11 = -lXext -lX11 -lm -lresolv -lsocket -lnsl - # Qt, Qt+OpenGL - SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib -@@ -26,13 +27,13 @@ - SYSCONF_LIBS_QT = -lqt$(QT_THREAD_SUFFIX) - SYSCONF_LIBS_QT_OPENGL = - # OpenGL --SYSCONF_LFLAGS_OPENGL = -+SYSCONF_LFLAGS_OPENGL = -L@LOCALBASE@/lib -L@X11BASE@/lib - SYSCONF_LIBS_OPENGL = -lGLU -lGL -lXmu - # Yacc - SYSCONF_LIBS_YACC = - - # Linking applications --SYSCONF_LINK = g++ -+SYSCONF_LINK = $(LIBTOOL) --mode=link g++ - SYSCONF_LFLAGS = - SYSCONF_LIBS = - -@@ -51,39 +52,22 @@ - # UI compiler - SYSCONF_UIC = $(QTDIR)/bin/uic - --# Linking shared libraries --# - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2 -+# Linking libtool libraries -+# - Build the $(TARGET) library, eg. lib$(TARGET).la - # - Place target in $(DESTDIR) - which has a trailing / - # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) - # --SYSCONF_LINK_SHLIB = g++ --SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) --SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared -h $(TARGET1) \ -- $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ -- $(OBJECTS) $(OBJMOC) $(LIBS) && \ -- mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ -- cd $(DESTDIR) && \ -- rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \ -- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \ -- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ); \ -- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN) -- --# Linking static libraries --# - Build the $(TARGET) library, eg. lib$(TARGET).a --# - Place target in $(DESTDIR) - which has a trailing / --# --SYSCONF_AR = ar cq --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) -+SYSCONF_LINK_TARGET = lib$(TARGET).la -+SYSCONF_LINK_LIB = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET); \ -+ $(SYSCONF_LINK) $(LFLAGS) -rpath $(QTPREFIX)/lib \ -+ -version-info $(VER_MAJ):$(VER_MIN) -o $(SYSCONF_LINK_TARGET) \ -+ $(OBJECTS:.o=.lo) $(OBJMOC:.o=.lo) $(LIBS) - # Compiling application source --SYSCONF_CXXFLAGS = -O2 --SYSCONF_CFLAGS = -O2 --SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_STATIC) --SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_STATIC) -+#SYSCONF_CXXFLAGS = -O2 -+#SYSCONF_CFLAGS = -O2 - # Compiling library source --SYSCONF_CXXFLAGS_LIB = --SYSCONF_CFLAGS_LIB = -+#SYSCONF_CXXFLAGS_LIB = -+#SYSCONF_CFLAGS_LIB = - # Compiling shared-object source - SYSCONF_CXXFLAGS_SHOBJ = -fPIC - SYSCONF_CFLAGS_SHOBJ = -fPIC diff --git a/x11/qt2-libs/patches/patch-ad b/x11/qt2-libs/patches/patch-ad deleted file mode 100644 index 2256f062759..00000000000 --- a/x11/qt2-libs/patches/patch-ad +++ /dev/null @@ -1,43 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2003/02/07 02:10:41 dmcmahill Exp $ - ---- configure.orig Wed Jun 13 04:57:02 2001 -+++ configure -@@ -18,37 +18,13 @@ - else - --touch .test.qt. --if [ '!' -f ${QTDIR}/.test.qt. ]; --then -- rm .test.qt. -- echo -- echo -- echo ' The environment variable $QTDIR is not set correctly. It is currently' -- echo ' set to "'$QTDIR'", but it should be set to this directory,' -- echo ' which is "'`pwd`'".' -- echo -- echo ' Please read the INSTALL file for instructions on how to set $QTDIR' -- echo ' correctly. If you have set $QTDIR in your .profile or .login, you ' -- echo ' will need to log out and log in again to make the setting effective.' -- echo -- echo -- exit 1 --fi --rm .test.qt. -- - # Find a make command --if ( make /dev/null ) >/dev/null 2>/dev/null --then -- MAKE=make --else - if ( gmake /dev/null ) >/dev/null 2>/dev/null - then - MAKE=gmake - else -- echo "You don't seem to have 'make' or 'gmake' in your PATH." -+ echo "You don't seem to have 'gmake' in your PATH." - echo "Cannot proceed." - exit 1 - fi --fi - - # Check licensed modules diff --git a/x11/qt2-libs/patches/patch-ae b/x11/qt2-libs/patches/patch-ae deleted file mode 100644 index 1cefd6e1c9c..00000000000 --- a/x11/qt2-libs/patches/patch-ae +++ /dev/null @@ -1,110 +0,0 @@ -$NetBSD: patch-ae,v 1.9 2003/02/05 23:13:10 dmcmahill Exp $ - ---- src/Makefile.in.orig Wed Jun 13 04:57:02 2001 -+++ src/Makefile.in -@@ -2,7 +2,7 @@ - - ####### Compiler, tools and options - --CXX = $(SYSCONF_CXX) $(QT_CXX_MT) -+CXX = $(SYSCONF_CXX_LIB) $(QT_CXX_MT) - CXXFLAGS= $(SYSCONF_CXXFLAGS_OPENGL) $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS_X11) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) $(QT_CXXFLAGS_OPT) - CC = $(SYSCONF_CC) $(QT_C_MT) - CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) $(QT_CFLAGS_OPT) -@@ -12,9 +12,12 @@ LIBS = $(SUBLIBS) $(SYSCONF_LIBS_OPENGL) - MOC = $(SYSCONF_MOC) - UIC = $(SYSCONF_UIC) - -+CFLAGS_NOOPT = $(CFLAGS:-O%=) -+CXXFLAGS_NOOPT = $(CXXFLAGS:-O%=) -+ - ####### Target - --DESTDIR = ../lib/ -+DESTDIR = - VER_MAJ = 2 - VER_MIN = 3 - VER_PATCH = 1 -@@ -372,25 +375,18 @@ OBJECTS_opengl = opengl/qgl.o \ - opengl/qgl_x11.o \ - opengl/moc_qgl.o - -- - ####### Implicit rules - - .SUFFIXES: .cpp .cxx .cc .C .c - - .cpp.o: -- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< -- --.cxx.o: -- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< -+ @cd `dirname $@` && $(CXX) -c $(CXXFLAGS) `basename $<` - - .cc.o: -- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< -- --.C.o: -- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< -+ @cd `dirname $@` && $(CXX) -c $(CXXFLAGS_NOOPT) `basename $<` - --.c.o: -- $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< -+.cpp.cc: -+ cp -f $< $@ - - ####### Build rules - -@@ -398,7 +394,7 @@ OBJECTS_opengl = opengl/qgl.o \ - all: $(DESTDIR)$(SYSCONF_LINK_TARGET) - - $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) -- $(SYSCONF_LINK_LIB) -+ $(SYSCONF_LINK_LIB) $(SYSCONF_RPATH_X11) $(SYSCONF_RPATH_OPENGL) - - moc: $(SRCMOC) - -@@ -13114,4 +13110,43 @@ opengl/qgl_x11.o: opengl/qgl_x11.cpp \ - tools/qgdict.h \ - kernel/qtranslator.h \ - tools/qintdict.h -+ -+# problem files -- compile with no optimization -+ifeq (${MACHINE_ARCH},alpha) -+ -+kernel/moc_qnetworkprotocol.o: kernel/moc_qnetworkprotocol.cc -+kernel/moc_qurloperator.o: kernel/moc_qurloperator.cc -+kernel/moc_qwidget.o: kernel/moc_qwidget.cc -+widgets/moc_qbutton.o: widgets/moc_qbutton.cc -+widgets/moc_qcombobox.o: widgets/moc_qcombobox.cc -+widgets/moc_qdial.o: widgets/moc_qdial.cc -+widgets/moc_qframe.o: widgets/moc_qframe.cc -+widgets/moc_qgroupbox.o: widgets/moc_qgroupbox.cc -+widgets/moc_qheader.o: widgets/moc_qheader.cc -+widgets/moc_qlabel.o: widgets/moc_qlabel.cc -+widgets/moc_qlcdnumber.o: widgets/moc_qlcdnumber.cc -+widgets/moc_qlineedit.o: widgets/moc_qlineedit.cc -+widgets/moc_qlistbox.o: widgets/moc_qlistbox.cc -+widgets/moc_qlistview.o: widgets/moc_qlistview.cc -+widgets/moc_qmainwindow.o: widgets/moc_qmainwindow.cc -+widgets/moc_qmultilineedit.o: widgets/moc_qmultilineedit.cc -+widgets/moc_qprogressbar.o: widgets/moc_qprogressbar.cc -+widgets/moc_qpushbutton.o: widgets/moc_qpushbutton.cc -+widgets/moc_qscrollbar.o: widgets/moc_qscrollbar.cc -+widgets/moc_qscrollview.o: widgets/moc_qscrollview.cc -+widgets/moc_qslider.o: widgets/moc_qslider.cc -+widgets/moc_qspinbox.o: widgets/moc_qspinbox.cc -+widgets/moc_qtabwidget.o: widgets/moc_qtabwidget.cc -+widgets/moc_qtextview.o: widgets/moc_qtextview.cc -+widgets/moc_qtoolbar.o: widgets/moc_qtoolbar.cc -+widgets/moc_qtoolbutton.o: widgets/moc_qtoolbutton.cc -+widgets/moc_qaction.o: widgets/moc_qaction.cc -+dialogs/moc_qfiledialog.o: dialogs/moc_qfiledialog.cc -+dialogs/moc_qmessagebox.o: dialogs/moc_qmessagebox.cc -+dialogs/moc_qprogressdialog.o: dialogs/moc_qprogressdialog.cc -+dialogs/moc_qprintdialog.o: dialogs/moc_qprintdialog.cc -+iconview/moc_qiconview.o: iconview/moc_qiconview.cc -+table/moc_qtable.o: table/moc_qtable.cc -+ -+endif - diff --git a/x11/qt2-libs/patches/patch-af b/x11/qt2-libs/patches/patch-af deleted file mode 100644 index f6f130ca1c9..00000000000 --- a/x11/qt2-libs/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.1.1.1 2000/10/19 07:41:16 skrll Exp $ - ---- src/moc/Makefile.in.orig Wed Oct 4 10:55:05 2000 -+++ src/moc/Makefile.in -@@ -92,7 +92,7 @@ - all: $(DESTDIR)$(TARGET) - - $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) -- $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) -+ $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) - - moc: $(SRCMOC) - diff --git a/x11/qt2-libs/patches/patch-ag b/x11/qt2-libs/patches/patch-ag deleted file mode 100644 index 2f5cce64dfb..00000000000 --- a/x11/qt2-libs/patches/patch-ag +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ag,v 1.3 2001/06/17 19:10:39 drochner Exp $ - ---- tools/designer/designer/Makefile.in.orig Wed Jun 13 10:57:07 2001 -+++ tools/designer/designer/Makefile.in Fri Jun 15 20:34:17 2001 -@@ -6,15 +6,15 @@ - CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) -DDESIGNER - CC = $(SYSCONF_CC) $(QT_C_MT) - CFLAGS = $(SYSCONF_CFLAGS) -DDESIGNER --INCPATH = -I../shared -I../util -I../../../src/3rdparty/zlib --LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) --LIBS = $(SUBLIBS) -L$(QTDIR)/lib -lqutil $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) -+INCPATH = -I../shared -I../util -+LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) $(SYSCONF_RPATH_X11) $(SYSCONF_RPATH_OPENGL) -+LIBS = $(SUBLIBS) ../util/libqutil.la $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) - MOC = $(SYSCONF_MOC) --UIC = $(SYSCONF_UIC) -+UIC = ../uic/uic - - ####### Target - --DESTDIR = $(QTDIR)/bin/ -+DESTDIR = - VER_MAJ = 1 - VER_MIN = 0 - VER_PATCH = 0 diff --git a/x11/qt2-libs/patches/patch-ah b/x11/qt2-libs/patches/patch-ah deleted file mode 100644 index 5040ad36ea8..00000000000 --- a/x11/qt2-libs/patches/patch-ah +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ah,v 1.3 2001/06/17 19:10:39 drochner Exp $ - ---- tools/designer/uic/Makefile.in.orig Wed Jun 13 10:57:08 2001 -+++ tools/designer/uic/Makefile.in Fri Jun 15 20:38:51 2001 -@@ -6,15 +6,15 @@ - CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) -DUIC - CC = $(SYSCONF_CC) $(QT_C_MT) - CFLAGS = $(SYSCONF_CFLAGS) -DUIC --INCPATH = -I../shared -I../util -I../../../src/3rdparty/zlib --LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) --LIBS = $(SUBLIBS) -L$(QTDIR)/lib -lqutil -L../lib $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) -+INCPATH = -I../shared -I../util -+LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) $(SYSCONF_RPATH_X11) $(SYSCONF_RPATH_OPENGL) -+LIBS = $(SUBLIBS) ../util/libqutil.la $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) - MOC = $(SYSCONF_MOC) - UIC = $(SYSCONF_UIC) - - ####### Target - --DESTDIR = $(QTDIR)/bin/ -+DESTDIR = - VER_MAJ = 1 - VER_MIN = 0 - VER_PATCH = 0 diff --git a/x11/qt2-libs/patches/patch-ai b/x11/qt2-libs/patches/patch-ai deleted file mode 100644 index ecbbb7ceaea..00000000000 --- a/x11/qt2-libs/patches/patch-ai +++ /dev/null @@ -1,52 +0,0 @@ -$NetBSD: patch-ai,v 1.1.1.1 2000/10/19 07:41:16 skrll Exp $ - ---- tools/designer/util/Makefile.in.orig Tue Oct 17 12:36:29 2000 -+++ tools/designer/util/Makefile.in -@@ -2,7 +2,7 @@ - - ####### Compiler, tools and options - --CXX = $(SYSCONF_CXX) $(QT_CXX_MT) -+CXX = $(SYSCONF_CXX_LIB) $(QT_CXX_MT) - CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) - CC = $(SYSCONF_CC) $(QT_C_MT) - CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -@@ -14,7 +14,7 @@ - - ####### Target - --DESTDIR = $(QTDIR)/lib/ -+DESTDIR = - VER_MAJ = 1 - VER_MIN = 0 - VER_PATCH = 0 -@@ -40,19 +40,7 @@ - .SUFFIXES: .cpp .cxx .cc .C .c - - .cpp.o: -- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< -- --.cxx.o: -- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< -- --.cc.o: -- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< -- --.C.o: -- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< -- --.c.o: -- $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< -+ @cd `dirname $@` && $(CXX) -c $(CXXFLAGS) `basename $<` - - ####### Build rules - -@@ -60,7 +48,7 @@ - all: $(DESTDIR)$(SYSCONF_LINK_TARGET) - - $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) -- $(SYSCONF_LINK_LIB) -+ $(SYSCONF_LINK_LIB) $(SYSCONF_RPATH_X11) $(SYSCONF_RPATH_OPENGL) - - moc: $(SRCMOC) - diff --git a/x11/qt2-libs/patches/patch-aj b/x11/qt2-libs/patches/patch-aj deleted file mode 100644 index 3cf53398ec2..00000000000 --- a/x11/qt2-libs/patches/patch-aj +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-aj,v 1.2 2001/06/17 19:10:39 drochner Exp $ - ---- tools/designer/uic/Makefile-kde.in.orig Wed Jun 13 10:57:07 2001 -+++ tools/designer/uic/Makefile-kde.in Fri Jun 15 20:43:34 2001 -@@ -6,15 +6,15 @@ - CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) -DUIC -DHAVE_KDE - CC = $(SYSCONF_CC) $(QT_C_MT) - CFLAGS = $(SYSCONF_CFLAGS) -DUIC -DHAVE_KDE --INCPATH = -I../shared -I../util -I../../../src/3rdparty/zlib -I$(KDEDIR)/include --LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) --LIBS = $(SUBLIBS) -L$(QTDIR)/lib -lqutil -L../lib -L$(KDEDIR)/lib -lkdecore -lkdeui -lDCOP $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) -+INCPATH = -I../shared -I../util -I$(KDEDIR)/include -+LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) $(SYSCONF_RPATH_X11) $(SYSCONF_RPATH_OPENGL) -+LIBS = $(SUBLIBS) ../util/libqutil.la -L$(KDEDIR)/lib -lkdecore -lkdeui -lDCOP $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) - MOC = $(SYSCONF_MOC) - UIC = $(SYSCONF_UIC) - - ####### Target - --DESTDIR = $(QTDIR)/bin/ -+DESTDIR = - VER_MAJ = 1 - VER_MIN = 0 - VER_PATCH = 0 diff --git a/x11/qt2-libs/patches/patch-ak b/x11/qt2-libs/patches/patch-ak deleted file mode 100644 index 11f9671b1ba..00000000000 --- a/x11/qt2-libs/patches/patch-ak +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ak,v 1.2 2001/06/17 19:10:39 drochner Exp $ - ---- tools/designer/designer/Makefile-kde.in.orig Wed Jun 13 10:57:06 2001 -+++ tools/designer/designer/Makefile-kde.in Fri Jun 15 20:48:20 2001 -@@ -6,15 +6,15 @@ - CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) -DDESIGNER -DHAVE_KDE - CC = $(SYSCONF_CC) $(QT_C_MT) - CFLAGS = $(SYSCONF_CFLAGS) -DDESIGNER -DHAVE_KDE --INCPATH = -I../shared -I../util -I../../../src/3rdparty/zlib -I$(KDEDIR)/include --LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) --LIBS = $(SUBLIBS) -L$(QTDIR)/lib -lqutil -L$(KDEDIR)/lib -lkdecore -lkdeui -lDCOP $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) -+INCPATH = -I../shared -I../util -I$(KDEDIR)/include -+LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) $(SYSCONF_RPATH_X11) $(SYSCONF_RPATH_OPENGL) -+LIBS = $(SUBLIBS) ../util/libqutil.la -L$(KDEDIR)/lib -lkdecore -lkdeui -lDCOP $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) - MOC = $(SYSCONF_MOC) --UIC = $(SYSCONF_UIC) -+UIC = ../uic/uic - - ####### Target - --DESTDIR = $(QTDIR)/bin/ -+DESTDIR = - VER_MAJ = 1 - VER_MIN = 0 - VER_PATCH = 0 diff --git a/x11/qt2-libs/patches/patch-al b/x11/qt2-libs/patches/patch-al deleted file mode 100644 index 34b24ad94bb..00000000000 --- a/x11/qt2-libs/patches/patch-al +++ /dev/null @@ -1,46 +0,0 @@ -$NetBSD: patch-al,v 1.1 2001/11/16 09:08:05 jlam Exp $ - ---- src/tools/qdir_unix.cpp.orig Wed Jun 13 04:53:47 2001 -+++ src/tools/qdir_unix.cpp -@@ -95,13 +95,39 @@ - - bool QDir::mkdir( const QString &dirName, bool acceptAbsPath ) const - { -- return MKDIR( QFile::encodeName(filePath(dirName,acceptAbsPath)), 0777 ) -+ // Remove trailing slashes from the directory name. -+ QString tmp = QFile::encodeName(filePath(dirName,acceptAbsPath)); -+ int pos = tmp.length(); -+ if (pos > 0) { -+ while ( (pos - 1) >= 0 && tmp[pos - 1] == '/' ) { -+ --pos; -+ }; -+ if ( pos == 0 ) { -+ tmp = QDir::rootDirPath(); -+ } else { -+ tmp.truncate( pos ); -+ } -+ } -+ return MKDIR( tmp, 0777 ) - == 0; - } - - bool QDir::rmdir( const QString &dirName, bool acceptAbsPath ) const - { -- return RMDIR( QFile::encodeName(filePath(dirName,acceptAbsPath)) ) == 0; -+ // Remove trailing slashes from the directory name. -+ QString tmp = QFile::encodeName(filePath(dirName,acceptAbsPath)); -+ int pos = tmp.length(); -+ if (pos > 0) { -+ while ( (pos - 1) >= 0 && tmp[pos - 1] == '/' ) { -+ --pos; -+ }; -+ if ( pos == 0 ) { -+ tmp = QDir::rootDirPath(); -+ } else { -+ tmp.truncate( pos ); -+ } -+ } -+ return RMDIR( tmp ) == 0; - } - - bool QDir::isReadable() const diff --git a/x11/qt2-libs/patches/patch-am b/x11/qt2-libs/patches/patch-am deleted file mode 100644 index cd9b00fb062..00000000000 --- a/x11/qt2-libs/patches/patch-am +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-am,v 1.2 2003/11/25 23:05:24 dmcmahill Exp $ - ---- src/kernel/qpsprinter.cpp.orig Wed Jun 13 08:53:46 2001 -+++ src/kernel/qpsprinter.cpp -@@ -92,6 +92,8 @@ - #include <unistd.h> - #endif - -+#include <stdlib.h> -+ - #ifdef _WS_X11_ - #include "qt_x11.h" - #ifdef None -@@ -2770,10 +2772,6 @@ private: - - }; - -- --#ifndef _OS_OSF_ --extern "C" char* getenv(char*); --#endif - - QPSPrinterFontTTF::QPSPrinterFontTTF(const QFont &f, QByteArray& d) - { diff --git a/x11/qt2-libs/patches/patch-ao b/x11/qt2-libs/patches/patch-ao deleted file mode 100644 index baf1e40dc18..00000000000 --- a/x11/qt2-libs/patches/patch-ao +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2005/10/04 19:34:36 joerg Exp $ - ---- src/tools/qglobal.h.orig 2005-07-30 22:20:46.000000000 +0000 -+++ src/tools/qglobal.h -@@ -99,7 +99,7 @@ - #define _OS_RELIANT_ - #elif defined(linux) || defined(__linux) || defined(__linux__) - #define _OS_LINUX_ --#elif defined(__FreeBSD__) -+#elif defined(__FreeBSD__) || defined(__DragonFly__) - #define _OS_FREEBSD_ - #elif defined(__NetBSD__) - #define _OS_NETBSD_ diff --git a/x11/qt2-libs/patches/patch-ap b/x11/qt2-libs/patches/patch-ap deleted file mode 100644 index 5e515d0e660..00000000000 --- a/x11/qt2-libs/patches/patch-ap +++ /dev/null @@ -1,115 +0,0 @@ -$NetBSD: patch-ap,v 1.2 2006/01/05 21:22:14 joerg Exp $ - ---- configs/freebsd-g++-static.orig 2005-07-30 22:54:44.000000000 +0000 -+++ configs/freebsd-g++-static -@@ -1,44 +1,42 @@ - # Compiling - INTERFACE_DECL_PATH = . --SYSCONF_CXX = g++ --SYSCONF_CC = gcc -+SYSCONF_CXX = c++ -+SYSCONF_CC = cc -+SYSCONF_CXX_LIB = ${LIBTOOL} --mode=compile c++ - DASHCROSS = - - # Compiling with support libraries --SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include -+SYSCONF_CXXFLAGS_X11 = -I@X11BASE@/include - SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include --SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include -+SYSCONF_CXXFLAGS_OPENGL = -I@LOCALBASE@/include -I@X11BASE@/include - - # Compiling YACC output - SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses - - # Linking with support libraries --SYSCONF_RPATH_X11 = -Wl,-rpath,/usr/X11R6/lib --SYSCONF_RPATH_QT = -Wl,-rpath,$(QTDIR)/lib --SYSCONF_RPATH_OPENGL = -Wl,-rpath,/usr/X11R6/lib -+SYSCONF_RPATH_X11 = -Wl,-R@X11BASE@/lib -+SYSCONF_RPATH_QT = -Wl,-R@QTDIR@/lib -+SYSCONF_RPATH_OPENGL = -Wl,-R@X11BASE@/lib -Wl,-R@LOCALBASE@/lib - - # Linking with support libraries - # X11 --SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib -+SYSCONF_LFLAGS_X11 = -L@X11BASE@/lib - 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_OPENGL = - # OpenGL --SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib -+SYSCONF_LFLAGS_OPENGL = -L@LOCALBASE@/lib -L@X11BASE@/lib - SYSCONF_LIBS_OPENGL = -lGLU -lGL -lXmu - # Yacc - SYSCONF_LIBS_YACC = - - # Linking applications --SYSCONF_LINK = g++ -+SYSCONF_LINK = $(LIBTOOL) --mode=link c++ - SYSCONF_LFLAGS = - SYSCONF_LIBS = - --# Link flags for shared objects --SYSCONF_LFLAGS_SHOBJ = -shared -- - # Flags for threading - SYSCONF_CFLAGS_THREAD = -pthread -D_THREAD_SAFE - SYSCONF_CXXFLAGS_THREAD = -pthread -D_THREAD_SAFE -@@ -51,43 +49,24 @@ SYSCONF_MOC = $(QTDIR)/bin/moc - # UI compiler - SYSCONF_UIC = $(QTDIR)/bin/uic - --# Linking shared libraries --# - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2 -+# Linking libtool libraries -+# - Build the $(TARGET) library, eg. lib$(TARGET).la - # - Place target in $(DESTDIR) - which has a trailing / - # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) - # --SYSCONF_LINK_SHLIB = g++ --SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) --SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \ -- $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ -- $(OBJECTS) $(OBJMOC) $(LIBS) && \ -- mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ -- cd $(DESTDIR) && \ -- rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \ -- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \ -- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ); \ -- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN) -+SYSCONF_LINK_TARGET = lib$(TARGET).la -+SYSCONF_LINK_LIB = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET); \ -+ $(SYSCONF_LINK) $(LFLAGS) -rpath $(QTPREFIX)/lib \ -+ -version-info $(VER_MAJ):$(VER_MIN) -o $(SYSCONF_LINK_TARGET) \ -+ $(OBJECTS:.o=.lo) $(OBJMOC:.o=.lo) $(LIBS) - --# Linking static libraries --# - Build the $(TARGET) library, eg. lib$(TARGET).a --# - Place target in $(DESTDIR) - which has a trailing / --# --SYSCONF_AR = ar cqs --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) - # Compiling application source --SYSCONF_CXXFLAGS = -pipe -fno-exceptions -O2 --SYSCONF_CFLAGS = -pipe -fno-exceptions -O2 --SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_STATIC) --SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_STATIC) -+#SYSCONF_CXXFLAGS = -O2 -+#SYSCONF_CFLAGS = -O2 - # Compiling library source --SYSCONF_CXXFLAGS_LIB = --SYSCONF_CFLAGS_LIB = -+#SYSCONF_CXXFLAGS_LIB = -+#SYSCONF_CFLAGS_LIB = - # Compiling shared-object source --SYSCONF_CXXFLAGS_SHOBJ = -fPIC --SYSCONF_CFLAGS_SHOBJ = -fPIC - # Linking Qt - SYSCONF_LIBS_QTLIB = $(SYSCONF_CXXFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT) - # Linking Qt applications --SYSCONF_LIBS_QTAPP = $(SYSCONF_LFLAGS_X11) $(SYSCONF_CXXFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT) $(SYSCONF_LIBS_X11) diff --git a/x11/qt2-libs/patches/patch-aq b/x11/qt2-libs/patches/patch-aq deleted file mode 100644 index c911b4eb6a4..00000000000 --- a/x11/qt2-libs/patches/patch-aq +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aq,v 1.1 2005/10/04 19:34:36 joerg Exp $ - ---- src/network/qsocketdevice_unix.cpp.orig 2005-07-30 23:19:35.000000000 +0000 -+++ src/network/qsocketdevice_unix.cpp -@@ -150,6 +150,8 @@ typedef unsigned long u_long; - #if defined(_OS_LINUX_) && defined(__GLIBC__) && ( __GLIBC__ >= 2 ) - // new linux is Single Unix 1998, not old linux - #define SOCKLEN_T socklen_t -+#elif defined(__DragonFly__) -+#define SOCKLEN_T socklen_t - #elif defined(BSD4_4) - // BSD 4.4 - # if defined(_OS_FREEBSD_) && __FreeBSD_version < 400000 diff --git a/x11/qt2-libs/patches/patch-ar b/x11/qt2-libs/patches/patch-ar deleted file mode 100644 index 37a2b92a59f..00000000000 --- a/x11/qt2-libs/patches/patch-ar +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ar,v 1.1 2007/09/28 13:11:29 drochner Exp $ - ---- src/tools/qvaluestack.h.orig 2001-06-13 10:53:47.000000000 +0200 -+++ src/tools/qvaluestack.h -@@ -54,7 +54,7 @@ public: - { - T elem( this->last() ); - if ( !this->isEmpty() ) -- remove( this->fromLast() ); -+ this->remove( this->fromLast() ); - return elem; - } - T& top() { return this->last(); } |