[pkgsrc/trunk]: pkgsrc/graphics/gimp gimp: PLIST fix; pkglint fixes

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5bfc744e4dbe
branches:  trunk
changeset: 450007:5bfc744e4dbe
user:      adam <adam%pkgsrc.org@localhost>
date:      Fri Apr 09 07:02:58 2021 +0000

description:
gimp: PLIST fix; pkglint fixes

diffstat:

 graphics/gimp/Makefile      |  12 ++++++------
 graphics/gimp/PLIST         |   4 ++--
 graphics/gimp/buildlink3.mk |   6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diffs (81 lines):

diff -r fb8a77f9d09d -r 5bfc744e4dbe graphics/gimp/Makefile
--- a/graphics/gimp/Makefile    Fri Apr 09 06:54:56 2021 +0000
+++ b/graphics/gimp/Makefile    Fri Apr 09 07:02:58 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.338 2021/04/09 06:55:01 wiz Exp $
+# $NetBSD: Makefile,v 1.339 2021/04/09 07:02:58 adam Exp $
 
 DISTNAME=      gimp-2.10.24
 PKGREVISION=   2
@@ -60,9 +60,9 @@
 .endif
 
 pre-configure:
-       ln -s mypaint-brushes-2.0.pc    \
-         ${BUILDLINK_DIR}/share/pkgconfig/mypaint-brushes-1.0.pc
-       
+       ${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
@@ -96,7 +96,7 @@
 .include "../../print/poppler-glib/buildlink3.mk"
 .include "../../textproc/iso-codes/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
-.if !empty(PKG_BUILD_OPTIONS.gtk2:Mx11)
+.if ${PKG_BUILD_OPTIONS.gtk2:Mx11}
 PLIST.remote=  yes
 .include "../../x11/libICE/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
@@ -106,7 +106,7 @@
 CONFIGURE_ARGS+=       --without-xmc
 CONFIGURE_ARGS+=       --without-libxpm
 .endif
-.if !empty(PKG_BUILD_OPTIONS.gtk2:Mquartz)
+.if ${PKG_BUILD_OPTIONS.gtk2:Mquartz}
 .include "../../x11/gtk-mac-integration/buildlink3.mk"
 .endif
 .include "../../mk/pthread.buildlink3.mk"
diff -r fb8a77f9d09d -r 5bfc744e4dbe graphics/gimp/PLIST
--- a/graphics/gimp/PLIST       Fri Apr 09 06:54:56 2021 +0000
+++ b/graphics/gimp/PLIST       Fri Apr 09 07:02:58 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.73 2021/04/03 05:32:52 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.74 2021/04/09 07:02:58 adam Exp $
 bin/gimp
 bin/gimp-2.10
 bin/gimp-console
@@ -321,7 +321,7 @@
 lib/gimp/2.0/plug-ins/file-xbm/file-xbm
 ${PLIST.remote}lib/gimp/2.0/plug-ins/file-xmc/file-xmc
 ${PLIST.remote}lib/gimp/2.0/plug-ins/file-xpm/file-xpm
-${PLIST.remote}lib/gimp/2.0/plug-ins/file-xwd/file-xwd
+lib/gimp/2.0/plug-ins/file-xwd/file-xwd
 lib/gimp/2.0/plug-ins/film/film
 lib/gimp/2.0/plug-ins/filter-pack/filter-pack
 lib/gimp/2.0/plug-ins/flame/flame
diff -r fb8a77f9d09d -r 5bfc744e4dbe graphics/gimp/buildlink3.mk
--- a/graphics/gimp/buildlink3.mk       Fri Apr 09 06:54:56 2021 +0000
+++ b/graphics/gimp/buildlink3.mk       Fri Apr 09 07:02:58 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.73 2020/11/05 09:06:54 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.74 2021/04/09 07:02:58 adam Exp $
 
 BUILDLINK_TREE+=       gimp
 
@@ -12,11 +12,11 @@
 pkgbase := gimp
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.gimp:Maalib)
+.if ${PKG_BUILD_OPTIONS.gimp:Maalib}
 .include "../../graphics/aalib/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.gimp:Mmng)
+.if ${PKG_BUILD_OPTIONS.gimp:Mmng}
 .include "../../graphics/mng/buildlink3.mk"
 .endif