Date: Mon, 29 Nov 2004 14:49:56 +0100 From: Florent Thoumie <flz@xbsd.org> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/74513: net/smbldap-tools - Update port to version 0.8.5.3 Message-ID: <41AB2904.2080105@xbsd.org> In-Reply-To: <200411291240.iATCeWiI030986@freefall.freebsd.org> References: <200411291240.iATCeWiI030986@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
I forgot to make some changes. Now example configuration files are stored in EXAMPLESDIR instead of $PREFIX/etc/$PORTNAME to avoid $PREFIX/etc clobbering. Here is the new diff : --- smbldap-tools-0.8.5-3.diff begins here --- diff -ruN smbldap-tools.old/Makefile smbldap-tools/Makefile --- smbldap-tools.old/Makefile Wed Nov 24 05:20:28 2004 +++ smbldap-tools/Makefile Mon Nov 29 14:32:07 2004 @@ -6,10 +6,10 @@ # PORTNAME= smbldap-tools -PORTVERSION= 0.8.5 +PORTVERSION= 0.8.5.3 CATEGORIES= net MASTER_SITES= http://samba.idealx.org/dist/ -EXTRACT_SUFX= .tgz +DISTFILES= ${PORTNAME}-0.8.5-3.tgz MAINTAINER= flz@xbsd.org COMMENT= Useful package for managing users and groups in a LDAP directory @@ -18,10 +18,17 @@ ${SITE_PERL}/Crypt/SmbHash.pm:${PORTSDIR}/security/p5-Crypt-SmbHash RUN_DEPENDS= ${BUILD_DEPENDS} +WRKSRC= ${WRKDIR}/${PORTNAME}-0.8.5 USE_PERL5= yes NO_BUILD= yes USE_REINPLACE= yes +PKGMESSAGE= ${WRKDIR}/pkg-message + +SED_SCRIPT= -e 's,%%PORTNAME%%,${PORTNAME},g' \ + -e 's,%%PREFIX%%,${PREFIX},g' \ + -e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' + post-patch: ${REINPLACE_CMD} -e 's#/etc/samba#${PREFIX}/etc/samba#' ${WRKSRC}/configure.pl \ ${WRKSRC}/smb.conf @@ -30,17 +37,25 @@ ${WRKSRC}/smbldap_tools.pm ${REINPLACE_CMD} -e 's#/usr/sbin#${LOCALBASE}/sbin#' ${WRKSRC}/smbldap-passwd +pre-install: + ${SED} ${SED_SCRIPT} ${PKGDIR}/pkg-message > ${WRKDIR}/pkg-message + do-install: ${MKDIR} ${EXAMPLESDIR} ${MKDIR} ${PREFIX}/etc/${PORTNAME} - ${INSTALL_SCRIPT} ${WRKSRC}/configure.pl ${PREFIX}/etc/${PORTNAME}/ + ${INSTALL_SCRIPT} ${WRKSRC}/configure.pl ${EXAMPLESDIR}/ .for i in smbldap.conf smbldap_bind.conf - ${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/etc/${PORTNAME}/$i.default + ${INSTALL_DATA} ${WRKSRC}/$i ${EXAMPLESDIR}/ .endfor -.for i in smbldap-groupadd smbldap-groupdel smbldap-groupmod smbldap-groupshow smbldap-useradd smbldap-userdel smbldap-usermod smbldap-usershow smbldap-migrate-accounts smbldap-migrate-groups smbldap-passwd smbldap-populate +.for i in smbldap-groupadd smbldap-groupdel smbldap-groupmod smbldap-groupshow smbldap-useradd smbldap-userdel smbldap-usermod smbldap-usershow smbldap-passwd smbldap-populate ${INSTALL_SCRIPT} ${WRKSRC}/$i ${PREFIX}/sbin .endfor + ${INSTALL_SCRIPT} ${WRKSRC}/doc/smbldap-migrate-accounts ${PREFIX}/sbin + ${INSTALL_SCRIPT} ${WRKSRC}/doc/smbldap-migrate-groups ${PREFIX}/sbin ${INSTALL_DATA} ${WRKSRC}/smbldap_tools.pm ${SITE_PERL}/ ${INSTALL_DATA} ${WRKSRC}/smb.conf ${EXAMPLESDIR}/ + +post-install: + ${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff -ruN smbldap-tools.old/distinfo smbldap-tools/distinfo --- smbldap-tools.old/distinfo Fri Jul 30 21:22:01 2004 +++ smbldap-tools/distinfo Thu Nov 25 22:28:49 2004 @@ -1,2 +1,2 @@ -MD5 (smbldap-tools-0.8.5.tgz) = 4bfa0e5328b8420b98d91a046117b7c5 -SIZE (smbldap-tools-0.8.5.tgz) = 269327 +MD5 (smbldap-tools-0.8.5-3.tgz) = 63abfa7c522c8fb37e1d2e2fb9d422ab +SIZE (smbldap-tools-0.8.5-3.tgz) = 275520 diff -ruN smbldap-tools.old/pkg-message smbldap-tools/pkg-message --- smbldap-tools.old/pkg-message Thu Jan 1 01:00:00 1970 +++ smbldap-tools/pkg-message Mon Nov 29 14:33:33 2004 @@ -0,0 +1,9 @@ +****************************************************************** +Before using smbldap-tools, you need to do some configuration. + +Configuration files can be created from examples located in : +%%EXAMPLESDIR%%. + +Copy these files and modify them to suit your needs, then put them +in %%PREFIX%%/etc/%%PORTNAME%%. +****************************************************************** diff -ruN smbldap-tools.old/pkg-plist smbldap-tools/pkg-plist --- smbldap-tools.old/pkg-plist Tue May 25 23:19:26 2004 +++ smbldap-tools/pkg-plist Mon Nov 29 14:13:14 2004 @@ -1,6 +1,3 @@ -etc/smbldap-tools/configure.pl -etc/smbldap-tools/smbldap.conf.default -etc/smbldap-tools/smbldap_bind.conf.default sbin/smbldap-groupadd sbin/smbldap-groupdel sbin/smbldap-groupmod @@ -13,7 +10,12 @@ sbin/smbldap-userdel sbin/smbldap-usermod sbin/smbldap-usershow +%%EXAMPLESDIR%%/configure.pl %%EXAMPLESDIR%%/smb.conf +%%EXAMPLESDIR%%/smbldap.conf +%%EXAMPLESDIR%%/smbldap_bind.conf %%SITE_PERL%%/smbldap_tools.pm -@dirrm etc/smbldap-tools +@exec mkdir -p etc/smbldap-tools +@unexec rmdir etc/smbldap-tools 2>/dev/null || true +@exec mkdir -p %%EXAMPLESDIR%% @dirrm %%EXAMPLESDIR%% --- smbldap-tools-0.8.5-3.diff ends here ---
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?41AB2904.2080105>