From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Feb 10 00:20:23 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A20DD16A4CE for ; Thu, 10 Feb 2005 00:20:23 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4FA6543D2F for ; Thu, 10 Feb 2005 00:20:23 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id j1A0KNcC078617 for ; Thu, 10 Feb 2005 00:20:23 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id j1A0KNPV078616; Thu, 10 Feb 2005 00:20:23 GMT (envelope-from gnats) Resent-Date: Thu, 10 Feb 2005 00:20:23 GMT Resent-Message-Id: <200502100020.j1A0KNPV078616@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Florent Thoumie Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 87AD916A4CE for ; Thu, 10 Feb 2005 00:17:17 +0000 (GMT) Received: from gate.xbsd.org (xbsd.org [82.233.2.192]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA04043D46 for ; Thu, 10 Feb 2005 00:17:16 +0000 (GMT) (envelope-from flz@xbsd.org) Received: from localhost (localhost.xbsd.org [127.0.0.1]) by gate.xbsd.org (Postfix) with ESMTP id C8BAE1195E for ; Thu, 10 Feb 2005 01:20:19 +0100 (CET) Received: from gate.xbsd.org ([127.0.0.1]) by localhost (gate.xbsd.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 62650-05 for ; Thu, 10 Feb 2005 01:20:15 +0100 (CET) Received: by gate.xbsd.org (Postfix, from userid 2001) id 5C5C31195D; Thu, 10 Feb 2005 01:20:15 +0100 (CET) Message-Id: <20050210002015.5C5C31195D@gate.xbsd.org> Date: Thu, 10 Feb 2005 01:20:15 +0100 (CET) From: Florent Thoumie To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/77331: Update port: net/smbldap-tools - fix missing dependency X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Florent Thoumie List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Feb 2005 00:20:23 -0000 >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 >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 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: