CVS commit: pkgsrc/graphics/gimp

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Apr  9 07:02:58 UTC 2021

Modified Files:
        pkgsrc/graphics/gimp: Makefile PLIST buildlink3.mk

Log Message:
gimp: PLIST fix; pkglint fixes


To generate a diff of this commit:
cvs rdiff -u -r1.338 -r1.339 pkgsrc/graphics/gimp/Makefile
cvs rdiff -u -r1.73 -r1.74 pkgsrc/graphics/gimp/PLIST \
    pkgsrc/graphics/gimp/buildlink3.mk

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.338 pkgsrc/graphics/gimp/Makefile:1.339
--- pkgsrc/graphics/gimp/Makefile:1.338 Fri Apr  9 06:55:01 2021
+++ pkgsrc/graphics/gimp/Makefile       Fri Apr  9 07:02:58 2021
@@ -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 @@ PLIST_SUBST+= GIMP_DEBUG_TOOL_DIR="libex
 .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 @@ BUILDLINK_API_DEPENDS.gegl+=          gegl>=0.4.
 .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 @@ PLIST.remote=       yes
 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"

Index: pkgsrc/graphics/gimp/PLIST
diff -u pkgsrc/graphics/gimp/PLIST:1.73 pkgsrc/graphics/gimp/PLIST:1.74
--- pkgsrc/graphics/gimp/PLIST:1.73     Sat Apr  3 05:32:52 2021
+++ pkgsrc/graphics/gimp/PLIST  Fri Apr  9 07:02:58 2021
@@ -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-wmf/file-wmf
 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
Index: pkgsrc/graphics/gimp/buildlink3.mk
diff -u pkgsrc/graphics/gimp/buildlink3.mk:1.73 pkgsrc/graphics/gimp/buildlink3.mk:1.74
--- pkgsrc/graphics/gimp/buildlink3.mk:1.73     Thu Nov  5 09:06:54 2020
+++ pkgsrc/graphics/gimp/buildlink3.mk  Fri Apr  9 07:02:58 2021
@@ -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 @@ BUILDLINK_PKGSRCDIR.gimp?=  ../../graphic
 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