cool-retro-term: rename cool-retro-term-git -> cool-retro-term

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: cool-retro-term: rename cool-retro-term-git -> cool-retro-term
From: Paul Ripke <stix%stix.id.au@localhost>
Date: Sat, 6 Jul 2024 04:15:15 +0000
Module Name:	pkgsrc-wip
Committed By:	Paul Ripke <stix%stix.id.au@localhost>
Pushed By:	stix
Date:		Sat Jul 6 14:13:40 2024 +1000
Changeset:	1a540a6f5d4c15ecf3190e7f61bdde20ec20d9e1

Modified Files:
	Makefile
Added Files:
	cool-retro-term/DESCR
	cool-retro-term/Makefile
	cool-retro-term/PLIST
	cool-retro-term/distinfo
	cool-retro-term/patches/patch-qmltermwidget_lib_kpty.cpp
Removed Files:
	cool-retro-term-git/DESCR
	cool-retro-term-git/Makefile
	cool-retro-term-git/PLIST
	cool-retro-term-git/distinfo
	cool-retro-term-git/patches/patch-qmltermwidget_lib_kpty.cpp

Log Message:
cool-retro-term: rename cool-retro-term-git -> cool-retro-term

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1a540a6f5d4c15ecf3190e7f61bdde20ec20d9e1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                           |  2 +-
 cool-retro-term-git/DESCR                          |  3 --
 cool-retro-term-git/Makefile                       | 48 ----------------------
 cool-retro-term-git/PLIST                          | 48 ----------------------
 cool-retro-term-git/distinfo                       |  9 ----
 .../patches/patch-qmltermwidget_lib_kpty.cpp       | 17 --------
 cool-retro-term/DESCR                              |  3 ++
 cool-retro-term/Makefile                           | 48 ++++++++++++++++++++++
 cool-retro-term/PLIST                              | 48 ++++++++++++++++++++++
 cool-retro-term/distinfo                           |  9 ++++
 .../patches/patch-qmltermwidget_lib_kpty.cpp       | 17 ++++++++
 11 files changed, 126 insertions(+), 126 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 70a4cabc49..43edd83e32 100644
--- a/Makefile
+++ b/Makefile
@@ -547,7 +547,7 @@ SUBDIR+=	conky
 SUBDIR+=	consul
 SUBDIR+=	contacts
 SUBDIR+=	convertall
-SUBDIR+=	cool-retro-term-git
+SUBDIR+=	cool-retro-term
 SUBDIR+=	cops
 SUBDIR+=	copytape
 SUBDIR+=	coreclr-git
