Date: Wed, 22 Dec 2004 09:50:23 GMT From: Florent Thoumie <flz@xbsd.org> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/74513: net/smbldap-tools - Update port to version 0.8.5.3 Message-ID: <200412220950.iBM9oMaj041237@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/74513; it has been noted by GNATS. From: Florent Thoumie <flz@xbsd.org> To: Sergey Matveychuk <sem@FreeBSD.org>, freebsd-gnats-submit@FreeBSD.org Cc: Subject: Re: ports/74513: net/smbldap-tools - Update port to version 0.8.5.3 Date: Wed, 22 Dec 2004 10:46:49 +0100 I may have been in an inconsistent state when I wrote this patch. Here is the rewritten patch using newly added SUB_FILES variable. --- smbldap-tools-0.8.5.3.diff begins here. --- diff -ruN smbldap-tools/Makefile smbldap-tools.new/Makefile --- smbldap-tools/Makefile Sun Dec 19 23:47:55 2004 +++ smbldap-tools.new/Makefile Wed Dec 22 09:54:15 2004 @@ -6,9 +6,10 @@ # PORTNAME= smbldap-tools -PORTVERSION= 0.8.5 +PORTVERSION= 0.8.5.3 CATEGORIES= net -MASTER_SITES= http://www.idealx.org/prj/samba/dist/ +MASTER_SITES= http://samba.idealx.org/dist/ +DISTNAME= ${PORTNAME}-0.8.5-3 EXTRACT_SUFX= .tgz MAINTAINER= flz@xbsd.org @@ -18,10 +19,13 @@ ${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 +SUB_FILES= pkg-message + post-patch: ${REINPLACE_CMD} -e 's#/etc/samba#${PREFIX}/etc/samba#' ${WRKSRC}/configure.pl \ ${WRKSRC}/smb.conf @@ -33,14 +37,18 @@ do-install: ${MKDIR} ${EXAMPLESDIR} ${MKDIR} ${PREFIX}/etc/${PORTNAME} - ${INSTALL_SCRIPT} ${WRKSRC}/configure.pl ${PREFIX}/etc/${PORTNAME}/ -.for i in smbldap.conf smbldap_bind.conf - ${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/etc/${PORTNAME}/$i.default + ${INSTALL_SCRIPT} ${WRKSRC}/configure.pl ${EXAMPLESDIR}/ +.for i in smb.conf smbldap.conf smbldap_bind.conf + ${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/distinfo smbldap-tools.new/distinfo --- smbldap-tools/distinfo Sun Dec 19 23:47:55 2004 +++ smbldap-tools.new/distinfo Sun Dec 19 22:50:40 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/files/pkg-message.in smbldap-tools.new/files/pkg-message.in --- smbldap-tools/files/pkg-message.in Thu Jan 1 01:00:00 1970 +++ smbldap-tools.new/files/pkg-message.in Sun Dec 19 22:52:15 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/smbldap-tools. +****************************************************************** diff -ruN smbldap-tools/pkg-plist smbldap-tools.new/pkg-plist --- smbldap-tools/pkg-plist Sun Dec 19 23:47:55 2004 +++ smbldap-tools.new/pkg-plist Wed Dec 22 09:56:03 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,11 @@ 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 @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?200412220950.iBM9oMaj041237>