Date: Thu, 10 Feb 2005 01:20:15 +0100 (CET) From: Florent Thoumie <flz@xbsd.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/77331: Update port: net/smbldap-tools - fix missing dependency Message-ID: <20050210002015.5C5C31195D@gate.xbsd.org> Resent-Message-ID: <200502100020.j1A0KNPV078616@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 77331
>Category: ports
>Synopsis: Update port: net/smbldap-tools - fix missing dependency
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Feb 10 00:20:22 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Florent Thoumie
>Release: FreeBSD 5.3-RELEASE i386
>Organization:
Xbsd.org
>Environment:
System: FreeBSD srv1.xbsd.org 5.3-RELEASE FreeBSD 5.3-RELEASE #2: Wed Nov 24 16:35:34 CET 2004 root@gate.xbsd.org:/usr/src/sys/i386/compile/GATE i386
>Description:
Add missing dependency.
Correct sed'ification order.
Bonus: Install example configuration files in ${EXAMPLESDIR} rather than in
${PREFIX}/etc/${PORTNAME}.
Noticed by: Alex Ianchici <alex@zbtechnologies.com>
>How-To-Repeat:
>Fix:
--- smbldap-tools.diff begins here ---
diff -ruN smbldap-tools.orig/Makefile smbldap-tools/Makefile
--- smbldap-tools.orig/Makefile Thu Feb 10 00:27:43 2005
+++ smbldap-tools/Makefile Thu Feb 10 01:11:51 2005
@@ -7,6 +7,7 @@
PORTNAME= smbldap-tools
PORTVERSION= 0.8.6
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://samba.idealx.org/dist/
EXTRACT_SUFX= .tgz
@@ -15,7 +16,8 @@
COMMENT= Useful package for managing users and groups in a LDAP directory
BUILD_DEPENDS= ${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap \
- ${SITE_PERL}/Crypt/SmbHash.pm:${PORTSDIR}/security/p5-Crypt-SmbHash
+ ${SITE_PERL}/Crypt/SmbHash.pm:${PORTSDIR}/security/p5-Crypt-SmbHash \
+ ${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PERL5= yes
@@ -24,18 +26,18 @@
post-patch:
@${PERL} -pi -e 's#/etc/samba#${PREFIX}/etc/samba#' ${WRKSRC}/configure.pl \
${WRKSRC}/smb.conf
- @${PERL} -pi -e 's#/etc/opt/IDEALX#${PREFIX}/etc#' ${WRKSRC}/smbldap_tools.pm
@${PERL} -pi -e 's#/etc/smb#${PREFIX}/etc/smb#' ${WRKSRC}/configure.pl \
${WRKSRC}/smbldap.conf \
${WRKSRC}/smbldap_tools.pm
+ @${PERL} -pi -e 's#/etc/opt/IDEALX#${PREFIX}/etc#' ${WRKSRC}/smbldap_tools.pm
@${PERL} -pi -e 's#/usr/sbin#${LOCALBASE}/sbin#' ${WRKSRC}/smbldap-passwd
do-install:
- ${MKDIR} ${EXAMPLESDIR}
${MKDIR} ${PREFIX}/etc/${PORTNAME}
- ${INSTALL_SCRIPT} ${WRKSRC}/configure.pl ${PREFIX}/etc/${PORTNAME}/
+ ${MKDIR} ${EXAMPLESDIR}/etc
.for i in smbldap.conf smbldap_bind.conf
- ${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/etc/${PORTNAME}/$i.default
+ ${INSTALL_DATA} ${WRKSRC}/$i ${EXAMPLESDIR}/etc/$i
+ @[ -f ${PREFIX}/etc/${PORTNAME}/$i ] || ${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/etc/${PORTNAME}/$i
.endfor
.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
@@ -44,5 +46,6 @@
${INSTALL_SCRIPT} ${WRKSRC}/doc/smbldap-migrate-groups ${PREFIX}/sbin
${INSTALL_DATA} ${WRKSRC}/smbldap_tools.pm ${SITE_PERL}/
${INSTALL_DATA} ${WRKSRC}/smb.conf ${EXAMPLESDIR}/
+ ${INSTALL_SCRIPT} ${WRKSRC}/configure.pl ${EXAMPLESDIR}/
.include <bsd.port.mk>
diff -ruN smbldap-tools.orig/pkg-plist smbldap-tools/pkg-plist
--- smbldap-tools.orig/pkg-plist Thu Feb 10 00:27:43 2005
+++ smbldap-tools/pkg-plist Thu Feb 10 01:09:40 2005
@@ -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,15 @@
sbin/smbldap-userdel
sbin/smbldap-usermod
sbin/smbldap-usershow
+@unexec if cmp -s %D/etc/smbldap-tools/smbldap.conf %D/%%EXAMPLESDIR%%/etc/smbldap.conf; then rm -f %D/etc/smbldap-tools/smbldap.conf; fi
+%%EXAMPLESDIR%%/etc/smbldap.conf
+@exec [ -f %D/etc/smbldap-tools/smbldap.conf ] || cp %B/%f %D/etc/smbldap-tools/smbldap.conf
+@unexec if cmp -s %D/etc/smbldap-tools/smbldap_bind.conf %D/%%EXAMPLESDIR%%/etc/smbldap_bind.conf; then rm -f %D/etc/smbldap-tools/smbldap_bind.conf; fi
+%%EXAMPLESDIR%%/etc/smbldap_bind.conf
+@exec [ -f %D/etc/smbldap-tools/smbldap_bind.conf ] || cp %B/%f %D/etc/smbldap-tools/smbldap_bind.conf
%%EXAMPLESDIR%%/smb.conf
+%%EXAMPLESDIR%%/configure.pl
%%SITE_PERL%%/smbldap_tools.pm
-@dirrm etc/smbldap-tools
+@unexec rmdir %D/etc/smbldap-tools 2> /dev/null || true
+@dirrm %%EXAMPLESDIR%%/etc
@dirrm %%EXAMPLESDIR%%
--- smbldap-tools.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050210002015.5C5C31195D>