pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc libxkbui: remove



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d3c49f1072c3
branches:  trunk
changeset: 405274:d3c49f1072c3
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Nov 25 22:37:17 2019 +0000

description:
libxkbui: remove

Only used by xorgcfg, which was long removed from modular-xorg-server.

diffstat:

 doc/CHANGES-2019              |   3 +-
 x11/Makefile                  |   3 +-
 x11/libxkbui/DESCR            |   1 -
 x11/libxkbui/Makefile         |  22 --------------
 x11/libxkbui/PLIST            |   4 --
 x11/libxkbui/buildlink3.mk    |  23 ---------------
 x11/libxkbui/distinfo         |   9 -----
 x11/libxkbui/patches/patch-aa |  15 ---------
 x11/libxkbui/patches/patch-ab |  65 -------------------------------------------
 x11/libxkbui/patches/patch-ac |  14 ---------
 10 files changed, 3 insertions(+), 156 deletions(-)

diffs (216 lines):

diff -r 16fd5565fc43 -r d3c49f1072c3 doc/CHANGES-2019
--- a/doc/CHANGES-2019  Mon Nov 25 22:35:58 2019 +0000
+++ b/doc/CHANGES-2019  Mon Nov 25 22:37:17 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2019,v 1.5120 2019/11/25 22:35:58 wiz Exp $
+$NetBSD: CHANGES-2019,v 1.5121 2019/11/25 22:37:17 wiz Exp $
 
 Changes to the packages collection and infrastructure in 2019:
 
@@ -8269,3 +8269,4 @@
        Updated finance/py-bitcoinlib to 0.10.2 [adam 2019-11-25]
        Updated converters/py-emoji to 0.5.4 [adam 2019-11-25]
        Updated meta-pkgs/modular-xorg-libs to 1.11 [wiz 2019-11-25]
+       Removed x11/libxkbui [wiz 2019-11-25]
diff -r 16fd5565fc43 -r d3c49f1072c3 x11/Makefile
--- a/x11/Makefile      Mon Nov 25 22:35:58 2019 +0000
+++ b/x11/Makefile      Mon Nov 25 22:37:17 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.865 2019/11/25 09:52:14 wiz Exp $
+# $NetBSD: Makefile,v 1.866 2019/11/25 22:37:17 wiz Exp $
 #
 
 COMMENT=       Packages to support the X window system
@@ -252,7 +252,6 @@
 SUBDIR+=       libxfce4util
 SUBDIR+=       libxkbcommon
 SUBDIR+=       libxkbfile
-SUBDIR+=       libxkbui
 SUBDIR+=       libxklavier
 SUBDIR+=       libxshmfence
 SUBDIR+=       listres
diff -r 16fd5565fc43 -r d3c49f1072c3 x11/libxkbui/DESCR
--- a/x11/libxkbui/DESCR        Mon Nov 25 22:35:58 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-This is the xkbui library from modular X.org.
diff -r 16fd5565fc43 -r d3c49f1072c3 x11/libxkbui/Makefile
--- a/x11/libxkbui/Makefile     Mon Nov 25 22:35:58 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2013/04/06 03:45:28 rodent Exp $
-#
-
-DISTNAME=      libxkbui-1.0.2
-PKGREVISION=   1
-CATEGORIES=    x11
-MASTER_SITES=  ${MASTER_SITE_XORG:=lib/}
-EXTRACT_SUFX=  .tar.bz2
-
-MAINTAINER=    joerg%NetBSD.org@localhost
-HOMEPAGE=      http://xorg.freedesktop.org/
-COMMENT=       Library for xkbui
-
-USE_LIBTOOL=           yes
-PKGCONFIG_OVERRIDE+=   xkbui.pc.in
-USE_TOOLS+=            pkg-config
-GNU_CONFIGURE=         yes
-
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libxkbfile/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff -r 16fd5565fc43 -r d3c49f1072c3 x11/libxkbui/PLIST
--- a/x11/libxkbui/PLIST        Mon Nov 25 22:35:58 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:25:00 joerg Exp $
-include/X11/extensions/XKBui.h
-lib/libxkbui.la
-lib/pkgconfig/xkbui.pc
diff -r 16fd5565fc43 -r d3c49f1072c3 x11/libxkbui/buildlink3.mk
--- a/x11/libxkbui/buildlink3.mk        Mon Nov 25 22:35:58 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:41 rillig Exp $
-
-.include "../../mk/bsd.fast.prefs.mk"
-
-.if ${X11_TYPE} != "modular"
-.include "../../mk/x11.buildlink3.mk"
-.else
-
-BUILDLINK_TREE+=       libxkbui
-
-.  if !defined(LIBXKBUI_BUILDLINK3_MK)
-LIBXKBUI_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.libxkbui+=       libxkbui>=1.0.2
-BUILDLINK_PKGSRCDIR.libxkbui?=         ../../x11/libxkbui
-
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libxkbfile/buildlink3.mk"
-.  endif # LIBXKBUI_BUILDLINK3_MK
-
-BUILDLINK_TREE+=       -libxkbui
-
-.endif
diff -r 16fd5565fc43 -r d3c49f1072c3 x11/libxkbui/distinfo
--- a/x11/libxkbui/distinfo     Mon Nov 25 22:35:58 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.3 2015/11/04 03:28:48 agc Exp $
-
-SHA1 (libxkbui-1.0.2.tar.bz2) = bd6f1d6fa390d3fee118f9d5b15e156315576b9f
-RMD160 (libxkbui-1.0.2.tar.bz2) = ff356dea1c93a1a94bab4df80b66f9304d827b2a
-SHA512 (libxkbui-1.0.2.tar.bz2) = ccfa2c8f740ae66e5b7c2ed19a8243696a34fb60d45d8d01bb540eb925d69c95ebe16b7a54f4362acc3170b1543f44eea8910135b11c4af88abce3637726062d
-Size (libxkbui-1.0.2.tar.bz2) = 221435 bytes
-SHA1 (patch-aa) = 31b131a85d95d454b41dfd4c7b51bbf72534da9a
-SHA1 (patch-ab) = e9aaee393da4ddcfa5fcaf06ed4da2f1b6e1cd2b
-SHA1 (patch-ac) = f57e6e0585169e8fa98457f0a3121f9ede0855b4
diff -r 16fd5565fc43 -r d3c49f1072c3 x11/libxkbui/patches/patch-aa
--- a/x11/libxkbui/patches/patch-aa     Mon Nov 25 22:35:58 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$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 16fd5565fc43 -r d3c49f1072c3 x11/libxkbui/patches/patch-ab
--- a/x11/libxkbui/patches/patch-ab     Mon Nov 25 22:35:58 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-$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 16fd5565fc43 -r d3c49f1072c3 x11/libxkbui/patches/patch-ac
--- a/x11/libxkbui/patches/patch-ac     Mon Nov 25 22:35:58 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$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



Home | Main Index | Thread Index | Old Index