- Update to 6.4.2

PR:		167129
Submitted by:	Muhammad Moinur Rahman <5u623l20@gmail.com>
Approved by:	,maintainer timeout

4 files changed, 32 insertions, 67 deletions

diff --git a/math/timbl/Makefile b/math/timbl/Makefile
index 85894c978fba..469d8b209a14 100644
--- a/math/timbl/Makefile
+++ b/math/timbl/Makefile
@@ -6,17 +6,25 @@
 #
 
 PORTNAME=	timbl
-PORTVERSION=	6.1.2
+PORTVERSION=	6.4.2
 CATEGORIES=	math
 MASTER_SITES=	http://ilk.uvt.nl/downloads/pub/software/
 
 MAINTAINER=	yuri@tsoft.com
 COMMENT=	Tilburg Memory Based Learner
 
+LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2
+
+MAN1=	timbl.1
+
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-USE_GNOME=	gnomehack
+USE_GNOME=	gnomehack pkgconfig
+USE_LDCONFIG=	yes
+
+post-patch:
+	@${REINPLACE_CMD} 's#doc/@PACKAGE@/examples#examples/@PACKAGE@#' ${WRKSRC}/demos/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/math/timbl/distinfo b/math/timbl/distinfo
index 9ce864360eee..509ec2dcb5d3 100644
--- a/math/timbl/distinfo
+++ b/math/timbl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (timbl-6.1.2.tar.gz) = 8384190a8e16b521785ed0713681c6359b3038f92aac502d9d54976171fd85a0
-SIZE (timbl-6.1.2.tar.gz) = 823951
+SHA256 (timbl-6.4.2.tar.gz) = a10075f0406032fd9e1c3ee4e56fb66bc056284505ca54ac4890ff065ec4c7e8
+SIZE (timbl-6.4.2.tar.gz) = 548063
diff --git a/math/timbl/files/patch-demos_Makefile.in b/math/timbl/files/patch-demos_Makefile.in
deleted file mode 100644
index 139108287968..000000000000
--- a/math/timbl/files/patch-demos_Makefile.in
+++ /dev/null
@@ -1,45 +0,0 @@
---- demos/Makefile.in.orig	2008-03-12 17:15:02.000000000 -0700
-+++ demos/Makefile.in	2008-03-12 17:22:05.000000000 -0700
-@@ -248,25 +248,25 @@
- $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
--	@$(NORMAL_INSTALL)
--	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
--	@list='$(bin_PROGRAMS)'; for p in $$list; do \
--	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
--	  if test -f $$p \
--	  ; then \
--	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
--	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
--	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
--	  else :; fi; \
--	done
-+	#@$(NORMAL_INSTALL)
-+	#test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-+	#@list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	#  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+	#  if test -f $$p \
-+	#  ; then \
-+	#    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-+	#   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-+	#   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-+	#  else :; fi; \
-+	#done
- 
- uninstall-binPROGRAMS:
--	@$(NORMAL_UNINSTALL)
--	@list='$(bin_PROGRAMS)'; for p in $$list; do \
--	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
--	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
--	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
--	done
-+	#@$(NORMAL_UNINSTALL)
-+	#@list='$(bin_PROGRAMS)'; for p in $$list; do \
-+	#  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-+	#  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-+	#  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-+	#done
- 
- clean-binPROGRAMS:
- 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
diff --git a/math/timbl/pkg-plist b/math/timbl/pkg-plist
index ab5367b10215..b03b3e9a477a 100644
--- a/math/timbl/pkg-plist
+++ b/math/timbl/pkg-plist
@@ -1,6 +1,6 @@
-bin/Timbl
-bin/TimblClient
+bin/timbl
 include/timbl/BestArray.h
+include/timbl/Choppers.h
 include/timbl/CommandLine.h
 include/timbl/Common.h
 include/timbl/GetOptClass.h
@@ -9,31 +9,33 @@ include/timbl/Instance.h
 include/timbl/LogBuffer.h
 include/timbl/LogStream.h
 include/timbl/MBLClass.h
+include/timbl/Matrices.h
+include/timbl/Metrics.h
 include/timbl/MsgClass.h
 include/timbl/Options.h
-include/timbl/ServerProcs.h
-include/timbl/SocketBasics.h
 include/timbl/Statistics.h
 include/timbl/StringOps.h
+include/timbl/Testers.h
 include/timbl/TimblAPI.h
 include/timbl/TimblExperiment.h
 include/timbl/Tree.h
 include/timbl/Trie.h
 include/timbl/Types.h
+include/timbl/XMLtools.h
 include/timbl/neighborSet.h
-lib/libTimbl.a
+lib/libtimbl.a
+lib/libtimbl.la
+lib/libtimbl.so
+lib/libtimbl.so.3
 libdata/pkgconfig/timbl.pc
-%%DOCSDIR%%/Timbl_6.1_API.pdf
-%%DOCSDIR%%/Timbl_6.1_Manual.pdf
-%%DOCSDIR%%/examples/cross_val.test
-%%DOCSDIR%%/examples/dimin.script
-%%DOCSDIR%%/examples/dimin.test
-%%DOCSDIR%%/examples/dimin.train
-%%DOCSDIR%%/examples/small_1.train
-%%DOCSDIR%%/examples/small_2.train
-%%DOCSDIR%%/examples/small_3.train
-%%DOCSDIR%%/examples/small_4.train
-%%DOCSDIR%%/examples/small_5.train
-@dirrm %%DOCSDIR%%/examples
-@dirrm %%DOCSDIR%%
+%%EXAMPLESDIR%%/cross_val.test
+%%EXAMPLESDIR%%/dimin.script
+%%EXAMPLESDIR%%/dimin.test
+%%EXAMPLESDIR%%/dimin.train
+%%EXAMPLESDIR%%/small_1.train
+%%EXAMPLESDIR%%/small_2.train
+%%EXAMPLESDIR%%/small_3.train
+%%EXAMPLESDIR%%/small_4.train
+%%EXAMPLESDIR%%/small_5.train
+@dirrm %%EXAMPLESDIR%%
 @dirrm include/timbl