From owner-svn-ports-head@FreeBSD.ORG Wed Jul 30 15:24:58 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 69CB47B8; Wed, 30 Jul 2014 15:24:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 4AF252D26; Wed, 30 Jul 2014 15:24:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6UFOwws079065; Wed, 30 Jul 2014 15:24:58 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6UFOvsG079063; Wed, 30 Jul 2014 15:24:57 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201407301524.s6UFOvsG079063@svn.freebsd.org> From: William Grzybowski Date: Wed, 30 Jul 2014 15:24:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363486 - 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-head@freebsd.org X-Mailman-Version: 2.1.18 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: Wed, 30 Jul 2014 15:24:58 -0000 Author: wg Date: Wed Jul 30 15:24:57 2014 New Revision: 363486 URL: http://svnweb.freebsd.org/changeset/ports/363486 QAT: https://qat.redports.org/buildarchive/r363486/ Log: net/smbldap-tools: support stage - Use options sub - Use @sample PR: 192245 Modified: head/net/smbldap-tools/Makefile head/net/smbldap-tools/pkg-plist Modified: head/net/smbldap-tools/Makefile ============================================================================== --- head/net/smbldap-tools/Makefile Wed Jul 30 15:00:45 2014 (r363485) +++ head/net/smbldap-tools/Makefile Wed Jul 30 15:24:57 2014 (r363486) @@ -9,6 +9,9 @@ MASTER_SITES= http://download.gna.org/sm MAINTAINER= ports@FreeBSD.org COMMENT= Samba-LDAP management and support tools +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + BUILD_DEPENDS= p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap \ p5-Crypt-SmbHash>=0:${PORTSDIR}/security/p5-Crypt-SmbHash \ p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \ @@ -17,9 +20,6 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/a//} -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING - USES= gmake perl5 GNU_CONFIGURE= yes ALL_TARGET= build @@ -29,50 +29,43 @@ PORTDOCS= * OPTIONS_DEFINE= MIGRATION_SCRIPTS PDF_DOC DOCS MIGRATION_SCRIPTS_DESC= Install migration scripts PDF_DOC_DESC= Install PDF documentation +OPTIONS_SUB= yes CONFIGURE_ARGS+= --with-samba-sysconfdir=${LOCALBASE}/etc \ --with-samba-bindir=${LOCALBASE}/bin \ --with-perl=${PERL} \ --with-perl-libdir=sitelib -NO_STAGE= yes .include -.if ${PORT_OPTIONS:MMIGRATION_SCRIPTS} -PLIST_SUB+= MIGRATION_SCRIPTS="" -.else -PLIST_SUB+= MIGRATION_SCRIPTS="@comment " -.endif - post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/smbldap-config.pl post-install: - @${MKDIR} ${PREFIX}/etc/smbldap-tools + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/smbldap-tools .for i in smbldap.conf smbldap_bind.conf - ${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/etc/smbldap-tools/$i.sample - @[ -f ${PREFIX}/etc/smbldap-tools/$i ] || ${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/etc/smbldap-tools/$i + ${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 \ smbldap-migrate-unix-accounts smbldap-migrate-unix-groups @${SED} -e 's|/usr/bin/perl|${PERL}|g' \ - ${WRKSRC}/doc/migration_scripts/$i > ${PREFIX}/sbin/$i + ${WRKSRC}/doc/migration_scripts/$i > ${STAGEDIR}${PREFIX}/sbin/$i . endfor .endif .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/smbldap-config.cmd ${DOCSDIR}/smbldap-config - ${INSTALL_SCRIPT} ${WRKSRC}/smbldap-upgrade-0.9.6.cmd ${DOCSDIR}/smbldap-upgrade-0.9.6 -.for file in CONTRIBUTORS COPYING ChangeLog FILES INFRA INSTALL README TODO - ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}/ + ${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 ${DOCSDIR}/smbldap-tools.html + ${INSTALL_DATA} ${WRKSRC}/doc/smbldap-tools.html ${STAGEDIR}${DOCSDIR}/smbldap-tools.html .if ${PORT_OPTIONS:MPDF_DOC} - ${INSTALL_DATA} ${WRKSRC}/doc/smbldap-tools.pdf ${DOCSDIR}/smbldap-tools.pdf + ${INSTALL_DATA} ${WRKSRC}/doc/smbldap-tools.pdf ${STAGEDIR}${DOCSDIR}/smbldap-tools.pdf .endif .endif Modified: head/net/smbldap-tools/pkg-plist ============================================================================== --- head/net/smbldap-tools/pkg-plist Wed Jul 30 15:00:45 2014 (r363485) +++ head/net/smbldap-tools/pkg-plist Wed Jul 30 15:24:57 2014 (r363486) @@ -16,12 +16,7 @@ sbin/smbldap-userinfo sbin/smbldap-userlist sbin/smbldap-usermod sbin/smbldap-usershow -@exec mkdir -p %D/etc/smbldap-tools -@unexec if cmp -s %D/etc/smbldap-tools/smbldap.conf %D/etc/smbldap-tools/smbldap.conf.sample; then rm -f %D/etc/smbldap-tools/smbldap.conf; fi -etc/smbldap-tools/smbldap.conf.sample -@exec [ -f %D/etc/smbldap-tools/smbldap.conf ] || cp %B/%f %D/etc/smbldap-tools/smbldap.conf -@unexec if cmp -s %D/etc/smbldap-tools/smbldap_bind.conf %D/etc/smbldap-tools/smbldap_bind.conf.sample; then rm -f %D/etc/smbldap-tools/smbldap_bind.conf; fi -etc/smbldap-tools/smbldap_bind.conf.sample -@exec [ -f %D/etc/smbldap-tools/smbldap_bind.conf ] || cp %B/%f %D/etc/smbldap-tools/smbldap_bind.conf +@sample %%ETCDIR%%/smbldap.conf.sample +@sample %%ETCDIR%%/smbldap_bind.conf.sample %%SITE_PERL%%/smbldap_tools.pm -@dirrmtry etc/smbldap-tools +@dirrmtry %%ETCDIR%%