Update to 3.6, and use libintl; from heko@iki.fi

converters/recode/Makefile

@@ -1,13 +1,15 @@
-# $OpenBSD: Makefile,v 1.14 2001/06/20 01:43:14 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.15 2001/08/02 19:00:56 angelos Exp $
 
 COMMENT=	"convert files between character sets and usages"
 
-DISTNAME=	recode-3.5
+DISTNAME=	recode-3.6
 CATEGORIES=	converters textproc
 NEED_VERSION=	1.402
 
 MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>
 
+LIB_DEPENDS=            intl::devel/gettext
+			
 # License: GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
@@ -18,5 +20,7 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR= recode
 
 CONFIGURE_STYLE=gnu
+CONFIGURE_ARGS=--without-included-gettext
+CONFIGURE_ENV+=CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
 
 .include <bsd.port.mk>

converters/recode/files/md5

@@ -1,3 +1,3 @@
-MD5 (recode-3.5.tar.gz) = 5f2c54592e9f7af31a11e62c7babc81c
-RMD160 (recode-3.5.tar.gz) = 729406733fdbc0cb328962538665dcf9b50d3c5a
-SHA1 (recode-3.5.tar.gz) = c2c74a7fa1e63e712d1f9f16ec9dbec25e9a71bb
+MD5 (recode-3.6.tar.gz) = be3f40ad2e93dae5cd5f628264bf1877
+RMD160 (recode-3.6.tar.gz) = 97dcb2544472c9025689452a94bed98ea36374b5
+SHA1 (recode-3.6.tar.gz) = 2de90cd2ba553bc07d75a29913ea4424dd9e616b

converters/recode/patches/patch-po

@@ -1,43 +0,0 @@
-Fix automake shit which doesn't take DESTDIR into account for gettext
-fragments...
-
-$OpenBSD: patch-po,v 1.1 2000/03/07 23:49:40 espie Exp $
---- po/Makefile.in.in.orig	Wed Mar  8 00:29:31 2000
-+++ po/Makefile.in.in	Wed Mar  8 00:30:39 2000
-@@ -111,9 +111,9 @@
- install-data-no: all
- install-data-yes: all
- 	if test -r "$(MKINSTALLDIRS)"; then \
--	  $(MKINSTALLDIRS) $(datadir); \
-+	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
- 	else \
--	  $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
-+	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
- 	fi
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
-@@ -123,7 +123,7 @@
- 	    *)     destdir=$(localedir);; \
- 	  esac; \
- 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
--	  dir=$$destdir/$$lang/LC_MESSAGES; \
-+	  dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
- 	  if test -r "$(MKINSTALLDIRS)"; then \
- 	    $(MKINSTALLDIRS) $$dir; \
- 	  else \
-@@ -153,12 +153,12 @@
- 	done
- 	if test "$(PACKAGE)" = "gettext"; then \
- 	  if test -r "$(MKINSTALLDIRS)"; then \
--	    $(MKINSTALLDIRS) $(gettextsrcdir); \
-+	    $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
- 	  else \
--	    $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
-+	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
- 	  fi; \
- 	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
--			  $(gettextsrcdir)/Makefile.in.in; \
-+			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
- 	else \
- 	  : ; \
- 	fi

converters/recode/pkg/PFRAG.shared

@@ -0,0 +1,3 @@
+@comment $OpenBSD: PFRAG.shared,v 1.1 2001/08/02 19:00:56 angelos Exp $
+lib/librecode.so.0.0
+DYNLIBDIR(%D/lib)

converters/recode/pkg/PLIST

@@ -1,3 +1,5 @@
+@comment $OpenBSD: PLIST,v 1.3 2001/08/02 19:00:56 angelos Exp $
+@unexec install-info --delete --info-dir=%D/info %D/info/recode.info
 bin/recode
 info/recode.info
 info/recode.info-1
@@ -5,18 +7,24 @@ info/recode.info-2
 info/recode.info-3
 info/recode.info-4
 info/recode.info-5
+info/recode.info-6
+info/recode.info-7
 man/man1/recode.1
 include/recode.h
 include/recodext.h
-lib/librecode.so.0.0
 lib/librecode.la
 lib/librecode.a
 share/locale/da/LC_MESSAGES/recode.mo
 share/locale/de/LC_MESSAGES/recode.mo
+share/locale/el/LC_MESSAGES/recode.mo
 share/locale/es/LC_MESSAGES/recode.mo
 share/locale/fr/LC_MESSAGES/recode.mo
+share/locale/gl/LC_MESSAGES/recode.mo
+share/locale/it/LC_MESSAGES/recode.mo
 share/locale/nl/LC_MESSAGES/recode.mo
 share/locale/pl/LC_MESSAGES/recode.mo
 share/locale/pt/LC_MESSAGES/recode.mo
 share/locale/sl/LC_MESSAGES/recode.mo
 share/locale/sv/LC_MESSAGES/recode.mo
+%%SHARED%%
+@exec install-info --info-dir=%D/info %D/info/recode.info