Date: Mon, 3 Oct 2005 14:00:44 GMT From: Thomas-Martin Seck <tmseck@netcologne.de> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/86850: [patch] port www/squid builds smb_auth with the wrong path to samba Message-ID: <200510031400.j93E0iTj094961@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200510031400.j93E0iTj094961>