FreeBSD: Minor adjustments

+ tqt3: added dependency on OpenGL
+ tqtinterface: correction of alphabetical order in pkg-plist
+ tdelibs: iceauth moved from RUN_DEPENDS to BUILD_DEPENDS
+ applications/Makefile: fixed typo

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

4 files changed, 42 insertions, 40 deletions

diff --git a/freebsd/applications/Makefile b/freebsd/applications/Makefile
index ed8a8bd84..4f9f7626e 100644
--- a/freebsd/applications/Makefile
+++ b/freebsd/applications/Makefile
@@ -22,7 +22,7 @@
     SUBDIR += kcmldap
     SUBDIR += kcmldapmanager
     SUBDIR += kcpuload
-    SUBDIR += kdbusnotification:
+    SUBDIR += kdbusnotification
     SUBDIR += kdirstat
     SUBDIR += keep
     SUBDIR += kiosktool
diff --git a/freebsd/dependencies/tqt3/Makefile b/freebsd/dependencies/tqt3/Makefile
index c64b6cbe3..037a83366 100644
--- a/freebsd/dependencies/tqt3/Makefile
+++ b/freebsd/dependencies/tqt3/Makefile
@@ -28,7 +28,9 @@ LIB_DEPENDS+=	libmng.so:${PORTSDIR}/graphics/libmng \
 		libjpeg.so:${PORTSDIR}/graphics/jpeg-turbo \
 		libglib-2.0.so:${PORTSDIR}/devel/glib20
 
+USES+=		gl xorg
 USE_XORG=	xcursor xinerama sm xorgproto xi
+USE_GL=		glu
 REINPLACE_ARGS=	-i ""
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/freebsd/dependencies/tqtinterface/pkg-plist b/freebsd/dependencies/tqtinterface/pkg-plist
index 31ec99040..607f598b1 100644
--- a/freebsd/dependencies/tqtinterface/pkg-plist
+++ b/freebsd/dependencies/tqtinterface/pkg-plist
@@ -1,34 +1,39 @@
 bin/convert_qt_tqt1
 bin/convert_qt_tqt2
 bin/convert_qt_tqt3
-bin/dcopidlng-tqt
 bin/dcopidl-tqt
 bin/dcopidl2cpp-tqt
+bin/dcopidlng-tqt
 bin/mcopidl-tqt
 bin/moc-tqt
 bin/tmoc
 bin/tqt-replace
 bin/tqt-replace-stream
 bin/uic-tqt
+include/tqt/Qt/q3cstring.h
+include/tqt/Qt/q3painter.h
+include/tqt/Qt/q3pointarray.h
+include/tqt/Qt/q3popupmenu.h
+include/tqt/Qt/q3whatsthis.h
 include/tqt/Qt/qapplication.h
 include/tqt/Qt/qbytearray.h
+include/tqt/Qt/qchar.h
 include/tqt/Qt/qcommonstyle.h
 include/tqt/Qt/qdatastream.h
 include/tqt/Qt/qdir.h
 include/tqt/Qt/qfileinfo.h
 include/tqt/Qt/qglobal.h
-include/tqt/Qt/qchar.h
 include/tqt/Qt/qicon.h
 include/tqt/Qt/qimage.h
 include/tqt/Qt/qiodevice.h
 include/tqt/Qt/qlist.h
-include/tqt/Qt/qmenudata.h
 include/tqt/Qt/qmenu.h
+include/tqt/Qt/qmenudata.h
 include/tqt/Qt/qmetaobject.h
 include/tqt/Qt/qmovie.h
 include/tqt/Qt/qnamespace.h
-include/tqt/Qt/qobjectdefs.h
 include/tqt/Qt/qobject.h
+include/tqt/Qt/qobjectdefs.h
 include/tqt/Qt/qpaintdevice.h
 include/tqt/Qt/qpixmap.h
 include/tqt/Qt/qscrollbar.h
@@ -42,11 +47,7 @@ include/tqt/Qt/qtooltip.h
 include/tqt/Qt/qvariant.h
 include/tqt/Qt/qvector.h
 include/tqt/Qt/qwidget.h
