ports-mgmt/octopkg: Update to 0.3.1

Changelog:
  https://github.com/aarnt/octopkg/releases/tag/v0.3.0
  https://github.com/aarnt/octopkg/releases/tag/v0.3.1

PR:		248835
Approved by:	maintainer timeout

4 files changed, 28 insertions, 67 deletions

diff --git a/ports-mgmt/octopkg/Makefile b/ports-mgmt/octopkg/Makefile
index ea63adbd7799..374b94688efc 100644
--- a/ports-mgmt/octopkg/Makefile
+++ b/ports-mgmt/octopkg/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	octopkg
-PORTVERSION=	0.2.0
-PORTREVISION=	7
+PORTVERSION=	0.3.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	ports-mgmt
 
@@ -13,23 +12,38 @@ COMMENT=	Graphical front-end to the FreeBSD pkg-ng package manager
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+USES=		qmake compiler:c++11-lib qt:5
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	aarnt
 
-USE_QT=		core concurrent declarative gui network xml widgets concurrent \
+USE_QT=		core concurrent declarative gui linguist network xml widgets \
 		buildtools_build
-USES=		qmake compiler:c++11-lib qt:5
 
-PLIST_FILES=	bin/${PORTNAME} share/pixmaps/octopi_green.png
+PLIST_FILES=	bin/${PORTNAME} \
+		lib/${PORTNAME}/${PORTNAME}-doas \
+		share/applications/${PORTNAME}.desktop
+
+post-patch:
+	${REINPLACE_CMD} 's#/usr/lib#${PREFIX}/lib#' \
+		${WRKSRC}/src/strconstants.cpp
+	${REINPLACE_CMD} 's#/usr/local#${PREFIX}#' \
+		${WRKSRC}/src/constants.h \
+		${WRKSRC}/src/main.cpp
+
+do-configure:
+	cd ${WRKSRC} && ${QMAKE_ENV} ${QMAKE} ${QMAKE_ARGS}
+	cd ${WRKSRC}/doas && ${QMAKE_ENV} ${QMAKE} ${QMAKE_ARGS}
 
-DESKTOP_ENTRIES=	"OctoPkg" "A powerful pkgng front-end" \
-			"${PREFIX}/share/pixmaps/octopi_green.png" \
-			"${PORTNAME}" "System;" false
+do-build:
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS}
+	cd ${WRKSRC}/doas && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS}
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/resources/images/octopi_green.png \
-		${STAGEDIR}${PREFIX}/share/pixmaps/
+	${INSTALL_PROGRAM} ${WRKSRC}/doas/${PORTNAME}-doas ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop \
+		${STAGEDIR}${PREFIX}/share/applications
 
 .include <bsd.port.mk>
diff --git a/ports-mgmt/octopkg/distinfo b/ports-mgmt/octopkg/distinfo
index 1cf362a4c4d8..5f298bcead03 100644
--- a/ports-mgmt/octopkg/distinfo
+++ b/ports-mgmt/octopkg/distinfo
@@ -1,2 +1,3 @@
-SHA256 (aarnt-octopkg-v0.2.0_GH0.tar.gz) = 91da866a033ce767562b271dade024e607e5561e27475c2a6d23f9792e7d3511
-SIZE (aarnt-octopkg-v0.2.0_GH0.tar.gz) = 157609
+TIMESTAMP = 1604135135
+SHA256 (aarnt-octopkg-v0.3.1_GH0.tar.gz) = a3270b7dd39d21130e2c958c9b564ff7875441baafbf21cfec052b1505c5124e
+SIZE (aarnt-octopkg-v0.3.1_GH0.tar.gz) = 350822
diff --git a/ports-mgmt/octopkg/files/patch-git_5f02bb3e b/ports-mgmt/octopkg/files/patch-git_5f02bb3e
deleted file mode 100644
index 6135990f0fa9..000000000000
--- a/ports-mgmt/octopkg/files/patch-git_5f02bb3e
+++ /dev/null
@@ -1,37 +0,0 @@
-Sent upstream: https://github.com/aarnt/octopkg/pull/4
-
-commit 5f02bb3e504d1d3560ee5a7a3d7c0f90b25adac5
-Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-Date:   Thu Jan 21 13:27:57 2016 +0100
-
-    QtSolutions: Fix build with Qt 5.5.1.
-
-    Import commit ad9bc4600 to the qt-solutions git repository:
-      QtSingleApplication: Fix build with Qt 5.5 due to the QDataStream
-      include cleanup.
-
-    This fixes the following error:
-
-    src/QtSolutions/qtlocalpeer.cpp:159:17: error: variable has incomplete type 'QDataStream'
-        QDataStream ds(&socket);
-                    ^
-    /usr/local/include/qt5/QtCore/qglobal.h:570:7: note: forward declaration of 'QDataStream'
-    class QDataStream;
-          ^
-    src/QtSolutions/qtlocalpeer.cpp:179:17: error: variable has incomplete type 'QDataStream'
-        QDataStream ds(socket);
-                    ^
-    /usr/local/include/qt5/QtCore/qglobal.h:570:7: note: forward declaration of 'QDataStream'
-    class QDataStream;
-          ^
-
---- src/QtSolutions/qtlocalpeer.cpp
-+++ src/QtSolutions/qtlocalpeer.cpp
-@@ -40,6 +40,7 @@
- 
- #include "qtlocalpeer.h"
- #include <QtCore/QCoreApplication>
-+#include <QtCore/QDataStream>
- #include <QtCore/QTime>
- #include <QRegularExpression>
- 
diff --git a/ports-mgmt/octopkg/files/patch-git_b93ad1a b/ports-mgmt/octopkg/files/patch-git_b93ad1a
deleted file mode 100644
index 7d9867ce5f87..000000000000
--- a/ports-mgmt/octopkg/files/patch-git_b93ad1a
+++ /dev/null
@@ -1,17 +0,0 @@
-Sent upstream: https://github.com/aarnt/octopkg/pull/7
-
-From b93ad1a5a1a05717d4e6e7d0d292f9e0a3679987 Mon Sep 17 00:00:00 2001
-From: "Jason E. Hale" <jhale@FreeBSD.org>
-Date: Thu, 30 Aug 2018 23:00:37 -0400
-Subject: [PATCH] Fix build with Qt 5.11
-
---- src/transactiondialog.cpp.orig
-+++ src/transactiondialog.cpp
-@@ -24,6 +24,7 @@
- 
- #include <QMessageBox>
- #include <QPushButton>
-+#include <QRegularExpression>
- #include <QDialog>
- #include <QCloseEvent>
-