Add patch to prevent from breaking if KRB5_HOME / HEIMDAL_HOME are defined.

PR:		34561
Submitted by:	maintainer

6 files changed, 72 insertions, 16 deletions

diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index e1dc5a97c0ea..e369d5d7159d 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cyrus-sasl
 PORTVERSION=	1.5.27
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \
 		http://prdownloads.sourceforge.net/cyrus-utils/ \
@@ -27,13 +27,6 @@ PATCHFILES=	sasl_apop_patch.gz \
 
 MAINTAINER=	hetzels@westbend.net
 
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 450000
-FMT=	/usr/bin/fmt
-.else
-FMT=	/usr/bin/fmt -w 67
-.endif
-
 USE_OPENSSL=	YES
 
 INSTALLS_SHLIB=	yes
@@ -111,6 +104,13 @@ PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
+.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 450000
+FMT=    /usr/bin/fmt
+.else
+FMT=    /usr/bin/fmt -w 67
+.endif
+
 pre-fetch:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.sasl
 
diff --git a/security/cyrus-sasl/files/patch-sample::Makefile.am b/security/cyrus-sasl/files/patch-sample::Makefile.am
new file mode 100644
index 000000000000..98fd62f809da
--- /dev/null
+++ b/security/cyrus-sasl/files/patch-sample::Makefile.am
@@ -0,0 +1,12 @@
+--- sample/Makefile.am.orig	Tue Jan 22 21:00:24 2002
++++ sample/Makefile.am	Tue Jan 22 21:01:02 2002
+@@ -54,7 +54,9 @@
+ client_SOURCES = client.c common.c common.h
+ 
+ server_LDADD = ../lib/libsasl.la $(LIB_SOCKET)
++server_LDFLAGS = $(GSSAPIBASE_LIBS)
+ client_LDADD = ../lib/libsasl.la $(LIB_SOCKET)
++client_LDFLAGS = $(GSSAPIBASE_LIBS)
+ 
+ sample_client_LDADD = ../lib/libsasl.la $(LIB_SOCKET)
+ sample_server_LDADD = ../lib/libsasl.la $(LIB_SOCKET)
diff --git a/security/cyrus-sasl/files/patch-utils::Makefile.am b/security/cyrus-sasl/files/patch-utils::Makefile.am
new file mode 100644
index 000000000000..f8c887ba515e
--- /dev/null
+++ b/security/cyrus-sasl/files/patch-utils::Makefile.am
@@ -0,0 +1,16 @@
+--- utils//Makefile.am.orig	Tue Jan 22 21:03:43 2002
++++ utils//Makefile.am	Tue Jan 22 21:02:49 2002
+@@ -45,10 +45,13 @@
+ sbin_PROGRAMS = saslpasswd sasldblistusers
+ man_MANS = saslpasswd.8 sasldblistusers.8
+ saslpasswd_LDADD = ../lib/libsasl.la
++saslpasswd_LDFLAGS = $(GSSAPIBASE_LIBS)
+ sasldblistusers_LDADD = $(SASL_DB_LIB)
++sasldblistusers_LDFLAGS = $(GSSAPIBASE_LIBS)
+ 
+ noinst_PROGRAMS = dbconverter-1.5.9
+ dbconverter_1_5_9_LDADD = ../lib/libsasl.la $(SASL_DB_LIB)
++dbconverter_1_5_9_LDFLAGS = $(GSSAPIBASE_LIBS)
+ 
+ EXTRA_PROGRAMS = testsuite
+ testsuite_LDADD = ../lib/libsasl.la $(SASL_DB_LIB) $(LIB_SOCKET)
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index e1dc5a97c0ea..e369d5d7159d 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cyrus-sasl
 PORTVERSION=	1.5.27
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \
 		http://prdownloads.sourceforge.net/cyrus-utils/ \
@@ -27,13 +27,6 @@ PATCHFILES=	sasl_apop_patch.gz \
 
 MAINTAINER=	hetzels@westbend.net
 
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 450000
-FMT=	/usr/bin/fmt
-.else
-FMT=	/usr/bin/fmt -w 67
-.endif
-
 USE_OPENSSL=	YES
 
 INSTALLS_SHLIB=	yes
@@ -111,6 +104,13 @@ PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
+.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 450000
+FMT=    /usr/bin/fmt
+.else
+FMT=    /usr/bin/fmt -w 67
+.endif
+
 pre-fetch:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.sasl
 
diff --git a/security/cyrus-sasl2/files/patch-sample::Makefile.am b/security/cyrus-sasl2/files/patch-sample::Makefile.am
new file mode 100644
index 000000000000..98fd62f809da
--- /dev/null
+++ b/security/cyrus-sasl2/files/patch-sample::Makefile.am
@@ -0,0 +1,12 @@
+--- sample/Makefile.am.orig	Tue Jan 22 21:00:24 2002
++++ sample/Makefile.am	Tue Jan 22 21:01:02 2002
+@@ -54,7 +54,9 @@
+ client_SOURCES = client.c common.c common.h
+ 
+ server_LDADD = ../lib/libsasl.la $(LIB_SOCKET)
++server_LDFLAGS = $(GSSAPIBASE_LIBS)
+ client_LDADD = ../lib/libsasl.la $(LIB_SOCKET)
++client_LDFLAGS = $(GSSAPIBASE_LIBS)
+ 
+ sample_client_LDADD = ../lib/libsasl.la $(LIB_SOCKET)
+ sample_server_LDADD = ../lib/libsasl.la $(LIB_SOCKET)
diff --git a/security/cyrus-sasl2/files/patch-utils::Makefile.am b/security/cyrus-sasl2/files/patch-utils::Makefile.am
new file mode 100644
index 000000000000..f8c887ba515e
--- /dev/null
+++ b/security/cyrus-sasl2/files/patch-utils::Makefile.am
@@ -0,0 +1,16 @@
+--- utils//Makefile.am.orig	Tue Jan 22 21:03:43 2002
++++ utils//Makefile.am	Tue Jan 22 21:02:49 2002
+@@ -45,10 +45,13 @@
+ sbin_PROGRAMS = saslpasswd sasldblistusers
+ man_MANS = saslpasswd.8 sasldblistusers.8
+ saslpasswd_LDADD = ../lib/libsasl.la
++saslpasswd_LDFLAGS = $(GSSAPIBASE_LIBS)
+ sasldblistusers_LDADD = $(SASL_DB_LIB)
++sasldblistusers_LDFLAGS = $(GSSAPIBASE_LIBS)
+ 
+ noinst_PROGRAMS = dbconverter-1.5.9
+ dbconverter_1_5_9_LDADD = ../lib/libsasl.la $(SASL_DB_LIB)
++dbconverter_1_5_9_LDFLAGS = $(GSSAPIBASE_LIBS)
+ 
+ EXTRA_PROGRAMS = testsuite
+ testsuite_LDADD = ../lib/libsasl.la $(SASL_DB_LIB) $(LIB_SOCKET)