Attachment 60973 Details for Bug 91453 – file.diff

[patch] file.diff

file.diff (text/plain), 5.90 KB, created by Ganael LAPLANCHE on 2006-01-07 12:30:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ganael LAPLANCHE

Created: 2006-01-07 12:30:03 UTC

Size: 5.90 KB

patch

obsolete

>diff -aur ldapscripts.orig/Makefile ldapscripts/Makefile
>--- ldapscripts.orig/Makefile	Mon Oct 17 02:10:24 2005
>+++ ldapscripts/Makefile	Sat Jan  7 13:00:43 2006
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	ldapscripts
>-PORTVERSION=	1.3
>+PORTVERSION=	1.4
> CATEGORIES=	net
> MASTER_SITES=	http://contribs.martymac.com/ldapscripts/
> EXTRACT_SUFX=	.tgz
>@@ -14,48 +14,78 @@
> MAINTAINER=	ganael.laplanche@martymac.com
> COMMENT=	Scripts to manage posix accounts in an OpenLDAP directory
> 
>-RUN_DEPENDS=	ldapadd:${PORTSDIR}/net/openldap23-server \
>-		ldapsearch:${PORTSDIR}/net/openldap23-server \
>-		ldapdelete:${PORTSDIR}/net/openldap23-server \
>-		ldapmodify:${PORTSDIR}/net/openldap23-server \
>-		slappasswd:${PORTSDIR}/net/openldap23-server
>+RUN_DEPENDS=	ldapadd:${PORTSDIR}/net/openldap23-client \
>+		ldapsearch:${PORTSDIR}/net/openldap23-client \
>+		ldapdelete:${PORTSDIR}/net/openldap23-client \
>+		ldapmodify:${PORTSDIR}/net/openldap23-client \
>+		ldapmodrdn:${PORTSDIR}/net/openldap23-client \
>+		ldappasswd:${PORTSDIR}/net/openldap23-client
> 
> USE_REINPLACE=	yes
> 
>+MANLANG=	""
>+MANCOMPRESSED=	no
>+MAN1+=		ldapaddgroup.1
>+MAN1+=		ldapaddmachine.1
>+MAN1+=		ldapadduser.1
>+MAN1+=		ldapaddusertogroup.1
>+MAN1+=		ldapdeletegroup.1
>+MAN1+=		ldapdeleteuser.1
>+MAN1+=		ldapdeleteuserfromgroup.1
>+MAN1+=		ldaprenameuser.1
>+MAN1+=		ldapsetprimarygroup.1
>+MAN1+=		_lsldap.1
>+MAN1+=		_ldaprenamemachine.1
>+MAN1+=		_ldaprenamegroup.1
>+MAN1+=		_ldapinit.1
>+MAN1+=		_ldapdeletemachine.1
>+MAN5+=		ldapscripts.5
>+
> # Change /etc to ${LOCALBASE}/etc
> post-patch:
>-.for file in _ldapdeletemachine _ldapinit _lsldap ldapaddgroup ldapadduser ldapdeletegroup \
>-		ldapdeleteuserfromgroup ldapsetprimarygroup ldapaddmachine ldapaddusertogroup ldapdeleteuser \
>-		ldapscripts.conf runtime README CHANGELOG COPYING VERSION
>-	${REINPLACE_CMD} -E -e "s|/etc/ldapscripts|${LOCALBASE}/etc/ldapscripts|g" ${WRKSRC}/${file}
>-.endfor
>+	${REINPLACE_CMD} -E -e "s|^_RUNTIMEFILE=.*|_RUNTIMEFILE=\"${LOCALBASE}/etc/ldapscripts/runtime\"|g" ${WRKSRC}/bin/*
>+	${REINPLACE_CMD} -E -e "s|^_CONFIGFILE=.*|_CONFIGFILE=\"${LOCALBASE}/etc/ldapscripts/ldapscripts.conf\"|g" ${WRKSRC}/etc/runtime
>+
>+	${REINPLACE_CMD} -E -e "s|^LDAPSEARCHBIN=.*|LDAPSEARCHBIN=\"${LOCALBASE}/bin/ldapsearch\"|g" ${WRKSRC}/etc/ldapscripts.conf
>+	${REINPLACE_CMD} -E -e "s|^LDAPADDBIN=.*|LDAPADDBIN=\"${LOCALBASE}/bin/ldapadd\"|g" ${WRKSRC}/etc/ldapscripts.conf
>+	${REINPLACE_CMD} -E -e "s|^LDAPDELETEBIN=.*|LDAPDELETEBIN=\"${LOCALBASE}/bin/ldapdelete\"|g" ${WRKSRC}/etc/ldapscripts.conf
>+	${REINPLACE_CMD} -E -e "s|^LDAPMODIFYBIN=.*|LDAPMODIFYBIN=\"${LOCALBASE}/bin/ldapmodify\"|g" ${WRKSRC}/etc/ldapscripts.conf
>+	${REINPLACE_CMD} -E -e "s|^LDAPMODRDNBIN=.*|LDAPMODRDNBIN=\"${LOCALBASE}/bin/ldapmodrdn\"|g" ${WRKSRC}/etc/ldapscripts.conf
>+	${REINPLACE_CMD} -E -e "s|^LDAPPASSWDBIN=.*|LDAPPASSWDBIN=\"${LOCALBASE}/bin/ldappasswd\"|g" ${WRKSRC}/etc/ldapscripts.conf
> 
> # We do not use any Makefile
> do-build:
> 
> # Just copy the scripts
> do-install:
>-	${CP} ${WRKSRC}/_ldapdeletemachine ${PREFIX}/bin
>-	${CP} ${WRKSRC}/_ldapinit ${PREFIX}/bin
>-	${CP} ${WRKSRC}/_lsldap ${PREFIX}/bin
>-	${CP} ${WRKSRC}/ldapaddgroup ${PREFIX}/bin
>-	${CP} ${WRKSRC}/ldapadduser ${PREFIX}/bin
>-	${CP} ${WRKSRC}/ldapdeletegroup ${PREFIX}/bin
>-	${CP} ${WRKSRC}/ldapdeleteuserfromgroup ${PREFIX}/bin
>-	${CP} ${WRKSRC}/ldapsetprimarygroup ${PREFIX}/bin
>-	${CP} ${WRKSRC}/ldapaddmachine ${PREFIX}/bin
>-	${CP} ${WRKSRC}/ldapaddusertogroup ${PREFIX}/bin
>-	${CP} ${WRKSRC}/ldapdeleteuser ${PREFIX}/bin
>+	${CP} ${WRKSRC}/bin/_ldapdeletemachine ${PREFIX}/bin
>+	${CP} ${WRKSRC}/bin/_ldapinit ${PREFIX}/bin
>+	${CP} ${WRKSRC}/bin/_lsldap ${PREFIX}/bin
>+	${CP} ${WRKSRC}/bin/ldapaddgroup ${PREFIX}/bin
>+	${CP} ${WRKSRC}/bin/ldapadduser ${PREFIX}/bin
>+	${CP} ${WRKSRC}/bin/ldapdeletegroup ${PREFIX}/bin
>+	${CP} ${WRKSRC}/bin/ldapdeleteuserfromgroup ${PREFIX}/bin
>+	${CP} ${WRKSRC}/bin/ldapsetprimarygroup ${PREFIX}/bin
>+	${CP} ${WRKSRC}/bin/ldapaddmachine ${PREFIX}/bin
>+	${CP} ${WRKSRC}/bin/ldapaddusertogroup ${PREFIX}/bin
>+	${CP} ${WRKSRC}/bin/ldapdeleteuser ${PREFIX}/bin
>+	${CP} ${WRKSRC}/bin/ldaprenameuser ${PREFIX}/bin
>+	${CP} ${WRKSRC}/bin/_ldaprenamegroup ${PREFIX}/bin
>+	${CP} ${WRKSRC}/bin/_ldaprenamemachine ${PREFIX}/bin
> 
> 	${MKDIR} ${LOCALBASE}/etc/ldapscripts
> 	if [ -f ${LOCALBASE}/etc/ldapscripts/ldapscripts.conf ]; then \
> 		${CP} ${LOCALBASE}/etc/ldapscripts/ldapscripts.conf ${LOCALBASE}/etc/ldapscripts/ldapscripts.conf.old; \
> 	fi
>-	${CP} ${WRKSRC}/ldapscripts.conf ${LOCALBASE}/etc/ldapscripts
>-	${CP} ${WRKSRC}/runtime ${LOCALBASE}/etc/ldapscripts
>+	${CP} ${WRKSRC}/etc/ldapscripts.conf ${LOCALBASE}/etc/ldapscripts
>+	${CP} ${WRKSRC}/etc/runtime ${LOCALBASE}/etc/ldapscripts
> 	${CP} ${WRKSRC}/README ${LOCALBASE}/etc/ldapscripts
> 	${CP} ${WRKSRC}/CHANGELOG ${LOCALBASE}/etc/ldapscripts
> 	${CP} ${WRKSRC}/COPYING ${LOCALBASE}/etc/ldapscripts
> 	${CP} ${WRKSRC}/VERSION ${LOCALBASE}/etc/ldapscripts
>+	${CP} ${WRKSRC}/TODO ${LOCALBASE}/etc/ldapscripts
>+
>+	${CP} ${WRKSRC}/man/man1/* ${MANPREFIX}/man/man1
>+	${CP} ${WRKSRC}/man/man5/* ${MANPREFIX}/man/man5
> 
> .include <bsd.port.mk>
>diff -aur ldapscripts.orig/distinfo ldapscripts/distinfo
>--- ldapscripts.orig/distinfo	Mon Oct 17 02:10:24 2005
>+++ ldapscripts/distinfo	Sat Jan  7 09:33:42 2006
>@@ -1,2 +1,2 @@
>-MD5 (ldapscripts-1.3.tgz) = ba297b68e199c222f2971249561bcc6d
>-SIZE (ldapscripts-1.3.tgz) = 14292
>+MD5 (ldapscripts-1.4.tgz) = 3e063297a5188922803a451cdbf7dd61
>+SIZE (ldapscripts-1.4.tgz) = 18812
>diff -aur ldapscripts.orig/pkg-plist ldapscripts/pkg-plist
>--- ldapscripts.orig/pkg-plist	Mon Oct 17 02:10:24 2005
>+++ ldapscripts/pkg-plist	Thu Jan  5 17:58:27 2006
>@@ -4,6 +4,7 @@
> etc/ldapscripts/CHANGELOG
> etc/ldapscripts/COPYING
> etc/ldapscripts/VERSION
>+etc/ldapscripts/TODO
> @unexec rmdir %D/etc/ldapscripts 2>/dev/null || true
> bin/_ldapdeletemachine
> bin/_ldapinit
>@@ -16,3 +17,6 @@
> bin/ldapdeleteuser
> bin/ldapdeleteuserfromgroup
> bin/ldapsetprimarygroup
>+bin/ldaprenameuser
>+bin/_ldaprenamemachine
>+bin/_ldaprenamegroup
>--------------- Patch ends here ---------------

Actions: View | Diff

Attachments on bug 91453: 60973