-include/tqt/Qt/q3cstring.h
-include/tqt/Qt/q3painter.h
-include/tqt/Qt/q3pointarray.h
-include/tqt/Qt/q3popupmenu.h
-include/tqt/Qt/q3whatsthis.h
+include/tqt/tq1xcompatibility.h
 include/tqt/tqabstractlayout.h
 include/tqt/tqaccel.h
 include/tqt/tqaccessible.h
@@ -66,23 +67,25 @@ include/tqt/tqbitmap.h
 include/tqt/tqbrush.h
 include/tqt/tqbttngrp.h
 include/tqt/tqbuffer.h
-include/tqt/tqbuttongroup.h
 include/tqt/tqbutton.h
+include/tqt/tqbuttongroup.h
 include/tqt/tqcache.h
 include/tqt/tqcanvas.h
 include/tqt/tqcdestyle.h
+include/tqt/tqcheckbox.h
+include/tqt/tqchkbox.h
 include/tqt/tqcleanuphandler.h
 include/tqt/tqclipboard.h
 include/tqt/tqclipbrd.h
 include/tqt/tqcollect.h
 include/tqt/tqcollection.h
-include/tqt/tqcolordialog.h
 include/tqt/tqcolor.h
-include/tqt/tqcombobox.h
+include/tqt/tqcolordialog.h
+include/tqt/tqcom_p.h
 include/tqt/tqcombo.h
+include/tqt/tqcombobox.h
 include/tqt/tqcommonstyle.h
 include/tqt/tqcompactstyle.h
-include/tqt/tqcom_p.h
 include/tqt/tqconfig.h
 include/tqt/tqconnect.h
 include/tqt/tqconnection.h
@@ -92,8 +95,8 @@ include/tqt/tqdatabrowser.h
 include/tqt/tqdatastream.h
 include/tqt/tqdatatable.h
 include/tqt/tqdataview.h
-include/tqt/tqdatetimeedit.h
 include/tqt/tqdatetime.h
+include/tqt/tqdatetimeedit.h
 include/tqt/tqdatetm.h
 include/tqt/tqdeepcopy.h
 include/tqt/tqdesktopwidget.h
@@ -118,16 +121,16 @@ include/tqt/tqeuckrcodec.h
 include/tqt/tqevent.h
 include/tqt/tqeventloop.h
 include/tqt/tqfeatures.h
+include/tqt/tqfile.h
 include/tqt/tqfiledef.h
 include/tqt/tqfiledialog.h
 include/tqt/tqfiledlg.h
-include/tqt/tqfile.h
 include/tqt/tqfileinf.h
 include/tqt/tqfileinfo.h
 include/tqt/tqfocusdata.h
+include/tqt/tqfont.h
 include/tqt/tqfontdatabase.h
 include/tqt/tqfontdialog.h
-include/tqt/tqfont.h
 include/tqt/tqfontinf.h
 include/tqt/tqfontinfo.h
 include/tqt/tqfontmet.h
@@ -135,14 +138,14 @@ include/tqt/tqfontmetrics.h
 include/tqt/tqframe.h
 include/tqt/tqftp.h
 include/tqt/tqgarray.h
-include/tqt/tqgbkcodec.h
 include/tqt/tqgb18030codec.h
+include/tqt/tqgbkcodec.h
 include/tqt/tqgcache.h
 include/tqt/tqgdict.h
 include/tqt/tqgeneric.h
 include/tqt/tqgif.h
-include/tqt/tqglcolormap.h
 include/tqt/tqgl.h
+include/tqt/tqglcolormap.h
 include/tqt/tqglist.h
 include/tqt/tqglobal.h
 include/tqt/tqgplugin.h
@@ -158,15 +161,13 @@ include/tqt/tqheader.h
 include/tqt/tqhgroupbox.h
 include/tqt/tqhostaddress.h
 include/tqt/tqhttp.h
-include/tqt/tqcheckbox.h
-include/tqt/tqchkbox.h
 include/tqt/tqiconset.h
 include/tqt/tqiconview.h
