From owner-svn-ports-all@FreeBSD.ORG Sun Jun 22 14:39:50 2014 Return-Path: Delivered-To: svn-ports-all@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 792FC1BA; Sun, 22 Jun 2014 14:39:50 +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 6662A2AAE; Sun, 22 Jun 2014 14:39:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5MEdo0n084461; Sun, 22 Jun 2014 14:39:50 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5MEdodK084458; Sun, 22 Jun 2014 14:39:50 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201406221439.s5MEdodK084458@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sun, 22 Jun 2014 14:39:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358807 - head/sysutils/ldap-account-manager 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.18 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: Sun, 22 Jun 2014 14:39:50 -0000 Author: rakuco Date: Sun Jun 22 14:39:49 2014 New Revision: 358807 URL: http://svnweb.freebsd.org/changeset/ports/358807 QAT: https://qat.redports.org/buildarchive/r358807/ Log: - Update to 4.6. - Use the @sample helper for handling config files. PR: 191037 Submitted by: basil@vpm.net.ua (maintainer) Modified: head/sysutils/ldap-account-manager/Makefile head/sysutils/ldap-account-manager/distinfo Modified: head/sysutils/ldap-account-manager/Makefile ============================================================================== --- head/sysutils/ldap-account-manager/Makefile Sun Jun 22 14:39:42 2014 (r358806) +++ head/sysutils/ldap-account-manager/Makefile Sun Jun 22 14:39:49 2014 (r358807) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ldap-account-manager -PORTVERSION= 4.5 +PORTVERSION= 4.6 CATEGORIES= sysutils www MASTER_SITES= SF/${SHORTNAME}/LAM/${PORTVERSION} @@ -31,31 +31,29 @@ OPTIONS_DEFINE= DOCS .include +post-extract: +.for CONFIG in ${CONFIGS} + @${MV} ${WRKSRC}/config/${CONFIG}_sample ${WRKSRC}/config/${CONFIG}.sample +.endfor do-install: @${ECHO_CMD} '@unexec if [ -f %D/${WWWDIR_REL}/config/shells ]; then ${RM} -f %D/${WWWDIR_REL}/config/shells; fi' >> ${TMPPLIST} .for CONFIG in ${CONFIGS} - @${ECHO_CMD} '@unexec if cmp -s %D/${WWWDIR_REL}/config/${CONFIG}_sample %D/${WWWDIR_REL}/config/${CONFIG}; then ${RM} -f %D/${WWWDIR_REL}/config/${CONFIG}; fi' >> ${TMPPLIST} + @${ECHO_CMD} '@sample ${WWWDIR_REL}/config/${CONFIG}.sample' >> ${TMPPLIST} .endfor .for I in ${LAMDATA} - @${FIND} -s ${WRKSRC}/${I} -type f -not -name '${CONFIGS}'| ${SED} -e 's,^${WRKSRC},${WWWDIR_REL},' >> ${TMPPLIST} - @${FIND} -ds ${WRKSRC}/${I} -type d | ${SED} -e 's,^${WRKSRC},@dirrm ${WWWDIR_REL},' >> ${TMPPLIST} + @${FIND} -s ${WRKSRC}/${I} -type f -not -name '*.sample' | ${SED} -e 's,^${WRKSRC},${WWWDIR_REL},' >> ${TMPPLIST} + @${FIND} -ds ${WRKSRC}/${I} -type d | ${SED} -e 's,^${WRKSRC},@dirrmtry ${WWWDIR_REL},' >> ${TMPPLIST} .endfor - @${ECHO_CMD} '@dirrm ${WWWDIR_REL}' >> ${TMPPLIST} + @${ECHO_CMD} '@dirrmtry ${WWWDIR_REL}' >> ${TMPPLIST} @cd ${WRKSRC} && ${COPYTREE_SHARE} "${LAMDATA}" ${STAGEDIR}${WWWDIR} -.for CONFIG in ${CONFIGS} - @${ECHO_CMD} '@exec if [ ! -f %D/${WWWDIR_REL}/config/${CONFIG} ]; then ${CP} %D/${WWWDIR_REL}/config/${CONFIG}_sample %D/${WWWDIR_REL}/config/${CONFIG}; ${CHOWN} ${WWWOWN} %D/${WWWDIR_REL}/config/${CONFIG}; fi' >> ${TMPPLIST} -.if !exists(${STAGEDIR}${WWWDIR}/config/${CONFIG}) - @${CP} ${STAGEDIR}${WWWDIR}/config/${CONFIG}_sample ${STAGEDIR}${WWWDIR}/config/${CONFIG} -.endif -.endfor .for DIR in ${WRITEABLES} @${CHOWN} -R ${WWWOWN} ${STAGEDIR}${WWWDIR}/${DIR} @${CHMOD} -R u+w ${STAGEDIR}${WWWDIR}/${DIR} - @${CHMOD} u+x ${STAGEDIR}${WWWDIR}/lib/lamdaemon.pl @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN} %D/${WWWDIR_REL}/${DIR}' >> ${TMPPLIST} @${ECHO_CMD} '@exec ${CHMOD} -R u+w %D/${WWWDIR_REL}/${DIR}' >> ${TMPPLIST} - @${ECHO_CMD} '@exec ${CHMOD} u+x %D/${WWWDIR_REL}/lib/lamdaemon.pl' >> ${TMPPLIST} .endfor + @${CHMOD} u+x ${STAGEDIR}${WWWDIR}/lib/lamdaemon.pl + @${ECHO_CMD} '@exec ${CHMOD} u+x %D/${WWWDIR_REL}/lib/lamdaemon.pl' >> ${TMPPLIST} .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} @cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR} Modified: head/sysutils/ldap-account-manager/distinfo ============================================================================== --- head/sysutils/ldap-account-manager/distinfo Sun Jun 22 14:39:42 2014 (r358806) +++ head/sysutils/ldap-account-manager/distinfo Sun Jun 22 14:39:49 2014 (r358807) @@ -1,2 +1,2 @@ -SHA256 (ldap-account-manager-4.5.tar.bz2) = 7652475905fdfb27b40feaa6c0dc39dc78caa6465e1654539799f5c40ae8f714 -SIZE (ldap-account-manager-4.5.tar.bz2) = 11729338 +SHA256 (ldap-account-manager-4.6.tar.bz2) = df9f267c33ddce52e598ac540fecce0f3dc2546a0cc339f8200f39a1baa411f1 +SIZE (ldap-account-manager-4.6.tar.bz2) = 12358788