[pkgsrc/trunk]: pkgsrc/x11/libxkbui libxkbui does not depend on libXt (as per...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/x11/libxkbui libxkbui does not depend on libXt (as per...
From: bjs <bjs%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 05:31:07 +0000

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

description:
libxkbui does not depend on libXt (as per Matthieu Herrb).  Thus,
remove this depedency from Makefile, b3.mk, configure scripts,
and xkbui.pc.in.  Bump Rev.

diffstat:

 x11/libxkbui/Makefile         |   4 +-
 x11/libxkbui/buildlink3.mk    |   3 +-
 x11/libxkbui/distinfo         |   5 ++-
 x11/libxkbui/patches/patch-aa |  15 +++++++++
 x11/libxkbui/patches/patch-ab |  65 +++++++++++++++++++++++++++++++++++++++++++
 x11/libxkbui/patches/patch-ac |  14 +++++++++
 6 files changed, 101 insertions(+), 5 deletions(-)

diffs (157 lines):

diff -r 215591d55b3b -r 49b389a1fc83 x11/libxkbui/Makefile
--- a/x11/libxkbui/Makefile     Fri Nov 23 14:24:16 2007 +0000
+++ b/x11/libxkbui/Makefile     Fri Nov 23 14:34:33 2007 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/11/14 19:45:03 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2007/11/23 14:34:33 bjs Exp $
 #
 
 DISTNAME=              libxkbui-1.0.2
+PKGREVISION=           1
 CATEGORIES=            x11
 MASTER_SITES=          http://xorg.freedesktop.org/releases/individual/lib/
 EXTRACT_SUFX=          .tar.bz2
@@ -18,7 +19,6 @@
 GNU_CONFIGURE=         yes
 
 .include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libxkbfile/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 215591d55b3b -r 49b389a1fc83 x11/libxkbui/buildlink3.mk
--- a/x11/libxkbui/buildlink3.mk        Fri Nov 23 14:24:16 2007 +0000
+++ b/x11/libxkbui/buildlink3.mk        Fri Nov 23 14:34:33 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/02/07 12:40:24 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2007/11/23 14:34:34 bjs Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -23,7 +23,6 @@
 .endif # LIBXKBUI_BUILDLINK3_MK
 
 .include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libxkbfile/buildlink3.mk"
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH:S/+$//}
diff -r 215591d55b3b -r 49b389a1fc83 x11/libxkbui/distinfo
--- a/x11/libxkbui/distinfo     Fri Nov 23 14:24:16 2007 +0000
+++ b/x11/libxkbui/distinfo     Fri Nov 23 14:34:33 2007 +0000
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/11/14 19:45:03 joerg Exp $
+$NetBSD: distinfo,v 1.2 2007/11/23 14:34:34 bjs Exp $
 
 SHA1 (libxkbui-1.0.2.tar.bz2) = bd6f1d6fa390d3fee118f9d5b15e156315576b9f
 RMD160 (libxkbui-1.0.2.tar.bz2) = ff356dea1c93a1a94bab4df80b66f9304d827b2a
 Size (libxkbui-1.0.2.tar.bz2) = 221435 bytes
+SHA1 (patch-aa) = 31b131a85d95d454b41dfd4c7b51bbf72534da9a
+SHA1 (patch-ab) = e9aaee393da4ddcfa5fcaf06ed4da2f1b6e1cd2b
+SHA1 (patch-ac) = f57e6e0585169e8fa98457f0a3121f9ede0855b4
diff -r 215591d55b3b -r 49b389a1fc83 x11/libxkbui/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/libxkbui/patches/patch-aa     Fri Nov 23 14:34:33 2007 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.1 2007/11/23 14:34:34 bjs Exp $
+
+libxkbui does not depend on libXt (as per Matthieu Herrb).
+
+--- configure.ac.orig  2006-04-26 15:59:50.000000000 -0400
++++ configure.ac
+@@ -34,7 +34,7 @@ AC_PROG_CC
+ AC_PROG_LIBTOOL
+ 
+ # Check for dependencies
+-PKG_CHECK_MODULES(XKBUI, x11 xt xkbfile)
++PKG_CHECK_MODULES(XKBUI, x11 xkbfile)
+ AC_SEARCH_LIBS(hypot, [m])
+ 
+ AC_SUBST(XKBUI_CFLAGS)
diff -r 215591d55b3b -r 49b389a1fc83 x11/libxkbui/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/libxkbui/patches/patch-ab     Fri Nov 23 14:34:33 2007 +0000
@@ -0,0 +1,65 @@
+$NetBSD: patch-ab,v 1.1 2007/11/23 14:34:34 bjs Exp $
+
+Follow patch-aa's lead.
+
+--- configure.orig     2006-04-26 16:00:02.000000000 -0400
++++ configure
+@@ -18758,12 +18758,12 @@ if test -n "$PKG_CONFIG"; then
+         pkg_cv_XKBUI_CFLAGS="$XKBUI_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xt xkbfile\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "x11 xt xkbfile") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xkbfile\"") >&5
++  ($PKG_CONFIG --exists --print-errors "x11 xkbfile") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_XKBUI_CFLAGS=`$PKG_CONFIG --cflags "x11 xt xkbfile" 2>/dev/null`
++  pkg_cv_XKBUI_CFLAGS=`$PKG_CONFIG --cflags "x11 xkbfile" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -18776,12 +18776,12 @@ if test -n "$PKG_CONFIG"; then
+         pkg_cv_XKBUI_LIBS="$XKBUI_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xt xkbfile\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "x11 xt xkbfile") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xkbfile\"") >&5
++  ($PKG_CONFIG --exists --print-errors "x11 xkbfile") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_XKBUI_LIBS=`$PKG_CONFIG --libs "x11 xt xkbfile" 2>/dev/null`
++  pkg_cv_XKBUI_LIBS=`$PKG_CONFIG --libs "x11 xkbfile" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -18800,14 +18800,14 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-              XKBUI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 xt xkbfile"`
++              XKBUI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 xkbfile"`
+         else
+-              XKBUI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 xt xkbfile"`
++              XKBUI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 xkbfile"`
+         fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$XKBUI_PKG_ERRORS" >&5
+ 
+-      { { echo "$as_me:$LINENO: error: Package requirements (x11 xt xkbfile) were not met:
++      { { echo "$as_me:$LINENO: error: Package requirements (x11 xkbfile) were not met:
+ 
+ $XKBUI_PKG_ERRORS
+ 
+@@ -18818,7 +18818,7 @@ Alternatively, you may set the environme
+ and XKBUI_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " >&5
+-echo "$as_me: error: Package requirements (x11 xt xkbfile) were not met:
++echo "$as_me: error: Package requirements (x11 xkbfile) were not met:
+ 
+ $XKBUI_PKG_ERRORS
+ 
diff -r 215591d55b3b -r 49b389a1fc83 x11/libxkbui/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/libxkbui/patches/patch-ac     Fri Nov 23 14:34:33 2007 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1 2007/11/23 14:34:35 bjs Exp $
+
+Follow patch-aa's lead.
+
+--- xkbui.pc.in.orig   2005-11-19 02:15:48.000000000 -0500
++++ xkbui.pc.in
+@@ -7,6 +7,6 @@ Name: xkbui
+ Description: The xkbui Library
+ Version: @PACKAGE_VERSION@
+ Requires: x11 kbproto
+-Requires.private: x11 xt
++Requires.private: x11
+ Cflags: -I${includedir}
+ Libs: -L${libdir} -lxkbui

Prev by Date: [pkgsrc/trunk]: pkgsrc/x11/xrestop Update to xrestop-0.4. Add DESTDIR suppor...
Next by Date: [pkgsrc/trunk]: pkgsrc/audio/herrie The option for using libmodplug is modplu...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/x11/xrestop Update to xrestop-0.4. Add DESTDIR suppor...
Next by Thread: [pkgsrc/trunk]: pkgsrc/audio/herrie The option for using libmodplug is modplu...
Indexes:

Home | Main Index | Thread Index | Old Index