Sat Jul 23 06:40:08 2022 UTC ()
gimp-devel: make PKGNAME match directory name

Requested by David H. Gutteridge


(wiz)
diff -r1.363 -r1.364 pkgsrc/graphics/gimp/Makefile
diff -r1.1 -r1.2 pkgsrc/graphics/gimp-devel/Makefile
diff -r1.1 -r1.2 pkgsrc/graphics/gimp-devel/buildlink3.mk
cvs diff -r1.363 -r1.364 pkgsrc/graphics/gimp/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/gimp/Makefile 2022/07/14 23:46:22 1.363
+++ pkgsrc/graphics/gimp/Makefile 2022/07/23 06:40:08 1.364
@@ -1,31 +1,32 @@ @@ -1,31 +1,32 @@
1# $NetBSD: Makefile,v 1.363 2022/07/14 23:46:22 dholland Exp $ 1# $NetBSD: Makefile,v 1.364 2022/07/23 06:40:08 wiz Exp $
2 2
3DISTNAME= gimp-2.10.32 3DISTNAME= gimp-2.10.32
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= https://download.gimp.org/pub/gimp/v${PKGVERSION_NOREV:R}/ 6MASTER_SITES= https://download.gimp.org/pub/gimp/v${PKGVERSION_NOREV:R}/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= adam@NetBSD.org 9MAINTAINER= adam@NetBSD.org
10HOMEPAGE= https://www.gimp.org/ 10HOMEPAGE= https://www.gimp.org/
11COMMENT= The GNU image manipulation program 11COMMENT= The GNU image manipulation program
12LICENSE= gnu-lgpl-v3 AND gnu-gpl-v3 12LICENSE= gnu-lgpl-v3 AND gnu-gpl-v3
13 13
14BUILD_DEPENDS+= vera-ttf-[0-9]*:../../fonts/vera-ttf 14BUILD_DEPENDS+= vera-ttf-[0-9]*:../../fonts/vera-ttf
15TOOL_DEPENDS+= gettext-tools>=0.19:../../devel/gettext-tools 15TOOL_DEPENDS+= gettext-tools>=0.19:../../devel/gettext-tools
16TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 16TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
17DEPENDS+= glib-networking>=2.36.2:../../net/glib-networking 17DEPENDS+= glib-networking>=2.36.2:../../net/glib-networking
18CONFLICTS+= gimp<=1.2.3 18
 19CONFLICTS+= gimp-devel-[0-9]*
19 20
20USE_LANGUAGES+= c c++14 21USE_LANGUAGES+= c c++14
21USE_LIBTOOL= yes 22USE_LIBTOOL= yes
22USE_PKGLOCALEDIR= yes 23USE_PKGLOCALEDIR= yes
23 24
24USE_TOOLS+= gmake pkg-config perl 25USE_TOOLS+= gmake pkg-config perl
25USE_TOOLS+= intltool msgfmt msgmerge xgettext 26USE_TOOLS+= intltool msgfmt msgmerge xgettext
26USE_TOOLS+= gdbus-codegen 27USE_TOOLS+= gdbus-codegen
27 28
28GNU_CONFIGURE= yes 29GNU_CONFIGURE= yes
29 30
30CONFIGURE_ARGS+= --disable-alsatest 31CONFIGURE_ARGS+= --disable-alsatest
31CONFIGURE_ARGS+= --disable-glibtest 32CONFIGURE_ARGS+= --disable-glibtest
cvs diff -r1.1 -r1.2 pkgsrc/graphics/gimp-devel/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/gimp-devel/Makefile 2022/07/22 20:18:54 1.1
+++ pkgsrc/graphics/gimp-devel/Makefile 2022/07/23 06:40:08 1.2
@@ -1,32 +1,35 @@ @@ -1,32 +1,35 @@
1# $NetBSD: Makefile,v 1.1 2022/07/22 20:18:54 wiz Exp $ 1# $NetBSD: Makefile,v 1.2 2022/07/23 06:40:08 wiz Exp $
2 2
3DISTNAME= gimp-2.99.10 3DISTNAME= gimp-2.99.10
 4PKGNAME= ${DISTNAME:S/gimp/gimp-devel/}
