6 files changed, 94 insertions, 11 deletions

diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile
index 02958e65db99..0b94eb0585a2 100644
--- a/security/gsasl/Makefile
+++ b/security/gsasl/Makefile
@@ -7,9 +7,10 @@
 #
 
 PORTNAME=	gsasl
-PORTVERSION=	0.2.29
+PORTVERSION=	1.3
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_GNU_ALPHA} \
+MASTER_SITES=	http://www.sfr-fresh.com/unix/misc/ \
+		${MASTER_SITE_GNU_ALPHA} \
 		http://josefsson.org/${PORTNAME}/releases/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
diff --git a/security/gsasl/Makefile.man b/security/gsasl/Makefile.man
index 8a429fd3478e..9b3bedf722ce 100644
--- a/security/gsasl/Makefile.man
+++ b/security/gsasl/Makefile.man
@@ -52,6 +52,7 @@ MAN3+=	gsasl_encode_inline.3
 MAN3+=	gsasl_finish.3
 MAN3+=	gsasl_free.3
 MAN3+=	gsasl_hmac_md5.3
+MAN3+=	gsasl_hmac_sha1.3
 MAN3+=	gsasl_init.3
 MAN3+=	gsasl_mechanism_name.3
 MAN3+=	gsasl_md5.3
@@ -104,6 +105,7 @@ MAN3+=	gsasl_server_suggest_mechanism.3
 MAN3+=	gsasl_server_support_p.3
 MAN3+=	gsasl_session_hook_get.3
 MAN3+=	gsasl_session_hook_set.3
+MAN3+=	gsasl_sha1.3
 MAN3+=	gsasl_simple_getpass.3
 MAN3+=	gsasl_step.3
 MAN3+=	gsasl_step64.3
diff --git a/security/gsasl/distinfo b/security/gsasl/distinfo
index 13b9c16424fe..54171f927060 100644
--- a/security/gsasl/distinfo
+++ b/security/gsasl/distinfo
@@ -1,3 +1,3 @@
-MD5 (gsasl-0.2.29.tar.gz) = f513d8eed4f8d47f598cf1ac052fefb3
-SHA256 (gsasl-0.2.29.tar.gz) = 65671084d17ff03c48571582b58ee11c1ecb35caf99ff28c90db0757dd38daaf
-SIZE (gsasl-0.2.29.tar.gz) = 3519920
+MD5 (gsasl-1.3.tar.gz) = df35e09a775e45d7704ae6883d3dd046
+SHA256 (gsasl-1.3.tar.gz) = 253ba57778ac60c5dacfb52d3f9a8f0cf0afb0015fd48acd1b33b599ab2a85b0
+SIZE (gsasl-1.3.tar.gz) = 3753660
diff --git a/security/gsasl/files/patch-doc_gsasl.texi b/security/gsasl/files/patch-doc_gsasl.texi
index 55d4d087c6ee..9e717957bb18 100644
--- a/security/gsasl/files/patch-doc_gsasl.texi
+++ b/security/gsasl/files/patch-doc_gsasl.texi
@@ -3,9 +3,9 @@ $FreeBSD$
 
 --- doc/gsasl.texi.orig
 +++ doc/gsasl.texi
-@@ -123,14 +123,6 @@
- and the command-line interface, self-tests and examples are licensed
- under the GNU General Public License.
+@@ -198,14 +198,6 @@
+ applications and the library through the official API is illustrated
+ below.
  
 -@float Illustration,fig:abstraction
 -@image{abstraction,10cm,5cm}
@@ -15,6 +15,6 @@ $FreeBSD$
 -
 -@end float
 -
