Bug 71383 - Update port: net/tsocks - Fix tsocks wrapper and install libtsocks.so in ${PREFIX}/lib instead of ${PREFIX}/lib/tsocks
Summary: Update port: net/tsocks - Fix tsocks wrapper and install libtsocks.so in ${PR...
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2004-09-04 23:10 UTC by Florent Thoumie
Modified: 2004-09-06 11:38 UTC (History)
0 users

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Florent Thoumie 2004-09-04 23:10:21 UTC 
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}.

Fix: --- tsocks.diff begins here. ---



--- tsocks.diff ends here. -----QVji6ws5QO0oUiBiFimZ3pWdlelTuL4aJXl66BlUpnrRs1qH
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

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
How-To-Repeat: 
Try tsocks <cmd>
Comment 1 Oliver Eikemeier freebsd_committer freebsd_triage 2004-09-05 03:14:35 UTC 
State Changed
From-To: open->feedback

Asked maintainer for review.
Comment 2 Oliver Eikemeier 2004-09-05 03:17:57 UTC 
Dear maintainer,

could you please review the patch contained in PR 71383:
   <http://www.freebsd.org/cgi/query-pr.cgi?pr=71383>

Thanks
-Oliver
Comment 3 Oliver Eikemeier freebsd_committer freebsd_triage 2004-09-06 11:38:32 UTC 
State Changed
From-To: feedback->closed

Committed, thanks!