CVS commit: pkgsrc/converters/help2man

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue May  6 10:09:36 UTC 2025

Modified Files:
        pkgsrc/converters/help2man: Makefile PLIST

Log Message:
help2man: Use SHLIB_EXT.


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 pkgsrc/converters/help2man/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/converters/help2man/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/converters/help2man/Makefile
diff -u pkgsrc/converters/help2man/Makefile:1.73 pkgsrc/converters/help2man/Makefile:1.74
--- pkgsrc/converters/help2man/Makefile:1.73    Sun Feb  9 00:28:19 2025
+++ pkgsrc/converters/help2man/Makefile Tue May  6 10:09:35 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2025/02/09 00:28:19 rillig Exp $
+# $NetBSD: Makefile,v 1.74 2025/05/06 10:09:35 jperkin Exp $
 
 DISTNAME=      help2man-1.49.3
 CATEGORIES=    converters
@@ -31,15 +31,10 @@ INFO_FILES=         yes
 .include "options.mk"
 
 .if ${OPSYS} == "Darwin"
-SOEXT=                 dylib
 SUBST_CLASSES+=                shlibarg
 SUBST_STAGE.shlibarg=  pre-configure
 SUBST_FILES.shlibarg=  Makefile.in
-SUBST_SED.shlibarg=    -e 's, -shared , -dynamiclib -install_name ${PREFIX}/lib/bindtextdomain.${SOEXT} ,g'
-.elif ${OBJECT_FMT} == "SOM"
-SOEXT=                 sl
-.else
-SOEXT=                 so
+SUBST_SED.shlibarg=    -e 's, -shared , -dynamiclib -install_name ${PREFIX}/lib/bindtextdomain.${SHLIB_EXT} ,g'
 .endif
 
 SUBST_CLASSES+=                soext
@@ -48,10 +43,8 @@ SUBST_NOOP_OK.soext= yes
 SUBST_STAGE.soext=     pre-configure
 SUBST_FILES.soext=     bindtextdomain.c
 SUBST_FILES.soext+=    Makefile.in
-SUBST_SED.soext+=      -e 's,bindtextdomain\.so,bindtextdomain.${SOEXT},g'
-SUBST_SED.soext+=      -e 's,$$(preload)\.so,$$(preload).${SOEXT},g'
-
-PLIST_SUBST+=          SOEXT=${SOEXT}
+SUBST_SED.soext+=      -e 's,bindtextdomain\.so,bindtextdomain.${SHLIB_EXT},g'
+SUBST_SED.soext+=      -e 's,$$(preload)\.so,$$(preload).${SHLIB_EXT},g'
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"

Index: pkgsrc/converters/help2man/PLIST
diff -u pkgsrc/converters/help2man/PLIST:1.21 pkgsrc/converters/help2man/PLIST:1.22
--- pkgsrc/converters/help2man/PLIST:1.21       Tue Apr 30 12:22:57 2024
+++ pkgsrc/converters/help2man/PLIST    Tue May  6 10:09:35 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2024/04/30 12:22:57 cheusov Exp $
+@comment $NetBSD: PLIST,v 1.22 2025/05/06 10:09:35 jperkin Exp $
 bin/help2man
 ${PLIST.nls}info/help2man-de.info
 ${PLIST.nls}info/help2man-es.info
@@ -11,7 +11,7 @@ ${PLIST.nls}info/help2man-sv.info
 ${PLIST.nls}info/help2man-uk.info
 ${PLIST.nls}info/help2man-zh_CN.info
 info/help2man.info
-${PLIST.nls}lib/bindtextdomain.${SOEXT}
+${PLIST.nls}lib/bindtextdomain.${SHLIB_EXT}
 ${PLIST.nls}man/da/man1/help2man.1
 ${PLIST.nls}man/de/man1/help2man.1
 ${PLIST.nls}man/el/man1/help2man.1