Update to 1.15:

enca-1.15 2013-09-30
  - Documentation improvement
  - Development moved to GitHub
  - Do not use deprecated autoconf macros

7 files changed, 8 insertions, 193 deletions

diff --git a/textproc/enca/Makefile b/textproc/enca/Makefile
index 687c15f4e0a..51affb9bcfb 100644
--- a/textproc/enca/Makefile
+++ b/textproc/enca/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2013/05/10 05:27:38 riastradh Exp $
-#
+# $NetBSD: Makefile,v 1.7 2013/11/13 19:44:03 wiz Exp $
 
-DISTNAME=		enca-1.14
+DISTNAME=		enca-1.15
 CATEGORIES=		converters
 MASTER_SITES=		http://dl.cihar.com/enca/
 EXTRACT_SUFX=		.tar.bz2
@@ -17,14 +16,4 @@ USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/enca.pc.in
 
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) && ${OPSYS} == "NetBSD"
-CONFIGURE_ENV+=		ac_cv_file__dev_random=yes
-CONFIGURE_ENV+=		ac_cv_file__dev_urandom=yes
-CONFIGURE_ENV+=		ac_cv_file__dev_srandom=no
-CONFIGURE_ENV+=		ac_cv_file__dev_arandom=no
-CONFIGURE_ENV+=		CC_FOR_BUILD=${NATIVE_CC:Q}
-.endif
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/enca/PLIST b/textproc/enca/PLIST
index b7783a4b357..dca236ffddc 100644
--- a/textproc/enca/PLIST
+++ b/textproc/enca/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:17:15 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/11/13 19:44:03 wiz Exp $
 bin/enca
 bin/enconv
 include/enca.h
@@ -11,11 +11,4 @@ libexec/enca/extconv/recode
 libexec/enca/extconv/umap
 man/man1/enca.1
 man/man1/enconv.1
-share/gtk-doc/html/libenca/ch01.html
-share/gtk-doc/html/libenca/index.html
-share/gtk-doc/html/libenca/index.sgml
-share/gtk-doc/html/libenca/libenca-Analyser.html
-share/gtk-doc/html/libenca/libenca-Auxiliary-Functions.html
-share/gtk-doc/html/libenca/libenca-Charsets-and-Surfaces.html
-share/gtk-doc/html/libenca/libenca-Typedefs-and-Constants.html
-share/gtk-doc/html/libenca/libenca.devhelp
+@pkgdir share/gtk-doc/html/libenca
diff --git a/textproc/enca/distinfo b/textproc/enca/distinfo
index 27c97f30955..cc76e966b57 100644
--- a/textproc/enca/distinfo
+++ b/textproc/enca/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.5 2013/05/10 14:33:01 riastradh Exp $
+$NetBSD: distinfo,v 1.6 2013/11/13 19:44:03 wiz Exp $
 
