OpenBSD: update R14 packages

17 files changed, 79 insertions, 80 deletions

diff --git a/openbsd/14.0.0/dependencies/Makefile b/openbsd/14.0.0/dependencies/Makefile
index a7c45f0c4..3d143740f 100644
--- a/openbsd/14.0.0/dependencies/Makefile
+++ b/openbsd/14.0.0/dependencies/Makefile
@@ -6,5 +6,6 @@
      SUBDIR += arts
      SUBDIR += dbus-tqt
      SUBDIR += dbus-1-tqt
+     SUBDIR += libart-lgpl
 
 .include <bsd.port.subdir.mk>
diff --git a/openbsd/14.0.0/dependencies/arts/Makefile b/openbsd/14.0.0/dependencies/arts/Makefile
index 4f1e3c867..d972a26bf 100644
--- a/openbsd/14.0.0/dependencies/arts/Makefile
+++ b/openbsd/14.0.0/dependencies/arts/Makefile
@@ -1,26 +1,30 @@
-VERSION=		1.5.10
-REVISION=		1
+.include </usr/ports/x11/trinity/trinity.port.mk>
+
 PKGNAME=		trinity-arts-${VERSION}
-PREFIX=			${TDE_PREFIX}
+VERSION=		1.5.10${PREVERSION}
+PREVERSION=		~pre134+62defb77
 
-CATEGORIES=		x11/trinity
 COMMENT=		aRts (analog realtime synthesizer) - the TDE sound system
+CATEGORIES=		x11/trinity/dependencies
+HOMEPAGE=		http://www.trinitydesktop.org/
+MAINTAINER=		François Andriot <francois.andriot@free.fr>
 
 MASTER_SITES=	http://nuc.vtf/tde/tde-tarballs/14.0.0/main/dependencies/
-DISTNAME=		trinity-arts-14.0.0~pre131+04e2524e
+DISTNAME=		trinity-arts-${TDE_VERSION}${PREVERSION}
 EXTRACT_SUFX=	.tar.gz
 
+PREFIX=			${TDE_PREFIX}
+
 BUILD_DEPENDS= 	devel/gmake \
 				devel/cmake \
-				x11/trinity/dependencies/tqtinterface,-devel
+				x11/trinity/dependencies/tqtinterface
 
 LIB_DEPENDS=	devel/libaudiofile \
                 devel/glib2 \
                 audio/libvorbis \
                 audio/libogg \
                 audio/libmad \
-				x11/trinity/dependencies/tqtinterface,-main \
-				x11/trinity/dependencies/tqtinterface,-devel
+				x11/trinity/dependencies/tqtinterface
 
 WANTLIB = glib-2.0 audiofile mad ogg vorbis
 
@@ -40,7 +44,6 @@ SHARED_LIBS +=  mcop_mt                   1.0
 SHARED_LIBS +=  qtmcop                    1.0
 SHARED_LIBS +=  soundserver_idl           1.0
 
-.include </usr/ports/x11/trinity/trinity.port.mk>
 
 do-configure: tde-cmake-rmbuild
 	${TDE_CMAKE_CONFIGURE} \
diff --git a/openbsd/14.0.0/dependencies/arts/distinfo b/openbsd/14.0.0/dependencies/arts/distinfo
deleted file mode 100644
index c8562401e..000000000
--- a/openbsd/14.0.0/dependencies/arts/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (trinity-arts-14.0.0~pre131+04e2524e.tar.gz) = ED45GNFbppQ27suVL1bPVwoUjbvKKXKWkyxLTBQ/mds=
-SIZE (trinity-arts-14.0.0~pre131+04e2524e.tar.gz) = 930222
diff --git a/openbsd/14.0.0/dependencies/dbus-1-tqt/Makefile b/openbsd/14.0.0/dependencies/dbus-1-tqt/Makefile
index 65274fd50..29171e3fd 100644
--- a/openbsd/14.0.0/dependencies/dbus-1-tqt/Makefile
+++ b/openbsd/14.0.0/dependencies/dbus-1-tqt/Makefile
@@ -1,17 +1,20 @@
 .include </usr/ports/x11/trinity/trinity.port.mk>
 
