Date: Mon, 26 Dec 2016 12:28:01 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429501 - head/mail/lbdb Message-ID: <201612261228.uBQCS1Jt089867@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Mon Dec 26 12:28:01 2016 New Revision: 429501 URL: https://svnweb.freebsd.org/changeset/ports/429501 Log: Fix handling of the GETENT plist substitution, add one for ypcat. GETENT is not a port option, WITH_GETENT is defined if /usr/bin/getent is present on the system, and the handling was broken in r319851 ("Convert to new options framework"). While here, add a check for /usr/bin/ypcat since it is not present when world is built with WITHOUT_NIS. MFH: 2016Q4 Modified: head/mail/lbdb/Makefile head/mail/lbdb/pkg-plist Modified: head/mail/lbdb/Makefile ============================================================================== --- head/mail/lbdb/Makefile Mon Dec 26 12:22:57 2016 (r429500) +++ head/mail/lbdb/Makefile Mon Dec 26 12:28:01 2016 (r429501) @@ -3,7 +3,7 @@ PORTNAME= lbdb PORTVERSION= 0.39 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= http://www.spinnaker.de/debian/ DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -25,12 +25,20 @@ CONFIGURE_ARGS= --enable-lbdb-dotlock \ MAKE_ARGS= install_prefix=${STAGEDIR} USES= gmake perl5 -.include <bsd.port.options.mk> - .if exists (/usr/bin/getent) -WITH_GETENT= yes +PLIST_SUB+= GETENT="" +.else +PLIST_SUB+= GETENT="@comment " +.endif + +.if exists (/usr/bin/ypcat) +PLIST_SUB+= YPCAT="" +.else +PLIST_SUB+= YPCAT="@comment " .endif +.include <bsd.port.options.mk> + .if ${PORT_OPTIONS:MGPG} BUILD_DEPENDS+= gpg:security/gnupg RUN_DEPENDS+= gpg:security/gnupg @@ -55,12 +63,6 @@ PLIST_SUB+= EVOLUTION="" PLIST_SUB+= EVOLUTION="@comment " .endif -.if ${PORT_OPTIONS:MGETENT} -PLIST_SUB+= GETENT="" -.else -PLIST_SUB+= GETENT="@comment " -.endif - .if ${PORT_OPTIONS:MLDAP} RUN_DEPENDS+= p5-perl-ldap>=0:net/p5-perl-ldap .endif Modified: head/mail/lbdb/pkg-plist ============================================================================== --- head/mail/lbdb/pkg-plist Mon Dec 26 12:22:57 2016 (r429500) +++ head/mail/lbdb/pkg-plist Mon Dec 26 12:28:01 2016 (r429501) @@ -23,7 +23,7 @@ libexec/lbdb/m_palm libexec/lbdb/m_passwd libexec/lbdb/m_pine libexec/lbdb/m_wanderlust -libexec/lbdb/m_yppasswd +%%YPCAT%%libexec/lbdb/m_yppasswd libexec/lbdb/munge libexec/lbdb/munge-keeporder libexec/lbdb/mutt_ldap_query
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612261228.uBQCS1Jt089867>