From 0bcec9f6b28c56aa9333bf78dcd322c25afb858e Mon Sep 17 00:00:00 2001 From: Sam Bingner Date: Sun, 29 Sep 2019 22:59:03 -1000 Subject: Add libtool and texinfo; update autoconf, automake --- data/autoconf/make.sh | 4 ++- data/automake/arm64.diff | 12 +++++++ data/automake/make.sh | 4 ++- data/libtool/_metadata/depends | 1 + data/libtool/_metadata/description | 1 + data/libtool/_metadata/homepage | 1 + data/libtool/_metadata/in.1443.00 | 0 data/libtool/_metadata/maintainer | 1 + data/libtool/_metadata/priority | 1 + data/libtool/_metadata/role | 1 + data/libtool/_metadata/section | 1 + data/libtool/_metadata/tags | 1 + data/libtool/_metadata/version | 1 + data/libtool/libtool-2.4.6.tar.xz | Bin 0 -> 973080 bytes data/libtool/make.sh | 19 ++++++++++ data/texinfo/_metadata/description | 1 + data/texinfo/_metadata/homepage | 1 + data/texinfo/_metadata/in.1443.00 | 0 data/texinfo/_metadata/license | 1 + data/texinfo/_metadata/maintainer | 1 + data/texinfo/_metadata/perl.dep | 1 + data/texinfo/_metadata/priority | 1 + data/texinfo/_metadata/role | 1 + data/texinfo/_metadata/section | 1 + data/texinfo/_metadata/tags | 1 + data/texinfo/_metadata/version | 1 + data/texinfo/doc.diff | 35 ++++++++++++++++++ data/texinfo/make.sh | 6 ++++ data/texinfo/perlpath.diff | 72 +++++++++++++++++++++++++++++++++++++ data/texinfo/texinfo-6.7.tar.xz | Bin 0 -> 4337984 bytes 30 files changed, 169 insertions(+), 2 deletions(-) create mode 100644 data/automake/arm64.diff create mode 100644 data/libtool/_metadata/depends create mode 100644 data/libtool/_metadata/description create mode 100644 data/libtool/_metadata/homepage create mode 100644 data/libtool/_metadata/in.1443.00 create mode 120000 data/libtool/_metadata/maintainer create mode 100644 data/libtool/_metadata/priority create mode 100644 data/libtool/_metadata/role create mode 100644 data/libtool/_metadata/section create mode 100644 data/libtool/_metadata/tags create mode 100644 data/libtool/_metadata/version create mode 100644 data/libtool/libtool-2.4.6.tar.xz create mode 100644 data/libtool/make.sh create mode 100644 data/texinfo/_metadata/description create mode 100644 data/texinfo/_metadata/homepage create mode 100644 data/texinfo/_metadata/in.1443.00 create mode 120000 data/texinfo/_metadata/license create mode 120000 data/texinfo/_metadata/maintainer create mode 120000 data/texinfo/_metadata/perl.dep create mode 100644 data/texinfo/_metadata/priority create mode 100644 data/texinfo/_metadata/role create mode 100644 data/texinfo/_metadata/section create mode 100644 data/texinfo/_metadata/tags create mode 100644 data/texinfo/_metadata/version create mode 100644 data/texinfo/doc.diff create mode 100644 data/texinfo/make.sh create mode 100644 data/texinfo/perlpath.diff create mode 100644 data/texinfo/texinfo-6.7.tar.xz diff --git a/data/autoconf/make.sh b/data/autoconf/make.sh index 452a4bfd5..5d66c05ba 100644 --- a/data/autoconf/make.sh +++ b/data/autoconf/make.sh @@ -1,4 +1,6 @@ +export M4=/usr/bin/m4 +export PERL=/usr/bin/perl pkg:setup pkg:configure -make +pkg:make pkg:install diff --git a/data/automake/arm64.diff b/data/automake/arm64.diff new file mode 100644 index 000000000..014588c0a --- /dev/null +++ b/data/automake/arm64.diff @@ -0,0 +1,12 @@ +diff -ur automake-1.16.1/lib/config.guess automake-1.16.1+iOS/lib/config.guess +--- automake-1.16.1/lib/config.guess 2018-03-11 11:19:05.000000000 -1000 ++++ automake-1.16.1+iOS/lib/config.guess 2019-09-27 22:40:33.000000000 -1000 +@@ -1316,6 +1316,8 @@ + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 ++ elif test "$UNAME_PROCESSOR" = arm64 ; then ++ UNAME_PROCESSOR=aarch64 + fi + echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" + exit ;; diff --git a/data/automake/make.sh b/data/automake/make.sh index 452a4bfd5..5d66c05ba 100644 --- a/data/automake/make.sh +++ b/data/automake/make.sh @@ -1,4 +1,6 @@ +export M4=/usr/bin/m4 +export PERL=/usr/bin/perl pkg:setup pkg:configure -make +pkg:make pkg:install diff --git a/data/libtool/_metadata/depends b/data/libtool/_metadata/depends new file mode 100644 index 000000000..c69f5cfe2 --- /dev/null +++ b/data/libtool/_metadata/depends @@ -0,0 +1 @@ +autoconf, automake, llvm-clang, file, grep, ld64, sed diff --git a/data/libtool/_metadata/description b/data/libtool/_metadata/description new file mode 100644 index 000000000..70d317aa3 --- /dev/null +++ b/data/libtool/_metadata/description @@ -0,0 +1 @@ +Generic library support script diff --git a/data/libtool/_metadata/homepage b/data/libtool/_metadata/homepage new file mode 100644 index 000000000..e5122a153 --- /dev/null +++ b/data/libtool/_metadata/homepage @@ -0,0 +1 @@ +http://www.gnu.org/software/libtool/ diff --git a/data/libtool/_metadata/in.1443.00 b/data/libtool/_metadata/in.1443.00 new file mode 100644 index 000000000..e69de29bb diff --git a/data/libtool/_metadata/maintainer b/data/libtool/_metadata/maintainer new file mode 120000 index 000000000..573d7ebef --- /dev/null +++ b/data/libtool/_metadata/maintainer @@ -0,0 +1 @@ +../../../people/sbingner \ No newline at end of file diff --git a/data/libtool/_metadata/priority b/data/libtool/_metadata/priority new file mode 100644 index 000000000..134d9bc32 --- /dev/null +++ b/data/libtool/_metadata/priority @@ -0,0 +1 @@ +optional diff --git a/data/libtool/_metadata/role b/data/libtool/_metadata/role new file mode 100644 index 000000000..52b4d7301 --- /dev/null +++ b/data/libtool/_metadata/role @@ -0,0 +1 @@ +hacker diff --git a/data/libtool/_metadata/section b/data/libtool/_metadata/section new file mode 100644 index 000000000..e0eb96881 --- /dev/null +++ b/data/libtool/_metadata/section @@ -0,0 +1 @@ +Development diff --git a/data/libtool/_metadata/tags b/data/libtool/_metadata/tags new file mode 100644 index 000000000..ad5d50831 --- /dev/null +++ b/data/libtool/_metadata/tags @@ -0,0 +1 @@ +purpose::console diff --git a/data/libtool/_metadata/version b/data/libtool/_metadata/version new file mode 100644 index 000000000..7bf4b6a8a --- /dev/null +++ b/data/libtool/_metadata/version @@ -0,0 +1 @@ +2.4.6 diff --git a/data/libtool/libtool-2.4.6.tar.xz b/data/libtool/libtool-2.4.6.tar.xz new file mode 100644 index 000000000..8782cd4a7 Binary files /dev/null and b/data/libtool/libtool-2.4.6.tar.xz differ diff --git a/data/libtool/make.sh b/data/libtool/make.sh new file mode 100644 index 000000000..6a2780cfd --- /dev/null +++ b/data/libtool/make.sh @@ -0,0 +1,19 @@ +pkg:setup +pkg:configure +pkg:make +pkg:install +GREP=$(grep '^GREP = ' ${PKG_WORK}/*/Makefile) +SED=$(grep '^SED = ' ${PKG_WORK}/*/Makefile) +LD=$(grep '^LD = ' ${PKG_WORK}/*/Makefile) +NM=$(grep '^NM = ' ${PKG_WORK}/*/Makefile) +echo sed -i'' \ + -e "s|${GREP##GREP = }|/bin/grep|" \ + -e "s|${SED##SED = }|/bin/sed|" \ + "${PKG_DEST}/$(cat ${PKG_BASE}/arch/${PKG_ARCH}/${PKG_CFTARG}/prefix)"/bin/{libtool,libtoolize} +sed -i'' \ + -e "s|${GREP##GREP = }|/bin/grep|" \ + -e "s|${SED##SED = }|/bin/sed|" \ + -e "s|${LD##LD = }|/usr/bin/ld|" \ + -e "s|${NM##NM = }|/usr/bin/nm|" \ + -e "s|${PKG_TARG}-||" \ + "${PKG_DEST}/$(cat ${PKG_BASE}/arch/${PKG_ARCH}/${PKG_CFTARG}/prefix)"/bin/{libtool,libtoolize} diff --git a/data/texinfo/_metadata/description b/data/texinfo/_metadata/description new file mode 100644 index 000000000..ce37a36b7 --- /dev/null +++ b/data/texinfo/_metadata/description @@ -0,0 +1 @@ +Documentation system for on-line information and printed output diff --git a/data/texinfo/_metadata/homepage b/data/texinfo/_metadata/homepage new file mode 100644 index 000000000..d8c7ec88a --- /dev/null +++ b/data/texinfo/_metadata/homepage @@ -0,0 +1 @@ +http://www.gnu.org/software/texinfo/ diff --git a/data/texinfo/_metadata/in.1443.00 b/data/texinfo/_metadata/in.1443.00 new file mode 100644 index 000000000..e69de29bb diff --git a/data/texinfo/_metadata/license b/data/texinfo/_metadata/license new file mode 120000 index 000000000..af4224931 --- /dev/null +++ b/data/texinfo/_metadata/license @@ -0,0 +1 @@ +../../../licenses/gpl-3 \ No newline at end of file diff --git a/data/texinfo/_metadata/maintainer b/data/texinfo/_metadata/maintainer new file mode 120000 index 000000000..573d7ebef --- /dev/null +++ b/data/texinfo/_metadata/maintainer @@ -0,0 +1 @@ +../../../people/sbingner \ No newline at end of file diff --git a/data/texinfo/_metadata/perl.dep b/data/texinfo/_metadata/perl.dep new file mode 120000 index 000000000..899dc46ed --- /dev/null +++ b/data/texinfo/_metadata/perl.dep @@ -0,0 +1 @@ +../../perl \ No newline at end of file diff --git a/data/texinfo/_metadata/priority b/data/texinfo/_metadata/priority new file mode 100644 index 000000000..134d9bc32 --- /dev/null +++ b/data/texinfo/_metadata/priority @@ -0,0 +1 @@ +optional diff --git a/data/texinfo/_metadata/role b/data/texinfo/_metadata/role new file mode 100644 index 000000000..52b4d7301 --- /dev/null +++ b/data/texinfo/_metadata/role @@ -0,0 +1 @@ +hacker diff --git a/data/texinfo/_metadata/section b/data/texinfo/_metadata/section new file mode 100644 index 000000000..e0eb96881 --- /dev/null +++ b/data/texinfo/_metadata/section @@ -0,0 +1 @@ +Development diff --git a/data/texinfo/_metadata/tags b/data/texinfo/_metadata/tags new file mode 100644 index 000000000..ad5d50831 --- /dev/null +++ b/data/texinfo/_metadata/tags @@ -0,0 +1 @@ +purpose::console diff --git a/data/texinfo/_metadata/version b/data/texinfo/_metadata/version new file mode 100644 index 000000000..341291e53 --- /dev/null +++ b/data/texinfo/_metadata/version @@ -0,0 +1 @@ +6.7 diff --git a/data/texinfo/doc.diff b/data/texinfo/doc.diff new file mode 100644 index 000000000..7a5d65bc2 --- /dev/null +++ b/data/texinfo/doc.diff @@ -0,0 +1,35 @@ +diff -ur texinfo-6.7/Makefile.am texinfo-6.7+iOS/Makefile.am +--- texinfo-6.7/Makefile.am 2019-08-25 07:11:44.000000000 -1000 ++++ texinfo-6.7+iOS/Makefile.am 2019-09-28 22:54:17.000000000 -1000 +@@ -62,8 +62,7 @@ + SUBDIRS += info + endif + endif +- SUBDIRS += install-info po po_document tp Pod-Simple-Texinfo texindex util \ +- doc man ++ SUBDIRS += install-info po po_document tp Pod-Simple-Texinfo texindex util + endif + + distclean-local: +diff -ur texinfo-6.7/Makefile.in texinfo-6.7+iOS/Makefile.in +--- texinfo-6.7/Makefile.in 2019-09-23 08:32:11.000000000 -1000 ++++ texinfo-6.7+iOS/Makefile.in 2019-09-28 22:54:43.000000000 -1000 +@@ -109,8 +109,7 @@ + @HAVE_TERMLIBS_TRUE@@TOOLS_ONLY_FALSE@am__append_5 = info + # DOS/Windows don't need TERMLIBS to build Info + @HAVE_TERMLIBS_FALSE@@HOST_IS_WINDOWS_TRUE@@TOOLS_ONLY_FALSE@am__append_6 = info +-@TOOLS_ONLY_FALSE@am__append_7 = install-info po po_document tp Pod-Simple-Texinfo texindex util \ +-@TOOLS_ONLY_FALSE@ doc man ++@TOOLS_ONLY_FALSE@am__append_7 = install-info po po_document tp Pod-Simple-Texinfo texindex util + + subdir = . + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -285,7 +284,7 @@ + CTAGS = ctags + CSCOPE = cscope + DIST_SUBDIRS = gnulib/lib install-info tp util info @native_tools@ po \ +- po_document Pod-Simple-Texinfo texindex doc man ++ po_document Pod-Simple-Texinfo texindex + am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.in \ + $(top_srcdir)/build-aux/compile \ + $(top_srcdir)/build-aux/config.guess \ diff --git a/data/texinfo/make.sh b/data/texinfo/make.sh new file mode 100644 index 000000000..4f0286475 --- /dev/null +++ b/data/texinfo/make.sh @@ -0,0 +1,6 @@ +export PERL_SRC="$(PKG_DEST_ perl)" +export PERL="$(PKG_WORK_ perl)"/perl-$(cat $(PKG_DATA_ perl)/_metadata/version)/miniperl_top +pkg:setup +pkg:configure +make -j8 +pkg:install diff --git a/data/texinfo/perlpath.diff b/data/texinfo/perlpath.diff new file mode 100644 index 000000000..92f47525f --- /dev/null +++ b/data/texinfo/perlpath.diff @@ -0,0 +1,72 @@ +diff -ur texinfo-6.7/Pod-Simple-Texinfo/Makefile.am texinfo-6.7+iOS/Pod-Simple-Texinfo/Makefile.am +--- texinfo-6.7/Pod-Simple-Texinfo/Makefile.am 2019-08-25 07:11:44.000000000 -1000 ++++ texinfo-6.7+iOS/Pod-Simple-Texinfo/Makefile.am 2019-09-28 23:09:18.000000000 -1000 +@@ -31,7 +31,7 @@ + -e 's,[@]USE_EXTERNAL_LIBINTL[@],$(USE_EXTERNAL_LIBINTL),g' \ + -e 's,[@]USE_EXTERNAL_EASTASIANWIDTH[@],$(USE_EXTERNAL_EASTASIANWIDTH),g' \ + -e 's,[@]USE_EXTERNAL_UNIDECODE[@],$(USE_EXTERNAL_UNIDECODE),g' \ +- -e '1 s,/usr/bin/env perl,$(PERL),g' \ ++ -e '1 s,/usr/bin/env perl,/usr/bin/perl,g' \ + $(srcdir)/pod2texi.pl >$@ + chmod a+x $@ + +diff -ur texinfo-6.7/Pod-Simple-Texinfo/Makefile.in texinfo-6.7+iOS/Pod-Simple-Texinfo/Makefile.in +--- texinfo-6.7/Pod-Simple-Texinfo/Makefile.in 2019-09-23 08:32:11.000000000 -1000 ++++ texinfo-6.7+iOS/Pod-Simple-Texinfo/Makefile.in 2019-09-28 23:09:27.000000000 -1000 +@@ -1673,7 +1673,7 @@ + -e 's,[@]USE_EXTERNAL_LIBINTL[@],$(USE_EXTERNAL_LIBINTL),g' \ + -e 's,[@]USE_EXTERNAL_EASTASIANWIDTH[@],$(USE_EXTERNAL_EASTASIANWIDTH),g' \ + -e 's,[@]USE_EXTERNAL_UNIDECODE[@],$(USE_EXTERNAL_UNIDECODE),g' \ +- -e '1 s,/usr/bin/env perl,$(PERL),g' \ ++ -e '1 s,/usr/bin/env perl,/usr/bin/perl,g' \ + $(srcdir)/pod2texi.pl >$@ + chmod a+x $@ + +diff -ur texinfo-6.7/tp/Makefile.am texinfo-6.7+iOS/tp/Makefile.am +--- texinfo-6.7/tp/Makefile.am 2019-08-25 07:11:45.000000000 -1000 ++++ texinfo-6.7+iOS/tp/Makefile.am 2019-09-28 23:09:59.000000000 -1000 +@@ -52,7 +52,7 @@ + -e 's,[@]USE_EXTERNAL_UNIDECODE[@],$(USE_EXTERNAL_UNIDECODE),g' \ + -e 's,[@]TEXINFO_DTD_VERSION[@],$(TEXINFO_DTD_VERSION),g' \ + -e 's,[@]enable_xs[@],$(enable_xs),g' \ +- -e '1 s,/usr/bin/env perl,$(PERL),g' ++ -e '1 s,/usr/bin/env perl,/usr/bin/perl,g' + + texi2any: texi2any.pl $(top_builddir)/config.status + $(do_subst) $(srcdir)/texi2any.pl >$@ +diff -ur texinfo-6.7/tp/Makefile.in texinfo-6.7+iOS/tp/Makefile.in +--- texinfo-6.7/tp/Makefile.in 2019-09-23 08:32:12.000000000 -1000 ++++ texinfo-6.7+iOS/tp/Makefile.in 2019-09-28 23:10:09.000000000 -1000 +@@ -2853,7 +2853,7 @@ + -e 's,[@]USE_EXTERNAL_UNIDECODE[@],$(USE_EXTERNAL_UNIDECODE),g' \ + -e 's,[@]TEXINFO_DTD_VERSION[@],$(TEXINFO_DTD_VERSION),g' \ + -e 's,[@]enable_xs[@],$(enable_xs),g' \ +- -e '1 s,/usr/bin/env perl,$(PERL),g' ++ -e '1 s,/usr/bin/env perl,/usr/bin/perl,g' + + modulesdir = $(pkgdatadir)/Texinfo + dist_modules_DATA = \ +diff -ur texinfo-6.7/util/Makefile.am texinfo-6.7+iOS/util/Makefile.am +--- texinfo-6.7/util/Makefile.am 2019-08-25 07:11:47.000000000 -1000 ++++ texinfo-6.7+iOS/util/Makefile.am 2019-09-28 23:10:30.000000000 -1000 +@@ -29,7 +29,7 @@ + -e 's,[@]USE_EXTERNAL_LIBINTL[@],$(USE_EXTERNAL_LIBINTL),g' \ + -e 's,[@]USE_EXTERNAL_EASTASIANWIDTH[@],$(USE_EXTERNAL_EASTASIANWIDTH),g' \ + -e 's,[@]USE_EXTERNAL_UNIDECODE[@],$(USE_EXTERNAL_UNIDECODE),g' \ +- -e '1 s,/usr/bin/env perl,$(PERL),g' \ ++ -e '1 s,/usr/bin/env perl,/usr/bin/perl,g' \ + $(srcdir)/txixml2texi.pl >$@ + chmod a+x $@ + +diff -ur texinfo-6.7/util/Makefile.in texinfo-6.7+iOS/util/Makefile.in +--- texinfo-6.7/util/Makefile.in 2019-09-23 08:32:13.000000000 -1000 ++++ texinfo-6.7+iOS/util/Makefile.in 2019-09-28 23:10:38.000000000 -1000 +@@ -1702,7 +1702,7 @@ + -e 's,[@]USE_EXTERNAL_LIBINTL[@],$(USE_EXTERNAL_LIBINTL),g' \ + -e 's,[@]USE_EXTERNAL_EASTASIANWIDTH[@],$(USE_EXTERNAL_EASTASIANWIDTH),g' \ + -e 's,[@]USE_EXTERNAL_UNIDECODE[@],$(USE_EXTERNAL_UNIDECODE),g' \ +- -e '1 s,/usr/bin/env perl,$(PERL),g' \ ++ -e '1 s,/usr/bin/env perl,/usr/bin/perl,g' \ + $(srcdir)/txixml2texi.pl >$@ + chmod a+x $@ + diff --git a/data/texinfo/texinfo-6.7.tar.xz b/data/texinfo/texinfo-6.7.tar.xz new file mode 100644 index 000000000..ee5172e94 Binary files /dev/null and b/data/texinfo/texinfo-6.7.tar.xz differ -- cgit v1.2.3