4CATEGORIES= graphics 5CATEGORIES= graphics
5MASTER_SITES= https://download.gimp.org/pub/gimp/v${PKGVERSION_NOREV:R}/ 6MASTER_SITES= https://download.gimp.org/pub/gimp/v${PKGVERSION_NOREV:R}/
6EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
7 8
8MAINTAINER= adam@NetBSD.org 9MAINTAINER= adam@NetBSD.org
9HOMEPAGE= https://www.gimp.org/ 10HOMEPAGE= https://www.gimp.org/
10COMMENT= The GNU image manipulation program (development version) 11COMMENT= The GNU image manipulation program (development version)
11LICENSE= gnu-lgpl-v3 AND gnu-gpl-v3 12LICENSE= gnu-lgpl-v3 AND gnu-gpl-v3
12 13
13BUILD_DEPENDS+= vera-ttf-[0-9]*:../../fonts/vera-ttf 14BUILD_DEPENDS+= vera-ttf-[0-9]*:../../fonts/vera-ttf
14TOOL_DEPENDS+= gettext-tools>=0.19:../../devel/gettext-tools 15TOOL_DEPENDS+= gettext-tools>=0.19:../../devel/gettext-tools
15TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 16TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
16DEPENDS+= glib-networking>=2.36.2:../../net/glib-networking 17DEPENDS+= glib-networking>=2.36.2:../../net/glib-networking
17DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils 18DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils
18DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3 19DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
19 20
 21CONFLICTS+= gimp-[0-9]*
 22
20USE_LANGUAGES+= c c++14 23USE_LANGUAGES+= c c++14
21USE_LIBTOOL= yes 24USE_LIBTOOL= yes
22USE_PKGLOCALEDIR= yes 25USE_PKGLOCALEDIR= yes
23 26
24USE_TOOLS+= gmake pkg-config perl 27USE_TOOLS+= gmake pkg-config perl
25USE_TOOLS+= intltool msgfmt msgmerge xgettext 28USE_TOOLS+= intltool msgfmt msgmerge xgettext
26USE_TOOLS+= gdbus-codegen 29USE_TOOLS+= gdbus-codegen
27 30
28GNU_CONFIGURE= yes 31GNU_CONFIGURE= yes
29 32
30CONFIGURE_ARGS+= --disable-alsatest 33CONFIGURE_ARGS+= --disable-alsatest
31CONFIGURE_ARGS+= --disable-glibtest 34CONFIGURE_ARGS+= --disable-glibtest
32CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 35CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
cvs diff -r1.1 -r1.2 pkgsrc/graphics/gimp-devel/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/graphics/gimp-devel/buildlink3.mk 2022/07/22 20:18:54 1.1
+++ pkgsrc/graphics/gimp-devel/buildlink3.mk 2022/07/23 06:40:08 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: buildlink3.mk,v 1.1 2022/07/22 20:18:54 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.2 2022/07/23 06:40:08 wiz Exp $
2 2
3BUILDLINK_TREE+= gimp 3BUILDLINK_TREE+= gimp-devel
4 4
5.if !defined(GIMP_BUILDLINK3_MK) 5.if !defined(GIMP_DEVEL_BUILDLINK3_MK)
6GIMP_BUILDLINK3_MK:= 6GIMP_DEVEL_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.gimp+= gimp>=2.99 8BUILDLINK_API_DEPENDS.gimp-devel+= gimp-devel>=2.99.10
9BUILDLINK_PKGSRCDIR.gimp?= ../../graphics/gimp-devel 9BUILDLINK_PKGSRCDIR.gimp-devel?= ../../graphics/gimp-devel
10 10
11.include "../../graphics/gegl/buildlink3.mk" 11.include "../../graphics/gegl/buildlink3.mk"
12.include "../../x11/gtk3/buildlink3.mk" 12.include "../../x11/gtk3/buildlink3.mk"
13.endif # GIMP_BUILDLINK3_MK 13.endif # GIMP_DEVEL_BUILDLINK3_MK
14 14
15BUILDLINK_TREE+= -gimp 15BUILDLINK_TREE+= -gimp-devel