Update the module extension for Darwin.

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

2 files changed, 30 insertions, 45 deletions

diff --git a/graphics/babl/Makefile b/graphics/babl/Makefile
index 606564ff1bc..3e366a0d47e 100644
--- a/graphics/babl/Makefile
+++ b/graphics/babl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2020/02/26 14:45:13 nia Exp $
+# $NetBSD: Makefile,v 1.34 2020/03/03 04:12:22 brook Exp $
 
 DISTNAME=	babl-0.1.74
 CATEGORIES=	graphics
@@ -37,21 +37,6 @@ BUILDLINK_TRANSFORM.Darwin+=	rm:-Wl,babl.map
 BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,--version-script
 BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,babl.map
 
-.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/babl-0.1 && for i in *.dylib; do \
-		install_name_tool -id ${PREFIX}/lib/babl-0.1/$${i%.dylib}.so $${i}; \
-		mv "$${i}" "$${i%.dylib}.so" \
-	; done
-.endif
-
 .include "../../devel/meson/build.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
diff --git a/graphics/babl/PLIST b/graphics/babl/PLIST
index e4cca172842..134cf619213 100644
--- a/graphics/babl/PLIST
+++ b/graphics/babl/PLIST
@@ -1,37 +1,37 @@
-@comment $NetBSD: PLIST,v 1.13 2020/02/26 14:45:13 nia Exp $
+@comment $NetBSD: PLIST,v 1.14 2020/03/03 04:12:22 brook Exp $
 include/babl-0.1/babl/babl-introspect.h
 include/babl-0.1/babl/babl-macros.h
 include/babl-0.1/babl/babl-types.h
 include/babl-0.1/babl/babl-version.h
 include/babl-0.1/babl/babl.h
-lib/babl-0.1/CIE.so
-lib/babl-0.1/HCY.so
-lib/babl-0.1/HSL.so
-lib/babl-0.1/HSV.so
-lib/babl-0.1/avx2-int8.so
-lib/babl-0.1/cairo.so
-lib/babl-0.1/double.so
-lib/babl-0.1/fast-float.so
-lib/babl-0.1/float.so
-lib/babl-0.1/gegl-fixups.so
-lib/babl-0.1/gggl-lies.so
-lib/babl-0.1/gggl-table-lies.so
-lib/babl-0.1/gggl-table.so
-lib/babl-0.1/gggl.so
-lib/babl-0.1/gimp-8bit.so
-lib/babl-0.1/grey.so
-lib/babl-0.1/half.so
-lib/babl-0.1/naive-CMYK.so
-lib/babl-0.1/simple.so
-lib/babl-0.1/sse-half.so
-lib/babl-0.1/sse2-float.so
-lib/babl-0.1/sse2-int16.so
-lib/babl-0.1/sse2-int8.so
-lib/babl-0.1/sse4-int8.so
-lib/babl-0.1/two-table.so
-lib/babl-0.1/u16.so
-lib/babl-0.1/u32.so
-lib/babl-0.1/ycbcr.so
+lib/babl-0.1/CIE.${SOEXT}
+lib/babl-0.1/HCY.${SOEXT}
+lib/babl-0.1/HSL.${SOEXT}
+lib/babl-0.1/HSV.${SOEXT}
+lib/babl-0.1/avx2-int8.${SOEXT}
+lib/babl-0.1/cairo.${SOEXT}
+lib/babl-0.1/double.${SOEXT}
+lib/babl-0.1/fast-float.${SOEXT}
+lib/babl-0.1/float.${SOEXT}
+lib/babl-0.1/gegl-fixups.${SOEXT}
+lib/babl-0.1/gggl-lies.${SOEXT}
+lib/babl-0.1/gggl-table-lies.${SOEXT}
+lib/babl-0.1/gggl-table.${SOEXT}
+lib/babl-0.1/gggl.${SOEXT}
+lib/babl-0.1/gimp-8bit.${SOEXT}
+lib/babl-0.1/grey.${SOEXT}
+lib/babl-0.1/half.${SOEXT}
+lib/babl-0.1/naive-CMYK.${SOEXT}
+lib/babl-0.1/simple.${SOEXT}
+lib/babl-0.1/sse-half.${SOEXT}
+lib/babl-0.1/sse2-float.${SOEXT}
+lib/babl-0.1/sse2-int16.${SOEXT}
+lib/babl-0.1/sse2-int8.${SOEXT}
+lib/babl-0.1/sse4-int8.${SOEXT}
+lib/babl-0.1/two-table.${SOEXT}
+lib/babl-0.1/u16.${SOEXT}
+lib/babl-0.1/u32.${SOEXT}
+lib/babl-0.1/ycbcr.${SOEXT}
 lib/libbabl-0.1.${SOEXT}
 ${PLIST.Darwin}lib/libbabl-0.1.0.${SOEXT}
 ${PLIST.not_Darwin}lib/libbabl-0.1.${SOEXT}.0