From owner-svn-ports-head@freebsd.org Sat Jan 13 07:18:03 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F3E7CE7958D; Sat, 13 Jan 2018 07:18:02 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CE59877D08; Sat, 13 Jan 2018 07:18:02 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 10BF07B26; Sat, 13 Jan 2018 07:18:02 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0D7I1kh096028; Sat, 13 Jan 2018 07:18:01 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0D7I1sA096025; Sat, 13 Jan 2018 07:18:01 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201801130718.w0D7I1sA096025@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Sat, 13 Jan 2018 07:18:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458892 - in head/sysutils/am-utils: . files X-SVN-Group: ports-head X-SVN-Commit-Author: cy X-SVN-Commit-Paths: in head/sysutils/am-utils: . files X-SVN-Commit-Revision: 458892 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Jan 2018 07:18:03 -0000 Author: cy Date: Sat Jan 13 07:18:01 2018 New Revision: 458892 URL: https://svnweb.freebsd.org/changeset/ports/458892 Log: Fix build with OPENLDAP and gdbm-compatibility. PR: 204140, 207687 Submitted by: Lawrence Chen Added: head/sysutils/am-utils/files/patch-configure.ac (contents, props changed) Modified: head/sysutils/am-utils/Makefile (contents, props changed) head/sysutils/am-utils/pkg-plist (contents, props changed) Modified: head/sysutils/am-utils/Makefile ============================================================================== --- head/sysutils/am-utils/Makefile Sat Jan 13 06:40:00 2018 (r458891) +++ head/sysutils/am-utils/Makefile Sat Jan 13 07:18:01 2018 (r458892) @@ -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 +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 post-patch: @${RM} ${WRKSRC}/doc/am-utils.info* Added: head/sysutils/am-utils/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/am-utils/files/patch-configure.ac Sat Jan 13 07:18:01 2018 (r458892) @@ -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") Modified: head/sysutils/am-utils/pkg-plist ============================================================================== --- head/sysutils/am-utils/pkg-plist Sat Jan 13 06:40:00 2018 (r458891) +++ head/sysutils/am-utils/pkg-plist Sat Jan 13 07:18:01 2018 (r458892) @@ -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