-include/tqt/tqimageformatplugin.h
 include/tqt/tqimage.h
+include/tqt/tqimageformatplugin.h
 include/tqt/tqinputdialog.h
-include/tqt/tqintcache.h
 include/tqt/tqintcach.h
+include/tqt/tqintcache.h
 include/tqt/tqintdict.h
 include/tqt/tqinterlacestyle.h
 include/tqt/tqinternal_p.h
@@ -178,14 +179,14 @@ include/tqt/tqjpunicode.h
 include/tqt/tqkeycode.h
 include/tqt/tqkeysequence.h
 include/tqt/tqlabel.h
-include/tqt/tqlayoutengine_p.h
 include/tqt/tqlayout.h
+include/tqt/tqlayoutengine_p.h
 include/tqt/tqlcdnumber.h
 include/tqt/tqlibrary.h
 include/tqt/tqlined.h
 include/tqt/tqlineedit.h
-include/tqt/tqlistbox.h
 include/tqt/tqlist.h
+include/tqt/tqlistbox.h
 include/tqt/tqlistiterator.h
 include/tqt/tqlistview.h
 include/tqt/tqlocale.h
@@ -197,8 +198,8 @@ include/tqt/tqmenubar.h
 include/tqt/tqmenudata.h
 include/tqt/tqmenudta.h
 include/tqt/tqmessagebox.h
-include/tqt/tqmetaobject.h
 include/tqt/tqmetaobj.h
+include/tqt/tqmetaobject.h
 include/tqt/tqmime.h
 include/tqt/tqmlined.h
 include/tqt/tqmngio.h
@@ -216,29 +217,29 @@ include/tqt/tqnetworkprotocol.h
 include/tqt/tqnp.h
 include/tqt/tqobjcoll.h
 include/tqt/tqobjdefs.h
+include/tqt/tqobject.h
 include/tqt/tqobjectcleanuphandler.h
 include/tqt/tqobjectdict.h
-include/tqt/tqobject.h
 include/tqt/tqobjectlist.h
+include/tqt/tqpaintd.h
 include/tqt/tqpaintdc.h
 include/tqt/tqpaintdevice.h
 include/tqt/tqpaintdevicemetrics.h
-include/tqt/tqpaintd.h
 include/tqt/tqpainter.h
 include/tqt/tqpair.h
 include/tqt/tqpalette.h
 include/tqt/tqpdevmet.h
 include/tqt/tqpen.h
 include/tqt/tqpicture.h
-include/tqt/tqpixmapcache.h
 include/tqt/tqpixmap.h
+include/tqt/tqpixmapcache.h
 include/tqt/tqplatinumstyle.h
 include/tqt/tqpluginmanager_p.h
 include/tqt/tqpmcache.h
 include/tqt/tqpngio.h
 include/tqt/tqpntarry.h
-include/tqt/tqpointarray.h
 include/tqt/tqpoint.h
+include/tqt/tqpointarray.h
 include/tqt/tqpolygonscanner.h
 include/tqt/tqpopmenu.h
 include/tqt/tqpopupmenu.h
@@ -283,13 +284,13 @@ include/tqt/tqsignal.h
 include/tqt/tqsignalmapper.h
 include/tqt/tqsignalslotimp.h
 include/tqt/tqsimplerichtext.h
-include/tqt/tqsizegrip.h
 include/tqt/tqsize.h
+include/tqt/tqsizegrip.h
 include/tqt/tqsizepolicy.h
 include/tqt/tqsjiscodec.h
 include/tqt/tqslider.h
-include/tqt/tqsocketdevice.h
 include/tqt/tqsocket.h
+include/tqt/tqsocketdevice.h
 include/tqt/tqsocketnotifier.h
 include/tqt/tqsocknot.h
 include/tqt/tqsortedlist.h
@@ -297,6 +298,7 @@ include/tqt/tqsound.h
 include/tqt/tqspinbox.h
 include/tqt/tqsplashscreen.h
 include/tqt/tqsplitter.h
