Date: Thu, 28 Aug 2014 21:37:55 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366457 - in head: devel/subversion devel/subversion/files www/serf www/serf/files Message-ID: <201408282137.s7SLbtq2007075@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Thu Aug 28 21:37:54 2014 New Revision: 366457 URL: http://svnweb.freebsd.org/changeset/ports/366457 QAT: https://qat.redports.org/buildarchive/r366457/ Log: - In www/serf move libssl and libcrypto from Requires.private to Libs.private in serf-1.pc such that subversion-static can use "pkg-config --static" instead of requiring a .la file - Remove an old libtool patch from devel/subversion Approved by: ohauer Deleted: head/devel/subversion/files/patch-build--ltmain.sh head/www/serf/files/libserf-1.la.in Modified: head/devel/subversion/Makefile.common head/www/serf/Makefile head/www/serf/pkg-plist Modified: head/devel/subversion/Makefile.common ============================================================================== --- head/devel/subversion/Makefile.common Thu Aug 28 21:21:57 2014 (r366456) +++ head/devel/subversion/Makefile.common Thu Aug 28 21:37:54 2014 (r366457) @@ -50,10 +50,10 @@ SASL_CONFIGURE_ON= --with-sasl=${LOCALB SASL_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 SERF_CONFIGURE_OFF= --without-serf -SERF_CONFIGURE_ON= --with-serf=${LOCALBASE} +SERF_CONFIGURE_ON= --with-serf SERF_LIB_DEPENDS= libserf-1.so:${PORTSDIR}/www/serf -STATIC_CONFIGURE_ON= --enable-all-static +STATIC_CONFIGURE_ON= --enable-all-static PKG_CONFIG="${LOCALBASE}/bin/pkg-config --static" # =============================================================== .include <bsd.port.options.mk> Modified: head/www/serf/Makefile ============================================================================== --- head/www/serf/Makefile Thu Aug 28 21:21:57 2014 (r366456) +++ head/www/serf/Makefile Thu Aug 28 21:37:54 2014 (r366457) @@ -3,6 +3,7 @@ PORTNAME= serf PORTVERSION= 1.3.7 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://serf.googlecode.com/svn/src_releases/ @@ -17,9 +18,6 @@ USES= scons tar:bzip2 USE_OPENSSL= yes USE_LDCONFIG= yes -# support for subversion-static, -SUB_FILES= libserf-1.la - OPTIONS_DEFINE= DOCS GSSAPI SCONS_ARGS= APR=${LOCALBASE}/bin/apr-1-config @@ -43,12 +41,14 @@ do-install: @(cd ${WRKSRC} && ${SENTENV} ${MAKE_CMD} ${SCONS_ARGS} ${INSTALL_TARGET}) post-patch: - @${REINPLACE_CMD} -e '/^Requires.private/d' ${WRKSRC}/build/serf.pc.in + @${REINPLACE_CMD} -E \ + -e '/^Requires.private/s/(libssl|libcrypto)//g' \ + -e '/^Libs.private/s|$$| -L${OPENSSLLIB} -lssl -lcrypto|' \ + ${WRKSRC}/build/serf.pc.in post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/design-guide.txt ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${SUB_FILES:S|^|${WRKDIR}/|} ${STAGEDIR}${PREFIX}/lib ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libserf-1.so regression-test check: build Modified: head/www/serf/pkg-plist ============================================================================== --- head/www/serf/pkg-plist Thu Aug 28 21:21:57 2014 (r366456) +++ head/www/serf/pkg-plist Thu Aug 28 21:37:54 2014 (r366457) @@ -2,7 +2,6 @@ include/serf-1/serf.h include/serf-1/serf_bucket_types.h include/serf-1/serf_bucket_util.h lib/libserf-1.a -lib/libserf-1.la lib/libserf-1.so lib/libserf-1.so.1 lib/libserf-1.so.1.3.0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408282137.s7SLbtq2007075>