ports: Use target xorg-util-macros for regeneration

vlang · Jan 13, 2024 · bd95733 · bd95733
1 parent 0de5b3d
commit bd95733
Show file tree

Hide file tree

Showing 43 changed files with 119 additions and 100 deletions.
diff --git a/host-recipes/xorg-util-macros b/host-recipes/xorg-util-macros
diff --git a/patches/xf86-input-keyboard/jinx-working-patch.patch b/patches/xf86-input-keyboard/jinx-working-patch.patch
@@ -1,5 +1,5 @@
 diff --git xf86-input-keyboard-clean/configure.ac xf86-input-keyboard-workdir/configure.ac
-index 0f71ce3..9673a82 100644
+index 0f71ce3..9d7adf9 100644
 --- xf86-input-keyboard-clean/configure.ac
 +++ xf86-input-keyboard-workdir/configure.ac
 @@ -57,6 +57,10 @@ AC_SUBST(inputdir)
@@ -22,7 +22,7 @@ index 0f71ce3..9673a82 100644
  AM_CONDITIONAL(SOLARIS, [test "x$IS_SOLARIS" = xyes])
  AM_CONDITIONAL(HURD, [test "x$IS_HURD" = xyes])
 diff --git xf86-input-keyboard-clean/src/Makefile.am xf86-input-keyboard-workdir/src/Makefile.am
-index 52f5f4d..45b0d0f 100644
+index 52f5f4d..643e707 100644
 --- xf86-input-keyboard-clean/src/Makefile.am
 +++ xf86-input-keyboard-workdir/src/Makefile.am
 @@ -26,10 +26,15 @@ kbd_drv_la_SOURCES = kbd.c xf86OSKbd.h xf86Keymap.h atKeynames.h

diff --git a/patches/xf86-input-mouse/jinx-working-patch.patch b/patches/xf86-input-mouse/jinx-working-patch.patch
@@ -1,5 +1,5 @@
 diff --git xf86-input-mouse-clean/configure.ac xf86-input-mouse-workdir/configure.ac
-index 6c453cd..7ed1521 100644
+index 1d871b2..d196694 100644
 --- xf86-input-mouse-clean/configure.ac
 +++ xf86-input-mouse-workdir/configure.ac
 @@ -62,7 +62,7 @@ AC_SUBST(inputdir)
@@ -23,7 +23,7 @@ index 6c453cd..7ed1521 100644
 
 diff --git xf86-input-mouse-workdir/src/vinix_mouse.c xf86-input-mouse-workdir/src/vinix_mouse.c
 new file mode 100644
-index 0000000..8de8a7f
+index 0000000..b664773
 --- /dev/null
 +++ xf86-input-mouse-workdir/src/vinix_mouse.c
 @@ -0,0 +1,119 @@

diff --git a/patches/xorg-proto/jinx-working-patch.patch b/patches/xorg-proto/jinx-working-patch.patch
@@ -1,5 +1,5 @@
 diff --git xorg-proto-clean/include/X11/Xos.h xorg-proto-workdir/include/X11/Xos.h
-index 75cc5b7..6c46e33 100644
+index 75cc5b7..9adf88d 100644
 --- xorg-proto-clean/include/X11/Xos.h
 +++ xorg-proto-workdir/include/X11/Xos.h
 @@ -60,7 +60,7 @@ in this Software without prior written authorization from The Open Group.
@@ -12,7 +12,7 @@ index 75cc5b7..6c46e33 100644
  # else
  #  ifndef index
 diff --git xorg-proto-clean/include/X11/Xos_r.h xorg-proto-workdir/include/X11/Xos_r.h
-index f963b64..542c19d 100644
+index f963b64..5ade17b 100644
 --- xorg-proto-clean/include/X11/Xos_r.h
 +++ xorg-proto-workdir/include/X11/Xos_r.h
 @@ -318,7 +318,7 @@ static __inline__ void _Xpw_copyPasswd(_Xgetpwparams p)

diff --git a/recipes/libfontenc b/recipes/libfontenc
@@ -3,8 +3,8 @@ version=1.1.7
 revision=1
 tarball_url="https://www.x.org/archive/individual/lib/libfontenc-${version}.tar.gz"
 tarball_blake2b="538dc45801dd2fc3b18527b5716fd468089206728ce4704416eb0ecd2ed528f951d64e7bf2f779a5852363670724458c966538afcec813a9823f5d04303d1bbb"
