From owner-freebsd-ports-bugs@FreeBSD.ORG  Mon Oct  3 14:00:49 2005
Return-Path: <owner-freebsd-ports-bugs@FreeBSD.ORG>
X-Original-To: freebsd-ports-bugs@hub.freebsd.org
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 8351516A422
	for <freebsd-ports-bugs@hub.freebsd.org>;
	Mon,  3 Oct 2005 14:00:48 +0000 (GMT)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CBEA943D49
	for <freebsd-ports-bugs@hub.freebsd.org>;
	Mon,  3 Oct 2005 14:00:44 +0000 (GMT)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j93E0ijC094962
	for <freebsd-ports-bugs@freefall.freebsd.org>;
	Mon, 3 Oct 2005 14:00:44 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j93E0iTj094961;
	Mon, 3 Oct 2005 14:00:44 GMT (envelope-from gnats)
Date: Mon, 3 Oct 2005 14:00:44 GMT
Message-Id: <200510031400.j93E0iTj094961@freefall.freebsd.org>
To: freebsd-ports-bugs@FreeBSD.org
From: Thomas-Martin Seck <tmseck@netcologne.de>
Cc: 
Subject: Re: ports/86850: [patch] port www/squid builds smb_auth with the
	wrong path to samba
X-BeenThere: freebsd-ports-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Thomas-Martin Seck <tmseck@netcologne.de>
List-Id: Ports bug reports <freebsd-ports-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, 
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs>
List-Post: <mailto:freebsd-ports-bugs@freebsd.org>
List-Help: <mailto:freebsd-ports-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, 
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Oct 2005 14:00:49 -0000

The following reply was made to PR ports/86850; it has been noted by GNATS.

From: Thomas-Martin Seck <tmseck@netcologne.de>
To: bug-followup@freebsd.org, mnag@freebsd.org, dmphilli@gmail.com
Cc:  
Subject: Re: ports/86850: [patch] port www/squid builds smb_auth with the wrong path to samba
Date: Mon, 3 Oct 2005 15:59:47 +0200

 (Somehow the feedback request mail did not reach me yet; I've noticed
 the PR while checking portsmon.)
 
 Hi,
 
 thanks for pointing this out; I do not use smb_auth myself and
 appreciate your report.
 
 However, I prefer the patch below (we do not need to mess around
 with the .in an .am files when we can fix the script directly).
 
 I also removed the hardcoded /usr/local assumption for ${LOCALBASE}
 while at it.
 
 Dean, could you try the patch below and see whether it works for you?
 
 If it does, this patch should be committed.
 
 Index: files/patch-helpers-basic_auth-SMB-smb_auth.sh
 ===================================================================
 --- files/patch-helpers-basic_auth-SMB-smb_auth.sh	(revision 587)
 +++ files/patch-helpers-basic_auth-SMB-smb_auth.sh	(revision 588)
 @@ -6,7 +6,7 @@
    # along with this program; if not, write to the Free Software
    # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
    
 -+ SAMBAPREFIX=${SAMBAPREFIX:-/usr/local/bin}
 ++ SAMBAPREFIX=${SAMBAPREFIX:-%%LOCALBASE%%}
  + 
    read DOMAINNAME
    read PASSTHROUGH
 Index: Makefile
 ===================================================================
 --- Makefile	(revision 587)
 +++ Makefile	(revision 588)
 @@ -70,7 +70,7 @@
  
  PORTNAME=	squid
  PORTVERSION=	2.5.11
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	www
  MASTER_SITES=	\
  		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
 @@ -348,6 +348,8 @@
  	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
  	@${REINPLACE_CMD} -e 's|%%SQUID_UID%%|${SQUID_UID}|g' \
  	    -e 's|%%SQUID_GID%%|${SQUID_GID}|g' ${WRKSRC}/src/cf.data.pre
 +	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 +	    ${WRKSRC}/helpers/basic_auth/SMB/smb_auth.sh
  
  pre-install:
  # Prevent installation of .orig files by deleting them.