Hi,

Here's an update to cool-retro-term.

The current package crashes on startup; it's missing USE_WXNEEDED.
It also needs some qt5 runtime dependencies.

Aside from the update, I also moved it to the "multiple MASTER_SITES"
method to handle Github submodules. Self-hosting the distfile is
undesirable since it requires some extra maintenance and also keeps
portroach from working.

ok?

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/cool-retro-term/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile    27 Jul 2017 10:15:28 -0000      1.12
+++ Makefile    4 Jan 2018 05:52:54 -0000
@@ -1,9 +1,19 @@
 # $OpenBSD: Makefile,v 1.12 2017/07/27 10:15:28 sthen Exp $
 
 COMMENT =      good looking terminal emulator which mimics old CRT displays
-DISTNAME =     cool-retro-term-1.0.0
+
 CATEGORIES =   x11
-REVISION =     7
+
+GH_ACCOUNT =   Swordfish90
+GH_PROJECT =   cool-retro-term
+GH_TAGNAME =   1.0.1
+
+QMLTERMWIDGET =        08958f7c83a7d05627f623b8904f3e79a0b7366b
+MASTER_SITES0 =        https://github.com/Swordfish90/qmltermwidget/archive/
+DISTFILES =    ${DISTNAME}${EXTRACT_SUFX} \
+               ${QMLTERMWIDGET}.tar.gz:0
+
+USE_WXNEEDED = Yes
 
 HOMEPAGE =     https://github.com/Swordfish90/cool-retro-term
 
@@ -14,18 +24,22 @@ WANTLIB += GL Qt5Core Qt5Gui Qt5Network 
 WANTLIB += Qt5Widgets c m pthread
 WANTLIB += ${COMPILER_LIBCXX}
 
-MASTER_SITES = http://mirrors.nycbug.org/pub/distfiles/
-
 MODULES =      devel/qmake x11/qt5
 
 RUN_DEPENDS =  devel/desktop-file-utils \
-               x11/gtk+3,-guic
+               x11/gtk+3,-guic \
+               x11/qt5/qtgraphicaleffects \
+               x11/qt5/qtquickcontrols
 
 LIB_DEPENDS =  x11/qt5/qtdeclarative
 
 MAKE_FLAGS =   CXX="${CXX}" CXXFLAGS="${CXXFLAGS} -fPIC -std=c++11"
 
 NO_TEST =      Yes
+
+post-extract:
+       rmdir ${WRKSRC}/qmltermwidget
+       ln -s ${WRKDIR}/qmltermwidget-${QMLTERMWIDGET} ${WRKSRC}/qmltermwidget
 
 pre-configure:
         ${SUBST_CMD} ${WRKSRC}/{app/app,cool-retro-term}.pro
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/cool-retro-term/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo    21 Mar 2015 19:14:40 -0000      1.1.1.1
+++ distinfo    4 Jan 2018 05:52:54 -0000
@@ -1,2 +1,4 @@
-SHA256 (cool-retro-term-1.0.0.tar.gz) = 
8L+p+NbJ6YhspUjUeQeda7Y58T8s/wtKgh+NnM+WOB4=
-SIZE (cool-retro-term-1.0.0.tar.gz) = 8004781
+SHA256 (08958f7c83a7d05627f623b8904f3e79a0b7366b.tar.gz) = 
Xx/Q8f9kLkC+6wSeOOYKF5pSeXCxKv3Q0uPjRUzWX8A=
+SHA256 (cool-retro-term-1.0.1.tar.gz) = 
Rc11bGG7buOud5byIdqNKxN+R/AMPSSDnQrAHtGaa0I=
+SIZE (08958f7c83a7d05627f623b8904f3e79a0b7366b.tar.gz) = 209653
+SIZE (cool-retro-term-1.0.1.tar.gz) = 7735425
Index: patches/patch-qmltermwidget_lib_ProcessInfo_cpp
===================================================================
RCS file: patches/patch-qmltermwidget_lib_ProcessInfo_cpp
diff -N patches/patch-qmltermwidget_lib_ProcessInfo_cpp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-qmltermwidget_lib_ProcessInfo_cpp     4 Jan 2018 05:52:54 
-0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: qmltermwidget/lib/ProcessInfo.cpp
+--- qmltermwidget/lib/ProcessInfo.cpp.orig
++++ qmltermwidget/lib/ProcessInfo.cpp
+@@ -27,6 +27,7 @@
+ #include <unistd.h>
+ #include <pwd.h>
+ #include <sys/param.h>
++#include <errno.h>
+ 
+ // Qt
+ #include <QtCore/QDir>
Index: patches/patch-qmltermwidget_lib_kpty_cpp
===================================================================
RCS file: patches/patch-qmltermwidget_lib_kpty_cpp
diff -N patches/patch-qmltermwidget_lib_kpty_cpp
--- patches/patch-qmltermwidget_lib_kpty_cpp    21 Mar 2015 19:14:40 -0000      
1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-qmltermwidget_lib_kpty_cpp,v 1.1.1.1 2015/03/21 19:14:40 
bcallah Exp $
-
-Sent upstream.
-
---- qmltermwidget/lib/kpty.cpp.orig    Fri Jan 30 14:50:56 2015
-+++ qmltermwidget/lib/kpty.cpp Fri Jan 30 14:51:43 2015
-@@ -27,9 +27,14 @@
- #include <QtDebug>
- 
- 
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || 
defined(__DragonFly__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- #define HAVE_LOGIN
- #define HAVE_LIBUTIL_H
-+#endif
-+
-+#if defined(__OpenBSD__)
-+#define HAVE_LOGIN
-+#define HAVE_UTIL_H
- #endif
- 
- #ifdef __sgi
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/cool-retro-term/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   21 Mar 2015 19:14:40 -0000      1.1.1.1
+++ pkg/PLIST   4 Jan 2018 05:52:54 -0000
@@ -1,7 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2015/03/21 19:14:40 bcallah Exp $
 @bin bin/cool-retro-term
-lib/qt5/
-lib/qt5/qml/
 lib/qt5/qml/QMLTermWidget/
 lib/qt5/qml/QMLTermWidget/QMLTermScrollbar.qml
 lib/qt5/qml/QMLTermWidget/color-schemes/

Reply via email to