4 files changed, 15 insertions, 74 deletions

diff --git a/dns/libidn/Makefile b/dns/libidn/Makefile
index b143c3bdfbb5..c32516624c84 100644
--- a/dns/libidn/Makefile
+++ b/dns/libidn/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libidn
-PORTVERSION=	0.3.6
+PORTVERSION=	0.3.7
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU_ALPHA} \
 		http://josefsson.org/libidn/releases/
@@ -25,7 +25,7 @@ CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 USE_GETOPT_LONG=	yes
 USE_GNOME=	gnomehack
-#INFO=		libidn
+INFO=		libidn
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/dns/libidn/distinfo b/dns/libidn/distinfo
index 010cf2f1d5d3..04b3d69d0111 100644
--- a/dns/libidn/distinfo
+++ b/dns/libidn/distinfo
@@ -1 +1 @@
-MD5 (libidn-0.3.6.tar.gz) = 26c3b27a1233a9d752006c2fe01d1fbb
+MD5 (libidn-0.3.7.tar.gz) = 3ec822e38dda0d1eadd032d82a5b238c
diff --git a/dns/libidn/files/patch-doc::Makefile.in b/dns/libidn/files/patch-doc::Makefile.in
deleted file mode 100644
index fb3b85a3dd56..000000000000
--- a/dns/libidn/files/patch-doc::Makefile.in
+++ /dev/null
@@ -1,71 +0,0 @@
---- doc/Makefile.in.orig	Tue Jan  6 22:53:45 2004
-+++ doc/Makefile.in	Tue Jan  6 22:55:11 2004
-@@ -101,7 +101,6 @@
- TEXINFOS = libidn.texi
- TEXI2DVI = texi2dvi
- TEXI2PDF = $(TEXI2DVI) --pdf --batch
--MAKEINFOHTML = $(MAKEINFO) --html
- DVIPS = dvips
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- 	html-recursive info-recursive install-data-recursive \
-@@ -169,7 +168,6 @@
- LT_AGE = @LT_AGE@
- LT_CURRENT = @LT_CURRENT@
- LT_REVISION = @LT_REVISION@
--MAKEINFO = @MAKEINFO@
- NM = @NM@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
-@@ -231,7 +229,6 @@
- 
- info_TEXINFOS = libidn.texi
- libidn_TEXINFOS = fdl.texi $(gdoc_TEXINFOS)
--AM_MAKEINFOHTMLFLAGS = --no-split --number-sections
- 
- # Man pages.
- dist_man_MANS = idn.1 $(gdoc_MANS)
-@@ -390,32 +387,16 @@
- 	  fi; \
- 	done; \
- 	cd "$$am__cwd"; \
--	if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
--	 -o $@ $<; \
--	then \
--	  rc=0; \
--	  cd $(srcdir); \
--	else \
--	  rc=$$?; \
--	  cd $(srcdir) && \
--	  $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
--	fi; \
- 	rm -rf $$backupdir; \
- 	exit $$rc
- 
- .texi.dvi:
--	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
--	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
--	$(TEXI2DVI) $<
-+	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS"
- 
- .texi.pdf:
--	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
--	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
--	$(TEXI2PDF) $<
-+	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS"
- 
- .texi.html:
--	$(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
--	 -o $@ $<
- 	if test ! -d $@ && test -d $(@:.html=); then \
- 	  mv $(@:.html=) $@; else :; fi
- $(srcdir)/libidn.info: libidn.texi $(srcdir)/version.texi $(libidn_TEXINFOS)
-@@ -1106,9 +1087,6 @@
- 	$(PERL) $(top_srcdir)/doc/gdoc -man $(GDOC_MAN_EXTRA_ARGS) -function stringprep_check_version $< > $@
- 
- # DocBook
--
--libidn-db.xml: libidn.texi $(libidn_TEXINFOS)
--	$(MAKEINFO) --docbook --output $@ libidn.texi
- 
- libidn-db.txt: libidn-db.xml
- 	$(DOCBOOK2TXT) $^
diff --git a/dns/libidn/files/patch-doc::libidn.texi b/dns/libidn/files/patch-doc::libidn.texi
new file mode 100644
index 000000000000..1429f7c14011
--- /dev/null
+++ b/dns/libidn/files/patch-doc::libidn.texi
@@ -0,0 +1,12 @@
+--- doc/libidn.texi.orig	Thu Jan 22 20:48:25 2004
++++ doc/libidn.texi	Thu Jan 22 20:48:45 2004
+@@ -1271,8 +1271,7 @@
+ Accessing a specific StringPrep profile directly:
+ 
+ @example
+-jas@@latte:~$ idn --quiet --profile=SASLprep --stringprep te@ss{}t@ordf{}
+-te@ss{}ta
++jas@@latte:~$ idn --quiet --profile=SASLprep --stringprep
+ jas@@latte:~$
+ @end example
+