-VERSION=		0.9
-REVISION=		1
 PKGNAME=		trinity-dbus_1_tqt-${VERSION}
-PREFIX=			${TDE_PREFIX}
+VERSION=		0.9${PREVERSION}
+PREVERSION=		~pre120+0add2f9a
 
-CATEGORIES=		x11/trinity
 COMMENT=		dbus TQT Interface
+CATEGORIES=		x11/trinity/dependencies
+HOMEPAGE=		http://www.trinitydesktop.org/
+MAINTAINER=		François Andriot <francois.andriot@free.fr>
 
 MASTER_SITES=	http://nuc.vtf/tde/tde-tarballs/14.0.0/main/dependencies/
-DISTNAME=		trinity-dbus-1-tqt-14.0.0~pre117+5ddc3488
+DISTNAME=		trinity-dbus-1-tqt-${TDE_VERSION}${PREVERSION}
 EXTRACT_SUFX=	.tar.gz
 
+PREFIX=			${TDE_PREFIX}
+
 BUILD_DEPENDS= 	devel/gmake \
 				devel/cmake \
 				x11/dbus \
diff --git a/openbsd/14.0.0/dependencies/dbus-1-tqt/distinfo b/openbsd/14.0.0/dependencies/dbus-1-tqt/distinfo
deleted file mode 100644
index 780e70249..000000000
--- a/openbsd/14.0.0/dependencies/dbus-1-tqt/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (trinity-dbus-1-tqt-14.0.0~pre117+5ddc3488.tar.gz) = GpOlshq2O1asC1tKN5PsnsVwqhjhzHB3nK7ePZNoMzI=
-SIZE (trinity-dbus-1-tqt-14.0.0~pre117+5ddc3488.tar.gz) = 389230
diff --git a/openbsd/14.0.0/dependencies/dbus-tqt/Makefile b/openbsd/14.0.0/dependencies/dbus-tqt/Makefile
index 09c1846fc..316fe3d3c 100644
--- a/openbsd/14.0.0/dependencies/dbus-tqt/Makefile
+++ b/openbsd/14.0.0/dependencies/dbus-tqt/Makefile
@@ -1,22 +1,24 @@
 .include </usr/ports/x11/trinity/trinity.port.mk>
 
-VERSION=		0.63
-REVISION=		1
 PKGNAME=		trinity-dbus-tqt-${VERSION}
-PREFIX=			${TDE_PREFIX}
+VERSION=		0.63${PREVERSION}
+PREVERSION=		~pre106+fc1ecd47
 
-CATEGORIES=		x11/trinity
 COMMENT=		Dbus TQT Interface
+CATEGORIES=		x11/trinity/dependencies
+HOMEPAGE=		http://www.trinitydesktop.org/
+MAINTAINER=		François Andriot <francois.andriot@free.fr>
 
 MASTER_SITES=	http://nuc.vtf/tde/tde-tarballs/14.0.0/main/dependencies/
-DISTNAME=		trinity-dbus-tqt-14.0.0~pre103+55421747
+DISTNAME=		trinity-dbus-tqt-${TDE_VERSION}${PREVERSION}
 EXTRACT_SUFX=	.tar.gz
 
+PREFIX=			${TDE_PREFIX}
+
 BUILD_DEPENDS= 	devel/gmake \
 				devel/cmake \
 				x11/dbus \
-				x11/trinity/dependencies/tqtinterface,-main \
-				x11/trinity/dependencies/tqtinterface,-devel
+				x11/trinity/dependencies/tqtinterface
 
 LIB_DEPENDS=	x11/dbus
 
