5 files changed, 47 insertions, 16 deletions

diff --git a/net/freewais-sf/Makefile b/net/freewais-sf/Makefile
index 5085ac6b6265..d5e2bcbef10e 100644
--- a/net/freewais-sf/Makefile
+++ b/net/freewais-sf/Makefile
@@ -6,30 +6,26 @@
 #
 
 PORTNAME=	freewais-sf
-PORTVERSION=	2.2.13
+PORTVERSION=	2.2.14
 CATEGORIES=	net databases
 MASTER_SITES=	ftp://ls6-ftp.cs.uni-dortmund.de/pub/src/freeWAIS-sf/
-DISTNAME=	freeWAIS-sf-2.2.13
+DISTNAME=	freeWAIS-sf-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
-CONFIGURE_ARGS=	< ${WRKDIR}/configure.ans
+CONFIGURE_ENV=	PREFIX="${PREFIX}" CC="${CC}" CFLAGS="${CFLAGS}"
+CONFIGURE_ARGS=	-sde -Dprefix="${PREFIX}" \
+		-Darchname="${MACHINE_ARCH}-freebsd"
 INSTALL_TARGET=	install install.man
 
-MAN1=	catalog.1 dictionary.1 inverted_file.1 makedb.1 mkfmt.1 waisindex.1 \
+MAN1=	catalog.1 dictionary.1 inverted_file.1 mkfmt.1 waisindex.1 \
 	waisq.1 waissearch.1 waisserver.1 xwais.1 xwaisq.1
 MAN3=	ftw.3 regexp.3 scandir.3
 
-pre-configure:
-	@${SED} -e "s:%%CC%%:${CC}:g" \
-	        -e "s:%%CFLAGS%%:${CFLAGS}:g" \
-		${FILESDIR}/configure.ans.skel > ${WRKDIR}/configure.ans
-
-post-configure:
-	@find ${WRKSRC} -type f | \
-		xargs ${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g"
+post-extract:
+	${CP} ${FILESDIR}/freebsd.sh ${WRKSRC}/hints
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/net/freewais-sf/distinfo b/net/freewais-sf/distinfo
index 448b3813d0c1..7c626ed166ea 100644
--- a/net/freewais-sf/distinfo
+++ b/net/freewais-sf/distinfo
@@ -1 +1 @@
-MD5 (freeWAIS-sf-2.2.13.tar.gz) = 31b9984cf7c9ef8cd65a5db6eadfee17
+MD5 (freeWAIS-sf-2.2.14.tar.gz) = d94ed4c2ccc0102dda37727c1de47dd1
diff --git a/net/freewais-sf/files/freebsd.sh b/net/freewais-sf/files/freebsd.sh
new file mode 100644
index 000000000000..b1f967b314b6
--- /dev/null
+++ b/net/freewais-sf/files/freebsd.sh
@@ -0,0 +1,7 @@
+locincpth="$PREFIX/include";
+libpth="/usr/lib";
+man3dir="$PREFIX/man/man3";
+privlic="$PREFIX/lib/";
+optimize="$CFLAGS";
+cc="$CC";
+ld="$CC";
diff --git a/net/freewais-sf/files/patch-ah b/net/freewais-sf/files/patch-ah
new file mode 100644
index 000000000000..888e6ada8b1d
--- /dev/null
+++ b/net/freewais-sf/files/patch-ah
@@ -0,0 +1,29 @@
+--- lib/ir/grundform.c.orig    Sat Jul 22 06:56:48 2000
++++ lib/ir/grundform.c Sat Jul 22 07:44:53 2000
+@@ -9,7 +9,7 @@
+  * Update Count    : 50
+  * Status          : Unknown, Use with caution!
+  * 
+- * (C) Copyright 1996, Universität Dortmund, all rights reserved.
++ * (C) Copyright 1996, UniversitçÕ Dortmund, all rights reserved.
+  * 
+  */
+ #include "../config.h"
+@@ -169,7 +169,7 @@
+ {
+   if (!my_perl_inited)   init_perl(NULL);
+   if (!my_module_loaded) {
+-    require_pv("Text/German.pm");
++    perl_require_pv("Text/German.pm");
+     my_module_loaded = 1;
+   }
+   return(call_reduce("Text::German::cache_reduce", word));
+@@ -181,7 +181,7 @@
+ {
+   if (!my_perl_inited)   init_perl(NULL);
+   if (!my_module_loaded) {
+-    require_pv("Text/German.pm");
++    perl_require_pv("Text/German.pm");
+     my_module_loaded = 1;
+   }
+   return (call_reduce("Text::German::stem", word));
diff --git a/net/freewais-sf/pkg-plist b/net/freewais-sf/pkg-plist
index 29247d898f0e..a3d67763c482 100644
--- a/net/freewais-sf/pkg-plist
+++ b/net/freewais-sf/pkg-plist
@@ -3,7 +3,6 @@ bin/check-sources
 bin/dictionary
 bin/getaddrs
 bin/inverted_file
-bin/makedb
 bin/mkfmt
 bin/server_stats
 bin/stats.awk
@@ -26,8 +25,8 @@ include/freeWAIS-sf/wais.h
 lib/freeWAIS-sf/emacs/lisp/wais.el
 lib/freeWAIS-sf/libwais.a
 share/doc/SF/fwsf.ps
-@dirrm include/freeWAIS-sf
+@dirrm share/doc/SF
 @dirrm lib/freeWAIS-sf/emacs/lisp
 @dirrm lib/freeWAIS-sf/emacs
 @dirrm lib/freeWAIS-sf
-@dirrm share/doc/SF
+@dirrm include/freeWAIS-sf