From owner-svn-ports-all@FreeBSD.ORG Mon Apr 28 09:34:40 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2DBE6FD; Mon, 28 Apr 2014 09:34:40 +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 1A7FB120C; Mon, 28 Apr 2014 09:34:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3S9YdAb052520; Mon, 28 Apr 2014 09:34:39 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3S9YdFx052518; Mon, 28 Apr 2014 09:34:39 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201404280934.s3S9YdFx052518@svn.freebsd.org> From: Pawel Pekala Date: Mon, 28 Apr 2014 09:34:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352477 - head/graphics/openrm 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.17 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: Mon, 28 Apr 2014 09:34:40 -0000 Author: pawel Date: Mon Apr 28 09:34:39 2014 New Revision: 352477 URL: http://svnweb.freebsd.org/changeset/ports/352477 QAT: https://qat.redports.org/buildarchive/r352477/ Log: - Add staging support - Convert to new LIB_DEPENDS format Modified: head/graphics/openrm/Makefile Modified: head/graphics/openrm/Makefile ============================================================================== --- head/graphics/openrm/Makefile Mon Apr 28 09:21:00 2014 (r352476) +++ head/graphics/openrm/Makefile Mon Apr 28 09:34:39 2014 (r352477) @@ -12,11 +12,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${ MAINTAINER= ports@FreeBSD.org COMMENT= Development environment used to build 2D/3D/stereo graphics -LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg - -OPTIONS_DEFINE= DOCS EXAMPLES - -WRKSRC= ${WRKDIR}/rm${PORTVERSION:R:S/.//g} +LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg USES= shebangfix perl5 SHEBANG_FILES= doc/*.pl @@ -32,6 +28,7 @@ MAKE_ARGS= AR="${AR}" \ RM="${RM}" \ STRIP_CMD="${STRIP_CMD}" \ X11BASE="${LOCALBASE}" +WRKSRC= ${WRKDIR}/rm${PORTVERSION:R:S/.//g} USE_LDCONFIG= yes MAKE_JOBS_UNSAFE=yes @@ -40,7 +37,8 @@ CFLAGS+= -fPIC -DPIC PORTDOCS= * PORTEXAMPLES= * -NO_STAGE= yes +OPTIONS_DEFINE= DOCS EXAMPLES + .include .if ${PORT_OPTIONS:MEXAMPLES} @@ -67,35 +65,24 @@ post-patch: .endif do-install: -# install includes - @${MKDIR} ${PREFIX}/include/rm - ${INSTALL_DATA} ${WRKSRC}/include/rm/*.h ${PREFIX}/include/rm -# install libraries + @${MKDIR} ${STAGEDIR}${PREFIX}/include/rm + ${INSTALL_DATA} ${WRKSRC}/include/rm/*.h ${STAGEDIR}${PREFIX}/include/rm .for f in librm librmaux librmi librmv - ${INSTALL_DATA} ${WRKSRC}/lib/${f}.a ${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/lib/${f}.so.1 ${PREFIX}/lib - ${LN} -fs ${f}.so.1 ${PREFIX}/lib/${f}.so + ${INSTALL_DATA} ${WRKSRC}/lib/${f}.a ${STAGEDIR}${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/lib/${f}.so.1 ${STAGEDIR}${PREFIX}/lib + ${LN} -fs ${f}.so.1 ${STAGEDIR}${PREFIX}/lib/${f}.so .endfor -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/FUTUREPLANS ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/RELEASENOTES ${DOCSDIR} - @${MKDIR} ${DOCSDIR}/HTML - ${INSTALL_DATA} ${WRKSRC}/doc/HTML/*.html ${DOCSDIR}/HTML - @${MKDIR} ${DOCSDIR}/HTML/images - ${INSTALL_DATA} ${WRKSRC}/doc/HTML/images/* ${DOCSDIR}/HTML/images -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR}/HTML/images + (cd ${WRKSRC} && ${INSTALL_DATA} FUTUREPLANS README RELEASENOTES \ + ${STAGEDIR}${DOCSDIR}) + ${INSTALL_DATA} ${WRKSRC}/doc/HTML/*.html ${STAGEDIR}${DOCSDIR}/HTML + ${INSTALL_DATA} ${WRKSRC}/doc/HTML/images/* \ + ${STAGEDIR}${DOCSDIR}/HTML/images .if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${DEMO_WRKSRC}/README ${EXAMPLESDIR} - ${INSTALL_DATA} ${DEMO_WRKSRC}/configure ${EXAMPLESDIR} - ${INSTALL_DATA} ${DEMO_WRKSRC}/makeinclude ${EXAMPLESDIR} - ${INSTALL_DATA} ${DEMO_WRKSRC}/Makefile.x11 ${EXAMPLESDIR} - ${INSTALL_DATA} ${DEMO_WRKSRC}/*.c ${EXAMPLESDIR} - ${INSTALL_DATA} ${DEMO_WRKSRC}/*.h ${EXAMPLESDIR} - @${MKDIR} ${EXAMPLESDIR}/data - ${INSTALL_DATA} ${DEMO_WRKSRC}/data/* ${EXAMPLESDIR}/data + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/data + (cd ${DEMO_WRKSRC} && ${INSTALL_DATA} README configure makeinclude \ + Makefile.x11 *.c *.h ${STAGEDIR}${EXAMPLESDIR}) + ${INSTALL_DATA} ${DEMO_WRKSRC}/data/* ${STAGEDIR}${EXAMPLESDIR}/data .endif .include