[pkgsrc/trunk]: pkgsrc/graphics/gegl gegl: PLIST fix

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/graphics/gegl gegl: PLIST fix
From: adam <adam%pkgsrc.org@localhost>
Date: Fri, 09 Apr 2021 06:07:17 +0000

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fc758a05acce
branches:  trunk
changeset: 450003:fc758a05acce
user:      adam <adam%pkgsrc.org@localhost>
date:      Fri Apr 09 05:12:58 2021 +0000

description:
gegl: PLIST fix

diffstat:

 graphics/gegl/Makefile      |  11 +-----
 graphics/gegl/PLIST         |  71 ++++++++++++++++++++++----------------------
 graphics/gegl/buildlink3.mk |  11 +-----
 graphics/gegl/options.mk    |   6 +-
 4 files changed, 44 insertions(+), 55 deletions(-)

diffs (186 lines):

diff -r 6ac4f35ec620 -r fc758a05acce graphics/gegl/Makefile
--- a/graphics/gegl/Makefile    Thu Apr 08 21:22:08 2021 +0000
+++ b/graphics/gegl/Makefile    Fri Apr 09 05:12:58 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.91 2021/04/03 05:30:51 ryoon Exp $
+# $NetBSD: Makefile,v 1.92 2021/04/09 05:12:58 adam Exp $
 
 DISTNAME=      gegl-0.4.30
 CATEGORIES=    graphics
@@ -15,21 +15,16 @@
 MESON_ARGS+=   -Dlibv4l2=disabled
 
 USE_LANGUAGES= c c++
-USE_TOOLS+=    pkg-config xgettext
-USE_TOOLS+=    bash
+USE_TOOLS+=    bash pkg-config xgettext
 
 PKGCONFIG_OVERRIDE+=   gegl.pc.in
 
 PYTHON_FOR_BUILD_ONLY= tool
 
 .include "../../mk/bsd.prefs.mk"
-
-PLIST_VARS+=           Darwin not_Darwin
 .if ${OPSYS} == "Darwin"
-PLIST.Darwin=          yes
 PLIST_SUBST+=          SOEXT="dylib"
 .else
-PLIST.not_Darwin=      yes
 PLIST_SUBST+=          SOEXT="so"
 .endif
 
@@ -46,7 +41,6 @@
 .include "../../devel/SDL2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.babl+=   babl>=0.1.72
 .include "../../graphics/babl/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
@@ -56,4 +50,5 @@
 .include "../../lang/python/tool.mk"
 .include "../../textproc/json-glib/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6ac4f35ec620 -r fc758a05acce graphics/gegl/PLIST
--- a/graphics/gegl/PLIST       Thu Apr 08 21:22:08 2021 +0000
+++ b/graphics/gegl/PLIST       Fri Apr 09 05:12:58 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2021/04/03 05:30:51 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.32 2021/04/09 05:12:58 adam Exp $
 bin/gegl
 bin/gegl-imgcmp
 include/gegl-0.4/gegl-apply.h
@@ -85,41 +85,42 @@
 include/gegl-0.4/sc/sc-outline.h
 include/gegl-0.4/sc/sc-sample.h
 lib/gegl-0.4/dropshadow2.json
-lib/gegl-0.4/exr-load.so
-lib/gegl-0.4/exr-save.so
-lib/gegl-0.4/gegl-common-cxx.so
-lib/gegl-0.4/gegl-common-gpl3.so
-lib/gegl-0.4/gegl-common.so
-lib/gegl-0.4/gegl-core.so
-lib/gegl-0.4/gegl-generated.so
-lib/gegl-0.4/gif-load.so
+lib/gegl-0.4/exr-load.${SOEXT}
+lib/gegl-0.4/exr-save.${SOEXT}
+lib/gegl-0.4/gegl-common-cxx.${SOEXT}
+lib/gegl-0.4/gegl-common-gpl3.${SOEXT}
+lib/gegl-0.4/gegl-common.${SOEXT}
+lib/gegl-0.4/gegl-core.${SOEXT}
+lib/gegl-0.4/gegl-generated.${SOEXT}
+lib/gegl-0.4/gif-load.${SOEXT}
 lib/gegl-0.4/grey2.json