diff --git a/openbsd/14.0.0/dependencies/dbus-tqt/distinfo b/openbsd/14.0.0/dependencies/dbus-tqt/distinfo
deleted file mode 100644
index 7f027516c..000000000
--- a/openbsd/14.0.0/dependencies/dbus-tqt/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (trinity-dbus-tqt-14.0.0~pre103+55421747.tar.gz) = 22T4eJmv91izM+EZdSSz3OS1dg0MzvqU6EW0IXs6k+8=
-SIZE (trinity-dbus-tqt-14.0.0~pre103+55421747.tar.gz) = 519009
diff --git a/openbsd/14.0.0/dependencies/libart-lgpl/Makefile b/openbsd/14.0.0/dependencies/libart-lgpl/Makefile
index 1586a51ca..18a066161 100644
--- a/openbsd/14.0.0/dependencies/libart-lgpl/Makefile
+++ b/openbsd/14.0.0/dependencies/libart-lgpl/Makefile
@@ -1,17 +1,20 @@
 .include </usr/ports/x11/trinity/trinity.port.mk>
 
-VERSION=		2.3.22
-REVISION=		1
 PKGNAME=		trinity-libart-lgpl-${VERSION}
-PREFIX=			${TDE_PREFIX}
+VERSION=		2.3.22${PREVERSION}
+PREVERSION=		~pre6+634771a9
 
-CATEGORIES=		x11/trinity
 COMMENT=		Library of functions for 2D graphics
+CATEGORIES=		x11/trinity/dependencies
+HOMEPAGE=		http://www.trinitydesktop.org/
+MAINTAINER=		François Andriot <francois.andriot@free.fr>
 
 MASTER_SITES=	http://nuc.vtf/tde/tde-tarballs/14.0.0/main/dependencies/
-DISTNAME=		trinity-libart-lgpl-14.0.0~pre6+634771a9
+DISTNAME=		trinity-libart-lgpl-${TDE_VERSION}${PREVERSION}
 EXTRACT_SUFX=	.tar.gz
 
+PREFIX=			${TDE_PREFIX}
+
 SHARED_LIBS +=        art_lgpl_2              5.21
 
 CONFIGURE_STYLE ?=      autoconf
diff --git a/openbsd/14.0.0/dependencies/libart-lgpl/distinfo b/openbsd/14.0.0/dependencies/libart-lgpl/distinfo
deleted file mode 100644
index 84293dbda..000000000
--- a/openbsd/14.0.0/dependencies/libart-lgpl/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (trinity-libart-lgpl-14.0.0~pre6+634771a9.tar.gz) = pi35jSqqq+RIXLyDDQ5sMszRm85qOG8qQBqACcc1W3I=
-SIZE (trinity-libart-lgpl-14.0.0~pre6+634771a9.tar.gz) = 407528
diff --git a/openbsd/14.0.0/dependencies/tqt3/Makefile b/openbsd/14.0.0/dependencies/tqt3/Makefile
index 7ae496ed3..885b0e96e 100644
--- a/openbsd/14.0.0/dependencies/tqt3/Makefile
+++ b/openbsd/14.0.0/dependencies/tqt3/Makefile
@@ -1,15 +1,20 @@
+.include </usr/ports/x11/trinity/trinity.port.mk>
+
 PKGNAME=		trinity-tqt3-${VERSION}
-VERSION=		3.5.0
-DISTNAME=		trinity-tqt3-14.0.0~pre219+16e2c768
-EXTRACT_SUFX=	.tar.gz
+VERSION=		3.5.0${PREVERSION}
+PREVERSION=		~pre221+117b166c
 
+COMMENT=		C++ X11 GUI toolkit
 CATEGORIES=		x11/trinity/dependencies
-MASTER_SITES=	http://nuc.vtf/tde/tde-tarballs/14.0.0/main/dependencies/
-
 HOMEPAGE=		http://www.trinitydesktop.org/
 MAINTAINER=		François Andriot <francois.andriot@free.fr>
 
