Update the module extension on Darwin.

gegl v0.4.22 now uses .dylib as the extension for modules on Darwin.
Consequently, it is no longer necessary to rename the files post-install.
It is, however, necessary to use different extensions for more of PLIST.

2 files changed, 37 insertions, 52 deletions

diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile
index c715aa97b11..97244382174 100644
--- a/graphics/gegl/Makefile
+++ b/graphics/gegl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2020/02/26 15:09:26 wiz Exp $
+# $NetBSD: Makefile,v 1.81 2020/03/03 04:15:20 brook Exp $
 
 DISTNAME=	gegl-0.4.22
 CATEGORIES=	graphics
@@ -40,21 +40,6 @@ pre-build:
 		${PYTHONBIN} cltostring.py "$$file" "$$file".h \
 	; done
 
-.if ${OPSYS} == "Darwin"
-#
-# Meson uses .dylib for Darwin shared libraries, but G_MODULE_SUFFIX
-# is always .so on Unix, including Darwin.  This is under discussion
-# at https://gitlab.gnome.org/GNOME/glib/issues/1413 but for now
-# rename the plugins and reset their internal ID to match the new
-# name.
-#
-post-install:
-	cd ${DESTDIR}/${PREFIX}/lib/gegl-0.4 && for i in *.dylib; do \
-		install_name_tool -id ${PREFIX}/lib/gegl-0.4/$${i%.dylib}.so $${i}; \
-		mv "$${i}" "$${i%.dylib}.so" \
-	; done
-.endif
-
 .include "options.mk"
 .include "../../devel/meson/build.mk"
 .include "../../devel/pango/buildlink3.mk"
diff --git a/graphics/gegl/PLIST b/graphics/gegl/PLIST
index 2a003d342fb..3dd009a3de6 100644
--- a/graphics/gegl/PLIST
+++ b/graphics/gegl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2020/02/26 14:57:16 nia Exp $
+@comment $NetBSD: PLIST,v 1.28 2020/03/03 04:15:20 brook Exp $
 bin/gegl
 bin/gegl-imgcmp
 include/gegl-0.4/gegl-apply.h
@@ -80,42 +80,42 @@ include/gegl-0.4/sc/sc-common.h
 include/gegl-0.4/sc/sc-context.h
 include/gegl-0.4/sc/sc-outline.h
 include/gegl-0.4/sc/sc-sample.h
-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
-${PLIST.jasper}lib/gegl-0.4/jp2-load.so
-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
-${PLIST.svg}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.${SOEXT}
 ${PLIST.Darwin}lib/libgegl-0.4.0.${SOEXT}
 ${PLIST.not_Darwin}lib/libgegl-0.4.${SOEXT}.0