-lib/gegl-0.4/jpg-load.so
-lib/gegl-0.4/jpg-save.so
-lib/gegl-0.4/lcms-from-profile.so
-lib/gegl-0.4/npd.so
-lib/gegl-0.4/npy-save.so
-lib/gegl-0.4/path.so
-lib/gegl-0.4/pixbuf-load.so
-lib/gegl-0.4/pixbuf-save.so
-lib/gegl-0.4/png-load.so
-lib/gegl-0.4/png-save.so
-lib/gegl-0.4/ppm-load.so
-lib/gegl-0.4/ppm-save.so
-lib/gegl-0.4/rgbe-load.so
-lib/gegl-0.4/rgbe-save.so
-lib/gegl-0.4/sdl2-display.so
-lib/gegl-0.4/seamless-clone-compose.so
-lib/gegl-0.4/seamless-clone.so
-lib/gegl-0.4/svg-load.so
-lib/gegl-0.4/text.so
-lib/gegl-0.4/tiff-load.so
-lib/gegl-0.4/tiff-save.so
-lib/gegl-0.4/transformops.so
-lib/gegl-0.4/vector-fill.so
-lib/gegl-0.4/vector-stroke.so
-lib/gegl-0.4/webp-load.so
-lib/gegl-0.4/webp-save.so
+${PLIST.jasper}lib/gegl-0.4/jp2-load.${SOEXT}
+lib/gegl-0.4/jpg-load.${SOEXT}
+lib/gegl-0.4/jpg-save.${SOEXT}
+lib/gegl-0.4/lcms-from-profile.${SOEXT}
+lib/gegl-0.4/npd.${SOEXT}
+lib/gegl-0.4/npy-save.${SOEXT}
+lib/gegl-0.4/path.${SOEXT}
+lib/gegl-0.4/pixbuf-load.${SOEXT}
+lib/gegl-0.4/pixbuf-save.${SOEXT}
+lib/gegl-0.4/png-load.${SOEXT}
+lib/gegl-0.4/png-save.${SOEXT}
+lib/gegl-0.4/ppm-load.${SOEXT}
+lib/gegl-0.4/ppm-save.${SOEXT}
+lib/gegl-0.4/rgbe-load.${SOEXT}
+lib/gegl-0.4/rgbe-save.${SOEXT}
+lib/gegl-0.4/sdl2-display.${SOEXT}
+lib/gegl-0.4/seamless-clone-compose.${SOEXT}
+lib/gegl-0.4/seamless-clone.${SOEXT}
+${PLIST.svg}lib/gegl-0.4/svg-load.${SOEXT}
+lib/gegl-0.4/text.${SOEXT}
+lib/gegl-0.4/tiff-load.${SOEXT}
+lib/gegl-0.4/tiff-save.${SOEXT}
+lib/gegl-0.4/transformops.${SOEXT}
+lib/gegl-0.4/vector-fill.${SOEXT}
+lib/gegl-0.4/vector-stroke.${SOEXT}
+lib/gegl-0.4/webp-load.${SOEXT}
+lib/gegl-0.4/webp-save.${SOEXT}
 lib/libgegl-0.4.so
 lib/libgegl-0.4.so.0
 lib/libgegl-0.4.so.0.429.1
diff -r 6ac4f35ec620 -r fc758a05acce graphics/gegl/buildlink3.mk
--- a/graphics/gegl/buildlink3.mk       Thu Apr 08 21:22:08 2021 +0000
+++ b/graphics/gegl/buildlink3.mk       Fri Apr 09 05:12:58 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.45 2020/11/05 09:06:54 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.46 2021/04/09 05:12:58 adam Exp $
 
 BUILDLINK_TREE+=       gegl
 
@@ -6,16 +6,9 @@
 GEGL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gegl+=   gegl>=0.3.0
-BUILDLINK_ABI_DEPENDS.gegl?=   gegl>=0.4.26nb1
+BUILDLINK_ABI_DEPENDS.gegl+=   gegl>=0.4.26nb1
 BUILDLINK_PKGSRCDIR.gegl?=     ../../graphics/gegl
 
-pkgbase := gegl
-.include "../../mk/pkg-build-options.mk"
-
-.if !empty(PKG_BUILD_OPTIONS.gegl:Msvg)
-.include "../../graphics/librsvg/buildlink3.mk"
-.endif
-
 .include "../../graphics/babl/buildlink3.mk"
 .include "../../textproc/json-glib/buildlink3.mk"
 .endif # GEGL_BUILDLINK3_MK
diff -r 6ac4f35ec620 -r fc758a05acce graphics/gegl/options.mk
--- a/graphics/gegl/options.mk  Thu Apr 08 21:22:08 2021 +0000
+++ b/graphics/gegl/options.mk  Fri Apr 09 05:12:58 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2019/11/02 14:05:46 nia Exp $
+# $NetBSD: options.mk,v 1.4 2021/04/09 05:12:58 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gegl
 PKG_SUPPORTED_OPTIONS= svg jasper
@@ -6,7 +6,8 @@
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=   svg
+PLIST_VARS+=   jasper svg
+
 .if !empty(PKG_OPTIONS:Msvg)
 .include "../../graphics/librsvg/buildlink3.mk"
 PLIST.svg=     yes
@@ -14,7 +15,6 @@
 MESON_ARGS+=   -Dlibrsvg=disabled
 .endif
 
-PLIST_VARS+=   jasper
 .if !empty(PKG_OPTIONS:Mjasper)
 .include "../../graphics/jasper/buildlink3.mk"
 PLIST.jasper=  yes

Prev by Date: [pkgsrc/trunk]: pkgsrc/x11/gtkmm3 gtkmm3: updated to 3.24.4
Next by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated devel/nss to 3.63nb1
Previous by Thread: [pkgsrc/trunk]: pkgsrc/x11/gtkmm3 gtkmm3: updated to 3.24.4
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated devel/nss to 3.63nb1
Indexes:

Home | Main Index | Thread Index | Old Index