CVS commit: pkgsrc/graphics/gimp

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Mar  6 13:35:15 UTC 2020

Modified Files:
        pkgsrc/graphics/gimp: Makefile

Log Message:
gimp: try to fix the build

- gimp looks for mypaint-brushes-1.0 but we have mypaint-brushes-2.0 now
- don't include archivers/xz/buidlink3.mk twice


To generate a diff of this commit:
cvs rdiff -u -r1.321 -r1.322 pkgsrc/graphics/gimp/Makefile

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

Modified files:

Index: pkgsrc/graphics/gimp/Makefile
diff -u pkgsrc/graphics/gimp/Makefile:1.321 pkgsrc/graphics/gimp/Makefile:1.322
--- pkgsrc/graphics/gimp/Makefile:1.321 Wed Mar  4 22:07:26 2020
+++ pkgsrc/graphics/gimp/Makefile       Fri Mar  6 13:35:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.321 2020/03/04 22:07:26 wiz Exp $
+# $NetBSD: Makefile,v 1.322 2020/03/06 13:35:15 tnn Exp $
 
 DISTNAME=      gimp-2.10.18
 PKGREVISION=   1
@@ -59,13 +59,16 @@ PLIST_SUBST+=       GIMP_DEBUG_TOOL_DIR="bin"
 PLIST_SUBST+=  GIMP_DEBUG_TOOL_DIR="libexec"
 .endif
 
+pre-configure:
+       ln -s mypaint-brushes-2.0.pc    \
+         ${BUILDLINK_DIR}/share/pkgconfig/mypaint-brushes-1.0.pc
+       
 .include "options.mk"
 .include "../../archivers/xz/buildlink3.mk"
 BUILDLINK_API_DEPENDS.freetype2+=      freetype2>=2.8.1
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
-.include "../../archivers/xz/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.fontconfig+=     fontconfig>=2.12.4
 .include "../../fonts/fontconfig/buildlink3.mk"