[kde-freebsd] ports/181212: [patch] textproc/redland: add ftp/curl dependency

Fri Aug 23 19:10:01 UTC 2013

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

From: Tijl Coosemans <tijl at coosemans.org>
To: Boris Samorodov <bsam at passap.ru>
Cc: bug-followup at FreeBSD.org, bsam at FreeBSD.org,
        Raphael Kubo da Costa
 <rakuco at FreeBSD.org>
Subject: Re: ports/181212: [patch] textproc/redland: add ftp/curl dependency
Date: Fri, 23 Aug 2013 21:01:43 +0200

 --Sig_/baJ4WDSlNEJDraIY+0HX41S
 Content-Type: multipart/mixed; boundary="MP_/.n1UqPOeXL8=1GgkBPKJodM"

 --MP_/.n1UqPOeXL8=1GgkBPKJodM
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: inline

 On Fri, 23 Aug 2013 14:52:16 +0400 Boris Samorodov wrote:
 > 23.08.2013 13:23, Tijl Coosemans =D0=BF=D0=B8=D1=88=D0=B5=D1=82:
 >> I think the bug is in the raptor2.pc pkgconfig file. Where it says
 >=20
 > OK, are you saying that current situation is not tolerable and
 > we should change something?

 I found this PR because I also had the problem with libcurl. So yes
 something should change in my opinion.

 >> Requires: libcurl >=3D 7.12.0, libxml-2.0 >=3D 2.6.8
 >>=20
 >> that should be Requires.private as recommended for instance by
 >> http://people.freedesktop.org/~dbn/pkg-config-guide.html
 >=20
 > After some reading I tend to agree with you.
 >=20
 > However the fix won't change anything at FreeBSD case,
 > since the libtool is used to compile raptor2 and redland.
 > And it is libtool which is linking with all recursive
 > dependencies at FreeBSD.

 Ah yes. Using Requires.private does seem to fix librdf.so though.
 Executables like rdfproc still link with libcurl, but fixing the
 library is at least an improvement.

 To fix the executables you can add something like this to the redland
 Makefile:

 post-configure:
 	@${REINPLACE_CMD} -e '/^link_all_deplibs=3D/s/=3D.*/=3Dno/' \
 		${WRKSRC}/libtool

 But I wonder if this should perhaps be turned into a new USES such that
 other ports can use it as well.

 I've attached a patch for both textproc/raptor2 and textproc/redland.
 The redland patch contains some unrelated changes:
 - gnomehack -> pathfix
 - remove libxml2 and openssl dependencies
 - remove lthack (doesn't have any effect)
 - perl5, gmake -> USES
 - remove --with-raptor=3Dsystem (doesn't have any effect)

 --MP_/.n1UqPOeXL8=1GgkBPKJodM
 Content-Type: text/x-patch
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: attachment; filename=rdf.patch

 Index: textproc/raptor2/Makefile
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- textproc/raptor2/Makefile	(revision 325259)
 +++ textproc/raptor2/Makefile	(working copy)
 @@ -3,7 +3,7 @@
 =20
  PORTNAME=3D	raptor2
  PORTVERSION=3D	2.0.9
 -PORTREVISION=3D	1
 +PORTREVISION=3D	2
  CATEGORIES=3D	textproc
  MASTER_SITES=3D	http://download.librdf.org/source/ \
  		SF/librdf/${PORTNAME}/${PORTVERSION}
 @@ -31,4 +31,8 @@ USE_LDCONFIG=3D	yes
  MAN1=3D		rapper.1
  MAN3=3D		libraptor2.3
 =20
 +post-patch:
 +	@${REINPLACE_CMD} -e 's/Requires:/Requires.private:/' \
 +		 ${WRKSRC}/raptor2.pc.in
 +
  .include <bsd.port.mk>
 Index: textproc/redland/Makefile
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- textproc/redland/Makefile	(revision 325259)
 +++ textproc/redland/Makefile	(working copy)
 @@ -3,6 +3,7 @@
 =20
  PORTNAME=3D	redland
  PORTVERSION=3D	1.0.16
 +PORTREVISION=3D	1
  CATEGORIES=3D	textproc
  MASTER_SITES=3D	http://download.librdf.org/source/
 =20
 @@ -13,14 +14,10 @@ LIB_DEPENDS=3D	raptor2:${PORTSDIR}/textpro
  		rasqal:${PORTSDIR}/textproc/rasqal
 =20
  USE_AUTOTOOLS=3D	libltdl
 -USE_GNOME=3D	gnomehack libxml2 lthack
 -USE_OPENSSL=3D	yes
 -USE_PERL5_BUILD=3D	yes
 -USES=3D		pkgconfig:both
 +USES=3D		gmake pathfix perl5 pkgconfig:both
 +USE_PERL5=3D	build
  GNU_CONFIGURE=3D	yes
 -CONFIGURE_ARGS=3D	--with-raptor=3Dsystem \
 -		--with-threestore=3Dno
 -USE_GMAKE=3D	yes
 +CONFIGURE_ARGS=3D	--with-threestore=3Dno
  USE_LDCONFIG=3D	yes
 =20
  MAN1=3D		rdfproc.1 redland-config.1 \
 @@ -100,4 +97,7 @@ pre-everything::
  	@${ECHO_CMD} "and set WITH_MYSQL_VER to the desired version"
  .	endif
 =20
 +post-configure:
 +	@${REINPLACE_CMD} -e '/^link_all_deplibs=3D/s/=3D.*/=3Dno/' ${WRKSRC}/lib=
 tool
 +
  .include <bsd.port.mk>

 --MP_/.n1UqPOeXL8=1GgkBPKJodM--

 --Sig_/baJ4WDSlNEJDraIY+0HX41S
 Content-Type: application/pgp-signature; name=signature.asc
 Content-Disposition: attachment; filename=signature.asc

 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (FreeBSD)

 iF4EAREIAAYFAlIXsZ0ACgkQfoCS2CCgtiszhAD+NgQlXkBg6rvv1e+2xXK8g3+e
 ydYKhSSDrepPZCdXIxUA/ir/D5CP3pE96iuU/kGuB/PNpwGi+1oqw5UZEk0lZSPN
 =HqCj
 -----END PGP SIGNATURE-----

 --Sig_/baJ4WDSlNEJDraIY+0HX41S--