git: cfd7db1acfd2 - main - math/qalculate: Rename to math/qalculate-gtk

From: Jason E. Hale <jhale_at_FreeBSD.org>
Date: Tue, 15 Mar 2022 03:48:30 UTC
The branch main has been updated by jhale:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cfd7db1acfd288cab70dcff1b3c6144ef52e5a66

commit cfd7db1acfd288cab70dcff1b3c6144ef52e5a66
Author:     Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2022-03-15 03:39:37 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2022-03-15 03:47:40 +0000

    math/qalculate: Rename to math/qalculate-gtk
    
    Match upstream project name and simplify Makefile.
---
 MOVED                                       |  1 +
 math/Makefile                               |  2 +-
 math/{qalculate => qalculate-gtk}/Makefile  | 11 ++---------
 math/{qalculate => qalculate-gtk}/distinfo  |  0
 math/{qalculate => qalculate-gtk}/pkg-descr |  0
 math/{qalculate => qalculate-gtk}/pkg-plist |  0
 6 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/MOVED b/MOVED
index b78e9f4e7134..4d7d97eaad73 100644
--- a/MOVED
+++ b/MOVED
@@ -16958,3 +16958,4 @@ databases/postgresql96-plpython||2022-03-11|Has expired: PostgreSQL-9.6 has reac
 databases/postgresql96-pltcl||2022-03-11|Has expired: PostgreSQL-9.6 has reached end-of-life
 databases/postgresql96-server||2022-03-11|Has expired: PostgreSQL-9.6 has reached end-of-life
 net-im/pidgin-bs|net-im/pidgin-bot-sentry|2022-03-13|Project was renamed
+math/qalculate|math/qalculate-gtk|2022-03-14|Renamed to match project name
diff --git a/math/Makefile b/math/Makefile
index 0707bcc29c00..bb9be988b65b 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -957,7 +957,7 @@
     SUBDIR += py-yt
     SUBDIR += py-z3-solver
     SUBDIR += pynac
-    SUBDIR += qalculate
+    SUBDIR += qalculate-gtk
     SUBDIR += qalculate-qt
     SUBDIR += qd
     SUBDIR += qhull
diff --git a/math/qalculate/Makefile b/math/qalculate-gtk/Makefile
similarity index 65%
rename from math/qalculate/Makefile
rename to math/qalculate-gtk/Makefile
index 8076344961ab..9745d8bb76d1 100644
--- a/math/qalculate/Makefile
+++ b/math/qalculate-gtk/Makefile
@@ -1,10 +1,9 @@
 # Created by: Sergey Akifyev <asa@gascom.ru>
 
-PORTNAME=	qalculate
+PORTNAME=	qalculate-gtk
 PORTVERSION=	4.0.0
 CATEGORIES=	math
-MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${PORTVERSION}/
-DISTNAME=	${GH_PROJECT}-${PORTVERSION}
+MASTER_SITES=	https://github.com/Qalculate/${PORTNAME}/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Multi-purpose desktop calculator (GTK+3 frontend)
@@ -20,13 +19,7 @@ USES=		compiler:c++11-lang gettext gmake gnome \
 		libtool:build localbase pkgconfig
 USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool libxml2
 
-# USE_GITHUB=	Use MASTER_SITES so that the pre-rolled release is downloaded
-GH_ACCOUNT=	Qalculate
-GH_PROJECT=	${PORTNAME}-gtk
-
 GNU_CONFIGURE=	yes
-DATADIR=	share/${GH_PROJECT}
-DOCSDIR=	share/doc/${GH_PROJECT}
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
diff --git a/math/qalculate/distinfo b/math/qalculate-gtk/distinfo
similarity index 100%
rename from math/qalculate/distinfo
rename to math/qalculate-gtk/distinfo
diff --git a/math/qalculate/pkg-descr b/math/qalculate-gtk/pkg-descr
similarity index 100%
rename from math/qalculate/pkg-descr
rename to math/qalculate-gtk/pkg-descr
diff --git a/math/qalculate/pkg-plist b/math/qalculate-gtk/pkg-plist
similarity index 100%
rename from math/qalculate/pkg-plist
rename to math/qalculate-gtk/pkg-plist