Re-enable GSS support.

--
Patch to fix pine from: jakob@
This commit is contained in:
brad 2001-09-27 23:37:30 +00:00
parent 3d2d0e69eb
commit acd1bd5437
3 changed files with 12 additions and 14 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.16 2001/09/27 16:28:09 brad Exp $
# $OpenBSD: Makefile,v 1.17 2001/09/27 23:37:30 brad Exp $
COMMENT= "University of Washington's c-client mail access routines"
VERSION= 4.40
DISTNAME= pine${VERSION}
PKGNAME= c-client-${VERSION}
PKGNAME= c-client-${VERSION}p1
CATEGORIES= mail devel
NEED_VERSION= 1.460
MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ \
@ -19,13 +19,11 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= No
PERMIT_DISTFILES_FTP= Yes
SHLIB= libc-client.so.2.2
SHLIB= libc-client.so.3.0
SUBST_VARS= SHLIB
# Disabled for now.
# EXTRAAUTHENTICATORS="gss"
MAKE_FLAGS= EXTRACFLAGS="${CFLAGS}" SHLIB="${SHLIB}" \
SSLTYPE="unix"
SSLTYPE="unix" EXTRAAUTHENTICATORS="gss"
ALL_TARGET= bso

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.33 2001/09/27 16:52:40 brad Exp $
# $OpenBSD: Makefile,v 1.34 2001/09/27 23:37:30 brad Exp $
COMMENT= "Program for Internet E-mail and News, with pico"
COMMENT-pico= "small text editor"
@ -6,9 +6,9 @@ COMMENT-pine= "Program for Internet E-mail and News, without pico"
VERSION= 4.40
DISTNAME= pine${VERSION}
PKGNAME= pine+pico-${VERSION}
PKGNAME= pine+pico-${VERSION}p1
FULLPKGNAME-pico=pico-${VERSION}
PKGNAME-pine= pine-${VERSION}
PKGNAME-pine= pine-${VERSION}p1
NEED_VERSION= 1.460
MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ \
ftp://ftp.sunet.se/pub/unix/mail/pine/
@ -32,10 +32,10 @@ SUBPACKAGE?=
CATEGORIES= editors
.elif ${SUBPACKAGE} == "-pine"
CATEGORIES= mail news
LIB_DEPENDS= c-client.2::mail/c-client
LIB_DEPENDS= c-client.3:c-client->=4.40p1:mail/c-client
.else
CATEGORIES= mail news editors
LIB_DEPENDS= c-client.2::mail/c-client
LIB_DEPENDS= c-client.3:c-client->=4.40p1:mail/c-client
.endif
.if ${FLAVOR:L} == "ldap" && ${SUBPACKAGE} != "-pico"

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-pine_makefile.bso,v 1.4 2001/09/27 18:44:41 brad Exp $
$OpenBSD: patch-pine_makefile.bso,v 1.5 2001/09/27 23:37:30 brad Exp $
--- pine/makefile.bso.orig Tue Jul 3 13:03:53 2001
+++ pine/makefile.bso Thu Sep 27 13:06:49 2001
+++ pine/makefile.bso Thu Sep 27 16:51:53 2001
@@ -50,7 +50,7 @@ OPTIMIZE= # -O
PROFILE= # -pg
DEBUG= -DDEBUG # -g
@ -19,7 +19,7 @@ $OpenBSD: patch-pine_makefile.bso,v 1.4 2001/09/27 18:44:41 brad Exp $
-LOCLIBDIR= -L$(PICODIR)
-LIBS= $(EXTRALIBES) $(LOCLIBDIR) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS) \
- `cat $(CCLIENTDIR)/LDFLAGS`
+STDLIBS= -ltermlib -lssl -lcrypto
+STDLIBS= -ltermlib -lssl -lcrypto -lgssapi -lkrb5 -lasn1 -lcom_err
+LOCLIBS= -lpico -lc-client
+LOCLIBDIR= -L$(PICODIR) -L$(LOCALBASE)/lib
+LIBS= $(EXTRALIBES) $(LOCLIBDIR) $(LOCLIBS) $(LDAPLIBS) $(STDLIBS)