From 0e3d5ce2d0c33a8d437fcb0e1bfc4b18ecf88332 Mon Sep 17 00:00:00 2001
From: Makoto Fujiwara <makoto@ki.nu>
Date: Mon, 28 Sep 2020 08:29:32 +0900
Subject: [PATCH] (x11/gnustep-gui) Name PKGNAME as x11/gnustep-gui

---
 libs-gui/Makefile      |  3 ++-
 libs-gui/buildlink3.mk | 18 +++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/libs-gui/Makefile b/libs-gui/Makefile
index d635f5cd83..8722a6df65 100644
--- a/libs-gui/Makefile
+++ b/libs-gui/Makefile
@@ -3,7 +3,8 @@
 GITHUB_PROJECT=	libs-gui
 GITHUB_TAG=	gui-0_28_0
 DISTNAME=	gui-0_28_0
-PKGNAME=	${GITHUB_PROJECT}-${DISTNAME:S/gui-//:S/_/./g}
+#PKGNAME=	${GITHUB_PROJECT}-${DISTNAME:S/gui-/-/:S/_/./g}
+PKGNAME=	gnustep-${DISTNAME:S/_/./g}
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=gnustep/}
 DIST_SUBDIR=	gnustep-gui
diff --git a/libs-gui/buildlink3.mk b/libs-gui/buildlink3.mk
index b7439ee246..ed100ed162 100644
--- a/libs-gui/buildlink3.mk
+++ b/libs-gui/buildlink3.mk
@@ -1,15 +1,15 @@
-# $NetBSD$
+# $NetBSD: buildlink3.mk,v 1.34 2020/06/02 08:23:02 adam Exp $
 
-BUILDLINK_TREE+=	libs-gui
+BUILDLINK_TREE+=	gnustep-gui
 
-.if !defined(LIBS_GUI_BUILDLINK3_MK)
-LIBS_GUI_BUILDLINK3_MK:=
+.if !defined(GNUSTEP_GUI_BUILDLINK3_MK)
+GNUSTEP_GUI_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libs-gui+=	libs-gui>=0.28
-BUILDLINK_ABI_DEPENDS.libs-gui+=	libs-gui>=0.28
-BUILDLINK_PKGSRCDIR.libs-gui?=		../../wip/libs-gui
+BUILDLINK_API_DEPENDS.gnustep-gui+=	gnustep-gui>=0.28
+BUILDLINK_ABI_DEPENDS.gnustep-gui+=	gnustep-gui>=0.28
+BUILDLINK_PKGSRCDIR.gnustep-gui?=	../../x11/gnustep-gui
 
 .include "../../devel/gnustep-base/buildlink3.mk"
-.endif # LIBS_GUI_BUILDLINK3_MK
+.endif # GNUSTEP_GUI_BUILDLINK3_MK
 
-BUILDLINK_TREE+=	-libs-gui
+BUILDLINK_TREE+=	-gnustep-gui