[pkgsrc/trunk]: pkgsrc/devel/py-expect Fix build with modern libtool by using...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/be593d583bbe
branches:  trunk
changeset: 577828:be593d583bbe
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Jul 21 14:11:16 2010 +0000

description:
Fix build with modern libtool by using -module and correct arguments.

diffstat:

 devel/py-expect/PLIST            |   4 ++--
 devel/py-expect/distinfo         |   4 ++--
 devel/py-expect/patches/patch-ad |  12 +++++++-----
 3 files changed, 11 insertions(+), 9 deletions(-)

diffs (73 lines):

diff -r 087514e7ae13 -r be593d583bbe devel/py-expect/PLIST
--- a/devel/py-expect/PLIST     Wed Jul 21 13:32:46 2010 +0000
+++ b/devel/py-expect/PLIST     Wed Jul 21 14:11:16 2010 +0000
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:49:04 joerg Exp $
-${PYLIB}/lib-dynload/ExpectPymodule.so
+@comment $NetBSD: PLIST,v 1.4 2010/07/21 14:11:16 joerg Exp $
+${PYLIB}/lib-dynload/ExpectPymodule.la
 share/examples/${PYPKGPREFIX}-expect/ask.py
 share/examples/${PYPKGPREFIX}-expect/glob.py
 share/examples/${PYPKGPREFIX}-expect/ping.py
diff -r 087514e7ae13 -r be593d583bbe devel/py-expect/distinfo
--- a/devel/py-expect/distinfo  Wed Jul 21 13:32:46 2010 +0000
+++ b/devel/py-expect/distinfo  Wed Jul 21 14:11:16 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2007/12/11 22:41:54 heinz Exp $
+$NetBSD: distinfo,v 1.9 2010/07/21 14:11:16 joerg Exp $
 
 SHA1 (ExpectPy-1.9b1.tar.gz) = f43fcd53901f327dc8acf0650dbfe45b274a8d7d
 RMD160 (ExpectPy-1.9b1.tar.gz) = d0e586a987db1c6eb22008519483081f7278be20
@@ -6,7 +6,7 @@
 SHA1 (patch-aa) = eff544e7290736bebb81b8391848369d630f7b03
 SHA1 (patch-ab) = d95ef8bc2f6c0178de0b05e649d6e2d6aed37335
 SHA1 (patch-ac) = 0ff7162129a84fbc913a8b1240209387b922c2a8
-SHA1 (patch-ad) = 135080d8709e489c6896cea9a1f5c5d31bf61e98
+SHA1 (patch-ad) = d2809ac63abb65ad59586cc35ffcda1b70088bcb
 SHA1 (patch-ae) = 0f5190724d3b17e7b7f06f6408e1c9e7a3e66868
 SHA1 (patch-af) = 130de0f91370a49db5c9236445d2cb258303b190
 SHA1 (patch-ag) = 7e43133aeebee5c63716aefba8fd4e0d4b1ff6ce
diff -r 087514e7ae13 -r be593d583bbe devel/py-expect/patches/patch-ad
--- a/devel/py-expect/patches/patch-ad  Wed Jul 21 13:32:46 2010 +0000
+++ b/devel/py-expect/patches/patch-ad  Wed Jul 21 14:11:16 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 2007/12/11 22:41:55 heinz Exp $
+$NetBSD: patch-ad,v 1.3 2010/07/21 14:11:16 joerg Exp $
 --- Makefile.in.orig   2000-10-20 14:06:30.000000000 +0200
 +++ Makefile.in
 @@ -29,8 +29,8 @@ PYTHLIB   = @PYTH_LIBDIR@/config
@@ -12,12 +12,14 @@
  RANLIB  = @RANLIB@
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -39,13 +39,13 @@ LN_S    = @LN_S@
+@@ -38,14 +38,14 @@ RM      = @RM@ -f
+ LN_S    = @LN_S@
  LDEXE   = @LDEXE@
  
- SO       = @SO@
+-SO       = @SO@
 -LDSHARED = @LDSHARED@
 -CCSHARED = @CCSHARED@
++SO       = .la
 +LDSHARED = ${LIBTOOL} --mode=link @CC@
 +CCSHARED = ${LIBTOOL} --mode=compile @CC@
  
@@ -25,7 +27,7 @@
  CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@
  CFLAGS   = @CFLAGS@
 -LDFLAGS  = @LDFLAGS@
-+LDFLAGS  = @LDFLAGS@ -shared
++LDFLAGS  = @LDFLAGS@ -module -rpath ${INSTLIBDIR}
  LIBS     = $(EXPLIB) @LIBS@
  INSTLIBDIR = @PYTH_SHLIBDIR@
  
@@ -48,7 +50,7 @@
 +      $(INSTALL_PROGRAM) python $(DESTDIR)$(exec_prefix)/bin/python.exppy
  installshared:  $(MODNAME)module$(SO)
 -      $(INSTALL_PROGRAM) $(MODNAME)module$(SO) $(INSTLIBDIR)
-+      $(INSTALL_PROGRAM) $(MODNAME)module$(SO) $(DESTDIR)$(INSTLIBDIR)
++      ${LIBTOOL} --mode=install $(BSD_INSTALL_LIB) $(MODNAME)module$(SO) $(DESTDIR)$(INSTLIBDIR)
  uninstall:
  
  clean::