On Wed, Jul 03, 2019 at 09:37:11PM +0000, ornx wrote:
> I noticed that the Quassel IRC client was not in the ports collection,
> so I thought I would take the port previously written by Chuck Burns
> (https://marc.info/?l=openbsd-ports&m=140875982720994&w=2) and update
> it to the latest version, as well as make some modifications. Quassel
> is a distributed IRC client, which means that it is split into a
> daemon (quasselcore) which handles the actual IRC connection, stores
> logs, etc, as well as a graphical client (quasselclient) which
> connects to the daemon and downloads the logs and handles input from
> the user. There is also a "monolithic" client, which combines these
> two parts to form a typical IRC client so that you don't need to
> fiddle with configuring a daemon in order to use the program. The
> previously posted version of this port used MULTI_PACKAGES, but since
> QT version 5 no longer seems to be split up into various libraries
> in OpenBSD, all three programs now share the same dependencies
> (x11/qt5/qtbase and x11/qt5/qtscript, as well as cmake). Therefore, I
> have removed the MULTI_PACKAGES feature and changed it so it always
> just installs all three programs (quasselcore, quasselclient, and the
> monolithic client). I also made some minor changes to the rc script.
> This is my first OpenBSD port, so I'm sure I've probably done at least
> something wrong, so I welcome any feedback or criticism.
I don't usually work with C++/Qt5 ports, so this feedback will probably
be incomplete. I'm also not really familiar with whether removing the
MULTI_PACKAGES is good or not.
That said, I made a number of changes.
PKGNAME is unnecessary since it defaults to being DISTNAME, and you have
them being identical, so I removed it.
I switch the HOMEPAGE and MASTER_SITES to use the https version of the
pages, as is the preference now.
Changed it to use the new PERMIT_PACKAGE rather than the obsolete
PERMIT_PACKAGE_CDROM.
I rearranged the line to better fit what is in Makefile.template.
You were missing x11/qt5 on the MODULES line. You were also missing
a number of WANTLIB entries. "make port-lib-depends-check" was
instrumental in finding and fixing those. They go in alphabetical order.
The devel/cmake module automatically adds devel/cmake to BUILD_DEPENDS
so I deleted that line. The *_DEPENDS lines should have one dependency
per line. I split those up. They should also be listed alphabetically
by category and then port name. The x11/* BUILD_DEPENDS are actually
RUN_DEPENDS so they got moved there.
Once I had all the WANTLIBS ironed out, I regenerated the PLIST.
I did only the simplest run test on quasselclient, but it seemed to
work.
I'm attaching an updated version of the tarball but including a diff
between what you sent and what I ended up with to make it easier to see
all the changes.
I hope it helps. I'm sure a more experienced porter may chime in with
things I missed.
--Kurt
diff -uNpr quassel/Makefile quassel-kmos/Makefile
--- quassel/Makefile Tue Jul 2 20:36:50 2019
+++ quassel-kmos/Makefile Wed Jul 3 23:11:40 2019
@@ -5,30 +5,36 @@ COMMENT = distributed IRC client
V = 0.13.1
DISTNAME = quassel-${V}
-PKGNAME = quassel-${V}
CATEGORIES = net
-HOMEPAGE = http://quassel-irc.org
+HOMEPAGE = https://quassel-irc.org
MAINTAINER = ornx <ornx@protonmail.com>
# GPLv2/3
-PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE = Yes
-BUILD_DEPENDS += x11/qt5/qtbase x11/qt5/qtscript devel/cmake
-RUN_DEPENDS += devel/desktop-file-utils x11/gtk+3,-guic
-MODULES = devel/cmake
+WANTLIB = ${COMPILER_LIBCXX} c m execinfo pthread \
+ Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Script \
+ Qt5Sql Qt5Widgets z
+MASTER_SITES = https://quassel-irc.org/pub/
+
+EXTRACT_SUFX = .tar.bz2
+
+MODULES = devel/cmake x11/qt5
+RUN_DEPENDS += devel/desktop-file-utils \
+ devel/libexecinfo \
+ x11/gtk+3,-guic \
+ x11/qt5/qtbase \
+ x11/qt5/qtscript
+
CONFIGURE_ARGS += -DWANT_CORE=ON \
-DWANT_QTCLIENT=ON \
-DWANT_MONO=ON \
-DWITH_OPENSSL=ON \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_PREFIX_PATH=${LOCALBASE}/lib/qt5/cmake/
-
-MASTER_SITES = http://quassel-irc.org/pub/
-
-EXTRACT_SUFX = .tar.bz2
NO_TEST = Yes
diff -uNpr quassel/pkg/PLIST quassel-kmos/pkg/PLIST
--- quassel/pkg/PLIST Tue Jul 2 20:32:14 2019
+++ quassel-kmos/pkg/PLIST Wed Jul 3 22:56:58 2019
@@ -3,28 +3,13 @@
@bin bin/quassel
@bin bin/quasselclient
@bin bin/quasselcore
-share/applications/
share/applications/quassel.desktop
share/applications/quasselclient.desktop
-share/icons/
-share/icons/hicolor/
-share/icons/hicolor/128x128/
-share/icons/hicolor/128x128/apps/
share/icons/hicolor/128x128/apps/quassel.png
-share/icons/hicolor/16x16/
-share/icons/hicolor/16x16/apps/
share/icons/hicolor/16x16/apps/quassel.png
-share/icons/hicolor/22x22/
-share/icons/hicolor/22x22/apps/
share/icons/hicolor/22x22/apps/quassel.png
-share/icons/hicolor/32x32/
-share/icons/hicolor/32x32/apps/
share/icons/hicolor/32x32/apps/quassel.png
-share/icons/hicolor/48x48/
-share/icons/hicolor/48x48/apps/
share/icons/hicolor/48x48/apps/quassel.png
-share/icons/hicolor/64x64/
-share/icons/hicolor/64x64/apps/
share/icons/hicolor/64x64/apps/quassel.png
share/quassel/
share/quassel/icons/
@@ -587,4 +572,42 @@ share/quassel/stylesheets/
share/quassel/stylesheets/LinuxDolt-bluestheme.qss
share/quassel/stylesheets/default.qss
share/quassel/stylesheets/jussi01-darktheme.qss
-share/quassel/stylesheets/m4yer.qss
\ No newline at end of file
+share/quassel/stylesheets/m4yer.qss
+share/quassel/translations/
+share/quassel/translations/cs.qm
+share/quassel/translations/da.qm
+share/quassel/translations/de.qm
+share/quassel/translations/el.qm
+share/quassel/translations/en_GB.qm
+share/quassel/translations/en_US.qm
+share/quassel/translations/eo.qm
+share/quassel/translations/es.qm
+share/quassel/translations/et.qm
+share/quassel/translations/fi.qm
+share/quassel/translations/fr.qm
+share/quassel/translations/gl.qm
+share/quassel/translations/hi.qm
+share/quassel/translations/hu.qm
+share/quassel/translations/it.qm
+share/quassel/translations/ja.qm
+share/quassel/translations/ko.qm
+share/quassel/translations/lt.qm
+share/quassel/translations/mr.qm
+share/quassel/translations/nb.qm
+share/quassel/translations/nl.qm
+share/quassel/translations/oc.qm
+share/quassel/translations/pa.qm
+share/quassel/translations/pl.qm
+share/quassel/translations/pt.qm
+share/quassel/translations/pt_BR.qm
+share/quassel/translations/ro.qm
+share/quassel/translations/ru.qm
+share/quassel/translations/sl.qm
+share/quassel/translations/sq.qm
+share/quassel/translations/sr.qm
+share/quassel/translations/sv.qm
+share/quassel/translations/tr.qm
+share/quassel/translations/uk.qm
+share/quassel/translations/zh_CN.qm
+@tag update-desktop-database
+@tag gtk-update-icon-cache %D/share/icons/hicolor
No comments:
Post a Comment