- Fix missing library problems when the linker enforces explicit linking

PR:		192062
Exp-run by:	antoine
Approved by:	portmgr (antoine)

7 files changed, 31 insertions, 46 deletions

diff --git a/net-p2p/createtorrent/Makefile b/net-p2p/createtorrent/Makefile
index f7f99cb537d1..1d42535da993 100644
--- a/net-p2p/createtorrent/Makefile
+++ b/net-p2p/createtorrent/Makefile
@@ -16,6 +16,9 @@ USE_OPENSSL=	yes
 
 PLIST_FILES=	bin/createtorrent
 
+post-patch:
+	@${REINPLACE_CMD} 's/-lssl/-lcrypto/' ${WRKSRC}/configure
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
diff --git a/net-p2p/gtorrentviewer/Makefile b/net-p2p/gtorrentviewer/Makefile
index e760be40bf47..60403528b9e1 100644
--- a/net-p2p/gtorrentviewer/Makefile
+++ b/net-p2p/gtorrentviewer/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	gtorrentviewer
 PORTVERSION=	0.2b
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF/${PORTNAME}/GTorrentViewer/${PORTVERSION}
 DISTNAME=	GTorrentViewer-${PORTVERSION}
@@ -13,33 +13,21 @@ MAINTAINER=	5u623l20@gmail.com
 COMMENT=	GTK+2 viewer and editor for BitTorrent meta files
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 
-USE_GNOME=	gtk20 gnomehier intlhack
 USES=		gmake pkgconfig
+USE_GNOME=	gtk20 gnomehier intlhack
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-pixmapsdir=${PREFIX}/share/pixmaps \
 		--with-desktopdir=${PREFIX}/share/applications
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib -lm
 
 PORTSCOUT=	skipv:0.2	# older than current version
 
-OPTIONS_DEFINE=	DOCS
-
-DOCS=		AUTHORS COPYING ChangeLog README
-
-.include <bsd.port.options.mk>
 post-patch:
 	@${REINPLACE_CMD} -e '/<curl\/types.h>/d' ${WRKSRC}/src/main.c
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
-.endfor
-.endif
-
 .include <bsd.port.mk>
diff --git a/net-p2p/gtorrentviewer/pkg-plist b/net-p2p/gtorrentviewer/pkg-plist
index 7b2ac0d181f8..686a2da77bad 100644
--- a/net-p2p/gtorrentviewer/pkg-plist
+++ b/net-p2p/gtorrentviewer/pkg-plist
@@ -13,13 +13,8 @@ share/GTorrentViewer/pixmaps/ok.png
 share/GTorrentViewer/pixmaps/string.png
 share/GTorrentViewer/pixmaps/unknown.png
 share/GTorrentViewer/pixmaps/warning.png
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README
 share/applications/gtorrentviewer.desktop
 share/pixmaps/gtorrentviewer.png
 share/pixmaps/gtorrentviewer.xpm
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/GTorrentViewer/pixmaps
 @dirrm share/GTorrentViewer
diff --git a/net-p2p/libbt/Makefile b/net-p2p/libbt/Makefile
index bbca2c125ac3..23e582002e14 100644
--- a/net-p2p/libbt/Makefile
+++ b/net-p2p/libbt/Makefile
@@ -23,6 +23,7 @@ PORTDOCS=	protocol-ext.txt protocol.txt
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|depend||' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|-lssl|-lcrypto|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|\(CFLAGS:=\)|\1\@CFLAGS\@ \@CPPFLAGS\@ |' ${WRKSRC}/src/Makefile.in
 
 do-install:
diff --git a/net-p2p/retroshare/Makefile b/net-p2p/retroshare/Makefile
index 4536654e743c..7d3de3abf105 100644
--- a/net-p2p/retroshare/Makefile
+++ b/net-p2p/retroshare/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	retroshare
 PORTVERSION=	0.5.5c
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=${PORTNAME}/${BINARY}/${PORTVERSION}
@@ -14,29 +14,17 @@ COMMENT=	Private and secure decentralised communication platform
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	protoc:${PORTSDIR}/devel/protobuf \
-		pkg-config:${PORTSDIR}/devel/pkgconf
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
-		libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
-		libpcre.so:${PORTSDIR}/devel/pcre \
+BUILD_DEPENDS=	protoc:${PORTSDIR}/devel/protobuf
+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
 		libupnp.so:${PORTSDIR}/devel/upnp \
-		libpng15.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libassuan.so:${PORTSDIR}/security/libassuan \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
 		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \
