Skip site navigation (1)Skip section navigation (2)
Date:      Sun,  5 Sep 2004 00:02:26 +0200 (CEST)
From:      Florent Thoumie <flz@xbsd.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/71383: Update port: net/tsocks - Fix tsocks wrapper and install libtsocks.so in ${PREFIX}/lib instead of ${PREFIX}/lib/tsocks
Message-ID:  <20040904220226.8E3961834@gw.xbsd.org>
Resent-Message-ID: <200409042210.i84MAL8D065883@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         71383
>Category:       ports
>Synopsis:       Update port: net/tsocks - Fix tsocks wrapper and install libtsocks.so in ${PREFIX}/lib instead of ${PREFIX}/lib/tsocks
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 04 22:10:21 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Florent Thoumie
>Release:        FreeBSD 4.9-RC i386
>Organization:
Xbsd.org
>Environment:

System: FreeBSD gw 4.9-RC FreeBSD 4.9-RC #4: Sun Oct 5 14:25:09 CEST 2003 rf@gw:/usr/src/sys/compile/GW i386

>Description:

When trying to use tsocks, it fails with that error :

innercity# tsocks ssh test
/libexec/ld-elf.so.1: Cannot open "/usr/lib/libtsocks.so"

The actualy version of the port installs the shared library in
${PREFIX}/lib/tsocks/, this patch installs it in ${PREFIX}/lib.

The tsocks wrapped used /usr/lib/libtsocks.so which didn't exist.
${REINPLACE_CMD} now replaces /usr with ${PREFIX}.

>How-To-Repeat:

Try tsocks <cmd>

>Fix:

--- tsocks.diff begins here. ---

diff -ruN tsocks/Makefile tsocks.new/Makefile
--- tsocks/Makefile	Wed Feb  4 06:08:22 2004
+++ tsocks.new/Makefile	Sat Sep  4 23:54:28 2004
@@ -6,7 +6,7 @@
 
 PORTNAME=	tsocks
 PORTVERSION=	1.8.b5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://ftp1.sourceforge.net/tsocks/ \
@@ -20,13 +20,12 @@
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
-LDCONFIG_DIRS=	${PREFIX}/lib/tsocks
 USE_REINPLACE=	yes
 
 WRKSRC=${WRKDIR}/${PORTNAME}-${PORTVERSION:C/.b.*//}
 
 CONFIGURE_ARGS=	--with-conf=${PREFIX}/etc/tsocks.conf \
-		--libdir=${LOCALBASE}/lib/tsocks
+		--libdir=${PREFIX}/lib
 
 MAN1=		tsocks.1
 MAN5=		tsocks.conf.5
@@ -94,6 +93,7 @@
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|ufds|fds|g' ${WRKSRC}/tsocks.c
+	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' ${WRKSRC}/tsocks
 
 .if !defined(NOPORTDOCS)
 post-install:
diff -ruN tsocks/pkg-plist tsocks.new/pkg-plist
--- tsocks/pkg-plist	Wed Oct  8 03:20:50 2003
+++ tsocks.new/pkg-plist	Sat Sep  4 20:39:27 2004
@@ -1,8 +1,7 @@
 bin/tsocks
 etc/tsocks.conf.sample
-lib/tsocks/libtsocks.so.1
-lib/tsocks/libtsocks.so
-@dirrm lib/tsocks/
+lib/libtsocks.so.1
+lib/libtsocks.so
 %%EXAMPLESDIR%%/tsocks.conf.complex.example
 %%EXAMPLESDIR%%/tsocks.conf.simple.example
 %%EXAMPLESDIR%%/README

--- tsocks.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?20040904220226.8E3961834>