5 files changed, 24 insertions, 30 deletions

diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile
index d6b32be8c4d1..da1437f8af40 100644
--- a/security/gsasl/Makefile
+++ b/security/gsasl/Makefile
@@ -7,13 +7,12 @@
 #
 
 PORTNAME=	gsasl
-PORTVERSION=	1.4.0
-PORTREVISION=	2
+PORTVERSION=	1.6.0
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	johans@FreeBSD.org
 COMMENT=	GNU SASL Library
 
 LIB_DEPENDS=	idn.16:${PORTSDIR}/dns/libidn \
@@ -23,7 +22,7 @@ LIB_DEPENDS=	idn.16:${PORTSDIR}/dns/libidn \
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_PERL5_BUILD=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
 INFO=	gsasl
@@ -36,14 +35,14 @@ USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .endif
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS=	-I/usr/include -I${LOCALBASE}/include
+LDFLAGS=	-L/usr/lib -L${LOCALBASE}/lib
 
 post-patch:
 .for file in \
 	lib/po/LINGUAS \
 	po/LINGUAS
-	@${REINPLACE_CMD} -e '1,2d' ${WRKSRC}/${file}
+	@${REINPLACE_CMD} -e '/^en@/d' ${WRKSRC}/${file}
 .endfor
 
 .include <bsd.port.pre.mk>
diff --git a/security/gsasl/distinfo b/security/gsasl/distinfo
index 3c671f3e2eba..36262fd606e4 100644
--- a/security/gsasl/distinfo
+++ b/security/gsasl/distinfo
@@ -1,3 +1,2 @@
-MD5 (gsasl-1.4.0.tar.gz) = fc138021ef7cbee04dc1e034faf0b85c
-SHA256 (gsasl-1.4.0.tar.gz) = 01b2167272b740a948885f39fb24ebbf0b265b6e93217b22edfdef8051581afa
-SIZE (gsasl-1.4.0.tar.gz) = 3771247
+SHA256 (gsasl-1.6.0.tar.gz) = ca8c8f07bae4e5a7ba36d7ee3e0c1987ccf3b5cea1e3381a74cf38e45dee56dd
+SIZE (gsasl-1.6.0.tar.gz) = 4611016
diff --git a/security/gsasl/files/patch-doc_gsasl.texi b/security/gsasl/files/patch-doc_gsasl.texi
index 9e717957bb18..66cc6a665f99 100644
--- a/security/gsasl/files/patch-doc_gsasl.texi
+++ b/security/gsasl/files/patch-doc_gsasl.texi
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- doc/gsasl.texi.orig
-+++ doc/gsasl.texi
-@@ -198,14 +198,6 @@
+--- doc/gsasl.texi.orig	2010-12-09 19:07:00.000000000 +0100
++++ doc/gsasl.texi	2011-02-25 14:25:22.000000000 +0100
+@@ -195,14 +195,6 @@ The design of the library and the intend
  applications and the library through the official API is illustrated
  below.
  
diff --git a/security/gsasl/files/patch-gl_Makefile.in b/security/gsasl/files/patch-gl_Makefile.in
index 390ff7736bd6..ec0989e73928 100644
--- a/security/gsasl/files/patch-gl_Makefile.in
+++ b/security/gsasl/files/patch-gl_Makefile.in
@@ -1,26 +1,23 @@
-
-$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
+--- gl/Makefile.in.orig	2011-02-25 14:26:47.000000000 +0100
++++ gl/Makefile.in	2011-02-25 14:27:40.000000000 +0100
+@@ -1029,8 +1029,6 @@ MOSTLYCLEANFILES = core *.stackdump allo
+ 	sys/time.h-t unistd.h unistd.h-t warn-on-use.h warn-on-use.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)
+@@ -1057,7 +1055,6 @@ libgl_la_LDFLAGS = $(AM_LDFLAGS) -no-und
+ ARG_NONNULL_H = arg-nonnull.h
+ CXXDEFS_H = c++defs.h
  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
+ WARN_ON_USE_H = warn-on-use.h
  all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-@@ -1523,53 +1520,13 @@
+@@ -1719,53 +1716,13 @@ iconv_open-solaris.h: iconv_open-solaris
  # On systems with glibc-2.1 or newer, the file is redundant, therefore we
  # avoid installing it.
  
diff --git a/security/gsasl/pkg-plist b/security/gsasl/pkg-plist
index 4f7753e8bb06..416ae3b35ac6 100644
--- a/security/gsasl/pkg-plist
+++ b/security/gsasl/pkg-plist
@@ -5,7 +5,7 @@ include/gsasl.h
 lib/libgsasl.a
 lib/libgsasl.la
 lib/libgsasl.so
-lib/libgsasl.so.14
+lib/libgsasl.so.15
 libdata/pkgconfig/libgsasl.pc
 %%PORTDOCS%%%%DOCSDIR%%/gsasl.html
 %%PORTDOCS%%%%DOCSDIR%%/reference/abstraction.png
@@ -42,6 +42,8 @@ libdata/pkgconfig/libgsasl.pc
 %%NLS%%share/locale/ga/LC_MESSAGES/libgsasl.mo
 %%NLS%%share/locale/id/LC_MESSAGES/gsasl.mo
 %%NLS%%share/locale/id/LC_MESSAGES/libgsasl.mo
+%%NLS%%share/locale/it/LC_MESSAGES/gsasl.mo
+%%NLS%%share/locale/it/LC_MESSAGES/libgsasl.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/gsasl.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/libgsasl.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/gsasl.mo