-SHA1 (enca-1.14.tar.bz2) = 9aacb595da981f40a5fa0dadb886f3efeca933f4
-RMD160 (enca-1.14.tar.bz2) = 2e4442b905ad6935241b8f47434429ebfd55fbbc
-Size (enca-1.14.tar.bz2) = 560982 bytes
-SHA1 (patch-configure) = 944b3da85306353fec793aa1de014e4949dbdfeb
-SHA1 (patch-configure.ac) = e19dd68be397805bf7874da621e0c61c73a80d11
-SHA1 (patch-tools_Makefile.am) = 1716a9b1675f1bed89e3f79c7ab8dcecea0f2455
-SHA1 (patch-tools_Makefile.in) = 885fe42ecc4f5daad9204fbe415eb77b99f2399d
+SHA1 (enca-1.15.tar.bz2) = cec4509b662ded6651c3c5e10d1c6f0067909b24
+RMD160 (enca-1.15.tar.bz2) = 6f25cb333e35eb339403a983f05c4fc90e82874d
+Size (enca-1.15.tar.bz2) = 536627 bytes
diff --git a/textproc/enca/patches/patch-configure b/textproc/enca/patches/patch-configure
deleted file mode 100644
index c2fd4db0525..00000000000
--- a/textproc/enca/patches/patch-configure
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-configure,v 1.2 2013/05/10 14:33:01 riastradh Exp $
-
-Pass CC_FOR_BUILD through for make_hash.
-
---- configure.orig	2012-09-11 09:12:23.000000000 +0000
-+++ configure
-@@ -635,6 +635,7 @@ ac_includes_default="\
- ac_subst_vars='am__EXEEXT_FALSE
- am__EXEEXT_TRUE
- LTLIBOBJS
-+CC_FOR_BUILD
- SHELL_RANDOM_FILENAME
- DEFAULT_CONVERTER_LIST
- DEFAULT_EXTERNAL_CONVERTER
-@@ -12446,6 +12447,15 @@ else
- $as_echo "no" >&6; }
- fi
- 
-+if test -z "$CC_FOR_BUILD"; then
-+  if test "x$cross_compiling" = xno; then
-+    CC_FOR_BUILD="$CC"
-+  else
-+    as_fn_error $? "can't compile tools on host without CC_FOR_BUILD" "$LINENO" 5
-+  fi
-+fi
-+
-+
- 
- 
- if test "$GCC" = yes; then
diff --git a/textproc/enca/patches/patch-configure.ac b/textproc/enca/patches/patch-configure.ac
deleted file mode 100644
index cb7042e2be4..00000000000
--- a/textproc/enca/patches/patch-configure.ac
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.2 2013/05/10 14:33:01 riastradh Exp $
-
-Pass CC_FOR_BUILD through for make_hash.
-
---- configure.ac.orig	2012-09-11 09:11:11.000000000 +0000
-+++ configure.ac
-@@ -46,6 +46,14 @@ AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PATH_PROG(MKTEMP_PROG, mktemp)
- 
-+if test -z "$CC_FOR_BUILD"; then
-+  if test "x$cross_compiling" = xno; then
-+    CC_FOR_BUILD="$CC"
-+  else
-+    AC_MSG_ERROR([can't compile tools on host without CC_FOR_BUILD])
-+  fi
-+fi
-+
- dnl With GCC, be paranoiac.  It should compile really cleanly.
- dnl Except -Wno-sign-compare, but older gcc's don't know it.
- if test "$GCC" = yes; then
-@@ -207,6 +215,7 @@ AC_SUBST(CONVERTER_LIBS)
- AC_SUBST(DEFAULT_EXTERNAL_CONVERTER)
- AC_SUBST(DEFAULT_CONVERTER_LIST)
- AC_SUBST(SHELL_RANDOM_FILENAME)
-+AC_SUBST(CC_FOR_BUILD)
- 
- AC_OUTPUT
- 
diff --git a/textproc/enca/patches/patch-tools_Makefile.am b/textproc/enca/patches/patch-tools_Makefile.am
deleted file mode 100644
index 25d86829384..00000000000
--- a/textproc/enca/patches/patch-tools_Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-tools_Makefile.am,v 1.1 2013/05/10 05:27:39 riastradh Exp $
-
-Use CC_FOR_BUILD to compile make_hash.
-
---- tools/Makefile.am.orig	2009-08-25 08:33:34.000000000 +0000
-+++ tools/Makefile.am
-@@ -3,7 +3,9 @@ noinst_PROGRAMS = make_hash
- noinst_HEADERS = encodings.h
- noinst_SCRIPTS = expand_table.pl
- 
--make_hash_SOURCES = make_hash.c
-+CLEANFILES = make_hash$(EXEEXT)
-+make_hash$(EXEEXT): make_hash.c
-+	$(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/make_hash.c
- 
- BUILT_SOURCES = $(noinst_HEADERS)
- 
-@@ -23,15 +25,15 @@ TABLE_SRC = \
-   TEX_SKIP.t \
-   encodings.dat
- 
--EXTRA_DIST = $(TABLE_SRC) $(noinst_SCRIPTS) iconvenc.null
-+EXTRA_DIST = $(TABLE_SRC) $(noinst_SCRIPTS) iconvenc.null make_hash.c
- 
- all: encodings.h
- 
- encodings.sed: $(top_builddir)/iconvenc.h
- 	sed -e 's/^#define \([A-Z0-9_]*\) \(.*\)/@\1@ \2/' -e 's/"//g' -e 's/NULL$$//' -e 's/ /\//' -e 's/^\(.*\)$$/s\/\1\//' $(top_builddir)/iconvenc.h >encodings.sed
- 
--encodings.h: encodings.sed $(srcdir)/encodings.dat make_hash
--	sed -f encodings.sed $(srcdir)/encodings.dat | ./make_hash >encodings.h
-+encodings.h: encodings.sed $(srcdir)/encodings.dat make_hash$(EXEEXT)
-+	sed -f encodings.sed $(srcdir)/encodings.dat | ./make_hash$(EXEEXT) >encodings.h
- 
- # Normally there's no need to regenerate tables, they are copy-and-pasted
- # into the C source manually, but the rules are here.  Run `make tables'
diff --git a/textproc/enca/patches/patch-tools_Makefile.in b/textproc/enca/patches/patch-tools_Makefile.in
deleted file mode 100644
index 2100529b52f..00000000000
--- a/textproc/enca/patches/patch-tools_Makefile.in
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD: patch-tools_Makefile.in,v 1.1 2013/05/10 05:27:39 riastradh Exp $
-
-Use CC_FOR_BUILD to compile make_hash.
-
---- tools/Makefile.in.orig	2012-09-11 09:12:22.000000000 +0000
-+++ tools/Makefile.in
-@@ -109,6 +109,7 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
-+CC_FOR_BUILD = @CC_FOR_BUILD@
- CFLAGS = @CFLAGS@
- CONVERTER_LIBS = @CONVERTER_LIBS@
- CPP = @CPP@
-@@ -233,6 +234,7 @@ top_srcdir = @top_srcdir@
- noinst_HEADERS = encodings.h
- noinst_SCRIPTS = expand_table.pl
- make_hash_SOURCES = make_hash.c
-+CLEANFILES = make_hash$(EXEEXT)
- BUILT_SOURCES = $(noinst_HEADERS)
- TABLE_SRC = \
-   ACCEPTED_CHARS.t \
-@@ -250,7 +252,7 @@ TABLE_SRC = \
-   TEX_SKIP.t \
-   encodings.dat
- 
--EXTRA_DIST = $(TABLE_SRC) $(noinst_SCRIPTS) iconvenc.null
-+EXTRA_DIST = $(TABLE_SRC) $(noinst_SCRIPTS) iconvenc.null make_hash.c
- 
- # Normally there's no need to regenerate tables, they are copy-and-pasted
- # into the C source manually, but the rules are here.  Run `make tables'
-@@ -313,9 +315,6 @@ clean-noinstPROGRAMS:
- 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- 	echo " rm -f" $$list; \
- 	rm -f $$list
--make_hash$(EXEEXT): $(make_hash_OBJECTS) $(make_hash_DEPENDENCIES) $(EXTRA_make_hash_DEPENDENCIES) 
--	@rm -f make_hash$(EXEEXT)
--	$(LINK) $(make_hash_OBJECTS) $(make_hash_LDADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -462,6 +461,7 @@ install-strip:
- mostlyclean-generic:
- 
- clean-generic:
-+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
- 
- distclean-generic:
- 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-@@ -558,14 +558,16 @@ uninstall-am:
- 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
- 	uninstall-am
- 
-+make_hash$(EXEEXT): make_hash.c
-+	$(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/make_hash.c
- 
- all: encodings.h
- 
- encodings.sed: $(top_builddir)/iconvenc.h
- 	sed -e 's/^#define \([A-Z0-9_]*\) \(.*\)/@\1@ \2/' -e 's/"//g' -e 's/NULL$$//' -e 's/ /\//' -e 's/^\(.*\)$$/s\/\1\//' $(top_builddir)/iconvenc.h >encodings.sed
- 
--encodings.h: encodings.sed $(srcdir)/encodings.dat make_hash
--	sed -f encodings.sed $(srcdir)/encodings.dat | ./make_hash >encodings.h
-+encodings.h: encodings.sed $(srcdir)/encodings.dat make_hash$(EXEEXT)
-+	sed -f encodings.sed $(srcdir)/encodings.dat | ./make_hash$(EXEEXT) >encodings.h
- 
- @MAINTAINER_MODE_TRUE@tables: $(TABLES) $(TABLES_INCR)
-