mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-01 01:17:02 +00:00
Code Issues Releases Activity

Fix build with OPENLDAP and gdbm-compatibility.

Browse Source 
PR:		204140, 207687
Submitted by:	Lawrence Chen <beastie@tardisi.com>
This commit is contained in:
Cy Schubert 2018-01-13 07:18:01 +00:00
parent 519049d33b
commit e6abfca62d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=458892
3 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sysutils/am-utils/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= am-utils
PORTVERSION= 6.2
PORTREVISION= 1
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= sysutils net
MASTER_SITES= ftp://ftp.am-utils.org/pub/am-utils/ \
@ -21,6 +21,7 @@ OPTIONS_DEFAULT=OPENLDAP
OPENLDAP_DESC= OpenLDAP support
USES= bison libtool makeinfo perl5
USE_AUTOTOOLS= autoconf
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE=yes
GNU_CONFIGURE= yes
@ -36,19 +37,15 @@ INSTALL_TARGET= install-strip
INFO= am-utils
DOCS= AUTHORS BUGS FAQ NEWS README.attrcache
.include <bsd.port.options.mk>
OPENLDAP_USE= OPENLDAP=yes
OPENLDAP_CONFIGURE_WITH= ldap
OPENLDAP_CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
CPPFLAGS="-I${LOCALBASE}/include"
OPENLDAP_VARS= DOCS+="README.ldap ldap-id.txt ldap.schema"
.if ${PORT_OPTIONS:MOPENLDAP}
USE_OPENLDAP= yes
CONFIGURE_ARGS+=--with-ldap=yes \
--enable-ldflags=-L${LOCALBASE}/lib \
--enable-cppflags=-I${LOCALBASE}/include
DOCS+= README.ldap ldap-id.txt ldap.schema
PLIST_SUB+= LDAP_DOC=""
.else
PLIST_SUB+= LDAP_DOC="@comment "
CONFIGURE_ARGS+=--with-ldap=no
.endif
OPTIONS_SUB= yes
.include <bsd.port.options.mk>
post-patch:
@${RM} ${WRKSRC}/doc/am-utils.info*

15
sysutils/am-utils/files/patch-configure.ac Normal file
View File

@ -0,0 +1,15 @@
--- configure.ac.orig 2014-10-28 17:12:59 UTC
+++ configure.ac
@@ -732,7 +732,11 @@ dnl libgdbm for dbm_pagfno, so check for
fi
dnl check if dbm_open is part of libc
if test "$ac_cv_lib_new_dbm" = "" -a "$ac_cv_header_ndbm_h" = "yes"; then
- AC_CHECK_LIB(c, dbm_open, ac_cv_header_new_dbm="ndbm.h"; ac_cv_lib_new_dbm="c")
+ AC_CHECK_LIB(c, dbm_open,
+dnl on FreeBSD dbm_open is in base libc, but if gdbm is installed with COMPAT
+dnl then GNU ndbm.h is present, so check if this is the case first.
+ AC_CHECK_LIB(gdbm_compat, dbm_pagfno, ac_cv_header_new_dbm="ndbm.h"; ac_cv_lib_new_dbm="gdbm -lgdbm_compat",
+ AC_CHECK_LIB(c, dbm_pagfno, ac_cv_header_new_dbm="ndbm.h"; ac_cv_lib_new_dbm="c")))
fi
if test "$ac_cv_lib_new_dbm" = "" -a "$ac_cv_header_db1_ndbm_h" = "yes"; then
AC_CHECK_LIB(db1, dbm_open, ac_cv_header_new_dbm="db1/ndbm.h"; ac_cv_lib_new_dbm="db1")

6
sysutils/am-utils/pkg-plist
View File

@ -40,6 +40,6 @@ sbin/wire-test
%%PORTDOCS%%%%DOCSDIR%%/FAQ
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README.attrcache
%%LDAP_DOC%%%%PORTDOCS%%%%DOCSDIR%%/README.ldap
%%LDAP_DOC%%%%PORTDOCS%%%%DOCSDIR%%/ldap-id.txt
%%LDAP_DOC%%%%PORTDOCS%%%%DOCSDIR%%/ldap.schema
%%OPENLDAP%%%%PORTDOCS%%%%DOCSDIR%%/README.ldap
%%OPENLDAP%%%%PORTDOCS%%%%DOCSDIR%%/ldap-id.txt
%%OPENLDAP%%%%PORTDOCS%%%%DOCSDIR%%/ldap.schema