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

Unbreak the drac FLAVOR, as spotted by naddy@ then jasper@

Browse Source
This commit is contained in:
ajacoutot 2010-11-02 07:08:04 +00:00
parent 656fd597d4
commit cda0d87677
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mail/cyrus-imapd/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.36 2010/10/29 12:54:43 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.37 2010/11/02 07:08:04 ajacoutot Exp $
COMMENT-main= Cyrus IMAP server
COMMENT-perl= perl utils for the Cyrus IMAP server
@ -78,8 +78,9 @@ FLAVOR?=
.if ${FLAVOR:L:Mdrac}
BUILD_DEPENDS+= ::mail/drac
PATCH_LIST+= ${WRKSRC}/contrib/drac_auth.patch \
drac-patch-imap_Makefile_in
PATCH_LIST+= drac-patch-imap_Makefile_in
pre-patch:
cd ${WRKSRC} && ${PATCH} -s -z .drac -p1 < contrib/drac_auth.patch
.endif
WANTLIB-main += ${WANTLIB} asn1 c com_err gssapi krb5 pthread wrap

17
mail/cyrus-imapd/patches/drac-patch-imap_Makefile_in
View File

@ -1,6 +1,7 @@
--- imap/Makefile.in.old Sun May 23 19:27:09 2004
+++ imap/Makefile.in Sun May 23 19:28:04 2004
@@ -61,7 +61,7 @@
$OpenBSD: drac-patch-imap_Makefile_in,v 1.2 2010/11/02 07:08:04 ajacoutot Exp $
--- imap/Makefile.in.orig Tue Nov 2 07:59:26 2010
+++ imap/Makefile.in Tue Nov 2 08:00:04 2010
@@ -58,19 +58,19 @@ AWK = @AWK@
CYRUS_USER=@cyrus_user@
CYRUS_GROUP=@cyrus_group@
@ -9,14 +10,18 @@
CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
IMAP_LIBS = @IMAP_LIBS@ @LIB_RT@
SIEVE_OBJS = @SIEVE_OBJS@
@@ -68,8 +68,8 @@
SIEVE_LIBS = @SIEVE_LIBS@
IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
LIB_WRAP = @LIB_WRAP@
-DRAC_LIBS = @DRACLIBS@
-LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
+DRAC_LIBS = -L${LOCALBASE}/lib
+LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS) -ldrac
+DRAC_LIBS = -ldrac
+LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS) $(DRAC_LIBS)
DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
CFLAGS = @CFLAGS@
-LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
+LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@ -L${LOCALBASE}/lib
SHELL = /bin/sh
MAKEDEPEND = @MAKEDEPEND@