Switch to external libltdl.

4 files changed, 35 insertions, 6 deletions

diff --git a/lang/see/Makefile b/lang/see/Makefile
index a7bf4953d41..ea132998a0b 100644
--- a/lang/see/Makefile
+++ b/lang/see/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2012/10/03 21:56:20 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/03/28 21:30:49 joerg Exp $
 #
 
 DISTNAME=	see-3.0.1376
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	lang
 MASTER_SITES=	http://users.tpg.com.au/dle0nard/software/
 
@@ -22,12 +22,13 @@ CONFIGURE_ARGS+=	--with-readline
 PKGCONFIG_OVERRIDE+=	libsee/see.pc.in
 
 pre-configure:
+	rm -rf ${WRKSRC}/libltdl
 	cd ${WRKSRC} && autoreconf -vif
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/USAGE.html ${DESTDIR}${PREFIX}/share/doc/see/
 
-.include "../../devel/libltdl/convenience.mk"
+.include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/boehm-gc/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/see/distinfo b/lang/see/distinfo
index 6989a351712..bce3cd9de3f 100644
--- a/lang/see/distinfo
+++ b/lang/see/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.5 2013/01/26 23:15:44 wiz Exp $
+$NetBSD: distinfo,v 1.6 2013/03/28 21:30:49 joerg Exp $
 
 SHA1 (see-3.0.1376.tar.gz) = d803adac6298a0f556d59f501f0376d9196d0821
 RMD160 (see-3.0.1376.tar.gz) = 1fb3eb7a796ba96fe68fbc3225bcaafff5692f6f
 Size (see-3.0.1376.tar.gz) = 1066852 bytes
+SHA1 (patch-Makefile.am) = 1cc4828c6e9eb7c220bb3825b6f0de90a035bf5e
 SHA1 (patch-aa) = 00d5260d023bc4f03239aa42eff0ced616a9691f
-SHA1 (patch-ab) = 401d11cc4a476bb8751e97e04d35ae006cb64971
+SHA1 (patch-ab) = 2617c8d1da42f94db3138f1c989b878311b99528
 SHA1 (patch-ac) = 387fcc2139fe2b558ea1556770b40bc339b195ff
diff --git a/lang/see/patches/patch-Makefile.am b/lang/see/patches/patch-Makefile.am
new file mode 100644
index 00000000000..71f65573ddd
--- /dev/null
+++ b/lang/see/patches/patch-Makefile.am
@@ -0,0 +1,13 @@
+$NetBSD: patch-Makefile.am,v 1.1 2013/03/28 21:30:49 joerg Exp $
+
+--- Makefile.am.orig	2007-09-13 22:01:46.000000000 +0000
++++ Makefile.am
+@@ -3,7 +3,7 @@
+ 
+ AUTOMAKE_OPTIONS= foreign
+ 
+-SUBDIRS = include libsee libltdl shell doc
++SUBDIRS = include libsee shell doc
+ if SSP
+ SUBDIRS += ssp
+ endif
diff --git a/lang/see/patches/patch-ab b/lang/see/patches/patch-ab
index d4f60718f85..1b9908c2345 100644
--- a/lang/see/patches/patch-ab
+++ b/lang/see/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2013/01/26 23:15:44 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2013/03/28 21:30:49 joerg Exp $
 
 First chunk: automake-1.13 compat.
 Rest: ?
@@ -14,6 +14,20 @@ Rest: ?
  AC_CONFIG_FILES([Makefile
  		 include/Makefile
  		 include/see/Makefile
+@@ -29,11 +29,11 @@ dnl
+ AC_PROG_CC
+ AC_PROG_SED
+ 
+-AC_LIBLTDL_CONVENIENCE([libltdl])
+ AC_LIBTOOL_DLOPEN
+ AC_PROG_LIBTOOL
+ dnl AC_LIB_LTDL
+-AC_CONFIG_SUBDIRS([libltdl])
++LIBLTDL=-lltdl
++LTDLINCL=
+ AC_SUBST([LIBLTDL])
+ AC_SUBST([LTDLINCL])
+ AC_SUBST([LIBSEE_LIBS])
 @@ -206,11 +206,12 @@ SEE_ARG_ENABLE(longjmperror,[yes],
          [Define if you want SEE to catch longjmp corruption])
  ])