diff options
| author | Clement Laforet <clement@FreeBSD.org> | 2004-12-21 08:59:42 +0000 |
|---|---|---|
| committer | Clement Laforet <clement@FreeBSD.org> | 2004-12-21 08:59:42 +0000 |
| commit | 7ef18bc03149b2fd5fc002e2e5a219c3796ee2e8 (patch) | |
| tree | 14e5daf0321e5bcec6a69cf36c14c650a67788ed /mail/anubis | |
| parent | Update to 1.51 (diff) | |
- Rework gpgme03 port to avoid conflict with gpgme 1.0
- Make ports depending on it use new layout
- Bump PORTREVISION (except elmo*)
Approved by: portmgr (marcus)
Notes
Notes:
svn path=/head/; revision=124666
Diffstat (limited to 'mail/anubis')
| -rw-r--r-- | mail/anubis/Makefile | 6 | ||||
| -rw-r--r-- | mail/anubis/files/patch-configure | 28 |
2 files changed, 32 insertions, 2 deletions
diff --git a/mail/anubis/Makefile b/mail/anubis/Makefile index a77bd07be293..2a7f71e77d8a 100644 --- a/mail/anubis/Makefile +++ b/mail/anubis/Makefile @@ -31,7 +31,8 @@ USE_REINPLACE= yes USE_GETOPT_LONG= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" LDFLAGS="${LDFLAGS}" +CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" LDFLAGS="${LDFLAGS}" \ + CFLAGS="${CFLAGS}" CPPFLAGS="${CFLAGS}" LDFLAGS+= -L${LOCALBASE}/lib .if defined(WITHOUT_NLS) @@ -57,7 +58,8 @@ CONFIGURE_ARGS+= --without-gnutls .if defined(WITHOUT_GPGME) CONFIGURE_ARGS+= --without-gpgme .else -LIB_DEPENDS+= gpgme:${PORTSDIR}/security/gpgme03 +LIB_DEPENDS+= gpgme03.9:${PORTSDIR}/security/gpgme03 +CFLAGS+= -I${LOCALBASE}/include/gpgme03 .endif # PCRE diff --git a/mail/anubis/files/patch-configure b/mail/anubis/files/patch-configure new file mode 100644 index 000000000000..641761441f7b --- /dev/null +++ b/mail/anubis/files/patch-configure @@ -0,0 +1,28 @@ +--- configure.orig Mon Dec 20 20:32:43 2004 ++++ configure Mon Dec 20 20:34:13 2004 +@@ -8603,13 +8603,13 @@ + + else + +-echo "$as_me:$LINENO: checking for main in -lgpgme" >&5 +-echo $ECHO_N "checking for main in -lgpgme... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking for main in -lgpgme03" >&5 ++echo $ECHO_N "checking for main in -lgpgme03... $ECHO_C" >&6 + if test "${ac_cv_lib_gpgme_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lgpgme $LIBS" ++LIBS="-lgpgme03 $LIBS" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + /* confdefs.h. */ +@@ -8656,7 +8656,7 @@ + #define HAVE_LIBGPGME 1 + _ACEOF + +- LIBS="-lgpgme $LIBS" ++ LIBS="-lgpgme03 $LIBS" + + else + with_gpgme=no |