-SHARED_LIBS =
+MASTER_SITES=	http://nuc.vtf/tde/tde-tarballs/14.0.0/main/dependencies/
+DISTNAME=		trinity-tqt3-${TDE_VERSION}${PREVERSION}
+EXTRACT_SUFX=	.tar.gz
+
+PREFIX=			${LOCALBASE}
+
 SHARED_LIBS += tqtdesignercore      1.0
 SHARED_LIBS += tqteditor            1.0
 SHARED_LIBS += tqassistantclient    1.0
diff --git a/openbsd/14.0.0/dependencies/tqt3/distinfo b/openbsd/14.0.0/dependencies/tqt3/distinfo
deleted file mode 100644
index 024a10a68..000000000
--- a/openbsd/14.0.0/dependencies/tqt3/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (trinity-tqt3-14.0.0~pre219+16e2c768.tar.gz) = OuJQLDc+nNpDptnmy0/Y3G4JJCk03W2sbE0YFbu7XTw=
-SIZE (trinity-tqt3-14.0.0~pre219+16e2c768.tar.gz) = 17542576
diff --git a/openbsd/14.0.0/dependencies/tqtinterface/Makefile b/openbsd/14.0.0/dependencies/tqtinterface/Makefile
index 120c7aec7..cff672ad2 100644
--- a/openbsd/14.0.0/dependencies/tqtinterface/Makefile
+++ b/openbsd/14.0.0/dependencies/tqtinterface/Makefile
@@ -1,37 +1,30 @@
 .include </usr/ports/x11/trinity/trinity.port.mk>
 
-VERSION=		${TDE_VERSION}
-REVISION=		1
 PKGNAME=		trinity-tqtinterface-${VERSION}
-PREFIX=			${LOCALBASE}
+VERSION=		4.2.0${PREVERSION}
+PREVERSION=		~pre188+15d1da6f
 
-CATEGORIES=		x11/trinity
+COMMENT=		Trinity QT intefarce
+CATEGORIES=		x11/trinity/dependencies
+HOMEPAGE=		http://www.trinitydesktop.org/
+MAINTAINER=		François Andriot <francois.andriot@free.fr>
 
 MASTER_SITES=	http://nuc.vtf/tde/tde-tarballs/14.0.0/main/dependencies/
-DISTNAME=		trinity-tqtinterface-14.0.0~pre185+b79cc765
+DISTNAME=		trinity-tqtinterface-${TDE_VERSION}${PREVERSION}
 EXTRACT_SUFX=	.tar.gz
 
+PREFIX=			${LOCALBASE}
+
 BUILD_DEPENDS= 	devel/gmake \
 				devel/cmake \
 				x11/trinity/dependencies/tqt3,-main
 
-SHARED_LIBS=			tqt                       4.2
+SHARED_LIBS=	tqt                       4.2
 
-MULTI_PACKAGES=	-main -devel
-
-# Main package
-PKGNAME-main=			trinity-tqtinterface-${VERSION}
-COMMENT-main=			Trinity QT intefarce
-RUN_DEPENDS-main=		textproc/gsed \
-						shells/bash \
-						x11/trinity/dependencies/tqt3,-main
-LIB_DEPENDS-main=		x11/trinity/dependencies/tqt3,-main
-
-# Development package
-PKGNAME-devel=			trinity-tqtinterface-devel-${VERSION}
-COMMENT-devel=			development files for Trinity QT interface
-LIB_DEPENDS-devel=		${BUILD_PKGPATH},-main
-RUN_DEPENDS-devel=		x11/trinity/dependencies/tqt3,-main
+RUN_DEPENDS=	textproc/gsed \
+				shells/bash \
+				x11/trinity/dependencies/tqt3,-main
+LIB_DEPENDS=	x11/trinity/dependencies/tqt3,-main
 
 # Build
 do-configure: tde-cmake-rmbuild
