cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

@rsadowski pointed out the version we have in ports is old, even it has

Browse Source 
a much higher version number than current ones, don't know where that came
from. This updates to the recent version, now using Qt5.

comments and OK rsadowski@
This commit is contained in:
sebastia 2020-02-03 12:40:23 +00:00
parent b51a04f7fb
commit 38002cf70b
4 changed files with 78 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
misc/dtcltiny/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.11 2019/07/12 20:47:49 sthen Exp $
# $OpenBSD: Makefile,v 1.12 2020/02/03 12:40:23 sebastia Exp $
COMMENT = small SRCP client to control digital model trains
DISTNAME = dtcltiny-0.8.4
REVISION= 3
EPOCH = 0
DISTNAME = dtcltiny-0.4.5
CATEGORIES = misc x11
HOMEPAGE = http://dtcltiny.sourceforge.net/
@ -14,12 +14,12 @@ PERMIT_PACKAGE = Yes
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=dtcltiny/}
MODULES = x11/qt3
WANTLIB += ICE SM X11 Xext c m png pthread ${COMPILER_LIBCXX} z
MODULES = x11/qt5
WANTLIB += c m pthread ${COMPILER_LIBCXX}
WANTLIB += Qt5Core Qt5Gui Qt5Network Qt5Widgets
COMPILER = base-clang ports-gcc base-gcc
SEPARATE_BUILD = Yes
USE_GMAKE = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ENV = LDFLAGS=-L${LOCALBASE}/lib CFLAGS=-I${LOCALBASE}/include \

4
misc/dtcltiny/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (dtcltiny-0.8.4.tar.gz) = hOmHeVEQszM2/tmCf8ujkEaCTuy7w7ra9JTU2P2koWs=
SIZE (dtcltiny-0.8.4.tar.gz) = 377902
SHA256 (dtcltiny-0.4.5.tar.gz) = m5KCrrsXEq99W/ZpZRcsA1NWWRW5YAbS/u7l51XiBxk=
SIZE (dtcltiny-0.4.5.tar.gz) = 364820

61
misc/dtcltiny/patches/patch-src_srcpmessage_cpp Normal file
View File

@ -0,0 +1,61 @@
$OpenBSD: patch-src_srcpmessage_cpp,v 1.1 2020/02/03 12:40:23 sebastia Exp $
work around gcc vs. clang:
error: addition of default argument on redeclaration makes this constructor a default constructor
see: https://stackoverflow.com/questions/18313509/default-argument-gcc-vs-clang
Index: src/srcpmessage.cpp
--- src/srcpmessage.cpp.orig
+++ src/srcpmessage.cpp
@@ -553,9 +553,9 @@ unsigned int GaMessage::getValue() const
* INIT <bus> GL <addr> <prot> <protv> <maxsteps> <fcount>
* 0 1 2 3 4 5 6 7
*/
-GlMessage::GlMessage(Type type = mtGlInit, unsigned int abus = 1,
- unsigned int addr = 1, Protocol prot = proDCC, unsigned int pv = 1,
- unsigned int maxvs = 14, unsigned int fc = 1):
+GlMessage::GlMessage(Type type, unsigned int abus,
+ unsigned int addr, Protocol prot, unsigned int pv,
+ unsigned int maxvs, unsigned int fc):
SrcpMessage(type, abus), address(addr), protocol(prot),
pversion(pv), maxvsteps(maxvs), fcount(fc), fmap(0)
{
@@ -566,10 +566,10 @@ GlMessage::GlMessage(Type type = mtGlInit, unsigned in
* SET <bus> GL <addr> <drivemode> <currentv> <maxv> <f1> . . <fn>
* 0 1 2 3 4 5 6 7
*/
-GlMessage::GlMessage(Type type = mtGlInit, unsigned int abus = 1,
- unsigned int addr = 1, unsigned int fc = 1, unsigned int dm = 1,
- unsigned int cv = 0, unsigned int mv = 14,
- unsigned int map = 0):
+GlMessage::GlMessage(Type type, unsigned int abus,
+ unsigned int addr, unsigned int fc, unsigned int dm,
+ unsigned int cv, unsigned int mv,
+ unsigned int map):
SrcpMessage(type, abus), address(addr), fcount(fc), drivemode(dm),
currentv(cv), maxv(mv), fmap(map)
{
@@ -579,9 +579,9 @@ GlMessage::GlMessage(Type type = mtGlInit, unsigned in
* SET <bus> GL <addr> <drivemode> <currentv> <maxv> <f1> . . <fn>
* 0 1 2 3 4 5 6 7
*/
-GlMessage::GlMessage(Type type = mtGlInit, unsigned int abus = 1,
- unsigned int addr = 1, unsigned int dm = 1,
- unsigned int cv = 0, unsigned int mv = 14, bool f0 = false):
+GlMessage::GlMessage(Type type, unsigned int abus,
+ unsigned int addr, unsigned int dm,
+ unsigned int cv, unsigned int mv, bool f0):
SrcpMessage(type, abus), address(addr), drivemode(dm),
currentv(cv), maxv(mv), fmap(0)
{
@@ -773,8 +773,8 @@ void GlMessage::setFunctionMap(unsigned int map = 0)
* TERM <bus> GL <addr>
* 0 1 2 3
*/
-GlMessage::GlMessage(Type type = mtGlGet, unsigned int abus = 1,
- unsigned int addr = 1):
+GlMessage::GlMessage(Type type, unsigned int abus,
+ unsigned int addr):
SrcpMessage(type, abus), address(addr)
{
}

21
misc/dtcltiny/pkg/PLIST
View File

@ -1,27 +1,22 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2011/03/17 14:00:56 sebastia Exp $
@comment $OpenBSD: PLIST,v 1.2 2020/02/03 12:40:23 sebastia Exp $
@bin bin/dtcltiny
@comment man/de/
@comment man/de/man1/
@comment @man man/de/man1/dtcltiny.1
@man man/man1/dtcltiny.1
share/doc/dtcltiny/
share/doc/dtcltiny/emergency.png
share/doc/dtcltiny/index.de.html
share/doc/dtcltiny/index.html
share/doc/dtcltiny/locodialog1.png
share/doc/dtcltiny/locodialog2.png
share/doc/dtcltiny/locodialog3.png
share/doc/dtcltiny/main-tiny.de.png
share/doc/dtcltiny/main-tiny.png
share/doc/dtcltiny/start_layout.png
share/doc/dtcltiny/stop_layout.png
share/dtcltiny/
share/dtcltiny/0coupl.xpm
share/dtcltiny/0light.xpm
share/dtcltiny/0shunt.xpm
share/dtcltiny/0smoke.xpm
share/dtcltiny/0sound.xpm
share/dtcltiny/1coupl.xpm
share/dtcltiny/1light.xpm
share/dtcltiny/1shunt.xpm
share/dtcltiny/1smoke.xpm
share/dtcltiny/1sound.xpm
share/dtcltiny/decoders
share/dtcltiny/dtcltiny_de.qm
share/dtcltiny/locopixmaps/
share/dtcltiny/locopixmaps/103.xpm
share/dtcltiny/locopixmaps/110.xpm
@ -36,6 +31,8 @@ share/dtcltiny/locopixmaps/v100.xpm
share/dtcltiny/locopixmaps/v160.xpm
share/dtcltiny/locopixmaps/v60.xpm
share/dtcltiny/protocols
share/dtcltiny/translations/
share/dtcltiny/translations/dtcltiny_de.qm
share/pixmaps/
share/pixmaps/dtcltiny_16.xpm
share/pixmaps/dtcltiny_32.xpm