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

better.

Browse Source
This commit is contained in:
fgsch 2004-01-16 14:26:27 +00:00
parent ac72df6a77
commit 19a7171e18
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mail/mutt/stable/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.15 2004/01/16 01:59:08 fgsch Exp $ # $OpenBSD: Makefile,v 1.16 2004/01/16 14:26:27 fgsch Exp $
COMMENT= "tty-based e-mail client" COMMENT= "tty-based e-mail client"
@ -30,7 +30,7 @@ FLAVOR?=
PATCH_LIST= gcc-* patch-* PATCH_LIST= gcc-* patch-*
.endif .endif
CONFIGURE_STYLE= autoconf CONFIGURE_STYLE= autoconf old
CONFIGURE_ARGS= --with-sharedir="${PREFIX}/share/mutt" \ CONFIGURE_ARGS= --with-sharedir="${PREFIX}/share/mutt" \
--with-docdir="${PREFIX}/share/doc/mutt" \ --with-docdir="${PREFIX}/share/doc/mutt" \
--enable-flock --disable-fcntl \ --enable-flock --disable-fcntl \
@ -54,10 +54,9 @@ CONFIGURE_ARGS+= --with-curses
PATCHFILES+= patch-${VERSION}.rr.compressed.1.gz:0 PATCHFILES+= patch-${VERSION}.rr.compressed.1.gz:0
PATCH_DIST_STRIP=-p1 PATCH_DIST_STRIP=-p1
CONFIGURE_ARGS+= --enable-compressed CONFIGURE_ARGS+= --enable-compressed
CONFIGURE_STYLE+= automake old CONFIGURE_STYLE+= automake
.else .else
SUPDISTFILES+= patch-${VERSION}.rr.compressed.1.gz:0 SUPDISTFILES+= patch-${VERSION}.rr.compressed.1.gz:0
CONFIGURE_STYLE+= old
.endif .endif
.if ${FLAVOR:L:Mmixmaster} .if ${FLAVOR:L:Mmixmaster}

17
mail/mutt/stable/patches/patch-aclocal_m4
View File

@ -1,24 +1,25 @@
$OpenBSD: patch-aclocal_m4,v 1.1 2004/01/16 01:59:09 fgsch Exp $ $OpenBSD: patch-aclocal_m4,v 1.2 2004/01/16 14:26:27 fgsch Exp $
--- aclocal.m4.orig 2004-01-15 22:26:58.000000000 -0300 --- aclocal.m4.orig 2003-03-19 19:11:36.000000000 -0300
+++ aclocal.m4 2004-01-15 22:32:37.000000000 -0300 +++ aclocal.m4 2004-01-15 23:51:42.000000000 -0300
@@ -494,11 +494,20 @@ AC_DEFUN(MUTT_AM_PATH_GSSAPI, @@ -494,11 +494,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"
then then
- AC_CHECK_LIB(gssapi, gss_init_sec_context, [ - AC_CHECK_LIB(gssapi, gss_init_sec_context, [
+ if test `uname -s` = "OpenBSD" - GSSAPI_IMPL="Heimdal"
+ then
+ AC_CHECK_LIB(gssapi, gss_init_sec_context, [
GSSAPI_IMPL="Heimdal"
- GSSAPI_LIBS="$GSSAPI_LDFLAGS -lgssapi -lkrb5 -ldes -lasn1 -lroken" - GSSAPI_LIBS="$GSSAPI_LDFLAGS -lgssapi -lkrb5 -ldes -lasn1 -lroken"
- GSSAPI_LIBS="$GSSAPI_LIBS -lcrypt -lcom_err" - GSSAPI_LIBS="$GSSAPI_LIBS -lcrypt -lcom_err"
- ],, -lkrb5 -ldes -lasn1 -lroken -lcrypt -lcom_err) - ],, -lkrb5 -ldes -lasn1 -lroken -lcrypt -lcom_err)
+ if test `uname -s` = "OpenBSD"
+ then
+ AC_CHECK_LIB(gssapi, gss_init_sec_context, [
+ GSSAPI_IMPL="Heimdal"
+ GSSAPI_LIBS="$GSSAPI_LDFLAGS -lgssapi -lkrb5 -ldes -lcrypto" + GSSAPI_LIBS="$GSSAPI_LDFLAGS -lgssapi -lkrb5 -ldes -lcrypto"
+ GSSAPI_CFLAGS="$CPPFLAGS -I/usr/include/kerberosV" + GSSAPI_CFLAGS="$CPPFLAGS -I/usr/include/kerberosV"
+ ],, -lkrb5 -ldes -lcrypto) + ],, -lkrb5 -ldes -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"
+ GSSAPI_LIBS="$GSSAPI_LDFLAGS -lgssapi -lkrb5 -ldes -lasn1 -lroken" + GSSAPI_LIBS="$GSSAPI_LDFLAGS -lgssapi -lkrb5 -ldes -lasn1 -lroken"
+ GSSAPI_LIBS="$GSSAPI_LIBS -lcrypt -lcom_err" + GSSAPI_LIBS="$GSSAPI_LIBS -lcrypt -lcom_err"
+ ],, -lkrb5 -ldes -lasn1 -lroken -lcrypt -lcom_err) + ],, -lkrb5 -ldes -lasn1 -lroken -lcrypt -lcom_err)