@@ -39,6 +32,7 @@ do-configure: tde-cmake-rmbuild
 		-DQTDIR="${LOCALBASE}/share/tqt3" \
 		-DQT_INCLUDE_DIR="${LOCALBASE}/include/tqt3" \
 		-DQT_LIBRARY_DIR="${LOCALBASE}/lib" \
+		-DQT_LIBRARIES="tqt-mt" \
 		\
 		-DCMAKE_INSTALL_PREFIX="${LOCALBASE}" \
 		-DPKGCONFIG_INSTALL_DIR="${LOCALBASE}/lib/pkgconfig" \
diff --git a/openbsd/14.0.0/dependencies/tqtinterface/distinfo b/openbsd/14.0.0/dependencies/tqtinterface/distinfo
deleted file mode 100644
index 4436b7045..000000000
--- a/openbsd/14.0.0/dependencies/tqtinterface/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (trinity-tqtinterface-14.0.0~pre185+b79cc765.tar.gz) = J73xHFQGtcB6NZhR8/s3A2Jue37irCCWXtJbIp8to6c=
-SIZE (trinity-tqtinterface-14.0.0~pre185+b79cc765.tar.gz) = 1354483
diff --git a/openbsd/14.0.0/dependencies/tqtinterface/pkg/DESCR-main b/openbsd/14.0.0/dependencies/tqtinterface/pkg/DESCR
index b6f890411..b6f890411 100644
--- a/openbsd/14.0.0/dependencies/tqtinterface/pkg/DESCR-main
+++ b/openbsd/14.0.0/dependencies/tqtinterface/pkg/DESCR
diff --git a/openbsd/14.0.0/dependencies/tqtinterface/pkg/DESCR-devel b/openbsd/14.0.0/dependencies/tqtinterface/pkg/DESCR-devel
deleted file mode 100644
index a7c76f52e..000000000
--- a/openbsd/14.0.0/dependencies/tqtinterface/pkg/DESCR-devel
+++ /dev/null
@@ -1 +0,0 @@
-Development files for Trinity QT Interface
diff --git a/openbsd/14.0.0/dependencies/tqtinterface/pkg/PLIST-devel b/openbsd/14.0.0/dependencies/tqtinterface/pkg/PLIST
index dbbdacb40..990dbfe2c 100644
--- a/openbsd/14.0.0/dependencies/tqtinterface/pkg/PLIST-devel
+++ b/openbsd/14.0.0/dependencies/tqtinterface/pkg/PLIST
@@ -1,4 +1,16 @@
 @comment $OpenBSD$
+bin/convert_qt_tqt1
+bin/convert_qt_tqt2
+bin/convert_qt_tqt3
+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/
 include/tqt/Qt/
 include/tqt/Qt/q3cstring.h
@@ -377,8 +389,11 @@ include/tqt/tqwmatrix.h
 include/tqt/tqworkspace.h
 include/tqt/tqxml.h
 lib/libtqt.la
+@lib lib/libtqt.so.${LIBtqt_VERSION}
 lib/pkgconfig/tqt.pc
 lib/pkgconfig/tqtqui.pc
+share/cmake/
+share/cmake/Modules/
 share/cmake/Modules/FindTDE.cmake
 share/cmake/Modules/FindTQt.cmake
 share/cmake/Modules/FindTQtQUI.cmake
diff --git a/openbsd/14.0.0/dependencies/tqtinterface/pkg/PLIST-main b/openbsd/14.0.0/dependencies/tqtinterface/pkg/PLIST-main
deleted file mode 100644
index 57657b7f4..000000000
--- a/openbsd/14.0.0/dependencies/tqtinterface/pkg/PLIST-main
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $OpenBSD$
-bin/convert_qt_tqt1
-bin/convert_qt_tqt2
-bin/convert_qt_tqt3
-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
-@lib lib/libtqt.so.${LIBtqt_VERSION}