From b2fd75e43812932b61dab72c80fedba5f9715b82 Mon Sep 17 00:00:00 2001
From: Ade Lovett <ade@FreeBSD.org>
Date: Thu, 26 Jun 2003 22:58:32 +0000
Subject: libtool uber-patch

* kill devel/libtool and move to devel/libtool13, upgrading to 1.3.5
* upgrade repo-copied devel/libtool14 to 1.4.3
* break out libltdl into its own separate port
* move to version-numbered binaries/scripts (ie: there is *no* 'libtool'
  any more -- USE_LIBTOOL and USE_LIBTOOL_VER are your friends)

Approved by:	portmgr (kris) - for the bsd.port.mk hooks
Tested by:	bento 4-exp builds (repeatedly)
---
 net/net-snmp4/Makefile               | 6 ++++--
 net/net-snmp4/files/patch-aclocal.m4 | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'net/net-snmp4')

diff --git a/net/net-snmp4/Makefile b/net/net-snmp4/Makefile
index f9f900a73eed..8aca1d7a88c2 100644
--- a/net/net-snmp4/Makefile
+++ b/net/net-snmp4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ucd-snmp
 PORTVERSION=	4.2.6
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://ucd-snmp.ucdavis.edu/ \
@@ -87,7 +87,9 @@ pre-everything::
 	@${ECHO} ""
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
+	@${REINPLACE_CMD} \
+		-e 's|%%LTCONFIG%%|${LIBTOOL_SHAREDIR}/ltconfig${LIBTOOL_VERSION}|g' \
+		-e 's|%%LTMAIN%%|${LIBTOOL_SHAREDIR}/ltmain.sh|g' \
 		${WRKSRC}/aclocal.m4
 
 post-install:
diff --git a/net/net-snmp4/files/patch-aclocal.m4 b/net/net-snmp4/files/patch-aclocal.m4
index c466d9e1f68c..eb2e519aa7f0 100644
--- a/net/net-snmp4/files/patch-aclocal.m4
+++ b/net/net-snmp4/files/patch-aclocal.m4
@@ -12,8 +12,8 @@
 +LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
 +LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
 +DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
-+${CONFIG_SHELL-/bin/sh} %%LOCALBASE%%/share/libtool/ltconfig --no-reexec \
-+$libtool_flags --no-verify --disable-ltlibs --release-ignore %%LOCALBASE%%/share/libtool/ltmain.sh $lt_target \
++${CONFIG_SHELL-/bin/sh} %%LTCONFIG%% --no-reexec \
++$libtool_flags --no-verify --disable-ltlibs --release-ignore %%LTMAIN%% $lt_target \
 +|| AC_MSG_ERROR([libtool configure failed])
 +
 +# Reload cache, that may have been modified by ltconfig
@@ -21,7 +21,7 @@
 +
  # This can be used to rebuild libtool when needed
 -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="--disable-ltlibs --release-ignore %%LOCALBASE%%/share/libtool/ltmain.sh"
++LIBTOOL_DEPS="--disable-ltlibs --release-ignore %%LTMAIN%%"
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -42,7 +42,7 @@
  # which needs '.lib').
  libext=a
 -ltmain="$ac_aux_dir/ltmain.sh"
-+ltmain="--disable-ltlibs --release-ignore %%LOCALBASE%%/share/libtool/ltmain.sh"
++ltmain="--disable-ltlibs --release-ignore %%LTMAIN%%"
  ofile="$default_ofile"
  with_gnu_ld="$lt_cv_prog_gnu_ld"
  need_locks="$enable_libtool_lock"
-- 
cgit v1.2.3