- Do not install useless .la files

- Dont depend on libtools.

PR:		35794
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

3 files changed, 30 insertions, 33 deletions

diff --git a/textproc/pspell-ispell/Makefile b/textproc/pspell-ispell/Makefile
index 657d2becee61..b1f90e1f1deb 100644
--- a/textproc/pspell-ispell/Makefile
+++ b/textproc/pspell-ispell/Makefile
@@ -7,10 +7,11 @@
 
 PORTNAME=	pspell-ispell
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pspell
-DISTNAME=	${PORTNAME}-.12
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/^0//}
 
 MAINTAINER=	ports@FreeBSD.org
 
@@ -18,10 +19,10 @@ BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
 LIB_DEPENDS=	pspell.4:${PORTSDIR}/textproc/pspell
 
 USE_NEWGCC=	yes
-USE_LIBTOOL=	yes
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
-CONFIGURE_ENV+=	CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib" LIBTOOL="${LIBTOOL}"
 
 .include <bsd.port.mk>
diff --git a/textproc/pspell-ispell/files/patch-aa b/textproc/pspell-ispell/files/patch-aa
index d0d704074add..e69de29bb2d1 100644
--- a/textproc/pspell-ispell/files/patch-aa
+++ b/textproc/pspell-ispell/files/patch-aa
@@ -1,29 +0,0 @@
---- configure.orig	Tue May 29 23:04:03 2001
-+++ configure	Mon Dec 10 16:48:26 2001
-@@ -2237,7 +2237,7 @@
- objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
- deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
-+$libtool_flags --build="$build" $ac_aux_dir/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
- 
- # Reload cache, that may have been modified by ltconfig
-@@ -2254,7 +2254,7 @@
- LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh"
- 
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL=${LIBTOOL}
- 
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
-@@ -2273,7 +2273,7 @@
- deplibs_check_method="$deplibs_check_method" \
- file_magic_cmd="$file_magic_cmd" \
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
----build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
-+--build="$build" $ac_aux_dir/ltcf-cxx.sh $host \
- || { echo "configure: error: libtool tag configuration failed" 1>&2; exit 1; }
- CC="$lt_save_CC"
- CFLAGS="$lt_save_CFLAGS"
diff --git a/textproc/pspell-ispell/files/patch-ltmain.sh b/textproc/pspell-ispell/files/patch-ltmain.sh
new file mode 100644
index 000000000000..7ace86bc7feb
--- /dev/null
+++ b/textproc/pspell-ispell/files/patch-ltmain.sh
@@ -0,0 +1,25 @@
+--- ltmain.sh.orig	Wed May  2 08:58:17 2001
++++ ltmain.sh	Sun Dec 30 00:09:59 2001
+@@ -2749,6 +2749,9 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test $build_libtool_need_lc = "yes"; then
+@@ -4645,10 +4648,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"