3 files changed, 7 insertions, 48 deletions
diff --git a/www/mnogosearch/Makefile b/www/mnogosearch/Makefile
index 5bc60ef3b74a..8f2549f59adf 100644
--- a/www/mnogosearch/Makefile
+++ b/www/mnogosearch/Makefile
@@ -20,8 +20,10 @@ MAN1=		indexer.1
 MAN5=		indexer.conf.5
 
 INSTALLS_SHLIB= yes
+USE_GNOME=	lthack
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=--enable-phrase \
@@ -85,6 +87,10 @@ pre-configure:
 	@exit 1
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
+
 pre-install:
 	@${MKDIR} ${PREFIX}/share/mnogosearch
 
diff --git a/www/mnogosearch/files/patch-ad b/www/mnogosearch/files/patch-ad
index 9b5300f64807..5334d08f91e4 100644
--- a/www/mnogosearch/files/patch-ad
+++ b/www/mnogosearch/files/patch-ad
@@ -1,31 +1,5 @@
 --- configure.orig	Tue Jun 17 13:35:22 2003
 +++ configure	Mon Jun 14 07:46:23 2004
-@@ -3176,13 +3176,14 @@
- fi
- rm -f confcache
- 
-+lt_aux_dir=${LOCALBASE}/share/libtool13
- # Actually configure libtool.  ac_aux_dir is where install-sh is found.
- CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
- LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
- LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
- DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
-+${CONFIG_SHELL-/bin/sh} $lt_aux_dir/ltconfig --no-reexec \
-+$libtool_flags --no-verify $lt_aux_dir/ltmain.sh $lt_target \
- || { { echo "$as_me:$LINENO: error: libtool configure failed" >&5
- echo "$as_me: error: libtool configure failed" >&2;}
-    { (exit 1); exit 1; }; }
-@@ -3207,7 +3208,7 @@
- 
- 
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="$lt_aux_dir/ltconfig $lt_aux_dir/ltmain.sh"
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 @@ -3659,6 +3660,8 @@
  #line $LINENO "configure"
  #include "confdefs.h"
@@ -46,23 +20,3 @@
  else
      echo "$as_me:$LINENO: result: disabled" >&5
  echo "${ECHO_T}disabled" >&6
-@@ -7553,8 +7556,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} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
-+${CONFIG_SHELL-/bin/sh} $lt_aux_dir/ltconfig --no-reexec \
-+$libtool_flags --no-verify $lt_aux_dir/ltmain.sh $lt_target \
- || { { echo "$as_me:$LINENO: error: libtool configure failed" >&5
- echo "$as_me: error: libtool configure failed" >&2;}
-    { (exit 1); exit 1; }; }
-@@ -7579,7 +7582,7 @@
- 
- 
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="$lt_aux_dir/ltconfig $lt_aux_dir/ltmain.sh"
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/www/mnogosearch/pkg-plist b/www/mnogosearch/pkg-plist
index b76e0254bf05..715bd8f8860e 100644
--- a/www/mnogosearch/pkg-plist
+++ b/www/mnogosearch/pkg-plist
@@ -44,7 +44,6 @@ include/udm_word.h
 include/udm_xmalloc.h
 include/udmsearch.h
 lib/libudmsearch.a
-lib/libudmsearch.la
 lib/libudmsearch.so
 lib/libudmsearch.so.1
 sbin/cachelogd