summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--x11/xcb-util-xrm/Makefile36
-rw-r--r--x11/xcb-util-xrm/distinfo2
-rw-r--r--x11/xcb-util-xrm/files/ax_compare_version.m4174
-rw-r--r--x11/xcb-util-xrm/files/xcb_util_common.m444
-rw-r--r--x11/xcb-util-xrm/files/xcb_util_m4_with_include_path.m424
-rw-r--r--x11/xcb-util-xrm/pkg/DESCR4
-rw-r--r--x11/xcb-util-xrm/pkg/PLIST6
7 files changed, 290 insertions, 0 deletions
diff --git a/x11/xcb-util-xrm/Makefile b/x11/xcb-util-xrm/Makefile
new file mode 100644
index 0000000..78c2d56
--- /dev/null
+++ b/x11/xcb-util-xrm/Makefile
@@ -0,0 +1,36 @@
+# $OpenBSD: Makefile.template,v 1.83 2019/07/02 12:03:14 sthen Exp $
+COMMENT = utility functions for the X resource manager
+
+GH_TAGNAME = v1.3
+GH_PROJECT = xcb-util-xrm
+GH_ACCOUNT = Airblader
+PKG_NAME = ${GH_PROJECT}-${GH_TAGNAME:S/v//}
+
+CATEGORIES = x11
+
+HOMEPAGE = https://github.com/Airblader/xcb-util-xrm
+
+MAINTAINER = xenocara@openbsd.org
+
+SHARED_LIBS= xcb-xrm 0.0
+
+# MIT
+PERMIT_PACKAGE = Yes
+
+WANTLIB = Xau Xdmcp m xcb xcb-util
+
+LIB_DEPENDS = x11/xcb-util
+
+SEPARATE_BUILD = Yes
+CONFIGURE_STYLE = autoreconf
+CONFIGURE_ARGS = --without-doxygen
+
+AUTOCONF_VERSION = 2.69
+AUTOMAKE_VERSION = 1.12
+
+post-extract:
+ @cp ${FILESDIR}/*.m4 ${WRKSRC}/m4
+
+NO_TEST = Yes
+
+.include <bsd.port.mk>
diff --git a/x11/xcb-util-xrm/distinfo b/x11/xcb-util-xrm/distinfo
new file mode 100644
index 0000000..774592f
--- /dev/null
+++ b/x11/xcb-util-xrm/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xcb-util-xrm-1.3.tar.gz) = nUpmxzZqu0hA9vgixhPhd2xYmCNTWN5yi6RVQmP6B4M=
+SIZE (xcb-util-xrm-1.3.tar.gz) = 51378
diff --git a/x11/xcb-util-xrm/files/ax_compare_version.m4 b/x11/xcb-util-xrm/files/ax_compare_version.m4
new file mode 100644
index 0000000..e22b50f
--- /dev/null
+++ b/x11/xcb-util-xrm/files/ax_compare_version.m4
@@ -0,0 +1,174 @@
+# ===========================================================================
+# http://autoconf-archive.cryp.to/ax_compare_version.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
+#
+# DESCRIPTION
+#
+# This macro compares two version strings. Due to the various number of
+# minor-version numbers that can exist, and the fact that string
+# comparisons are not compatible with numeric comparisons, this is not
+# necessarily trivial to do in a autoconf script. This macro makes doing
+# these comparisons easy.
+#
+# The six basic comparisons are available, as well as checking equality
+# limited to a certain number of minor-version levels.
+#
+# The operator OP determines what type of comparison to do, and can be one
+# of:
+#
+# eq - equal (test A == B)
+# ne - not equal (test A != B)
+# le - less than or equal (test A <= B)
+# ge - greater than or equal (test A >= B)
+# lt - less than (test A < B)
+# gt - greater than (test A > B)
+#
+# Additionally, the eq and ne operator can have a number after it to limit
+# the test to that number of minor versions.
+#
+# eq0 - equal up to the length of the shorter version
+# ne0 - not equal up to the length of the shorter version
+# eqN - equal up to N sub-version levels
+# neN - not equal up to N sub-version levels
+#
+# When the condition is true, shell commands ACTION-IF-TRUE are run,
+# otherwise shell commands ACTION-IF-FALSE are run. The environment
+# variable 'ax_compare_version' is always set to either 'true' or 'false'
+# as well.
+#
+# Examples:
+#
+# AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8])
+# AX_COMPARE_VERSION([3.15],[lt],[3.15.8])
+#
+# would both be true.
+#
+# AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8])
+# AX_COMPARE_VERSION([3.15],[gt],[3.15.8])
+#
+# would both be false.
+#
+# AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8])
+#
+# would be true because it is only comparing two minor versions.
+#
+# AX_COMPARE_VERSION([3.15.7],[eq0],[3.15])
+#
+# would be true because it is only comparing the lesser number of minor
+# versions of the two values.
+#
+# Note: The characters that separate the version numbers do not matter. An
+# empty string is the same as version 0. OP is evaluated by autoconf, not
+# configure, so must be a string, not a variable.
+#
+# The author would like to acknowledge Guido Draheim whose advice about
+# the m4_case and m4_ifvaln functions make this macro only include the
+# portions necessary to perform the specific comparison specified by the
+# OP argument in the final configure script.
+#
+# LICENSE
+#
+# Copyright (c) 2008 Tim Toolan <toolan@ele.uri.edu>
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved.
+
+dnl #########################################################################
+AC_DEFUN([AX_COMPARE_VERSION], [
+ AC_PROG_AWK
+
+ # Used to indicate true or false condition
+ ax_compare_version=false
+
+ # Convert the two version strings to be compared into a format that
+ # allows a simple string comparison. The end result is that a version
+ # string of the form 1.12.5-r617 will be converted to the form
+ # 0001001200050617. In other words, each number is zero padded to four
+ # digits, and non digits are removed.
+ AS_VAR_PUSHDEF([A],[ax_compare_version_A])
+ A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
+ -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/[[^0-9]]//g'`
+
+ AS_VAR_PUSHDEF([B],[ax_compare_version_B])
+ B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
+ -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/[[^0-9]]//g'`
+
+ dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary
+ dnl # then the first line is used to determine if the condition is true.
+ dnl # The sed right after the echo is to remove any indented white space.
+ m4_case(m4_tolower($2),
+ [lt],[
+ ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"`
+ ],
+ [gt],[
+ ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"`
+ ],
+ [le],[
+ ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"`
+ ],
+ [ge],[
+ ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"`
+ ],[
+ dnl Split the operator from the subversion count if present.
+ m4_bmatch(m4_substr($2,2),
+ [0],[
+ # A count of zero means use the length of the shorter version.
+ # Determine the number of characters in A and B.
+ ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'`
+ ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'`
+
+ # Set A to no more than B's length and B to no more than A's length.
+ A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"`
+ B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"`
+ ],
+ [[0-9]+],[
+ # A count greater than zero means use only that many subversions
+ A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
+ B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
+ ],
+ [.+],[
+ AC_WARNING(
+ [illegal OP numeric parameter: $2])
+ ],[])
+
+ # Pad zeros at end of numbers to make same length.
+ ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`"
+ B="$B`echo $A | sed 's/./0/g'`"
+ A="$ax_compare_version_tmp_A"
+
+ # Check for equality or inequality as necessary.
+ m4_case(m4_tolower(m4_substr($2,0,2)),
+ [eq],[
+ test "x$A" = "x$B" && ax_compare_version=true
+ ],
+ [ne],[
+ test "x$A" != "x$B" && ax_compare_version=true
+ ],[
+ AC_WARNING([illegal OP parameter: $2])
+ ])
+ ])
+
+ AS_VAR_POPDEF([A])dnl
+ AS_VAR_POPDEF([B])dnl
+
+ dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE.
+ if test "$ax_compare_version" = "true" ; then
+ m4_ifvaln([$4],[$4],[:])dnl
+ m4_ifvaln([$5],[else $5])dnl
+ fi
+]) dnl AX_COMPARE_VERSION
diff --git a/x11/xcb-util-xrm/files/xcb_util_common.m4 b/x11/xcb-util-xrm/files/xcb_util_common.m4
new file mode 100644
index 0000000..bc1cd42
--- /dev/null
+++ b/x11/xcb-util-xrm/files/xcb_util_common.m4
@@ -0,0 +1,44 @@
+# XCB_UTIL_COMMON(xcb-required-version, xcb-proto-required-version)
+# -----------------------------------------------------------------
+#
+# Defines default options for xcb-util libraries. xorg/util/macros >=
+# 1.16.0 is required for cross-platform compiler flags and to build
+# library documentation.
+#
+AC_DEFUN([XCB_UTIL_COMMON], [
+m4_ifndef([AX_COMPARE_VERSION],
+ [m4_fatal([could not find AX_COMPARE_VERSION in macros search path])])
+
+AC_REQUIRE([AC_PROG_LIBTOOL])
+
+# Define header files and pkgconfig paths
+xcbincludedir='${includedir}/xcb'
+AC_SUBST(xcbincludedir)
+pkgconfigdir='${libdir}/pkgconfig'
+AC_SUBST(pkgconfigdir)
+
+# Check xcb version
+PKG_CHECK_MODULES(XCB, xcb >= [$1])
+
+# Check version of xcb-proto that xcb was compiled against
+xcbproto_required=[$2]
+
+AC_MSG_CHECKING([whether libxcb was compiled against xcb-proto >= $xcbproto_required])
+xcbproto_version=`$PKG_CONFIG --variable=xcbproto_version xcb`
+AX_COMPARE_VERSION([$xcbproto_version],[ge],[$xcbproto_required], xcbproto_ok="yes",
+ xcbproto_ok="no")
+AC_MSG_RESULT([$xcbproto_ok])
+
+if test $xcbproto_ok = no; then
+ AC_MSG_ERROR([libxcb was compiled against xcb-proto $xcbproto_version; it needs to be compiled against version $xcbproto_required or higher])
+fi
+
+# Call macros from Xorg util-macros
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.16.0 or later before running autoconf/autogen])])
+
+XORG_MACROS_VERSION([1.16.0])
+XORG_DEFAULT_OPTIONS
+XORG_ENABLE_DEVEL_DOCS
+XORG_WITH_DOXYGEN
+]) # XCB_UTIL_COMMON
diff --git a/x11/xcb-util-xrm/files/xcb_util_m4_with_include_path.m4 b/x11/xcb-util-xrm/files/xcb_util_m4_with_include_path.m4
new file mode 100644
index 0000000..a3ddce4
--- /dev/null
+++ b/x11/xcb-util-xrm/files/xcb_util_m4_with_include_path.m4
@@ -0,0 +1,24 @@
+# XCB_UTIL_M4_WITH_INCLUDE_PATH
+# ------------------------------
+#
+# This macro attempts to locate an m4 macro processor which supports
+# -I option and is only useful for modules relying on M4 in order to
+# expand macros in source code files.
+#
+# M4: variable holding the path to an usable m4 program.
+#
+# This macro requires Autoconf 2.62 or later as it is relying upon
+# AC_PATH_PROGS_FEATURE_CHECK macro. NOTE: As soon as the minimum
+# required version of Autoconf for Xorg is bumped to 2.62, this macro
+# is supposed to be shipped with xorg/util/macros.
+#
+AC_DEFUN([XCB_UTIL_M4_WITH_INCLUDE_PATH], [
+AC_CACHE_CHECK([for m4 that supports -I option], [ac_cv_path_M4],
+ [AC_PATH_PROGS_FEATURE_CHECK([M4], [m4 gm4],
+ [[$ac_path_M4 -I. /dev/null > /dev/null 2>&1 && \
+ ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:]],
+ [AC_MSG_ERROR([could not find m4 that supports -I option])],
+ [$PATH:/usr/gnu/bin])])
+
+AC_SUBST([M4], [$ac_cv_path_M4])
+]) # XCB_UTIL_M4_WITH_INCLUDE_PATH
diff --git a/x11/xcb-util-xrm/pkg/DESCR b/x11/xcb-util-xrm/pkg/DESCR
new file mode 100644
index 0000000..6bfbd3a
--- /dev/null
+++ b/x11/xcb-util-xrm/pkg/DESCR
@@ -0,0 +1,4 @@
+XCB util-xrm module provides the following libraries:
+
+ - xrm: utility functions for the X resource manager
+
diff --git a/x11/xcb-util-xrm/pkg/PLIST b/x11/xcb-util-xrm/pkg/PLIST
new file mode 100644
index 0000000..22d04c8
--- /dev/null
+++ b/x11/xcb-util-xrm/pkg/PLIST
@@ -0,0 +1,6 @@
+@comment $OpenBSD: PLIST,v$
+include/xcb/xcb_xrm.h
+@static-lib lib/libxcb-xrm.a
+lib/libxcb-xrm.la
+@lib lib/libxcb-xrm.so.${LIBxcb-xrm_VERSION}
+lib/pkgconfig/xcb-xrm.pc
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 08:33:04 +0000