+include/tqt/tqsql.h
 include/tqt/tqsqlcursor.h
 include/tqt/tqsqldatabase.h
 include/tqt/tqsqldriver.h
@@ -305,7 +307,6 @@ include/tqt/tqsqleditorfactory.h
 include/tqt/tqsqlerror.h
 include/tqt/tqsqlfield.h
 include/tqt/tqsqlform.h
-include/tqt/tqsql.h
 include/tqt/tqsqlindex.h
 include/tqt/tqsqlpropertymap.h
 include/tqt/tqsqlquery.h
@@ -318,26 +319,26 @@ include/tqt/tqstring.h
 include/tqt/tqstringlist.h
 include/tqt/tqstrlist.h
 include/tqt/tqstrvec.h
-include/tqt/tqstylefactory.h
 include/tqt/tqstyle.h
+include/tqt/tqstylefactory.h
 include/tqt/tqstyleplugin.h
 include/tqt/tqstylesheet.h
 include/tqt/tqsyntaxhighlighter.h
+include/tqt/tqt.h
 include/tqt/tqtabbar.h
 include/tqt/tqtabdialog.h
 include/tqt/tqtabdlg.h
 include/tqt/tqtable.h
 include/tqt/tqtabwidget.h
 include/tqt/tqtextbrowser.h
-include/tqt/tqtextcodecfactory.h
 include/tqt/tqtextcodec.h
+include/tqt/tqtextcodecfactory.h
 include/tqt/tqtextcodecplugin.h
 include/tqt/tqtextedit.h
 include/tqt/tqtextengine_p.h
 include/tqt/tqtextstream.h
 include/tqt/tqtextview.h
 include/tqt/tqtglobaldefines.h
-include/tqt/tqt.h
 include/tqt/tqthread.h
 include/tqt/tqthreadstorage.h
 include/tqt/tqtimer.h
@@ -349,8 +350,8 @@ include/tqt/tqtooltip.h
 include/tqt/tqtranslator.h
 include/tqt/tqtsciicodec.h
 include/tqt/tqtstream.h
-include/tqt/tqucomextra_p.h
 include/tqt/tqucom_p.h
+include/tqt/tqucomextra_p.h
 include/tqt/tqurl.h
 include/tqt/tqurlinfo.h
 include/tqt/tqurloperator.h
@@ -369,8 +370,8 @@ include/tqt/tqvgroupbox.h
 include/tqt/tqwaitcondition.h
 include/tqt/tqwhatsthis.h
 include/tqt/tqwidcoll.h
-include/tqt/tqwidgetfactory.h
 include/tqt/tqwidget.h
+include/tqt/tqwidgetfactory.h
 include/tqt/tqwidgetintdict.h
 include/tqt/tqwidgetinterface_p.h
 include/tqt/tqwidgetlist.h
@@ -384,7 +385,6 @@ include/tqt/tqwizard.h
 include/tqt/tqwmatrix.h
 include/tqt/tqworkspace.h
 include/tqt/tqxml.h
-include/tqt/tq1xcompatibility.h
 lib/libtqt.la
 lib/libtqt.so
 lib/libtqt.so.4
diff --git a/freebsd/tdelibs/Makefile b/freebsd/tdelibs/Makefile
index 20a3f438f..7ad96d40a 100644
--- a/freebsd/tdelibs/Makefile
+++ b/freebsd/tdelibs/Makefile
@@ -23,6 +23,7 @@ LIB_DEPENDS+=	libtqt.so:${PORTSDIR}/x11/trinity/dependencies/tqtinterface \
 
 BUILD_DEPENDS+=\
 		hspell:${PORTSDIR}/hebrew/hspell \
+		iceauth:${PORTSDIR}/x11/iceauth \
 
 LIB_DEPENDS+=\
 		libbz2.so:${PORTSDIR}/archivers/bzip2 \
@@ -42,7 +43,6 @@ LIB_DEPENDS+=\
 
 RUN_DEPENDS:\
 		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
-		iceauth:${PORTSDIR}/x11/iceauth \
 
 # Build
 post-patch: tde-pathfix