Attachment #167699 for bug #207687

View | Details | Raw Unified | Return to bug 207687
Collapse All | Expand All




OPENLDAP_DESC=	OpenLDAP support

USES=		bison libtool makeinfo perl5
USE_AUTOTOOLS=	autoconf
USE_LDCONFIG=	yes
MAKE_JOBS_UNSAFE=yes
GNU_CONFIGURE=	yes

INFO=		am-utils
DOCS=		AUTHORS BUGS FAQ NEWS README.attrcache

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"

OPTIONS_SUB=	yes

.include <bsd.port.options.mk>
		--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

post-patch:
	@${RM} ${WRKSRC}/doc/am-utils.info*

Lines 40-45 sbin/wire-test Link Here

(-)pkg-plist (-3 / +3 lines)
40	%%PORTDOCS%%%%DOCSDIR%%/FAQ	40	%%PORTDOCS%%%%DOCSDIR%%/FAQ
41	%%PORTDOCS%%%%DOCSDIR%%/NEWS	41	%%PORTDOCS%%%%DOCSDIR%%/NEWS
42	%%PORTDOCS%%%%DOCSDIR%%/README.attrcache	42	%%PORTDOCS%%%%DOCSDIR%%/README.attrcache
43	%%LDAP_DOC%%%%PORTDOCS%%%%DOCSDIR%%/README.ldap	43	%%OPENLDAP%%%%PORTDOCS%%%%DOCSDIR%%/README.ldap
44	%%LDAP_DOC%%%%PORTDOCS%%%%DOCSDIR%%/ldap-id.txt	44	%%OPENLDAP%%%%PORTDOCS%%%%DOCSDIR%%/ldap-id.txt
45	%%LDAP_DOC%%%%PORTDOCS%%%%DOCSDIR%%/ldap.schema	45	%%OPENLDAP%%%%PORTDOCS%%%%DOCSDIR%%/ldap.schema




--- 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")

Return to bug 207687

Lines 20-25 OPTIONS_DEFAULT=OPENLDAP Link Here

(-)Makefile (-12 / +9 lines)
20	OPENLDAP_DESC= OpenLDAP support	20	OPENLDAP_DESC= OpenLDAP support
21		21
22	USES= bison libtool makeinfo perl5	22	USES= bison libtool makeinfo perl5
		23	USE_AUTOTOOLS= autoconf
23	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
24	MAKE_JOBS_UNSAFE=yes	25	MAKE_JOBS_UNSAFE=yes
25	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
Lines 34-52 INSTALL_TARGET= install-strip Link Here
34	INFO= am-utils	35	INFO= am-utils
35	DOCS= AUTHORS BUGS FAQ NEWS README.attrcache	36	DOCS= AUTHORS BUGS FAQ NEWS README.attrcache
36		37
37	.include <bsd.port.options.mk>	38	OPENLDAP_USE= OPENLDAP=yes
		39	OPENLDAP_CONFIGURE_WITH= ldap
		40	OPENLDAP_CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \
		41	CPPFLAGS="-I${LOCALBASE}/include"
		42	OPENLDAP_VARS= DOCS+="README.ldap ldap-id.txt ldap.schema"
38		43
39	.if ${PORT_OPTIONS:MOPENLDAP}	44	OPTIONS_SUB= yes
40	USE_OPENLDAP= yes	45
41	CONFIGURE_ARGS+=--with-ldap=yes \	46	.include <bsd.port.options.mk>
42	--enable-ldflags=-L${LOCALBASE}/lib \
43	--enable-cppflags=-I${LOCALBASE}/include
44	DOCS+= README.ldap ldap-id.txt ldap.schema
45	PLIST_SUB+= LDAP_DOC=""
46	.else
47	PLIST_SUB+= LDAP_DOC="@comment "
48	CONFIGURE_ARGS+=--with-ldap=no
49	.endif
50		47
51	post-patch:	48	post-patch:
52	@${RM} ${WRKSRC}/doc/am-utils.info*	49	@${RM} ${WRKSRC}/doc/am-utils.info*

Line 0 Link Here

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