[pkgsrc/trunk]: pkgsrc/x11/xterm Force ac_cv_lib_pcreposix_pcreposix_regcomp=...

[bjs <bjs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/08b2045908ee
branches:  trunk
changeset: 535637:08b2045908ee
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Fri Nov 23 14:23:34 2007 +0000

description:
Force ac_cv_lib_pcreposix_pcreposix_regcomp=yes, bump rev.
This function does not exist AFAIK in our pcre libraries, and the configure
check was failing.

A segment of nm output reads:

/usr/pkg/lib/libpcreposix.so:00000a06 T regcomp
/usr/pkg/lib/libpcreposix.so:00000abf T regerror
/usr/pkg/lib/libpcreposix.so:000007a8 T regexec
/usr/pkg/lib/libpcreposix.so:00000780 T regfree

These symbols will override those in libc:


/usr/lib/libc.so:00031be8 T _regcomp
/usr/lib/libc.so:0002fbf8 T _regerror
/usr/lib/libc.so:0002e9c2 T _regexec
/usr/lib/libc.so:0006336c T _regfree
/usr/lib/libc.so:00031be8 W regcomp
/usr/lib/libc.so:0002fbf8 W regerror
/usr/lib/libc.so:0002e9c2 W regexec
/usr/lib/libc.so:0006336c W regfree

diffstat:

 x11/xterm/Makefile   |  10 +++++-----
 x11/xterm/options.mk |   9 ++++++++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diffs (55 lines):

diff -r 084a0a9e2b81 -r 08b2045908ee x11/xterm/Makefile
--- a/x11/xterm/Makefile        Fri Nov 23 13:48:19 2007 +0000
+++ b/x11/xterm/Makefile        Fri Nov 23 14:23:34 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2007/09/17 06:36:21 bjs Exp $
+# $NetBSD: Makefile,v 1.37 2007/11/23 14:23:34 bjs Exp $
 
 DISTNAME=      xterm-229
 CATEGORIES=    x11
@@ -31,9 +31,9 @@
 CONFIGURE_ARGS+= --with-setuid
 .endif
 
-.if ${OPSYS} == "SunOS"
-INSTALL_FILE=  ${WRKDIR}/INSTALL
-DEINSTALL_FILE=        ${INSTALL_FILE}
+#.#if ${OPSYS} == "SunOS"
+#INSTALL_FILE= ${WRKDIR}/INSTALL
+#DEINSTALL_FILE=       ${INSTALL_FILE}
 
 pre-build:
        ${MKDIR} ${INSTALL_FILE:H}
@@ -47,7 +47,7 @@
 
 post-install:
        ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
-.endif
+#.endif
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
diff -r 084a0a9e2b81 -r 08b2045908ee x11/xterm/options.mk
--- a/x11/xterm/options.mk      Fri Nov 23 13:48:19 2007 +0000
+++ b/x11/xterm/options.mk      Fri Nov 23 14:23:34 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2007/10/02 15:04:53 aymeric Exp $
+# $NetBSD: options.mk,v 1.7 2007/11/23 14:23:34 bjs Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.xterm
 PKG_SUPPORTED_OPTIONS= pcre xterm-luit freetype xterm-toolbar
@@ -30,7 +30,14 @@
 CONFIGURE_ARGS+= --enable-toolbar
 .endif
 
+###
+### XXX The configure test checks for pcreposix_regcomp in libpcreposix.
+###    However, there is no such function [insofar as I can tell].
+###    Moreover, libc's regex(3) functions are weak-aliased to those
+###     within libc's namespace, so we should have no problems.
+###
 .if !empty(PKG_OPTIONS:Mpcre)
 CONFIGURE_ARGS+= --with-pcre
+CONFIGURE_ENV+=  ac_cv_lib_pcreposix_pcreposix_regcomp=yes
 .  include "../../devel/pcre/buildlink3.mk"
 .endif