Upgrade to 1.7.1. Fix the long standing problem reported in ports/41339

(wrong resourcedir specified). Don't install second copies of some
man-pages under share/. Verify build on -current -- with the new
bsd.lib.mk (ports/40174).

PR:		ports/40174, ports/41339
Submitted by:	Sid Carter, Maxim Tulyuk

12 files changed, 85 insertions, 56 deletions

diff --git a/textproc/wordnet/Makefile b/textproc/wordnet/Makefile
index 13d769cc548e..3abcc5954733 100644
--- a/textproc/wordnet/Makefile
+++ b/textproc/wordnet/Makefile
@@ -5,24 +5,39 @@
 # $FreeBSD$
 #
 
-PORTNAME=	wordnet
-PORTVERSION=	1.7
+PORTNAME=	WordNet
+PORTVERSION=	1.7.1
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.cogsci.princeton.edu/pub/wordnet/${PORTVERSION}/ \
 		ftp://ftp.ims.uni-stuttgart.de/pub/WordNet/${PORTVERSION}/
-DISTFILES=	wn${PORTVERSION:S/.//}.unix.tar.gz
 
 MAINTAINER=	mi@aldan.algebra.com
 
-LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83
+LIB_DEPENDS=	tk${TCL_VER}.1:${PORTSDIR}/x11-toolkits/tk${TCL_VER}
 
-TCL_DVER=	8.3
-SCRIPTS_ENV+=	TCL_DVER=${TCL_DVER}
-MAKE_ENV+=	TCL_DVER=${TCL_DVER}
+# The vendor packages up a lot of useless precompiled binaries
+# for a few platforms with the source code. Do not extract them:
+EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude '*/bin/*' \
+		--exclude '*/lib/solaris/*' \
+		--exclude '*/lib/linux/*' \
+		--exclude '*/lib/irix/*' \
+		--exclude '*/*.[ao]'
+
+TCL_DVER?=	8.3
+TCL_VER=	${TCL_DVER:C/\.//}
+SCRIPTS_ENV+=	TCL_DVER=${TCL_DVER} VER=${PORTVERSION}
+MAKE_ENV+=	TCL_DVER=${TCL_DVER} VER=${PORTVERSION}
 PLIST_SUB+=	TCL_DVER=${TCL_DVER} VER=${PORTVERSION}
 # Parallel build is faster even on a single cpu machine:
 MAKE_ARGS=	-j 2
-NO_WRKSUBDIR=	yes
+USE_REINPLACE=	yes
+REINPLACE_ARGS=	-i ""
+INSTALLS_SHLIB=	yes
+
+post-patch:
+	${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},g' \
+		-e 's,_VER_,${PORTVERSION},g' ${WRKSRC}/include/wnconsts.h \
+		${WRKSRC}/src/wnb/wnb
 
 .include <bsd.port.pre.mk>
 
diff --git a/textproc/wordnet/distinfo b/textproc/wordnet/distinfo
index aaa3d5c8ec54..3a7af18c35d3 100644
--- a/textproc/wordnet/distinfo
+++ b/textproc/wordnet/distinfo
@@ -1 +1 @@
-MD5 (wn17.unix.tar.gz) = 96a1c6d54ed19edd8e44e51042364c7d
+MD5 (WordNet-1.7.1.tar.gz) = 5c8e569339cf7d8e727d884234365508
diff --git a/textproc/wordnet/files/dict.Makefile b/textproc/wordnet/files/dict.Makefile
index dccae6a07a6f..e77eaf1e9b9d 100644
--- a/textproc/wordnet/files/dict.Makefile
+++ b/textproc/wordnet/files/dict.Makefile
@@ -1,4 +1,4 @@
-WN_INSTALLDIR=	${PREFIX}/share/wordnet-1.7
+WN_INSTALLDIR=	${PREFIX}/share/WordNet-${VER}
 WN_FILES=	data.noun data.verb data.adj data.adv index.noun \
 		index.verb index.adj index.adv noun.exc verb.exc \
 		adj.exc adv.exc index.sense cntlist.rev \
diff --git a/textproc/wordnet/files/include.Makefile b/textproc/wordnet/files/include.Makefile
index dc2d1b1049e5..ed3f8e6aae1d 100644
--- a/textproc/wordnet/files/include.Makefile
+++ b/textproc/wordnet/files/include.Makefile
@@ -1,4 +1,4 @@
-WN_INSTALLDIR = ${PREFIX}/include/wordnet-1.7
+WN_INSTALLDIR = ${PREFIX}/include/WordNet-${VER}
 
 WN_FILES=	license.h setutil.h wn.h wnconsts.h wnglobal.h \
 		wnhelp.h wnrtl.h wntypes.h
diff --git a/textproc/wordnet/files/patch-aa b/textproc/wordnet/files/patch-aa
index 6e194dff90de..1111d7e513ff 100644
--- a/textproc/wordnet/files/patch-aa
+++ b/textproc/wordnet/files/patch-aa
@@ -1,10 +1,14 @@
 --- include/wnconsts.h	Fri Feb 27 13:54:53 1998
 +++ include/wnconsts.h	Sat Feb 26 16:11:51 2000
-@@ -16,2 +16,6 @@
--#define DEFAULTPATH	"/usr/local/wordnet1.7/dict"
--#define DEFAULTBIN      "/usr/local/wordnet1.7/bin"
+@@ -15,6 +15,10 @@
+ /* Platform specific path and filename specifications */
+ 
+ #ifdef UNIX
+ #define DICTDIR         "/dict"
+-#define DEFAULTPATH	"/usr/local/WordNet-_VER_/dict"
+-#define DEFAULTBIN      "/usr/local/WordNet-_VER_/bin"
 +#ifndef DEFAULTPATH
-+#define DEFAULTPATH	"/usr/local/share/wordnet-1.7"
++#define DEFAULTPATH	"/usr/local/share/WordNet-_VER_"
 +#endif
 +#ifndef DEFAULTBIN
 +#define DEFAULTBIN      "/usr/local/bin"
diff --git a/textproc/wordnet/files/patch-af b/textproc/wordnet/files/patch-af
new file mode 100644
index 000000000000..c2f740677509
--- /dev/null
+++ b/textproc/wordnet/files/patch-af
@@ -0,0 +1,7 @@
+--- include/wn.h	Thu Mar  7 14:59:59 2002
++++ include/wn.h	Tue Aug 20 11:24:43 2002
+@@ -32,3 +32,3 @@
+ /* Set bit for each search type that is valid for the search word
+    passed and return bit mask. */
+-extern unsigned int is_defined(char *, int); 
++extern unsigned long is_defined(char *, int); 
diff --git a/textproc/wordnet/files/patch-ag b/textproc/wordnet/files/patch-ag
new file mode 100644
index 000000000000..ebcf49f52613
--- /dev/null
+++ b/textproc/wordnet/files/patch-ag
@@ -0,0 +1,7 @@
+--- src/wnb/wnb	Tue Aug 20 11:54:54 2002
++++ src/wnb/wnb	Tue Aug 20 11:57:02 2002
+@@ -99,3 +96,3 @@
+    if {[lsearch -exact [array names env] WNHOME] == -1} {
+-	set resourcedir "/usr/local/WordNet-1.7.1/lib/wnres"
++	set resourcedir "/usr/local/share/WordNet-1.7.1/wnres"
+    } else {
diff --git a/textproc/wordnet/files/src.lib.Makefile b/textproc/wordnet/files/src.lib.Makefile
index 404fb842d279..fb82288f5c13 100644
--- a/textproc/wordnet/files/src.lib.Makefile
+++ b/textproc/wordnet/files/src.lib.Makefile
@@ -1,7 +1,7 @@
 SRCS=		binsrch.c morph.c search.c setutil.c wnglobal.c \
 		wnhelp.c wnrtl.c wnutil.c
 
-CFLAGS+=	-DUNIX -DDEFAULTPATH="\"${PREFIX}/share/wordnet-1.7\"" \
+CFLAGS+=	-DUNIX -DDEFAULTPATH="\"${PREFIX}/share/WordNet-${VER}\"" \
 		-DDEFAULTBIN="\"${PREFIX}/bin\"" -Werror
 
 CFLAGS+=	-I${.CURDIR}/../../include
diff --git a/textproc/wordnet/files/src.wn.Makefile b/textproc/wordnet/files/src.wn.Makefile
index aeb5e3239ab4..c527695cfb96 100644
--- a/textproc/wordnet/files/src.wn.Makefile
+++ b/textproc/wordnet/files/src.wn.Makefile
@@ -1,7 +1,7 @@
 PROG=		wn
 NOMAN=		True	# man pages installed separately
 
-CFLAGS+=	-DUNIX -DDEFAULTPATH="\"${PREFIX}/share/wordnet-1.7\"" \
+CFLAGS+=	-DUNIX -DDEFAULTPATH="\"${PREFIX}/share/WordNet-${VER}\"" \
 		-DDEFAULTBIN="\"${PREFIX}/bin\""
 
 CFLAGS+=	-I${.CURDIR}/../../include
diff --git a/textproc/wordnet/files/src.wnb.Makefile b/textproc/wordnet/files/src.wnb.Makefile
index 1c440d9d4295..eb9a61a918f5 100644
--- a/textproc/wordnet/files/src.wnb.Makefile
+++ b/textproc/wordnet/files/src.wnb.Makefile
@@ -3,7 +3,7 @@ TCL_DVER?=	8.3
 TCL_VER=	${TCL_DVER:S/.//g}
 TCL_INCDIR?=	${PREFIX}/include/tcl${TCL_DVER}
 
-CFLAGS+=	-DUNIX -DDEFAULTPATH="\"${PREFIX}/share/wordnet-1.7\"" \
+CFLAGS+=	-DUNIX -DDEFAULTPATH="\"${PREFIX}/share/WordNet-${VER}\"" \
 		-DDEFAULTBIN="\"${PREFIX}/bin\""
 
 CFLAGS+=	-I${.CURDIR}/../../include -I$(TCL_INCDIR)
@@ -21,7 +21,7 @@ pkgIndex.tcl:
 			> pkgIndex.tcl
 
 LIBDIR=		${PREFIX}/lib
-RESDIR=		${PREFIX}/share/wordnet-1.7/wnres
+RESDIR=		${PREFIX}/share/WordNet-${VER}/wnres
 
 ${LIBDIR} ${RESDIR} ${LIBDIR}/tcl${TCL_DVER}/Wordnet:
 	mkdir -p ${.TARGET}
@@ -30,7 +30,8 @@ beforeinstall: ${LIBDIR} ${RESDIR} ${LIBDIR}/tcl${TCL_DVER}/Wordnet
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
 		pkgIndex.tcl ${LIBDIR}/tcl${TCL_DVER}/Wordnet
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
-		${.CURDIR}/../lib/wnres/*.* ${RESDIR}
+		${.CURDIR}/../lib/wnres/license.txt \
+		${.CURDIR}/../lib/wnres/*.xbm ${RESDIR}
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 755 \
 		wnb ${PREFIX}/bin
 
diff --git a/textproc/wordnet/pkg-plist b/textproc/wordnet/pkg-plist
index 2d7543b29388..c474d5c9c17b 100644
--- a/textproc/wordnet/pkg-plist
+++ b/textproc/wordnet/pkg-plist
@@ -1,42 +1,40 @@
 bin/wnb
 bin/wn
-include/wordnet-%%VER%%/license.h
-include/wordnet-%%VER%%/setutil.h
-include/wordnet-%%VER%%/wn.h
-include/wordnet-%%VER%%/wnconsts.h
-include/wordnet-%%VER%%/wnglobal.h
-include/wordnet-%%VER%%/wnhelp.h
-include/wordnet-%%VER%%/wnrtl.h
-include/wordnet-%%VER%%/wntypes.h
+include/WordNet-%%VER%%/license.h
+include/WordNet-%%VER%%/setutil.h
+include/WordNet-%%VER%%/wn.h
+include/WordNet-%%VER%%/wnconsts.h
+include/WordNet-%%VER%%/wnglobal.h
+include/WordNet-%%VER%%/wnhelp.h
+include/WordNet-%%VER%%/wnrtl.h
+include/WordNet-%%VER%%/wntypes.h
 lib/libwn1.a
 lib/libwn1.so.7
 lib/libwn1.so
 lib/libtclwn1.so.7
 lib/libtclwn1.so
 lib/tcl%%TCL_DVER%%/Wordnet/pkgIndex.tcl
-share/wordnet-%%VER%%/adj.exc
-share/wordnet-%%VER%%/adv.exc
-share/wordnet-%%VER%%/cntlist
-share/wordnet-%%VER%%/cntlist.rev
-share/wordnet-%%VER%%/data.adj
-share/wordnet-%%VER%%/data.adv
-share/wordnet-%%VER%%/data.noun
-share/wordnet-%%VER%%/data.verb
-share/wordnet-%%VER%%/index.adj
-share/wordnet-%%VER%%/index.adv
-share/wordnet-%%VER%%/index.noun
-share/wordnet-%%VER%%/index.sense
-share/wordnet-%%VER%%/index.verb
-share/wordnet-%%VER%%/lexnames
-share/wordnet-%%VER%%/noun.exc
-share/wordnet-%%VER%%/sentidx.vrb
-share/wordnet-%%VER%%/sents.vrb
-share/wordnet-%%VER%%/verb.exc
-share/wordnet-%%VER%%/wnres/license.txt
-share/wordnet-%%VER%%/wnres/wn.xbm
-share/wordnet-%%VER%%/wnres/wnb.man
-share/wordnet-%%VER%%/wnres/wngloss.man
-@dirrm include/wordnet-%%VER%%
+share/WordNet-%%VER%%/adj.exc
+share/WordNet-%%VER%%/adv.exc
+share/WordNet-%%VER%%/cntlist
+share/WordNet-%%VER%%/cntlist.rev
+share/WordNet-%%VER%%/data.adj
+share/WordNet-%%VER%%/data.adv
+share/WordNet-%%VER%%/data.noun
+share/WordNet-%%VER%%/data.verb
+share/WordNet-%%VER%%/index.adj
+share/WordNet-%%VER%%/index.adv
+share/WordNet-%%VER%%/index.noun
+share/WordNet-%%VER%%/index.sense
+share/WordNet-%%VER%%/index.verb
+share/WordNet-%%VER%%/lexnames
+share/WordNet-%%VER%%/noun.exc
+share/WordNet-%%VER%%/sentidx.vrb
+share/WordNet-%%VER%%/sents.vrb
+share/WordNet-%%VER%%/verb.exc
+share/WordNet-%%VER%%/wnres/license.txt
+share/WordNet-%%VER%%/wnres/wn.xbm
+@dirrm include/WordNet-%%VER%%
 @dirrm lib/tcl%%TCL_DVER%%/Wordnet
-@dirrm share/wordnet-%%VER%%/wnres
-@dirrm share/wordnet-%%VER%%
+@dirrm share/WordNet-%%VER%%/wnres
+@dirrm share/WordNet-%%VER%%
diff --git a/textproc/wordnet/scripts/configure b/textproc/wordnet/scripts/configure
index f730d5a64949..b02bfa80a898 100644
--- a/textproc/wordnet/scripts/configure
+++ b/textproc/wordnet/scripts/configure
@@ -20,7 +20,4 @@ Configuring the wnb script to call the right wish-binary directly
 +#!${PREFIX}/bin/wish${TCL_DVER}
 +
 +package require Wordnet
-@@ -30 +27 @@
--	set resourcedir "/usr/local/wordnet1.6/lib/wnres"
-+	set resourcedir "${PREFIX}/share/wordnet-1.6/wnres"
 EOPATCH