From owner-svn-ports-all@freebsd.org Wed Sep 27 06:58:01 2017 Return-Path: Delivered-To: svn-ports-all@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 254ACE2CB42; Wed, 27 Sep 2017 06:58:01 +0000 (UTC) (envelope-from delphij@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 mx1.freebsd.org (Postfix) with ESMTPS id E2B2366683; Wed, 27 Sep 2017 06:58:00 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8R6vxaL097118; Wed, 27 Sep 2017 06:57:59 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8R6vxRN097117; Wed, 27 Sep 2017 06:57:59 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201709270657.v8R6vxRN097117@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 27 Sep 2017 06:57:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r450722 - head/net/openldap24-server X-SVN-Group: ports-head X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: head/net/openldap24-server X-SVN-Commit-Revision: 450722 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Sep 2017 06:58:01 -0000 Author: delphij Date: Wed Sep 27 06:57:59 2017 New Revision: 450722 URL: https://svnweb.freebsd.org/changeset/ports/450722 Log: Reorder several variable definitions in Makefile. PR: ports/222405 Submitted by: Yasuhiro KIMURA Modified: head/net/openldap24-server/Makefile Modified: head/net/openldap24-server/Makefile ============================================================================== --- head/net/openldap24-server/Makefile Wed Sep 27 06:40:50 2017 (r450721) +++ head/net/openldap24-server/Makefile Wed Sep 27 06:57:59 2017 (r450722) @@ -13,30 +13,41 @@ MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SU ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/%SUBDIR%/ \ http://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/ MASTER_SITE_SUBDIR= openldap-release - .if defined(CLIENT_ONLY) .if ${CLIENT_ONLY} == sasl PKGNAMESUFFIX= -sasl-client -COMMENT= Open source LDAP client implementation with SASL2 support -CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.* \ - ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.[0-3].* .else PKGNAMESUFFIX= -client -COMMENT= Open source LDAP client implementation -CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.[0-3].* \ - ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.* .endif .else PKGNAMESUFFIX?= -server .endif MAINTAINER= delphij@FreeBSD.org -COMMENT?= Open source LDAP server implementation +.if defined(CLIENT_ONLY) +.if ${CLIENT_ONLY} == sasl +COMMENT= Open source LDAP client implementation with SASL2 support +.else +COMMENT= Open source LDAP client implementation +.endif +.else +COMMENT= Open source LDAP server implementation +.endif LICENSE= OPENLDAP LICENSE_NAME= OpenLDAP Public License LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept + +.if defined(CLIENT_ONLY) +.if ${CLIENT_ONLY} == sasl +CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.* \ + ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.[0-3].* +.else +CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.[0-3].* \ + ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.* +.endif +.endif GNU_CONFIGURE= yes # :keepla because port uses lt_dlopen