[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tdom/files/, dev-tcltk/tdom/
commit: 8e78b4f5cfe5ff2be4a246c0620a79408404071b
Author: Alfredo Tupone gentoo org>
AuthorDate: Mon Feb 26 07:47:34 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Mon Feb 26 07:48:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e78b4f5
dev-tcltk/tdom: fix for new expat
Closes: https://bugs.gentoo.org/924859
Signed-off-by: Alfredo Tupone gentoo.org>
dev-tcltk/tdom/files/tdom-0.9.3-expat.patch | 10 ++
dev-tcltk/tdom/tdom-0.9.3.ebuild| 5 -
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/dev-tcltk/tdom/files/tdom-0.9.3-expat.patch
b/dev-tcltk/tdom/files/tdom-0.9.3-expat.patch
new file mode 100644
index ..a55fa4b22c14
--- /dev/null
+++ b/dev-tcltk/tdom/files/tdom-0.9.3-expat.patch
@@ -0,0 +1,10 @@
+--- a/generic/dom.h2024-02-26 08:37:08.464473295 +0100
b/generic/dom.h2024-02-26 08:43:19.859997138 +0100
+@@ -37,6 +37,7 @@
+ #include
+ #include
+ #include
++#define XML_GE 1
+ #include
+ #include
+
diff --git a/dev-tcltk/tdom/tdom-0.9.3.ebuild b/dev-tcltk/tdom/tdom-0.9.3.ebuild
index 4fce30a261a6..86d97afcb2ba 100644
--- a/dev-tcltk/tdom/tdom-0.9.3.ebuild
+++ b/dev-tcltk/tdom/tdom-0.9.3.ebuild
@@ -23,7 +23,10 @@ RDEPEND="${DEPEND}"
S="${WORKDIR}"/${P}-src
-PATCHES=( "${FILESDIR}"/${PN}-0.9.2-useCC.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.9.2-useCC.patch
+ "${FILESDIR}"/${P}-expat.patch
+)
QA_CONFIG_IMPL_DECL_SKIP=(
stat64 arc4random_buf arc4random # used to test for Large File Support
[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tdom/files/, dev-tcltk/tdom/
commit: 63b754832e7537ac7bc657caabc1ae32e457c2b6
Author: Alfredo Tupone gentoo org>
AuthorDate: Fri Dec 31 20:25:41 2021 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Fri Dec 31 20:25:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63b75483
dev-tcltk/tdom: fix build with tcl unthreaded
Closes: https://bugs.gentoo.org/821598
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Alfredo Tupone gentoo.org>
dev-tcltk/tdom/files/tdom-0.9.2-nothreads.patch | 11 +++
dev-tcltk/tdom/tdom-0.9.2.ebuild| 5 -
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/dev-tcltk/tdom/files/tdom-0.9.2-nothreads.patch
b/dev-tcltk/tdom/files/tdom-0.9.2-nothreads.patch
new file mode 100644
index ..b24c9821f0d4
--- /dev/null
+++ b/dev-tcltk/tdom/files/tdom-0.9.2-nothreads.patch
@@ -0,0 +1,11 @@
+--- a/generic/tdomDecls.h 2021-12-31 20:52:18.070370435 +0100
b/generic/tdomDecls.h 2021-12-31 20:53:45.892045820 +0100
+@@ -63,7 +63,7 @@
+ EXTERN domDocument * tcldom_getDocumentFromName(Tcl_Interp *interp,
+ char *docName, char **errMsg);
+ /* 18 */
+-EXTERN SchemaData * tdomGetSchemadata(void);
++EXTERN SchemaData * tdomGetSchemadata(Tcl_Interp *interp);
+
+ typedef struct TdomStubs {
+ int magic;
diff --git a/dev-tcltk/tdom/tdom-0.9.2.ebuild b/dev-tcltk/tdom/tdom-0.9.2.ebuild
index c8dbe69542c7..29ad01876f00 100644
--- a/dev-tcltk/tdom/tdom-0.9.2.ebuild
+++ b/dev-tcltk/tdom/tdom-0.9.2.ebuild
@@ -23,7 +23,10 @@ RDEPEND="${DEPEND}"
S="${WORKDIR}"/${P}-src
-PATCHES=( "${FILESDIR}"/${P}-useCC.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-useCC.patch
+ "${FILESDIR}"/${P}-nothreads.patch
+)
src_prepare() {
append-libs -lm
[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tdom/files/, dev-tcltk/tdom/
commit: 5f35ff2c2e9870c41acfb456aa857ab5805af455
Author: Alfredo Tupone gentoo org>
AuthorDate: Mon Oct 25 19:57:07 2021 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Mon Oct 25 19:57:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f35ff2c
dev-tcltk/tdom: bump 0.9.2
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alfredo Tupone gentoo.org>
dev-tcltk/tdom/Manifest | 1 +
dev-tcltk/tdom/files/tdom-0.9.2-useCC.patch | 28 ++
dev-tcltk/tdom/tdom-0.9.2.ebuild| 82 +
3 files changed, 111 insertions(+)
diff --git a/dev-tcltk/tdom/Manifest b/dev-tcltk/tdom/Manifest
index a2049669de4..086daff6deb 100644
--- a/dev-tcltk/tdom/Manifest
+++ b/dev-tcltk/tdom/Manifest
@@ -1 +1,2 @@
DIST tdom-0.9.1-src.tgz 1100163 BLAKE2B
25fca8ae7b2dbcfaca711df90e42479dfba57e9aaf0e616c519b6e74bafb1b5fa371c48abe0875126aa8e1979196a10f6030a0ffe8786b21f7685e8c2ddcb16c
SHA512
40dd5ec942ac4cce2fd78f53caf3a2b5e2fae9fbc5617923d94f07c9f530fa936696d79abe080ade2edbc4f4a86c35898b000180f20d9320edd8bfa3fa19d863
+DIST tdom-0.9.2-src.tgz 1215099 BLAKE2B
1d720043ee4acc27d3fad138baced96b291c2e39dc1535fb1927a9968e07324d5e0e0bb0c71d8e5678b8c6f4bb69fb09ce05ac9447712422af0d91c9e06c163e
SHA512
ba6611db866f3afffd112887cf6b0f250273f29ab4ed8e29de89405b997a0f7569216f86206040462aba9a4b8548c346bc72945cf7d617cf45a644fa8ded7121
diff --git a/dev-tcltk/tdom/files/tdom-0.9.2-useCC.patch
b/dev-tcltk/tdom/files/tdom-0.9.2-useCC.patch
new file mode 100644
index 000..cdfdcb8bf81
--- /dev/null
+++ b/dev-tcltk/tdom/files/tdom-0.9.2-useCC.patch
@@ -0,0 +1,28 @@
+--- a/tclconfig/tcl.m4 2019-12-07 22:00:18.094712146 +0100
b/tclconfig/tcl.m4 2019-12-07 22:00:28.961515544 +0100
+@@ -434,7 +434,6 @@
+ AC_SUBST(TCL_STUB_LIB_SPEC)
+
+ AC_MSG_CHECKING([platform])
+-hold_cc=$CC; CC="$TCL_CC"
+ AC_TRY_COMPILE(,[
+ #ifdef _WIN32
+ #error win32
+@@ -446,7 +445,6 @@
+ TEA_PLATFORM="windows"
+ AC_CHECK_PROG(CYGPATH, cygpath, cygpath -m, echo) ]
+ )
+-CC=$hold_cc
+ AC_MSG_RESULT($TEA_PLATFORM)
+
+ # The BUILD_$pkg is to define the correct extern storage class
+--- a/configure.ac 2019-12-07 22:06:56.954496437 +0100
b/configure.ac 2019-12-07 22:07:53.538472872 +0100
+@@ -33,6 +33,7 @@
+ TEA_INIT([3.13])
+
+ AC_CONFIG_AUX_DIR(tclconfig)
++AC_CONFIG_SUBDIRS([extensions/tnc extensions/example])
+
+ #
+ # Load the tclConfig.sh file
diff --git a/dev-tcltk/tdom/tdom-0.9.2.ebuild b/dev-tcltk/tdom/tdom-0.9.2.ebuild
new file mode 100644
index 000..c8dbe69542c
--- /dev/null
+++ b/dev-tcltk/tdom/tdom-0.9.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+MY_P="tDOM-${PV}"
+
+DESCRIPTION="A XML/DOM/XPath/XSLT Implementation for Tcl"
+HOMEPAGE="https://core.tcl.tk/tdom/";
+SRC_URI="http://tdom.org/downloads/${P}-src.tgz";
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc
~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs threads"
+
+DEPEND="
+ dev-lang/tcl:0=
+ dev-libs/expat"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${P}-src
+
+PATCHES=( "${FILESDIR}"/${P}-useCC.patch )
+
+src_prepare() {
+ append-libs -lm
+ sed \
+ -e 's:-O2::g' \
+ -e 's:-pipe::g' \
+ -e 's:-fomit-frame-pointer::g' \
+ -e '/SHLIB_LD_LIBS/s:\"$: ${TCL_LIB_FLAG}":g' \
+ -i {.,extensions/tnc}/configure tclconfig/tcl.m4 || die
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable threads)
+ --enable-shared
+ --with-tcl="${EPREFIX}"/usr/$(get_libdir)
+ )
+
+ cd "${S}"/unix && ECONF_SOURCE=".." econf ${myeconfargs} \
+ --disable-tdomalloc --with-expat
+ cd "${S}"/extensions/tdomhtml && econf
+ cd "${S}"/extensions/tnc && econf ${myeconfargs}
+}
+
+src_compile() {
+ local dir
+
+ for dir in "${S}"/unix "${S}"/extensions/tnc; do
+ pushd ${dir} > /dev/null
+ emake
+ popd > /dev/null
+ done
+}
+
+src_test() {
+ cd unix && default
+}
+
+src_install() {
+ local dir
+
+ dodoc CHANGES ChangeLog README*
+
+ for dir in "${S}"/unix "${S}"/extensions/tdomhtml
"${S}"/extensions/tnc; do
+ pushd ${dir} > /dev/null
+ emake DESTDIR="${D}" install
+ popd > /dev/null
+ done
+
+ if ! use static-libs; then
+ einfo "Removing static libs ..."
+ rm -f "${ED}"/usr/$(get_libdir)/*.{a,la} || die
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tdom/files/, dev-tcltk/tdom/
commit: fe157520e9af5c1b5e1fc008cdb26f174ccd0e24
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Apr 18 09:15:46 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Apr 19 07:54:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe157520
dev-tcltk/tdom: Drop 0.8.3-r4, EAPI5--
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-tcltk/tdom/Manifest | 1 -
dev-tcltk/tdom/files/tdom-0.8.2-tnc.patch| 73 ---
dev-tcltk/tdom/files/tdom-0.8.2.patch| 52
dev-tcltk/tdom/files/tdom-0.8.3-expat.patch | 84 --
dev-tcltk/tdom/files/tdom-0.8.3-soname.patch | 26
dev-tcltk/tdom/files/tdom-0.8.3-tcl8.6.patch | 21 ---
dev-tcltk/tdom/tdom-0.8.3-r4.ebuild | 89
7 files changed, 346 deletions(-)
diff --git a/dev-tcltk/tdom/Manifest b/dev-tcltk/tdom/Manifest
index da4d8a71d02..a2049669de4 100644
--- a/dev-tcltk/tdom/Manifest
+++ b/dev-tcltk/tdom/Manifest
@@ -1,2 +1 @@
-DIST tDOM-0.8.3.tgz 990367 BLAKE2B
172c20fba9a5d66564f94b76b2a732d0ec1d281386b957b151e300c824d96dea746f355446896eda1953aab9708da8916e05083d991c9ef317f11928ec04a541
SHA512
aa5352bc9b67c45d115e52dbf2cf153a3db89f851b51c1cd574af69b02c466f643df0b5448f7d105245246d20a92f80605f16bd927cd7925c1f2007827f2dc20
DIST tdom-0.9.1-src.tgz 1100163 BLAKE2B
25fca8ae7b2dbcfaca711df90e42479dfba57e9aaf0e616c519b6e74bafb1b5fa371c48abe0875126aa8e1979196a10f6030a0ffe8786b21f7685e8c2ddcb16c
SHA512
40dd5ec942ac4cce2fd78f53caf3a2b5e2fae9fbc5617923d94f07c9f530fa936696d79abe080ade2edbc4f4a86c35898b000180f20d9320edd8bfa3fa19d863
diff --git a/dev-tcltk/tdom/files/tdom-0.8.2-tnc.patch
b/dev-tcltk/tdom/files/tdom-0.8.2-tnc.patch
deleted file mode 100644
index 7fa200b9ee3..000
--- a/dev-tcltk/tdom/files/tdom-0.8.2-tnc.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Source:
http://download.opensuse.org/repositories/openSUSE:/11.0/standard/src/tdom-0.8.2-50.1.src.rpm
extensions/tnc/Makefile.in
-+++ extensions/tnc/Makefile.in
-@@ -355,29 +355,30 @@
- #
-
- install-lib-binaries: binaries
-- @mkdir -p $(DESTDIR)$(pkglibdir)
-+ @mkdir -p $(DESTDIR)$(libdir)
- @list='$(lib_BINARIES)'; for p in $$list; do \
- if test -f $$p; then \
-- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
-+ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p"; \
-+ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p; \
- stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
- if test "x$$stub" = "xstub"; then \
-- echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \
-- $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \
-+ echo " $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p"; \
-+ $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p; \
- else \
-- echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
-- $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
-+ echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
-+ $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
- fi; \
- ext=`echo $$p|sed -e "s/.*\.//"`; \
- if test "x$$ext" = "xdll"; then \
- lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \
- if test -f $$lib; then \
-- echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib";
\
-- $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \
-+ echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib"; \
-+ $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib; \
- fi; \
- fi; \
- fi; \
- done
-+ @mkdir -p $(DESTDIR)$(pkglibdir)
- @list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
- if test -f $(srcdir)/$$p; then \
- destp=`basename $$p`; \
extensions/tnc/configure.in
-+++ extensions/tnc/configure.in
-@@ -89,7 +89,7 @@
- if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
- TEA_ADD_LIBS([\"`${CYGPATH} ${TDOM_STUB_LIB_PATH}`\"])
- else
--TEA_ADD_LIBS([${TDOM_STUB_LIB_SPEC}])
-+TEA_ADD_LIBS([${TDOM_BUILD_STUB_LIB_SPEC}])
- fi
-
- #
extensions/tnc/pkgIndex.tcl.in
-+++ extensions/tnc/pkgIndex.tcl.in
-@@ -2,4 +2,4 @@
-
- package ifneeded tnc @PACKAGE_VERSION@\
- "package require tdom; \
-- [list load [file join $dir @PKG_LIB_FILE@] tnc]"
-+ [list load @PKG_LIB_FILE@ tnc]"
extensions/tnc/Makefile.in
-+++ extensions/tnc/Makefile.in
-@@ -160,7 +160,7 @@ DEFS = @DEFS@ $(PKG_CFLAGS)
- CONFIG_CLEAN_FILES = Makefile
-
- CPPFLAGS = @CPPFLAGS@
--LIBS = @PKG_LIBS@ @LIBS@
-+LIBS
[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tdom/files/, dev-tcltk/tdom/
commit: 2d60d6fa3e66bfcfbf7c945bea0236c3f58e3066
Author: Tupone Alfredo gentoo org>
AuthorDate: Sat Dec 7 21:14:38 2019 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sat Dec 7 21:14:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d60d6fa
dev-tcltk/tdom: use CC during configure test
Closes: https://bugs.gentoo.org/702234
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Alfredo Tupone gentoo.org>
dev-tcltk/tdom/files/tdom-0.9.1-useCC.patch | 28
dev-tcltk/tdom/tdom-0.9.1.ebuild| 2 ++
2 files changed, 30 insertions(+)
diff --git a/dev-tcltk/tdom/files/tdom-0.9.1-useCC.patch
b/dev-tcltk/tdom/files/tdom-0.9.1-useCC.patch
new file mode 100644
index 000..918c944b6f6
--- /dev/null
+++ b/dev-tcltk/tdom/files/tdom-0.9.1-useCC.patch
@@ -0,0 +1,28 @@
+--- a/tclconfig/tcl.m4 2019-12-07 22:00:18.094712146 +0100
b/tclconfig/tcl.m4 2019-12-07 22:00:28.961515544 +0100
+@@ -434,7 +434,6 @@
+ AC_SUBST(TCL_STUB_LIB_SPEC)
+
+ AC_MSG_CHECKING([platform])
+-hold_cc=$CC; CC="$TCL_CC"
+ AC_TRY_COMPILE(,[
+ #ifdef _WIN32
+ #error win32
+@@ -446,7 +445,6 @@
+ TEA_PLATFORM="windows"
+ AC_CHECK_PROG(CYGPATH, cygpath, cygpath -m, echo) ]
+ )
+-CC=$hold_cc
+ AC_MSG_RESULT($TEA_PLATFORM)
+
+ # The BUILD_$pkg is to define the correct extern storage class
+--- a/configure.in 2019-12-07 22:06:56.954496437 +0100
b/configure.in 2019-12-07 22:07:53.538472872 +0100
+@@ -33,6 +33,7 @@
+ TEA_INIT([3.13])
+
+ AC_CONFIG_AUX_DIR(tclconfig)
++AC_CONFIG_SUBDIRS([extensions/tnc extensions/example])
+
+ #
+ # Load the tclConfig.sh file
diff --git a/dev-tcltk/tdom/tdom-0.9.1.ebuild b/dev-tcltk/tdom/tdom-0.9.1.ebuild
index 4f20b7f4760..67ca7a61e0a 100644
--- a/dev-tcltk/tdom/tdom-0.9.1.ebuild
+++ b/dev-tcltk/tdom/tdom-0.9.1.ebuild
@@ -21,6 +21,8 @@ DEPEND="
dev-libs/expat"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}"/${P}-useCC.patch )
+
src_prepare() {
append-libs -lm
sed \
[gentoo-commits] repo/gentoo:master commit in: dev-tcltk/tdom/files/, dev-tcltk/tdom/
commit: 6bf3dc8251e79a674c8fc399004d05611f4508b3 Author: Tupone Alfredo gentoo org> AuthorDate: Mon Nov 4 08:11:56 2019 + Commit: Alfredo Tupone gentoo org> CommitDate: Mon Nov 4 08:11:56 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bf3dc82 dev-tcltk/tdom: fix installation Closes: https://bugs.gentoo.org/699262 Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Alfredo Tupone gentoo.org> dev-tcltk/tdom/files/tdom-0.9.1-tnc.patch | 55 - dev-tcltk/tdom/files/tdom-0.9.1.patch | 58 --- dev-tcltk/tdom/tdom-0.9.1.ebuild | 6 3 files changed, 119 deletions(-) diff --git a/dev-tcltk/tdom/files/tdom-0.9.1-tnc.patch b/dev-tcltk/tdom/files/tdom-0.9.1-tnc.patch deleted file mode 100644 index 36d844d74cb..000 --- a/dev-tcltk/tdom/files/tdom-0.9.1-tnc.patch +++ /dev/null @@ -1,55 +0,0 @@ a/extensions/tnc/Makefile.in 2018-10-31 21:18:18.701695694 +0100 -+++ b/extensions/tnc/Makefile.in 2018-10-31 21:19:25.621555122 +0100 -@@ -372,25 +372,25 @@ - # - - install-lib-binaries: binaries -- @$(INSTALL_DATA_DIR) $(DESTDIR)$(pkglibdir) -+ @$(INSTALL_DATA_DIR) $(DESTDIR)$(libdir) - @list='$(lib_BINARIES)'; for p in $$list; do \ - if test -f $$p; then \ -- echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ -- $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p; \ -+ echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(libdir)/$$p"; \ -+ $(INSTALL_LIBRARY) $$p $(DESTDIR)$(libdir)/$$p; \ - stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \ - if test "x$$stub" = "xstub"; then \ -- echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \ -- $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \ -+ echo " $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p"; \ -+ $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p; \ - else \ -- echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \ -- $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \ -+ echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \ -+ $(RANLIB) $(DESTDIR)$(libdir)/$$p; \ - fi; \ - ext=`echo $$p|sed -e "s/.*\.//"`; \ - if test "x$$ext" = "xdll"; then \ - lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \ - if test -f $$lib; then \ -- echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \ -- $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \ -+ echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib"; \ -+ $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib; \ - fi; \ - fi; \ - fi; \ -@@ -398,13 +398,13 @@ - @list='$(PKG_TCL_SOURCES)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ - destp=`basename $$p`; \ -- echo " Install $$destp $(DESTDIR)$(pkglibdir)/$$destp"; \ -- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \ -+ echo " Install $$destp $(DESTDIR)$(libdir)/$$destp"; \ -+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(libdir)/$$destp; \ - fi; \ - done - @if test "x$(SHARED_BUILD)" = "x1"; then \ -- echo " Install pkgIndex.tcl $(DESTDIR)$(pkglibdir)"; \ -- $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \ -+ echo " Install pkgIndex.tcl $(DESTDIR)$(libdir)"; \ -+ $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(libdir); \ - fi - - # diff --git a/dev-tcltk/tdom/files/tdom-0.9.1.patch b/dev-tcltk/tdom/files/tdom-0.9.1.patch deleted file mode 100644 index 00d3df2a306..000 --- a/dev-tcltk/tdom/files/tdom-0.9.1.patch +++ /dev/null @@ -1,58 +0,0 @@ a/Makefile.in 2018-10-31 21:12:16.856861967 +0100 -+++ b/Makefile.in 2018-10-31 21:15:26.611628532 +0100 -@@ -326,7 +326,7 @@ - - pkgIndex.tcl-hand: - @(echo 'package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION) \ -- "load [list [file join $$dir $(PKG_LIB_FILE)]];\ -+ "load $(PKG_LIB_FILE);\ - source [list [file join $$dir tdom.tcl]]"'\ - ) > pkgIndex.tcl - -@@ -422,7 +422,7 @@ - # - - install-lib-binaries: binaries -- @$(INSTALL_DATA_DIR) $(DESTDIR)$(pkglibdir) -+ @$(INSTALL_DATA_DIR) $(DESTDIR)$(libdir) - @list='$(lib_BINARIES)'; for p in $$list; do \ - if test -f $$p; then \ - if test "x$$stub" = "xstub"; then \ -@@ -432,15 +432,15 @@ - echo " $(RANLIB) $$p"; \ - $(RANLIB) $$p; \ - fi; \ -- echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p"; \ -- $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pk
