From owner-svn-ports-all@FreeBSD.ORG Fri Jun 27 18:39:58 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 49DC3B5C; Fri, 27 Jun 2014 18:39:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1DB622E5A; Fri, 27 Jun 2014 18:39:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5RIdv6X036796; Fri, 27 Jun 2014 18:39:57 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5RIdv88036795; Fri, 27 Jun 2014 18:39:57 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201406271839.s5RIdv88036795@svn.freebsd.org> From: Pawel Pekala Date: Fri, 27 Jun 2014 18:39:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359594 - head/net-p2p/liberator X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jun 2014 18:39:58 -0000 Author: pawel Date: Fri Jun 27 18:39:57 2014 New Revision: 359594 URL: http://svnweb.freebsd.org/changeset/ports/359594 QAT: https://qat.redports.org/buildarchive/r359594/ Log: - Add staging support - Convert to USES=tar:bzip2, USE_OCAML, new options framework Modified: head/net-p2p/liberator/Makefile Modified: head/net-p2p/liberator/Makefile ============================================================================== --- head/net-p2p/liberator/Makefile Fri Jun 27 18:31:19 2014 (r359593) +++ head/net-p2p/liberator/Makefile Fri Jun 27 18:39:57 2014 (r359594) @@ -11,12 +11,10 @@ DISTNAME= ofcp-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Command line client to FreeNet Network -MAKE_JOBS_UNSAFE= yes - -BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml - -USE_BZIP2= yes +USES= tar:bzip2 +USE_OCAML= yes ALL_TARGET= all opt +MAKE_JOBS_UNSAFE=yes DATA_FILES= liber_mimetypes DOC_FILES= COPYING FREESITE-HOWTO README TODO @@ -26,7 +24,8 @@ LIB_FILES= fcp.cma hlfi.cma asfi.cm fcp.cmi hlfreenet.cmi asfreenet.cmi fieldset.cmi \ fstream.cmi -NO_STAGE= yes +OPTIONS_DEFINE= DOCS + post-patch: @${SED} -e 's|%%PREFIX%%|${PREFIX}|; \ s|%%DATADIR%%|${DATADIR:S,^${PREFIX}/,,}|' \ @@ -39,26 +38,15 @@ do-configure: ${WRKSRC}/Makefile do-install: -# bin - @${INSTALL_PROGRAM} ${WRKSRC}/liber ${PREFIX}/bin/liber-real - @${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/liber -# data - @${MKDIR} ${DATADIR} -.for file in ${DATA_FILES} - @${INSTALL_DATA} ${WRKSRC}/${file} ${DATADIR} -.endfor -# doc -.ifndef(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR} -.for file in ${DOC_FILES} - ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} -.endfor -.endif -# lib - @${MKDIR} ${PREFIX}/lib/ocaml -.for file in ${LIB_FILES} - @${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/lib/ocaml -.endfor + ${INSTALL_PROGRAM} ${WRKSRC}/liber ${STAGEDIR}${PREFIX}/bin/liber-real + ${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${STAGEDIR}${PREFIX}/bin/liber + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${DATA_FILES:S|^|${WRKSRC}/|} ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${DOC_FILES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/ocaml + ${INSTALL_DATA} ${LIB_FILES:S|^|${WRKSRC}/|} \ + ${STAGEDIR}${PREFIX}/lib/ocaml .include