-		libgpg-error.so:${PORTSDIR}/security/libgpg-error \
-		libgpgme.so:${PORTSDIR}/security/gpgme \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
 		libspeex.so:${PORTSDIR}/audio/speex \
 		libxslt.so:${PORTSDIR}/textproc/libxslt \
 		libssh_threads.so:${PORTSDIR}/security/libssh
-RUN_DEPENDS=	pinentry-qt4:${PORTSDIR}/security/pinentry-qt4
 
-USES=		compiler:features dos2unix qmake
-USE_GNOME=	glib20
-USE_XORG=	ice sm x11 xau xcb xdmcp xext xrender
+USES=		compiler:features dos2unix pkgconfig qmake
+USE_GNOME=	glib20 libxml2 libxslt
+USE_XORG=	x11 xscrnsaver
 USE_QT4=	corelib gui network xml script designer_build uic_build \
 		qmake_build moc_build rcc_build multimedia
 HAS_CONFIGURE=	yes
diff --git a/net-p2p/retroshare/files/patch-retroshare-gui__src__retroshare-gui.pro b/net-p2p/retroshare/files/patch-retroshare-gui__src__retroshare-gui.pro
index c97372734ee0..6255e157257c 100644
--- a/net-p2p/retroshare/files/patch-retroshare-gui__src__retroshare-gui.pro
+++ b/net-p2p/retroshare/files/patch-retroshare-gui__src__retroshare-gui.pro
@@ -1,24 +1,29 @@
 --- retroshare-gui/src/retroshare-gui.pro.orig	2014-04-10 13:28:51.661832058 +0200
 +++ retroshare-gui/src/retroshare-gui.pro	2014-04-10 13:29:31.092831413 +0200
-@@ -215,17 +215,19 @@
+@@ -215,17 +215,22 @@ macx {
  freebsd-* {
  	INCLUDEPATH *= /usr/local/include/gpgme
  	LIBS *= ../../libretroshare/src/lib/libretroshare.a
 +	LIBS *= ../../openpgpsdk/src/lib/libops.a -lbz2
  	LIBS *= -lssl
- 	LIBS *= -lgpgme
+-	LIBS *= -lgpgme
 -	LIBS *= -lupnp
++	LIBS *= -lcrypto
++	LIBS *= -lz
 +	LIBS *= -lupnp -lixml
++	LIBS *= -lXss -lX11
  	LIBS *= -lgnome-keyring
  	PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
 +	PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a
  
          gxs {
                  LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
-                 LIBS += -lsqlite3
+-                LIBS += -lsqlite3
++                LIBS += ../../../lib/sqlcipher/.libs/libsqlcipher.a
          }
 -
 +	LIBS *= -rdynamic
++	DEFINES *= HAVE_XSS # for idle time, libx screensaver extensions
  }
  
  ##################################### OpenBSD ######################################
diff --git a/net-p2p/retroshare/files/patch-retroshare-nogui__src__retroshare-nogui.pro b/net-p2p/retroshare/files/patch-retroshare-nogui__src__retroshare-nogui.pro
index 90292c2c22e5..fd794a6492f8 100644
--- a/net-p2p/retroshare/files/patch-retroshare-nogui__src__retroshare-nogui.pro
+++ b/net-p2p/retroshare/files/patch-retroshare-nogui__src__retroshare-nogui.pro
@@ -1,21 +1,26 @@
 --- retroshare-nogui/src/retroshare-nogui.pro.orig	2014-04-10 14:14:22.622840778 +0200
 +++ retroshare-nogui/src/retroshare-nogui.pro	2014-04-10 14:14:55.384836372 +0200
-@@ -114,12 +114,16 @@
+@@ -114,12 +114,20 @@ macx {
  
  freebsd-* {
  	INCLUDEPATH *= /usr/local/include/gpgme
 +	QMAKE_CXXFLAGS *= -Dfseeko64=fseeko -Dftello64=ftello -Dstat64=stat -Dstatvfs64=statvfs -Dfopen64=fopen
  	LIBS *= ../../libretroshare/src/lib/libretroshare.a
 -	LIBS *= -lssl
+-	LIBS *= -lgpgme
+-	LIBS *= -lupnp
 +	LIBS *= ../../openpgpsdk/src/lib/libops.a -lbz2
 +	LIBS *= -lssl -lcrypto
- 	LIBS *= -lgpgme
--	LIBS *= -lupnp
++	LIBS *= -lz
 +	LIBS *= -lupnp -lixml
  	LIBS *= -lgnome-keyring
  	PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
 +	PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a
 +	LIBS *= -rdynamic
++	gxs {
++		# We need a explicit path here, to force using the home version
++		LIBS += ../../../lib/sqlcipher/.libs/libsqlcipher.a
++	}
  }
  
  ##################################### OpenBSD  ######################################