CVS commit: pkgsrc/x11

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Sun Jul  7 11:37:25 UTC 2024

Modified Files:
        pkgsrc/x11/wxGTK30: Makefile
        pkgsrc/x11/wxGTK32: Makefile

Log Message:
wxGTK3*: output rpath from wx-config

Pkgsrc uses rpath on many systems but
wx-config only outputs the rpath if
it is run uninstalled, so make it
output the rpath if pkgsrc uses rpath.
Makes wxgtk programs execute correctly
when run compiled and run from
codelite.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/x11/wxGTK30/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/x11/wxGTK32/Makefile

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

Modified files:

Index: pkgsrc/x11/wxGTK30/Makefile
diff -u pkgsrc/x11/wxGTK30/Makefile:1.58 pkgsrc/x11/wxGTK30/Makefile:1.59
--- pkgsrc/x11/wxGTK30/Makefile:1.58    Sun Apr  7 07:35:29 2024
+++ pkgsrc/x11/wxGTK30/Makefile Sun Jul  7 11:37:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2024/04/07 07:35:29 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2024/07/07 11:37:24 nros Exp $
 
 DISTNAME=      wxWidgets-3.0.5.1
 PKGNAME=       ${DISTNAME:S/wxWidgets/wxGTK30/}
@@ -66,6 +66,15 @@ PLIST_SRC+=          ${PLIST_SRC_DFLT}
 
 CONFIGURE_ARGS.SunOS+= --disable-xlocale
 
+.if defined(_USE_RPATH) && !empty(_USE_RPATH:M[yY][eE][sS])
+SUBST_CLASSES+=                wx-rpath
+SUBST_STAGE.wx-rpath=  pre-configure
+SUBST_MESSAGE.wx-rpath=        Setting rpath in wx-config
+SUBST_FILES.wx-rpath=  wx-config.in
+SUBST_SED.wx-rpath+=   -e 's|@WXCONFIG_RPATH@|${COMPILER_RPATH_FLAG}${PREFIX}/lib|g'
+SUBST_SED.wx-rpath+=   -e 's,is_installed || \[ -n ,\[ -n ,g'
+.endif
+
 post-configure:
        ${ECHO} 'install_qadll: install_xmldll' >> ${WRKSRC}/Makefile
 

Index: pkgsrc/x11/wxGTK32/Makefile
diff -u pkgsrc/x11/wxGTK32/Makefile:1.41 pkgsrc/x11/wxGTK32/Makefile:1.42
--- pkgsrc/x11/wxGTK32/Makefile:1.41    Wed May 29 16:35:16 2024
+++ pkgsrc/x11/wxGTK32/Makefile Sun Jul  7 11:37:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2024/05/29 16:35:16 adam Exp $
+# $NetBSD: Makefile,v 1.42 2024/07/07 11:37:24 nros Exp $
 
 DISTNAME=      wxWidgets-3.2.5
 PKGNAME=       ${DISTNAME:S/wxWidgets/wxGTK32/}
@@ -105,6 +105,15 @@ SUBST_SED.fix-paths=               -e 's,/usr/pkg/inc
 SUBST_VARS.fix-paths=          PREFIX
 .endif
 
+.if defined(_USE_RPATH) && !empty(_USE_RPATH:M[yY][eE][sS])
+SUBST_CLASSES+=                wx-rpath
+SUBST_STAGE.wx-rpath=  pre-configure
+SUBST_MESSAGE.wx-rpath=        Setting rpath in wx-config
+SUBST_FILES.wx-rpath=  wx-config.in
+SUBST_SED.wx-rpath+=   -e 's|@WXCONFIG_RPATH@|${COMPILER_RPATH_FLAG}${PREFIX}/lib|g'
+SUBST_SED.wx-rpath+=   -e 's,is_installed || \[ -n ,\[ -n ,g'
+.endif
+
 post-build:
        ${RM} ${WRKSRC}/locale/*.mo
        # We could do this: