On Tue, Jan 28 2020, Stuart Henderson <[email protected]> wrote:
> On 2020/01/28 07:03, Rafael Sadowski wrote:
>> Yet another switch from qt4 to qt5. Update qgit to the latest stable
>> version from github.
>>
>> "QGit's project management has now moved to GitHub." --
>> http://libre.tibirna.org/
>>
>> Tested on amd64 with some git repos.
>>
>> OK?
[...]
> Don't set MASTER_SITES to a github.../archive/ URL yourself. If there
> is a proper tarball in .../releases or on another site then use that,
> otherwise set GH_*.
>
> In this case:
>
> GH_ACCOUNT=libtirna
> GH_PROJECT=qgit
> GH_TAGNAME=qgit-2.9
> DIATNAME=${GH_TAGNAME}
Also make plist strips a few directories, ok jca@ for the diff below.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/qgit/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile 12 Jul 2019 20:45:57 -0000 1.16
+++ Makefile 28 Jan 2020 10:21:57 -0000
@@ -1,34 +1,24 @@
# $OpenBSD: Makefile,v 1.16 2019/07/12 20:45:57 sthen Exp $
-COMMENT = qt git repository viewer
+COMMENT = Qt git repository viewer
-# XXX also change MASTER_SITES when updating
-DISTNAME = qgit-2.5
-REVISION = 1
+GH_ACCOUNT = tibirna
+GH_PROJECT = qgit
+GH_TAGNAME = qgit-2.9
+DISTNAME = ${GH_TAGNAME}
CATEGORIES = devel x11
-HOMEPAGE = http://libre.tibirna.org/projects/qgit
-
# GPLv2
PERMIT_PACKAGE = Yes
-WANTLIB += ICE QtGui SM X11 Xext Xi Xinerama Xrender c fontconfig
-WANTLIB += freetype m pthread ${COMPILER_LIBCXX}
-
-COMPILER = base-clang ports-gcc base-gcc
-
-MASTER_SITES = http://libre.tibirna.org/attachments/download/9/
-
-MODULES = devel/qmake x11/qt4
-
-RUN_DEPENDS = devel/git
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Widgets c m
-WRKSRC = ${WRKDIR}/redivivus
+MODULES = devel/cmake \
+ x11/qt5
-do-install:
- ${INSTALL_PROGRAM} ${WRKBUILD}/bin/qgit ${PREFIX}/bin/
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/qgit/
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/qgit/
+RUN_DEPENDS = devel/git \
+ devel/desktop-file-utils \
+ x11/gtk+3,-guic
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/qgit/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 19 Dec 2014 12:29:51 -0000 1.3
+++ distinfo 28 Jan 2020 10:21:57 -0000
@@ -1,2 +1,2 @@
-SHA256 (qgit-2.5.tar.gz) = JfHKKGDYQNh7mRnTT8OhsF1BY2ce2H0pw+SooJ4LJJk=
-SIZE (qgit-2.5.tar.gz) = 250855
+SHA256 (qgit-2.9.tar.gz) = aXiO/afUNNG8CUu0FL2SwmnceJQyYyBjRQCwXWPACOg=
+SIZE (qgit-2.9.tar.gz) = 263875
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/qgit/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 19 Dec 2014 12:29:51 -0000 1.2
+++ pkg/PLIST 28 Jan 2020 10:21:57 -0000
@@ -1,4 +1,8 @@
@comment $OpenBSD: PLIST,v 1.2 2014/12/19 12:29:51 jca Exp $
@bin bin/qgit
-share/doc/qgit/
-share/doc/qgit/README
+share/applications/qgit.desktop
+share/icons/hicolor/48x48/apps/qgit.png
+share/metainfo/
+share/metainfo/qgit.appdata.xml
+@tag update-desktop-database
+@tag gtk-update-icon-cache %D/share/icons/hicolor
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE