Date: Mon, 24 Feb 2014 18:46:38 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345890 - in head/net-p2p: rtorrent rtorrent-devel Message-ID: <201402241846.s1OIkc4a059269@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Mon Feb 24 18:46:37 2014 New Revision: 345890 URL: http://svnweb.freebsd.org/changeset/ports/345890 QAT: https://qat.redports.org/buildarchive/r345890/ Log: - Stage support - New LIB_DEPENDS syntax Modified: head/net-p2p/rtorrent-devel/Makefile head/net-p2p/rtorrent/Makefile Modified: head/net-p2p/rtorrent-devel/Makefile ============================================================================== --- head/net-p2p/rtorrent-devel/Makefile Mon Feb 24 18:44:16 2014 (r345889) +++ head/net-p2p/rtorrent-devel/Makefile Mon Feb 24 18:46:37 2014 (r345890) @@ -12,7 +12,7 @@ COMMENT= BitTorrent Client written in C+ BUILD_DEPENDS= libtorrent-devel=0.13.3_1:${PORTSDIR}/net-p2p/libtorrent-devel RUN_DEPENDS= libtorrent-devel=0.13.3_1:${PORTSDIR}/net-p2p/libtorrent-devel -LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl +LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl CONFLICTS= rtorrent-[0-9]* @@ -26,25 +26,24 @@ SUB_FILES= pkg-message PORTDOCS= README OPTIONS_DEFINE= XMLRPC IPV6 DOCS -OPTIONS_DEFAULT= XMLRPC IPV6 +OPTIONS_DEFAULT= XMLRPC XMLRPC_DESC= Compile with xmlrpc-c support -NO_STAGE= yes -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if ${ARCH} == "arm" +.if ${ARCH} == arm BROKEN= Does not configure on arm .endif # Workaround to build and segfault on > 10.x -.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1000000 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 USE_GCC= yes LDFLAGS+= -lc++ .endif .if ${PORT_OPTIONS:MXMLRPC} CONFIGURE_ARGS+= --with-xmlrpc-c -LIB_DEPENDS+= xmlrpc:${PORTSDIR}/net/xmlrpc-c-devel +LIB_DEPENDS+= libxmlrpc.so:${PORTSDIR}/net/xmlrpc-c-devel .else CONFIGURE_ARGS+= --with-xmlrpc-c=no .endif @@ -57,12 +56,9 @@ post-patch: @${REINPLACE_CMD} -e 's|-O3|${CFLAGS}|' ${WRKSRC}/configure post-install: - ${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/rtorrent.rc ${EXAMPLESDIR}/ -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR}/ -.endif - @${CAT} ${PKGMESSAGE} + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/rtorrent.rc ${STAGEDIR}${EXAMPLESDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/net-p2p/rtorrent/Makefile ============================================================================== --- head/net-p2p/rtorrent/Makefile Mon Feb 24 18:44:16 2014 (r345889) +++ head/net-p2p/rtorrent/Makefile Mon Feb 24 18:46:37 2014 (r345890) @@ -11,7 +11,7 @@ COMMENT= BitTorrent Client written in C+ BUILD_DEPENDS= libtorrent=0.13.2_1:${PORTSDIR}/net-p2p/libtorrent RUN_DEPENDS= libtorrent=0.13.2_1:${PORTSDIR}/net-p2p/libtorrent -LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl +LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl CONFLICTS= rtorrent-devel-[0-9]* @@ -25,25 +25,24 @@ SUB_FILES= pkg-message PORTDOCS= README OPTIONS_DEFINE= XMLRPC IPV6 DOCS -OPTIONS_DEFAULT= XMLRPC IPV6 +OPTIONS_DEFAULT= XMLRPC XMLRPC_DESC= Compile with xmlrpc-c support -NO_STAGE= yes -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if ${ARCH} == "arm" +.if ${ARCH} == arm BROKEN= Does not configure on arm .endif # Workaround to build and segfault on > 10.x -.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1000000 -USE_GCC= yes +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 +USE_GCC= yes LDFLAGS+= -lc++ .endif .if ${PORT_OPTIONS:MXMLRPC} CONFIGURE_ARGS+= --with-xmlrpc-c -LIB_DEPENDS+= xmlrpc.3:${PORTSDIR}/net/xmlrpc-c-devel +LIB_DEPENDS+= libxmlrpc.so:${PORTSDIR}/net/xmlrpc-c-devel .else CONFIGURE_ARGS+= --with-xmlrpc-c=no .endif @@ -56,12 +55,9 @@ post-patch: @${REINPLACE_CMD} -e 's|-O3|${CFLAGS}|' ${WRKSRC}/configure post-install: - ${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/rtorrent.rc ${EXAMPLESDIR}/ -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR}/ -.endif - @${CAT} ${PKGMESSAGE} + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/rtorrent.rc ${STAGEDIR}${EXAMPLESDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402241846.s1OIkc4a059269>