Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1658558408254840"
MIME-Version: 1.0
Date: Sat, 23 Jul 2022 06:40:08 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/graphics
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20220723064008.EB07CFB1A@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1658558408254840
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Sat Jul 23 06:40:08 UTC 2022

Modified Files:
	pkgsrc/graphics/gimp: Makefile
	pkgsrc/graphics/gimp-devel: Makefile buildlink3.mk

Log Message:
gimp-devel: make PKGNAME match directory name

Requested by David H. Gutteridge


To generate a diff of this commit:
cvs rdiff -u -r1.363 -r1.364 pkgsrc/graphics/gimp/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/gimp-devel/Makefile \
    pkgsrc/graphics/gimp-devel/buildlink3.mk

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


--_----------=_1658558408254840
Content-Disposition: inline
Content-Length: 2669
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/graphics/gimp/Makefile
diff -u pkgsrc/graphics/gimp/Makefile:1.363 pkgsrc/graphics/gimp/Makefile:1.364
--- pkgsrc/graphics/gimp/Makefile:1.363	Thu Jul 14 23:46:22 2022
+++ pkgsrc/graphics/gimp/Makefile	Sat Jul 23 06:40:08 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.363 2022/07/14 23:46:22 dholland Exp $
+# $NetBSD: Makefile,v 1.364 2022/07/23 06:40:08 wiz Exp $
 
 DISTNAME=	gimp-2.10.32
 PKGREVISION=	1
@@ -15,7 +15,8 @@ BUILD_DEPENDS+=	vera-ttf-[0-9]*:../../fo
 TOOL_DEPENDS+=	gettext-tools>=0.19:../../devel/gettext-tools
 TOOL_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
 DEPENDS+=	glib-networking>=2.36.2:../../net/glib-networking
-CONFLICTS+=	gimp<=1.2.3
+
+CONFLICTS+=	gimp-devel-[0-9]*
 
 USE_LANGUAGES+=		c c++14
 USE_LIBTOOL=		yes

Index: pkgsrc/graphics/gimp-devel/Makefile
diff -u pkgsrc/graphics/gimp-devel/Makefile:1.1 pkgsrc/graphics/gimp-devel/Makefile:1.2
--- pkgsrc/graphics/gimp-devel/Makefile:1.1	Fri Jul 22 20:18:54 2022
+++ pkgsrc/graphics/gimp-devel/Makefile	Sat Jul 23 06:40:08 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2022/07/22 20:18:54 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2022/07/23 06:40:08 wiz Exp $
 
 DISTNAME=	gimp-2.99.10
+PKGNAME=	${DISTNAME:S/gimp/gimp-devel/}
 CATEGORIES=	graphics
 MASTER_SITES=	https://download.gimp.org/pub/gimp/v${PKGVERSION_NOREV:R}/
 EXTRACT_SUFX=	.tar.bz2
@@ -17,6 +18,8 @@ DEPENDS+=	glib-networking>=2.36.2:../../
 DEPENDS+=	xdg-utils-[0-9]*:../../misc/xdg-utils
 DEPENDS+=	${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
 
+CONFLICTS+=	gimp-[0-9]*
+
 USE_LANGUAGES+=		c c++14
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
Index: pkgsrc/graphics/gimp-devel/buildlink3.mk
diff -u pkgsrc/graphics/gimp-devel/buildlink3.mk:1.1 pkgsrc/graphics/gimp-devel/buildlink3.mk:1.2
--- pkgsrc/graphics/gimp-devel/buildlink3.mk:1.1	Fri Jul 22 20:18:54 2022
+++ pkgsrc/graphics/gimp-devel/buildlink3.mk	Sat Jul 23 06:40:08 2022
@@ -1,15 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1 2022/07/22 20:18:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2022/07/23 06:40:08 wiz Exp $
 
-BUILDLINK_TREE+=	gimp
+BUILDLINK_TREE+=	gimp-devel
 
-.if !defined(GIMP_BUILDLINK3_MK)
-GIMP_BUILDLINK3_MK:=
+.if !defined(GIMP_DEVEL_BUILDLINK3_MK)
+GIMP_DEVEL_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gimp+=	gimp>=2.99
-BUILDLINK_PKGSRCDIR.gimp?=	../../graphics/gimp-devel
+BUILDLINK_API_DEPENDS.gimp-devel+=	gimp-devel>=2.99.10
+BUILDLINK_PKGSRCDIR.gimp-devel?=	../../graphics/gimp-devel
 
 .include "../../graphics/gegl/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
-.endif # GIMP_BUILDLINK3_MK
+.endif	# GIMP_DEVEL_BUILDLINK3_MK
 
-BUILDLINK_TREE+=	-gimp
+BUILDLINK_TREE+=	-gimp-devel


--_----------=_1658558408254840--