From owner-svn-ports-all@freebsd.org Mon Apr 25 09:02:56 2016 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 48494B124B9; Mon, 25 Apr 2016 09:02:56 +0000 (UTC) (envelope-from amdmi3@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 0ACC318EB; Mon, 25 Apr 2016 09:02:55 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3P92tkY078947; Mon, 25 Apr 2016 09:02:55 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3P92tp4078946; Mon, 25 Apr 2016 09:02:55 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201604250902.u3P92tp4078946@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 25 Apr 2016 09:02:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413971 - head/net/smbldap-tools X-SVN-Group: ports-head 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.21 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: Mon, 25 Apr 2016 09:02:56 -0000 Author: amdmi3 Date: Mon Apr 25 09:02:55 2016 New Revision: 413971 URL: https://svnweb.freebsd.org/changeset/ports/413971 Log: - Clarify LICENSE - Switch to options helpers - Remove needless PDF_DOC option, always install pdf docfile Modified: head/net/smbldap-tools/Makefile Modified: head/net/smbldap-tools/Makefile ============================================================================== --- head/net/smbldap-tools/Makefile Mon Apr 25 08:31:53 2016 (r413970) +++ head/net/smbldap-tools/Makefile Mon Apr 25 09:02:55 2016 (r413971) @@ -10,7 +10,7 @@ MASTER_SITES= http://download.gna.org/sm MAINTAINER= ports@FreeBSD.org COMMENT= Samba-LDAP management and support tools -LICENSE= GPLv2 +LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= p5-perl-ldap>=0:net/p5-perl-ldap \ @@ -23,23 +23,18 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVER USES= gmake perl5 GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-samba-sysconfdir=${LOCALBASE}/etc \ + --with-samba-bindir=${LOCALBASE}/bin \ + --with-perl=${PERL} \ + --with-perl-libdir=sitelib ALL_TARGET= build - NO_ARCH= yes PORTDOCS= * -OPTIONS_DEFINE= MIGRATION_SCRIPTS PDF_DOC DOCS -MIGRATION_SCRIPTS_DESC= Install migration scripts -PDF_DOC_DESC= Install PDF documentation +OPTIONS_DEFINE= MIGRATION_SCRIPTS DOCS OPTIONS_SUB= yes - -CONFIGURE_ARGS+= --with-samba-sysconfdir=${LOCALBASE}/etc \ - --with-samba-bindir=${LOCALBASE}/bin \ - --with-perl=${PERL} \ - --with-perl-libdir=sitelib - -.include +MIGRATION_SCRIPTS_DESC= Install migration scripts post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ @@ -51,25 +46,21 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/$i ${STAGEDIR}${PREFIX}/etc/smbldap-tools/$i.sample .endfor -.if ${PORT_OPTIONS:MMIGRATION_SCRIPTS} -. for i in smbldap-migrate-pwdump-accounts smbldap-migrate-pwdump-groups \ +post-install-MIGRATION_SCRIPTS-on: +.for i in smbldap-migrate-pwdump-accounts smbldap-migrate-pwdump-groups \ smbldap-migrate-unix-accounts smbldap-migrate-unix-groups @${SED} -e 's|/usr/bin/perl|${PERL}|g' \ ${WRKSRC}/doc/migration_scripts/$i > ${STAGEDIR}${PREFIX}/sbin/$i -. endfor -.endif +.endfor -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR} +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_SCRIPT} ${WRKSRC}/smbldap-config.cmd ${STAGEDIR}${DOCSDIR}/smbldap-config ${INSTALL_SCRIPT} ${WRKSRC}/smbldap-upgrade-0.9.6.cmd ${STAGEDIR}${DOCSDIR}/smbldap-upgrade-0.9.6 .for f in CONTRIBUTORS COPYING ChangeLog FILES INFRA INSTALL README TODO ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/ .endfor ${INSTALL_DATA} ${WRKSRC}/doc/smbldap-tools.html ${STAGEDIR}${DOCSDIR}/smbldap-tools.html -.if ${PORT_OPTIONS:MPDF_DOC} ${INSTALL_DATA} ${WRKSRC}/doc/smbldap-tools.pdf ${STAGEDIR}${DOCSDIR}/smbldap-tools.pdf -.endif -.endif .include