- @menu
- * Getting Started::
- * Features::
+ @node Features
+ @section Features
+ 
diff --git a/security/gsasl/files/patch-gl_Makefile.in b/security/gsasl/files/patch-gl_Makefile.in
new file mode 100644
index 000000000000..390ff7736bd6
--- /dev/null
+++ b/security/gsasl/files/patch-gl_Makefile.in
@@ -0,0 +1,77 @@
+
+$FreeBSD$
+
+--- gl/Makefile.in.orig
++++ gl/Makefile.in
+@@ -869,8 +869,6 @@
+ 	sys/time.h-t unistd.h unistd.h-t wchar.h wchar.h-t wctype.h \
+ 	wctype.h-t
+ MOSTLYCLEANDIRS = arpa netinet sys sys
+-CLEANFILES = configmake.h configmake.h-t charset.alias ref-add.sed \
+-	ref-del.sed
+ DISTCLEANFILES = 
+ MAINTAINERCLEANFILES = iconv_open-aix.h iconv_open-hpux.h \
+ 	iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h
+@@ -894,7 +892,6 @@
+ libgl_la_LDFLAGS = $(AM_LDFLAGS) $(am__append_1)
+ GPERF = gperf
+ LINK_WARNING_H = $(top_srcdir)/lib/build-aux/link-warning.h
+-charset_alias = $(DESTDIR)$(libdir)/charset.alias
+ charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+@@ -1523,53 +1520,13 @@
+ # On systems with glibc-2.1 or newer, the file is redundant, therefore we
+ # avoid installing it.
+ 
+-all-local: charset.alias ref-add.sed ref-del.sed
++all-local: ref-add.sed ref-del.sed
+ install-exec-local: install-exec-localcharset
+ install-exec-localcharset: all-local
+-	if test $(GLIBC21) = no; then \
+-	  case '$(host_os)' in \
+-	    darwin[56]*) \
+-	      need_charset_alias=true ;; \
+-	    darwin* | cygwin* | mingw* | pw32* | cegcc*) \
+-	      need_charset_alias=false ;; \
+-	    *) \
+-	      need_charset_alias=true ;; \
+-	  esac ; \
+-	else \
+-	  need_charset_alias=false ; \
+-	fi ; \
+-	if $$need_charset_alias; then \
+-	  $(mkinstalldirs) $(DESTDIR)$(libdir) ; \
+-	fi ; \
+-	if test -f $(charset_alias); then \
+-	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
+-	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+-	  rm -f $(charset_tmp) ; \
+-	else \
+-	  if $$need_charset_alias; then \
+-	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
+-	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+-	    rm -f $(charset_tmp) ; \
+-	  fi ; \
+-	fi
+ 
+ uninstall-local: uninstall-localcharset
+ uninstall-localcharset: all-local
+-	if test -f $(charset_alias); then \
+-	  sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
+-	  if grep '^# Packages using this file: $$' $(charset_tmp) \
+-	      > /dev/null; then \
+-	    rm -f $(charset_alias); \
+-	  else \
+-	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
+-	  fi; \
+-	  rm -f $(charset_tmp); \
+-	fi
+ 
+-charset.alias: config.charset
+-	$(AM_V_GEN)rm -f t-$@ $@ && \
+-	$(SHELL) $(srcdir)/config.charset '$(host)' > t-$@ && \
+-	mv t-$@ $@
+ .sin.sed:
+ 	$(AM_V_GEN)rm -f t-$@ $@ && \
+ 	sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@ && \
diff --git a/security/gsasl/pkg-plist b/security/gsasl/pkg-plist
index d43c32ec7432..076e3affa5e6 100644
--- a/security/gsasl/pkg-plist
+++ b/security/gsasl/pkg-plist
@@ -26,6 +26,8 @@ libdata/pkgconfig/libgsasl.pc
 %%PORTDOCS%%%%DOCSDIR%%/reference/ix04.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/ix05.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/ix06.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/ix07.html
+%%PORTDOCS%%%%DOCSDIR%%/reference/ix08.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/left.png
 %%PORTDOCS%%%%DOCSDIR%%/reference/right.png
 %%PORTDOCS%%%%DOCSDIR%%/reference/style.css
@@ -44,6 +46,7 @@ libdata/pkgconfig/libgsasl.pc
 %%NLS%%share/locale/pl/LC_MESSAGES/libgsasl.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/gsasl.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/libgsasl.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/gsasl.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/libgsasl.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/gsasl.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/gsasl.mo