fix x11/itk

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

fix x11/itk

Sebastian Reitenbach
Hi,

seems x11/itk is broken, without the patch:

> wish8.5
% package require Itk
couldn't load file "/usr/local/lib/tcl/itk/libitk33.so.0.0": File not found

and with the patch:

> wish8.5                                                              
% package require Itk
3.3

Also, this makes x11/iwidges regress test at least working again. There are the same File not found errors.

Someone could argue, if the .so file needs to be versioned or not, however, this makes it at least work.

OK?

cheers,
Sebastian

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/itk/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile 11 Mar 2016 20:28:33 -0000 1.14
+++ Makefile 29 Apr 2019 17:56:48 -0000
@@ -5,7 +5,7 @@
 VERSION= 3.3
 DISTNAME= itk${VERSION}
 PKGNAME= itk-${VERSION}
-REVISION= 4
+REVISION= 5
 SHARED_LIBS= itk33 0.0

 CATEGORIES= x11 devel
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/x11/itk/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in 5 Jan 2011 19:15:09 -0000 1.2
+++ patches/patch-Makefile_in 29 Apr 2019 17:56:48 -0000
@@ -1,5 +1,6 @@
---- Makefile.in.orig Fri Mar 25 23:58:48 2005
-+++ Makefile.in Wed Oct 25 16:47:12 2006
+Index: Makefile.in
+--- Makefile.in.orig
++++ Makefile.in
 @@ -96,7 +96,7 @@ DESTDIR =

  PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION)
@@ -9,14 +10,3 @@
  pkgincludedir = $(includedir)/$(PKG_DIR)

  top_builddir = .
-@@ -366,8 +366,8 @@ install-lib-binaries:
- @mkdir -p $(DESTDIR)$(pkglibdir)
- @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)$(pkglibdir)/../../$$p"; \
-+    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/../../$$p; \
-    stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
-    if test "x$$stub" = "xstub"; then \
- echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/itk/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- pkg/PLIST 16 Mar 2015 18:07:59 -0000 1.4
+++ pkg/PLIST 29 Apr 2019 17:56:48 -0000
@@ -2,12 +2,12 @@
 include/itk/
 include/itk/itk.h
 include/itk/itkDecls.h
-@lib lib/libitk33.so.${LIBitk33_VERSION}
 lib/tcl/itk/
 lib/tcl/itk/Archetype.itk
 lib/tcl/itk/Toplevel.itk
 lib/tcl/itk/Widget.itk
 lib/tcl/itk/itk.tcl
+@lib lib/tcl/itk/libitk33.so.${LIBitk33_VERSION}
 lib/tcl/itk/pkgIndex.tcl
 lib/tcl/itk/tclIndex
 @man man/mann/Archetype.n

Reply | Threaded
Open this post in threaded view
|

Re: fix x11/itk

Jeremie Courreges-Anglas-2
On Mon, Apr 29 2019, "Sebastian Reitenbach" <[hidden email]> wrote:

> Hi,
>
> seems x11/itk is broken, without the patch:
>
>> wish8.5
> % package require Itk
> couldn't load file "/usr/local/lib/tcl/itk/libitk33.so.0.0": File not found
>
> and with the patch:
>
>> wish8.5
> % package require Itk
> 3.3
>
> Also, this makes x11/iwidges regress test at least working again. There are the same File not found errors.
>
> Someone could argue, if the .so file needs to be versioned or not, however, this makes it at least work.
>
> OK?

I don't know much about the tcl/tk ecosystem but the fix works and looks
reasonable, ok jca

--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE