Attachment 144013 Details for Bug 191037 – lam46_1

[patch] lam46_1

lam46_1.txt (text/plain), 3.43 KB, created by basil on 2014-06-22 07:32:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: basil

Created: 2014-06-22 07:32:01 UTC

Size: 3.43 KB

patch

obsolete

>diff -ruN /usr/ports/sysutils/ldap-account-manager/Makefile /root/ldap-account-manager/Makefile
>--- /usr/ports/sysutils/ldap-account-manager/Makefile	2014-04-20 09:36:26.000000000 +0300
>+++ /root/ldap-account-manager/Makefile	2014-06-22 10:20:46.422381937 +0300
>@@ -1,7 +1,7 @@
> # $FreeBSD: head/sysutils/ldap-account-manager/Makefile 351612 2014-04-20 06:36:26Z rm $
> 
> PORTNAME=	ldap-account-manager
>-PORTVERSION=	4.5
>+PORTVERSION=	4.6
> CATEGORIES=	sysutils www
> MASTER_SITES=	SF/${SHORTNAME}/LAM/${PORTVERSION}
> 
>@@ -31,31 +31,29 @@
> 
> .include <bsd.port.options.mk>
> 
>+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}
>diff -ruN /usr/ports/sysutils/ldap-account-manager/distinfo /root/ldap-account-manager/distinfo
>--- /usr/ports/sysutils/ldap-account-manager/distinfo	2014-04-20 09:34:11.000000000 +0300
>+++ /root/ldap-account-manager/distinfo	2014-06-20 23:21:38.088396490 +0300
>@@ -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

Actions: View | Diff

Attachments on bug 191037: 144013