- Update to version 1.13

- Add LICENSE info
- Mark MAKE_JOBS_SAFE
- Add missing dependencies
- Update WWW

PR:		153566
Submitted by:	Pawel Pekala" <c0rn@o2.pl>
Approved by:	maintainer timeout
Feature safe:	yes

5 files changed, 28 insertions, 27 deletions

diff --git a/converters/enca/Makefile b/converters/enca/Makefile
index 05541991eb8a..db884d4f4cdb 100644
--- a/converters/enca/Makefile
+++ b/converters/enca/Makefile
@@ -6,14 +6,19 @@
 #
 
 PORTNAME=	enca
-PORTVERSION=	1.9
+PORTVERSION=	1.13
 CATEGORIES=	converters textproc russian ukrainian
-MASTER_SITES=	http://trific.ath.cx/Ftp/enca/ \
-		http://freebsd.unixfreunde.de/sources/
+MASTER_SITES=	http://dl.cihar.com/enca/
 
 MAINTAINER=	never@nevermind.kiev.ua
 COMMENT=	A package for detecting encoding of text files
 
+BUILD_DEPENDS=	umap:${PORTSDIR}/converters/p5-Unicode-Map8
+LIB_DEPENDS=	recode:${PORTSDIR}/converters/recode
+RUN_DEPENDS=	umap:${PORTSDIR}/converters/p5-Unicode-Map8
+
+LICENSE=	GPLv2
+
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	pkgconfig
 USE_ICONV=	yes
@@ -21,9 +26,9 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR} \
-		--without-librecode \
-		--with-libiconv=${LOCALBASE}
+MAKE_JOBS_SAFE=	yes
+CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR}
+
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include \
 		LDFLAGS=-L${LOCALBASE}/lib
 
diff --git a/converters/enca/distinfo b/converters/enca/distinfo
index a96bb5a91ddc..9f38fd87c58c 100644
--- a/converters/enca/distinfo
+++ b/converters/enca/distinfo
@@ -1,3 +1,2 @@
-MD5 (enca-1.9.tar.bz2) = b3581e28d68d452286fb0bfe58bed3b3
-SHA256 (enca-1.9.tar.bz2) = 02acfef2b24a9c842612da49338138311f909f1cd33933520c07b8b26c410f4d
-SIZE (enca-1.9.tar.bz2) = 503547
+SHA256 (enca-1.13.tar.bz2) = 6c091455d524b3ddae3533fe9bb375092f60ad6fe252e0777c873bd7869c7432
+SIZE (enca-1.13.tar.bz2) = 532000
diff --git a/converters/enca/files/patch-Makefile.in b/converters/enca/files/patch-Makefile.in
index 3853e0b55ac8..c8cfb3be0991 100644
--- a/converters/enca/files/patch-Makefile.in
+++ b/converters/enca/files/patch-Makefile.in
@@ -1,17 +1,17 @@
---- Makefile.in.orgi	Wed Jun  7 21:02:05 2006
-+++ Makefile.in	Wed Jun  7 21:03:31 2006
-@@ -196,6 +196,7 @@
+--- Makefile.in.orig	2010-02-09 11:23:03.000000000 +0100
++++ Makefile.in	2010-12-30 21:08:30.000000000 +0100
+@@ -245,6 +245,7 @@
  infodir = @infodir@
  install_sh = @install_sh@
  libdir = @libdir@
 +libdatadir = $(exec_prefix)/libdata
  libexecdir = @libexecdir@
+ localedir = @localedir@
  localstatedir = @localstatedir@
- mandir = @mandir@
-@@ -207,10 +208,10 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+@@ -264,10 +265,10 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
 -@MAINTAINER_MODE_FALSE@SUBDIRS = tools script lib src devel-docs test
 +@MAINTAINER_MODE_FALSE@SUBDIRS = tools script lib src devel-docs
  
@@ -20,8 +20,8 @@
 +@MAINTAINER_MODE_TRUE@SUBDIRS = tools data script lib src devel-docs
  man_MANS = man/enca.1
  DISTCHECK_CONFIGURE_FLAGS = --enable-maintainer-mode
- M4TESTS = \
-@@ -241,7 +242,7 @@
+ ACLOCAL_AMFLAGS = -I m4
+@@ -299,7 +300,7 @@
    man/enca.1 \
    $(M4TESTS)
  
diff --git a/converters/enca/files/patch-configure b/converters/enca/files/patch-configure
index 0f236e98c3d1..9cf2cb6629ca 100644
--- a/converters/enca/files/patch-configure
+++ b/converters/enca/files/patch-configure
@@ -1,12 +1,9 @@
-
-$FreeBSD$
-
---- configure	2002/10/08 14:50:26	1.1
-+++ configure	2002/10/08 14:50:33
-@@ -7459,6 +7459,7 @@
+--- configure.orig	2010-02-09 11:23:03.000000000 +0100
++++ configure	2010-12-30 21:12:31.000000000 +0100
+@@ -7156,6 +7156,7 @@
  
  # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+ LIBTOOL_DEPS="$ltmain"
 +$ac_aux_dir/ltconfig $LIBTOOL_DEPS
  
  # Always use our own libtool.
diff --git a/converters/enca/pkg-descr b/converters/enca/pkg-descr
index b2538d369df3..95088ad183e3 100644
--- a/converters/enca/pkg-descr
+++ b/converters/enca/pkg-descr
@@ -2,7 +2,7 @@ Enca currently can determine 8bit charsets of Belarussian, Czech, Polish,
 Russian, Slovak and Ukrainian texts and also some multibyte encodings,
 independently on language (provided it's some European language).
 
-WWW: http://trific.ath.cx/software/enca/
+WWW: http://gitorious.org/enca
 
 - Alexandr "Nevermind" Kovalenko
 never@nevermind.kiev.ua