-source_hostdeps="automake autoconf libtool pkg-config xorg-util-macros"
-source_deps="xorg-font-util"
+source_hostdeps="automake autoconf libtool pkg-config"
+source_deps="xorg-font-util xorg-util-macros"
 hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs xorg-proto zlib"
 

diff --git a/recipes/libice b/recipes/libice
@@ -3,12 +3,13 @@ version=1.1.1
 revision=1
 tarball_url="https://www.x.org/archive/individual/lib/libICE-${version}.tar.gz"
 tarball_blake2b="1acb1cdb5b0fd49451b6e4498061c16fff35711a19a5da2c2de0046b6b3ed6bd6bdccf8d45f7adcdb7f2f685245176488f149b41087e562945754088f18c220b"
-source_hostdeps="automake autoconf libtool pkg-config xorg-util-macros"
+source_hostdeps="automake autoconf libtool pkg-config"
+source_deps="xorg-util-macros"
 hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs xorg-proto xtrans"
 
 regenerate() {
-    autoreconf -fvi
+    autotools_recursive_regen
 }
 
 build() {

diff --git a/recipes/libsm b/recipes/libsm
@@ -3,12 +3,13 @@ version=1.2.4
 revision=1
 tarball_url="https://www.x.org/archive/individual/lib/libSM-${version}.tar.gz"
 tarball_blake2b="9f05c36f933ddbe66e06a96c7b9f5c23a2b5218da724a838b42ef4b798195c24a2be13e1d5c61bccf7660a4880f78da8452fa93a668f483ce808ce840c2cfcfb"
-source_hostdeps="automake autoconf libtool pkg-config xorg-util-macros"
+source_hostdeps="automake autoconf libtool pkg-config"
+source_deps="xorg-util-macros"
 hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs xorg-proto libice"
 
 regenerate() {
-    autoreconf -fvi
+    autotools_recursive_regen
 }
 
 build() {

diff --git a/recipes/libx11 b/recipes/libx11
@@ -3,8 +3,8 @@ version=1.8.7
 revision=1
 tarball_url="https://www.x.org/archive/individual/lib/libX11-${version}.tar.xz"
 tarball_blake2b="335d8af91c13aba11255c266c4687a7f66b021207a92485d723b4107601bbabb6a0e5535241a3bcff4ac9a99142730d2b3d2e2eaff86b507fee5b35a2590d792"
-source_hostdeps="automake autoconf libtool pkg-config xorg-util-macros"
-source_deps="xtrans"
+source_hostdeps="automake autoconf libtool pkg-config"
+source_deps="xtrans xorg-util-macros"
 imagedeps="gcc"
 hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs xorg-proto libxcb xtrans"

diff --git a/recipes/libxau b/recipes/libxau
@@ -3,12 +3,13 @@ version=1.0.11
 revision=1
 tarball_url="https://www.x.org/archive/individual/lib/libXau-${version}.tar.gz"
 tarball_blake2b="2c1066e40fe64ebd8b095bb7bac436d3b0d518080b80e93d1def040af390bd08ed3f4f49feb0b4b390a5733e74bf7429c96ddac5f8fbfb904eb25b496676618a"
-source_hostdeps="automake autoconf libtool pkg-config xorg-util-macros"
+source_hostdeps="automake autoconf libtool pkg-config"
+source_deps="xorg-util-macros"
 hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs xorg-proto"
 
 regenerate() {
-    autoreconf -fvi
+    autotools_recursive_regen
 }
 
 build() {

diff --git a/recipes/libxaw b/recipes/libxaw
@@ -3,12 +3,13 @@ version=1.0.15
 revision=1
 tarball_url="https://www.x.org/archive/individual/lib/libXaw-${version}.tar.gz"
 tarball_blake2b="71d7b413f9a5178149871c810122589ec74fb4b1e78e884a1538871afd69ad775c3ff15e0c0b21115700f5c9c0965c65336b4c07c1d1069490e6c214ad0f3af0"
-source_hostdeps="automake autoconf libtool pkg-config xorg-util-macros"
+source_hostdeps="automake autoconf libtool pkg-config"
+source_deps="xorg-util-macros"
 hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs libxmu libxpm"
 
 regenerate() {
-    autoreconf -fvi
+    autotools_recursive_regen
 }
 
 build() {

diff --git a/recipes/libxcb b/recipes/libxcb
@@ -3,13 +3,14 @@ version=1.16
 revision=1
 tarball_url="https://www.x.org/archive/individual/lib/libxcb-${version}.tar.xz"
 tarball_blake2b="1ddd5c2e6be8400a0a77db4b5fbd4698996fd1a00984e370b1f712f6b9ce456c8ccfb6992f2973f5eaf8d5b6b75f39b9f51a1458c2432ddb41edd8199b91b3f9"
-source_hostdeps="automake autoconf libtool pkg-config xorg-util-macros"
+source_hostdeps="automake autoconf libtool pkg-config"
+source_deps="xorg-util-macros"
 imagedeps="python"
 hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs xorg-proto libxau libxdmcp xcb-proto"
 
 regenerate() {
-    autoreconf -fvi
+    autotools_recursive_regen
     sed -i 's/pthread-stubs//' "${source_dir}"/configure
 }
 

diff --git a/recipes/libxcursor b/recipes/libxcursor
@@ -3,12 +3,13 @@ version=1.2.1
 revision=1
 tarball_url="https://www.x.org/archive/individual/lib/libXcursor-${version}.tar.gz"
 tarball_blake2b="42ee1c77f9c976541f51044474b6bf60935ee62d3d95298ce9d71c92e612bc12c460c4161c148d7f9c99a9ea76f74b34ca4f4b8980af2ccabd78fdad4752f2f5"
-source_hostdeps="autoconf automake libtool pkg-config xorg-util-macros"
+source_hostdeps="autoconf automake libtool pkg-config"
+source_deps="xorg-util-macros"
 hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs libxrender libxfixes libx11"
 
 regenerate() {
-    autoreconf -fvi
+    autotools_recursive_regen
 }
 
 build() {

diff --git a/recipes/libxdamage b/recipes/libxdamage
@@ -3,12 +3,13 @@ version=1.1.6
 revision=1
 tarball_url="https://www.x.org/archive/individual/lib/libXdamage-${version}.tar.gz"
 tarball_blake2b="e8fcdbb3b93b7f3a74b10adbb4ceaccc963c7f9ce4fe0edee5842fde7d26cbb2cf3061f073c9ca400baa8378d06ed83c8c751495febb1aeb86a27058d74b1543"
-source_hostdeps="automake autoconf libtool pkg-config xorg-util-macros"
+source_hostdeps="automake autoconf libtool pkg-config"
+source_deps="xorg-util-macros"
 hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs xorg-proto libxfixes"
 
 regenerate() {
-    autoreconf -fvi
+    autotools_recursive_regen
 }
 
 build() {

diff --git a/recipes/libxdmcp b/recipes/libxdmcp
@@ -3,12 +3,13 @@ version=1.1.4
 revision=1
 tarball_url="https://www.x.org/archive/individual/lib/libXdmcp-${version}.tar.gz"
 tarball_blake2b="83973212793c93253b06ee75902842873f1f322c53dc32f054954131243dcf5c31d6792dc5d216134c9536c142b4d5823c8fd998d048ec093383b4f7362fb066"
-source_hostdeps="automake autoconf libtool pkg-config xorg-util-macros"
+source_hostdeps="automake autoconf libtool pkg-config"
+source_deps="xorg-util-macros"
 hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs xorg-proto"
 
 regenerate() {
-    autoreconf -fvi
+    autotools_recursive_regen
 }
 
 build() {

diff --git a/recipes/libxext b/recipes/libxext
@@ -3,12 +3,13 @@ version=1.3.5
 revision=1
 tarball_url="https://www.x.org/archive/individual/lib/libXext-${version}.tar.gz"
 tarball_blake2b="74ee5d3fc3832fc5d9774f7f1a8e0d30ab1af97c35f0e3da0b314c228f8f511cdb106c74eeeb1de56db16d4c2b8aaab34b7ca886f02530319fde1a7ae7788598"
-source_hostdeps="automake autoconf libtool pkg-config xorg-util-macros"
+source_hostdeps="automake autoconf libtool pkg-config"
+source_deps="xorg-util-macros"
 hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs xorg-proto libx11"
 
 regenerate() {
-    autoreconf -fvi
+    autotools_recursive_regen
 }
 
 build() {

diff --git a/recipes/libxfixes b/recipes/libxfixes
@@ -3,12 +3,13 @@ version=6.0.1
 revision=1
 tarball_url="https://www.x.org/archive/individual/lib/libXfixes-${version}.tar.gz"
 tarball_blake2b="22be454b2db230057204932ae75aacb2b56523b25b14e501d7e7a2a664e57ae6bcbfa56b6fac4d42d3f8ef770c41debe0eec25451dd70baa9cfc83b1a10e4649"
-source_hostdeps="automake autoconf libtool pkg-config xorg-util-macros"
+source_hostdeps="automake autoconf libtool pkg-config"
+source_deps="xorg-util-macros"
 hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs xorg-proto libx11"
 
 regenerate() {
-    autoreconf -fvi
+    autotools_recursive_regen
 }
 
 build() {

diff --git a/recipes/libxfont2 b/recipes/libxfont2
@@ -3,12 +3,13 @@ version=2.0.6
 revision=1
 tarball_url="https://www.x.org/archive/individual/lib/libXfont2-${version}.tar.gz"
 tarball_blake2b="1a871c6d7c81beadf1c9a5e864a2df186b6429337e86f4fee0c8969d158cf284f10019f69a2f7e0c9298d9f6fa842d5315932152b5e70cb068c5530360e578a0"
-source_hostdeps="automake autoconf libtool pkg-config xorg-util-macros"
+source_hostdeps="automake autoconf libtool pkg-config"
+source_deps="xorg-util-macros"
 hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs xorg-proto xtrans freetype bzip2 libfontenc zlib"
 
 regenerate() {
-    autoreconf -fvi
+    autotools_recursive_regen
 }
 
 build() {

diff --git a/recipes/libxft b/recipes/libxft
@@ -3,12 +3,13 @@ version=2.3.8
 revision=1
 tarball_url="https://www.x.org/archive/individual/lib/libXft-${version}.tar.gz"
 tarball_blake2b="06d797ed53df793e5b9751bc7984a62a96c973e36d8aa99e4dc96a03e0e7013d6adc9e46f033e1ffcb4632cec2ac0318108ff2894beb4464d44d524254b15328"
-source_hostdeps="automake autoconf libtool pkg-config xorg-util-macros"
+source_hostdeps="automake autoconf libtool pkg-config"
+source_deps="xorg-util-macros"
 hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs libxrender fontconfig"
 
 regenerate() {
-    autoreconf -fvi
+    autotools_recursive_regen
 }
 
 build() {

diff --git a/recipes/libxi b/recipes/libxi
@@ -3,12 +3,13 @@ version=1.8.1
 revision=1
 tarball_url="https://www.x.org/archive/individual/lib/libXi-${version}.tar.gz"
 tarball_blake2b="473bf5a80c86ef853dcf21b2292eb07818148302b051ca4fb9bfdf42053ae0ae6c53d588de7c027d1c72d7b5a9dba775111f4913b36e771380f4d0fcb823e345"
-source_hostdeps="automake autoconf libtool pkg-config xorg-util-macros"
+source_hostdeps="automake autoconf libtool pkg-config"
+source_deps="xorg-util-macros"
 hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs xorg-proto libxext libxfixes"
 
 regenerate() {
-    autoreconf -fvi
+    autotools_recursive_regen
 }
 
 build() {

diff --git a/recipes/libxkbfile b/recipes/libxkbfile
@@ -3,12 +3,13 @@ version=1.1.2
 revision=1
 tarball_url="https://www.x.org/archive/individual/lib/libxkbfile-${version}.tar.gz"
 tarball_blake2b="192c0d7a9e9c8f555ccd0a120e79f5d0fb4d9843fe0eb437b5ed5ce62bd65366a50649037aeed9112cd2ca11db4e088282049d4b799bb26d11d2d9b07384a8e1"
-source_hostdeps="automake autoconf libtool pkg-config xorg-util-macros"
+source_hostdeps="automake autoconf libtool pkg-config"
+source_deps="xorg-util-macros"
 hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs libx11"
 
 regenerate() {
-    autoreconf -fvi
+    autotools_recursive_regen
 }
 
 build() {

diff --git a/recipes/libxmu b/recipes/libxmu
@@ -3,12 +3,13 @@ version=1.1.4
 revision=1
 tarball_url="https://www.x.org/archive/individual/lib/libXmu-${version}.tar.gz"
 tarball_blake2b="b95188ecd667ffa9d831e547803c16637a968199c4e20d11d8beaf8da19c327aeb655c886f21d6b7d1d2a2b9cce522a091ca791c2626ae74d77f838441fa4a90"
-source_hostdeps="automake autoconf libtool pkg-config xorg-util-macros"
+source_hostdeps="automake autoconf libtool pkg-config"
+source_deps="xorg-util-macros"
 hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs libxext libxt"
 
 regenerate() {
-    autoreconf -fvi
+    autotools_recursive_regen
 }
 
 build() {

diff --git a/recipes/libxpm b/recipes/libxpm
@@ -3,12 +3,13 @@ version=3.5.17
 revision=1
 tarball_url="https://www.x.org/archive/individual/lib/libXpm-${version}.tar.gz"
 tarball_blake2b="0acc342fb0aebad04a2d68f60106ad8f52910b2ca65d402bfda09e5914ab92b2b2b9d57680bbb6c6f1c8767971e9cffc1315337f6645fb61940a9cb5ccdf80c0"
-source_hostdeps="automake autoconf libtool pkg-config xorg-util-macros"
+source_hostdeps="automake autoconf libtool pkg-config"
+source_deps="xorg-util-macros"
 hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs libxext libxt"
 
 regenerate() {
-    autoreconf -fvi
+    autotools_recursive_regen
 }
 
 build() {

diff --git a/recipes/libxrandr b/recipes/libxrandr
@@ -3,12 +3,13 @@ version=1.5.4
 revision=1
 tarball_url="https://www.x.org/archive/individual/lib/libXrandr-${version}.tar.gz"
 tarball_blake2b="d5dd5ef33c4452fac7d2c5f16afc15d9e2dcb4e721824ca6e412c6a990ab529003e1beea087afad9dedbcceab17953e066700dac7df0b2aac2cec404335ba93f"
-source_hostdeps="automake autoconf libtool pkg-config xorg-util-macros"
+source_hostdeps="automake autoconf libtool pkg-config"
+source_deps="xorg-util-macros"
 hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs xorg-proto libx11 libxrender libxext"
 
 regenerate() {
-    autoreconf -fvi
+    autotools_recursive_regen
 }
 
 build() {

diff --git a/recipes/libxrender b/recipes/libxrender
@@ -3,12 +3,13 @@ version=0.9.11
 revision=1
 tarball_url="https://www.x.org/archive/individual/lib/libXrender-${version}.tar.gz"
 tarball_blake2b="c8d5cf0c925ccf885634ac535b83b6280b49bc354a9c054375ed6db916350f1e5a1892f9937e0726d3d29fec0f531e787e03d76c3a0c0a22ca6c289c28f2287e"
-source_hostdeps="automake autoconf libtool pkg-config xorg-util-macros"
+source_hostdeps="automake autoconf libtool pkg-config"
+source_deps="xorg-util-macros"
 hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs xorg-proto libx11"
 
 regenerate() {
-    autoreconf -fvi
+    autotools_recursive_regen
 }
 
 build() {

diff --git a/recipes/libxshmfence b/recipes/libxshmfence
@@ -3,12 +3,13 @@ version=1.3.2
 revision=1
 tarball_url="https://www.x.org/archive/individual/lib/libxshmfence-${version}.tar.gz"
 tarball_blake2b="ae99fff03f94c5b001bd901e446f56e4ed2edbfb140ab92ec471ab910af92d45ceeb623718e65e0b8e9bd301aacf0c5d5d3a31dab0246c824aabe0664957e78e"
-source_hostdeps="automake autoconf libtool pkg-config xorg-util-macros"
+source_hostdeps="automake autoconf libtool pkg-config"
+source_deps="xorg-util-macros"
 hostdeps="gcc autoconf automake libtool pkg-config"
 deps="core-libs xorg-proto"
 
 regenerate() {
-    autoreconf -fvi
+    autotools_recursive_regen
 }
 
 build() {