diff --git a/cool-retro-term-git/DESCR b/cool-retro-term-git/DESCR
deleted file mode 100644
index 161b0e9ba4..0000000000
--- a/cool-retro-term-git/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-cool-retro-term is a terminal emulator which mimics the look and feel
-of the old cathode tube screens. It has been designed to be eye-candy,
-customizable, and reasonably lightweight.
diff --git a/cool-retro-term-git/Makefile b/cool-retro-term-git/Makefile
deleted file mode 100644
index 4946e3f991..0000000000
--- a/cool-retro-term-git/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# $NetBSD$
-
-PKGVERSION=		1.2.0
-PKGNAME=		cool-retro-term-${PKGVERSION}
-CATEGORIES=		x11
-
-MAINTAINER=		stix%stix.id.au@localhost
-HOMEPAGE=		https://github.com/Swordfish90/cool-retro-term
-COMMENT=		Terminal emulator which mimics old cathode display artifacts
-LICENSE=		gnu-gpl-v3
-
-MASTER_SITES=		${MASTER_SITE_GITHUB:=Swordfish90/}
-TERM_TAG=		${PKGVERSION}
-QMLTERMWIDGET_TAG=	63228027e1f97c24abb907550b22ee91836929c5
-DISTFILES+=		${TERM_TAG}.tar.gz
-DISTFILES+=		${QMLTERMWIDGET_TAG}.tar.gz
-DIST_SUBDIR=		cool-retro-term
-SITES.${TERM_TAG}.tar.gz= \
-			${MASTER_SITE_GITHUB:=Swordfish90/cool-retro-term/archive/}
-SITES.${QMLTERMWIDGET_TAG}.tar.gz= \
-			${MASTER_SITE_GITHUB:=Swordfish90/qmltermwidget/archive/}
-WRKSRC=			${WRKDIR}/cool-retro-term-${TERM_TAG}
-
-SUBST_CLASSES+=		usrpath
-SUBST_STAGE.usrpath=	pre-configure
-SUBST_FILES.usrpath+=	app/app.pro
-SUBST_FILES.usrpath+=	cool-retro-term.pro
-SUBST_SED.usrpath=	-e "s|/usr/|${PREFIX}/|g"
-
-DEPENDS+=		qt5-qtgraphicaleffects-[0-9]*:../../x11/qt5-qtgraphicaleffects
-
-ICON_THEMES=		yes
-USE_LANGUAGES=		c c++
-USE_TOOLS+=		pax
-MAKE_FLAGS+=		INSTALL_ROOT=${DESTDIR} sysconfdir=${PREFIX}/share
-
-post-extract:
-	# Move git submodule into the correct location.
-	${MV} ${WRKDIR}/qmltermwidget-${QMLTERMWIDGET_TAG}/* ${WRKSRC}/qmltermwidget/
-
-do-configure:
-	cd ${WRKSRC} && ${QTDIR}/bin/qmake
-
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qtdeclarative/buildlink3.mk"
-.include "../../x11/qt5-qtquickcontrols2/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/cool-retro-term-git/PLIST b/cool-retro-term-git/PLIST
deleted file mode 100644
index cf58739577..0000000000
--- a/cool-retro-term-git/PLIST
+++ /dev/null
@@ -1,48 +0,0 @@
-@comment $NetBSD$
-bin/cool-retro-term
-qt5/qml/QMLTermWidget/QMLTermScrollbar.qml
-qt5/qml/QMLTermWidget/color-schemes/BlackOnLightYellow.colorscheme
-qt5/qml/QMLTermWidget/color-schemes/BlackOnRandomLight.colorscheme
-qt5/qml/QMLTermWidget/color-schemes/BlackOnWhite.colorscheme
-qt5/qml/QMLTermWidget/color-schemes/BreezeModified.colorscheme
-qt5/qml/QMLTermWidget/color-schemes/DarkPastels.colorscheme
-qt5/qml/QMLTermWidget/color-schemes/GreenOnBlack.colorscheme
-qt5/qml/QMLTermWidget/color-schemes/Linux.colorscheme
-qt5/qml/QMLTermWidget/color-schemes/Solarized.colorscheme
-qt5/qml/QMLTermWidget/color-schemes/SolarizedLight.colorscheme
-qt5/qml/QMLTermWidget/color-schemes/Tango.colorscheme
-qt5/qml/QMLTermWidget/color-schemes/Ubuntu.colorscheme
-qt5/qml/QMLTermWidget/color-schemes/WhiteOnBlack.colorscheme
-qt5/qml/QMLTermWidget/color-schemes/cool-retro-term.colorscheme
-qt5/qml/QMLTermWidget/color-schemes/historic/BlackOnLightColor.schema
-qt5/qml/QMLTermWidget/color-schemes/historic/DarkPicture.schema
-qt5/qml/QMLTermWidget/color-schemes/historic/Example.Schema
-qt5/qml/QMLTermWidget/color-schemes/historic/GreenOnBlack.schema
-qt5/qml/QMLTermWidget/color-schemes/historic/GreenTint.schema
-qt5/qml/QMLTermWidget/color-schemes/historic/GreenTint_MC.schema
-qt5/qml/QMLTermWidget/color-schemes/historic/LightPicture.schema
-qt5/qml/QMLTermWidget/color-schemes/historic/Linux.schema
-qt5/qml/QMLTermWidget/color-schemes/historic/README.Schema
-qt5/qml/QMLTermWidget/color-schemes/historic/README.default.Schema
-qt5/qml/QMLTermWidget/color-schemes/historic/Transparent.schema
-qt5/qml/QMLTermWidget/color-schemes/historic/Transparent_MC.schema
-qt5/qml/QMLTermWidget/color-schemes/historic/Transparent_darkbg.schema
-qt5/qml/QMLTermWidget/color-schemes/historic/Transparent_lightbg.schema
-qt5/qml/QMLTermWidget/color-schemes/historic/XTerm.schema
-qt5/qml/QMLTermWidget/color-schemes/historic/syscolor.schema
-qt5/qml/QMLTermWidget/color-schemes/historic/vim.schema
-qt5/qml/QMLTermWidget/kb-layouts/README
-qt5/qml/QMLTermWidget/kb-layouts/default.keytab
-qt5/qml/QMLTermWidget/kb-layouts/historic/vt100.keytab
-qt5/qml/QMLTermWidget/kb-layouts/historic/x11r5.keytab
-qt5/qml/QMLTermWidget/kb-layouts/linux.keytab
-qt5/qml/QMLTermWidget/kb-layouts/macbook.keytab
-qt5/qml/QMLTermWidget/kb-layouts/solaris.keytab
-qt5/qml/QMLTermWidget/kb-layouts/vt420pc.keytab
-qt5/qml/QMLTermWidget/libqmltermwidget.so
-qt5/qml/QMLTermWidget/qmldir
-share/applications/cool-retro-term.desktop
-share/icons/hicolor/128x128/apps/cool-retro-term.png
-share/icons/hicolor/256x256/apps/cool-retro-term.png
-share/icons/hicolor/32x32/apps/cool-retro-term.png
-share/icons/hicolor/64x64/apps/cool-retro-term.png
diff --git a/cool-retro-term-git/distinfo b/cool-retro-term-git/distinfo
deleted file mode 100644
index cb4e3d548a..0000000000
--- a/cool-retro-term-git/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD$
-
-BLAKE2s (cool-retro-term/1.2.0.tar.gz) = 5962c9ba6f8968faee92f92fe919794794e0d720cf4d491fa6b91ab410bcaf7e
-SHA512 (cool-retro-term/1.2.0.tar.gz) = 21d3551d429380b026f8003652d78d186e5ac7079d3f143fe7f8f0c57876df263e5c40f218577ef236da859e779699f766414949591ecab38921caec5fd59209
-Size (cool-retro-term/1.2.0.tar.gz) = 1996540 bytes
-BLAKE2s (cool-retro-term/63228027e1f97c24abb907550b22ee91836929c5.tar.gz) = d0e43ff75eccc8a2e4b1e4a2ab9bf46bb580654e824e9ea4d77d6e842772cefc
-SHA512 (cool-retro-term/63228027e1f97c24abb907550b22ee91836929c5.tar.gz) = 7b80ef2cba24d4ceaf50ebb4adc69efe54919ef9a0dfa49ce766f56c3500ad200468db76676dd048cd3e41209b3a06b3ef5505c64d683702bf181ff8ec82c07e
-Size (cool-retro-term/63228027e1f97c24abb907550b22ee91836929c5.tar.gz) = 235028 bytes
-SHA1 (patch-qmltermwidget_lib_kpty.cpp) = 583d9718f0902e244ced73f6ee04145313e552ed
diff --git a/cool-retro-term-git/patches/patch-qmltermwidget_lib_kpty.cpp b/cool-retro-term-git/patches/patch-qmltermwidget_lib_kpty.cpp
deleted file mode 100644
index 676617b368..0000000000
--- a/cool-retro-term-git/patches/patch-qmltermwidget_lib_kpty.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-Switch NetBSD from pty to pts terminal ops.
-
---- qmltermwidget/lib/kpty.cpp.orig	2022-03-02 01:05:10.815701940 +0000
-+++ qmltermwidget/lib/kpty.cpp
-@@ -39,7 +39,9 @@
- #if defined(__NetBSD__)
- #define HAVE_LOGIN
- #define HAVE_UTIL_H
--#define HAVE_OPENPTY
-+#define HAVE_PTSNAME
-+#define HAVE_UNLOCKPT
-+#define HAVE_GRANTPT
- #endif
- 
- #if defined(__APPLE__)
diff --git a/cool-retro-term/DESCR b/cool-retro-term/DESCR
new file mode 100644
index 0000000000..161b0e9ba4
--- /dev/null
+++ b/cool-retro-term/DESCR
@@ -0,0 +1,3 @@
+cool-retro-term is a terminal emulator which mimics the look and feel
+of the old cathode tube screens. It has been designed to be eye-candy,
+customizable, and reasonably lightweight.
diff --git a/cool-retro-term/Makefile b/cool-retro-term/Makefile
new file mode 100644
index 0000000000..4946e3f991
--- /dev/null
+++ b/cool-retro-term/Makefile
@@ -0,0 +1,48 @@
+# $NetBSD$
+
+PKGVERSION=		1.2.0
+PKGNAME=		cool-retro-term-${PKGVERSION}
+CATEGORIES=		x11
+
+MAINTAINER=		stix%stix.id.au@localhost
+HOMEPAGE=		https://github.com/Swordfish90/cool-retro-term
+COMMENT=		Terminal emulator which mimics old cathode display artifacts
+LICENSE=		gnu-gpl-v3
+
+MASTER_SITES=		${MASTER_SITE_GITHUB:=Swordfish90/}
+TERM_TAG=		${PKGVERSION}
+QMLTERMWIDGET_TAG=	63228027e1f97c24abb907550b22ee91836929c5
+DISTFILES+=		${TERM_TAG}.tar.gz
+DISTFILES+=		${QMLTERMWIDGET_TAG}.tar.gz
+DIST_SUBDIR=		cool-retro-term
+SITES.${TERM_TAG}.tar.gz= \
+			${MASTER_SITE_GITHUB:=Swordfish90/cool-retro-term/archive/}
+SITES.${QMLTERMWIDGET_TAG}.tar.gz= \
+			${MASTER_SITE_GITHUB:=Swordfish90/qmltermwidget/archive/}
+WRKSRC=			${WRKDIR}/cool-retro-term-${TERM_TAG}
+
+SUBST_CLASSES+=		usrpath
+SUBST_STAGE.usrpath=	pre-configure
+SUBST_FILES.usrpath+=	app/app.pro
+SUBST_FILES.usrpath+=	cool-retro-term.pro
+SUBST_SED.usrpath=	-e "s|/usr/|${PREFIX}/|g"
+
+DEPENDS+=		qt5-qtgraphicaleffects-[0-9]*:../../x11/qt5-qtgraphicaleffects
+
+ICON_THEMES=		yes
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		pax
+MAKE_FLAGS+=		INSTALL_ROOT=${DESTDIR} sysconfdir=${PREFIX}/share
+
+post-extract:
+	# Move git submodule into the correct location.
+	${MV} ${WRKDIR}/qmltermwidget-${QMLTERMWIDGET_TAG}/* ${WRKSRC}/qmltermwidget/
+
+do-configure:
+	cd ${WRKSRC} && ${QTDIR}/bin/qmake
+
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtdeclarative/buildlink3.mk"
+.include "../../x11/qt5-qtquickcontrols2/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/cool-retro-term/PLIST b/cool-retro-term/PLIST
new file mode 100644
index 0000000000..cf58739577
--- /dev/null
+++ b/cool-retro-term/PLIST
@@ -0,0 +1,48 @@
+@comment $NetBSD$
+bin/cool-retro-term
+qt5/qml/QMLTermWidget/QMLTermScrollbar.qml
+qt5/qml/QMLTermWidget/color-schemes/BlackOnLightYellow.colorscheme
+qt5/qml/QMLTermWidget/color-schemes/BlackOnRandomLight.colorscheme
+qt5/qml/QMLTermWidget/color-schemes/BlackOnWhite.colorscheme
+qt5/qml/QMLTermWidget/color-schemes/BreezeModified.colorscheme
+qt5/qml/QMLTermWidget/color-schemes/DarkPastels.colorscheme
+qt5/qml/QMLTermWidget/color-schemes/GreenOnBlack.colorscheme
+qt5/qml/QMLTermWidget/color-schemes/Linux.colorscheme
+qt5/qml/QMLTermWidget/color-schemes/Solarized.colorscheme
+qt5/qml/QMLTermWidget/color-schemes/SolarizedLight.colorscheme
+qt5/qml/QMLTermWidget/color-schemes/Tango.colorscheme
+qt5/qml/QMLTermWidget/color-schemes/Ubuntu.colorscheme
+qt5/qml/QMLTermWidget/color-schemes/WhiteOnBlack.colorscheme
+qt5/qml/QMLTermWidget/color-schemes/cool-retro-term.colorscheme
+qt5/qml/QMLTermWidget/color-schemes/historic/BlackOnLightColor.schema
+qt5/qml/QMLTermWidget/color-schemes/historic/DarkPicture.schema
+qt5/qml/QMLTermWidget/color-schemes/historic/Example.Schema
+qt5/qml/QMLTermWidget/color-schemes/historic/GreenOnBlack.schema
+qt5/qml/QMLTermWidget/color-schemes/historic/GreenTint.schema
+qt5/qml/QMLTermWidget/color-schemes/historic/GreenTint_MC.schema
+qt5/qml/QMLTermWidget/color-schemes/historic/LightPicture.schema
+qt5/qml/QMLTermWidget/color-schemes/historic/Linux.schema
+qt5/qml/QMLTermWidget/color-schemes/historic/README.Schema
+qt5/qml/QMLTermWidget/color-schemes/historic/README.default.Schema
+qt5/qml/QMLTermWidget/color-schemes/historic/Transparent.schema
+qt5/qml/QMLTermWidget/color-schemes/historic/Transparent_MC.schema
+qt5/qml/QMLTermWidget/color-schemes/historic/Transparent_darkbg.schema
+qt5/qml/QMLTermWidget/color-schemes/historic/Transparent_lightbg.schema
+qt5/qml/QMLTermWidget/color-schemes/historic/XTerm.schema
+qt5/qml/QMLTermWidget/color-schemes/historic/syscolor.schema
+qt5/qml/QMLTermWidget/color-schemes/historic/vim.schema
+qt5/qml/QMLTermWidget/kb-layouts/README
+qt5/qml/QMLTermWidget/kb-layouts/default.keytab
+qt5/qml/QMLTermWidget/kb-layouts/historic/vt100.keytab
+qt5/qml/QMLTermWidget/kb-layouts/historic/x11r5.keytab
+qt5/qml/QMLTermWidget/kb-layouts/linux.keytab
+qt5/qml/QMLTermWidget/kb-layouts/macbook.keytab
+qt5/qml/QMLTermWidget/kb-layouts/solaris.keytab
+qt5/qml/QMLTermWidget/kb-layouts/vt420pc.keytab
+qt5/qml/QMLTermWidget/libqmltermwidget.so
+qt5/qml/QMLTermWidget/qmldir
+share/applications/cool-retro-term.desktop
+share/icons/hicolor/128x128/apps/cool-retro-term.png
+share/icons/hicolor/256x256/apps/cool-retro-term.png
+share/icons/hicolor/32x32/apps/cool-retro-term.png
+share/icons/hicolor/64x64/apps/cool-retro-term.png
diff --git a/cool-retro-term/distinfo b/cool-retro-term/distinfo
new file mode 100644
index 0000000000..cb4e3d548a
--- /dev/null
+++ b/cool-retro-term/distinfo
@@ -0,0 +1,9 @@
+$NetBSD$
+
+BLAKE2s (cool-retro-term/1.2.0.tar.gz) = 5962c9ba6f8968faee92f92fe919794794e0d720cf4d491fa6b91ab410bcaf7e
+SHA512 (cool-retro-term/1.2.0.tar.gz) = 21d3551d429380b026f8003652d78d186e5ac7079d3f143fe7f8f0c57876df263e5c40f218577ef236da859e779699f766414949591ecab38921caec5fd59209
+Size (cool-retro-term/1.2.0.tar.gz) = 1996540 bytes
+BLAKE2s (cool-retro-term/63228027e1f97c24abb907550b22ee91836929c5.tar.gz) = d0e43ff75eccc8a2e4b1e4a2ab9bf46bb580654e824e9ea4d77d6e842772cefc
+SHA512 (cool-retro-term/63228027e1f97c24abb907550b22ee91836929c5.tar.gz) = 7b80ef2cba24d4ceaf50ebb4adc69efe54919ef9a0dfa49ce766f56c3500ad200468db76676dd048cd3e41209b3a06b3ef5505c64d683702bf181ff8ec82c07e
+Size (cool-retro-term/63228027e1f97c24abb907550b22ee91836929c5.tar.gz) = 235028 bytes
+SHA1 (patch-qmltermwidget_lib_kpty.cpp) = 583d9718f0902e244ced73f6ee04145313e552ed
diff --git a/cool-retro-term/patches/patch-qmltermwidget_lib_kpty.cpp b/cool-retro-term/patches/patch-qmltermwidget_lib_kpty.cpp
new file mode 100644
index 0000000000..676617b368
--- /dev/null
+++ b/cool-retro-term/patches/patch-qmltermwidget_lib_kpty.cpp
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Switch NetBSD from pty to pts terminal ops.
+
+--- qmltermwidget/lib/kpty.cpp.orig	2022-03-02 01:05:10.815701940 +0000
++++ qmltermwidget/lib/kpty.cpp
+@@ -39,7 +39,9 @@
+ #if defined(__NetBSD__)
+ #define HAVE_LOGIN
+ #define HAVE_UTIL_H
+-#define HAVE_OPENPTY
++#define HAVE_PTSNAME
++#define HAVE_UNLOCKPT
++#define HAVE_GRANTPT
+ #endif
+ 
+ #if defined(__APPLE__)
Prev by Date: cool-retro-term: Fix building outside of wip.
Next by Date: ladybird-git: switch to new upstream location
Previous by Thread: cool-retro-term: Fix building outside of wip.
Next by Thread: ladybird-git: switch to new upstream location
Indexes:
Home | Main Index | Thread Index | Old Index