cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no need to link libdes for kerberos

Browse Source 
ok sthen@
This commit is contained in:
jsg 2010-10-18 20:29:53 +00:00
parent 051dfa8362
commit 521279458c
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mail/mutt/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.33 2010/09/08 09:57:28 sthen Exp $ # $OpenBSD: Makefile.inc,v 1.34 2010/10/18 20:29:53 jsg Exp $
CATEGORIES= mail CATEGORIES= mail
@ -24,7 +24,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
WANTLIB+= c crypto des gssapi krb5 ssl WANTLIB+= c crypto gssapi krb5 ssl
FLAVORS+= slang mixmaster compressed FLAVORS+= slang mixmaster compressed
FLAVOR?= FLAVOR?=

4
mail/mutt/snapshot/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.63 2010/10/18 19:59:16 espie Exp $ # $OpenBSD: Makefile,v 1.64 2010/10/18 20:29:53 jsg Exp $
COMMENT= tty-based e-mail client, development version COMMENT= tty-based e-mail client, development version
DISTNAME= mutt-1.5.21 DISTNAME= mutt-1.5.21
REVISION= 0 REVISION= 1
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mutt/} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mutt/}
WANTLIB= qdbm.>=14 z WANTLIB= qdbm.>=14 z

10
mail/mutt/snapshot/patches/patch-m4_gssapi_m4
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-m4_gssapi_m4,v 1.1 2005/02/07 19:28:05 naddy Exp $ $OpenBSD: patch-m4_gssapi_m4,v 1.2 2010/10/18 20:29:53 jsg Exp $
--- m4/gssapi.m4.orig Wed Feb 2 15:41:57 2005 --- m4/gssapi.m4.orig Wed Mar 19 21:07:06 2008
+++ m4/gssapi.m4 Wed Feb 2 15:41:57 2005 +++ m4/gssapi.m4 Sat Oct 16 14:32:52 2010
@@ -49,11 +49,20 @@ AC_DEFUN([MUTT_AM_PATH_GSSAPI], @@ -49,11 +49,20 @@ AC_DEFUN([MUTT_AM_PATH_GSSAPI],
dnl Heimdal kerberos V support dnl Heimdal kerberos V support
if test "$GSSAPI_IMPL" = "none" if test "$GSSAPI_IMPL" = "none"
@ -14,9 +14,9 @@ $OpenBSD: patch-m4_gssapi_m4,v 1.1 2005/02/07 19:28:05 naddy Exp $
+ then + then
+ AC_CHECK_LIB(gssapi, gss_init_sec_context, [ + AC_CHECK_LIB(gssapi, gss_init_sec_context, [
+ GSSAPI_IMPL="Heimdal" + GSSAPI_IMPL="Heimdal"
+ GSSAPI_LIBS="$GSSAPI_LDFLAGS -lgssapi -lkrb5 -ldes -lcrypto" + GSSAPI_LIBS="$GSSAPI_LDFLAGS -lgssapi -lkrb5 -lcrypto"
+ GSSAPI_CFLAGS="$CPPFLAGS -I/usr/include/kerberosV" + GSSAPI_CFLAGS="$CPPFLAGS -I/usr/include/kerberosV"
+ ],, -lkrb5 -ldes -lcrypto) + ],, -lkrb5 -lcrypto)
+ else + else
+ AC_CHECK_LIB(gssapi, gss_init_sec_context, [ + AC_CHECK_LIB(gssapi, gss_init_sec_context, [
+ GSSAPI_IMPL="Heimdal" + GSSAPI_IMPL="Heimdal"

4
mail/mutt/stable/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.39 2010/10/18 19:59:16 espie Exp $ # $OpenBSD: Makefile,v 1.40 2010/10/18 20:29:53 jsg Exp $
COMMENT= tty-based e-mail client COMMENT= tty-based e-mail client
VERSION= 1.4.2.3 VERSION= 1.4.2.3
DISTNAME= mutt-${VERSION} DISTNAME= mutt-${VERSION}
REVISION= 1 REVISION= 2
MASTER_SITES= ${MASTER_SITES_MUTT} MASTER_SITES= ${MASTER_SITES_MUTT}
USE_GROFF = Yes USE_GROFF = Yes

10
mail/mutt/stable/patches/patch-m4_gssapi_m4
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-m4_gssapi_m4,v 1.1 2006/07/24 09:44:20 bernd Exp $ $OpenBSD: patch-m4_gssapi_m4,v 1.2 2010/10/18 20:29:53 jsg Exp $
--- m4/gssapi.m4.orig Mon Jul 17 10:56:48 2006 --- m4/gssapi.m4.orig Wed May 23 03:17:53 2007
+++ m4/gssapi.m4 Mon Jul 17 10:58:14 2006 +++ m4/gssapi.m4 Sat Oct 16 14:27:15 2010
@@ -49,11 +49,20 @@ AC_DEFUN(MUTT_AM_PATH_GSSAPI, @@ -49,11 +49,20 @@ AC_DEFUN(MUTT_AM_PATH_GSSAPI,
dnl Heimdal kerberos V support dnl Heimdal kerberos V support
if test "$GSSAPI_IMPL" = "none" if test "$GSSAPI_IMPL" = "none"
@ -14,9 +14,9 @@ $OpenBSD: patch-m4_gssapi_m4,v 1.1 2006/07/24 09:44:20 bernd Exp $
+ then + then
+ AC_CHECK_LIB(gssapi, gss_init_sec_context, [ + AC_CHECK_LIB(gssapi, gss_init_sec_context, [
+ GSSAPI_IMPL="Heimdal" + GSSAPI_IMPL="Heimdal"
+ GSSAPI_LIBS="$GSSAPI_LDFLAGS -lgssapi -lkrb5 -ldes -lcrypto" + GSSAPI_LIBS="$GSSAPI_LDFLAGS -lgssapi -lkrb5 -lcrypto"
+ GSSAPI_CFLAGS="$CPPFLAGS -I/usr/include/kerberosV" + GSSAPI_CFLAGS="$CPPFLAGS -I/usr/include/kerberosV"
+ ],, -lkrb5 -ldes -lcrypto) + ],, -lkrb5 -lcrypto)
+ else + else
+ AC_CHECK_LIB(gssapi, gss_init_sec_context, [ + AC_CHECK_LIB(gssapi, gss_init_sec_context, [
+ GSSAPI_IMPL="Heimdal" + GSSAPI_IMPL="Heimdal"