From owner-svn-ports-all@FreeBSD.ORG Wed Oct 16 01:10:29 2013 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 ESMTP id E96F66A0; Wed, 16 Oct 2013 01:10:29 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BD2DC24C7; Wed, 16 Oct 2013 01:10:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9G1ATBS042917; Wed, 16 Oct 2013 01:10:29 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9G1AToG042915; Wed, 16 Oct 2013 01:10:29 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201310160110.r9G1AToG042915@svn.freebsd.org> From: Dmitry Marakasov Date: Wed, 16 Oct 2013 01:10:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330468 - in head/astro/libosmpbf: . files 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.14 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: Wed, 16 Oct 2013 01:10:30 -0000 Author: amdmi3 Date: Wed Oct 16 01:10:29 2013 New Revision: 330468 URL: http://svnweb.freebsd.org/changeset/ports/330468 Log: - Support staging - Use new LIB_DEPENDS syntax Modified: head/astro/libosmpbf/Makefile head/astro/libosmpbf/files/patch-src-Makefile Modified: head/astro/libosmpbf/Makefile ============================================================================== --- head/astro/libosmpbf/Makefile Wed Oct 16 00:59:26 2013 (r330467) +++ head/astro/libosmpbf/Makefile Wed Oct 16 01:10:29 2013 (r330468) @@ -10,7 +10,7 @@ COMMENT= Library for handling binary Ope LICENSE= GPLv3 -LIB_DEPENDS= protobuf:${PORTSDIR}/devel/protobuf +LIB_DEPENDS= libprotobuf.so:${PORTSDIR}/devel/protobuf USE_GITHUB= yes GH_ACCOUNT= scrosby @@ -18,7 +18,6 @@ GH_PROJECT= OSM-binary GH_TAGNAME= v${PORTVERSION} GH_COMMIT= d9be2d1 -NO_STAGE= yes USES= gmake BUILD_WRKSRC= ${WRKSRC}/src INSTALL_WRKSRC= ${WRKSRC}/src @@ -27,12 +26,11 @@ CXXFLAGS+= -I${LOCALBASE}/include PORTDOCS= * -.include +OPTIONS_DEFINE= DOCS +OPTIONS_DEFAULT=DOCS -.if ${PORT_OPTIONS:MDOCS} post-install: - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/ -.endif + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/ .include Modified: head/astro/libosmpbf/files/patch-src-Makefile ============================================================================== --- head/astro/libosmpbf/files/patch-src-Makefile Wed Oct 16 00:59:26 2013 (r330467) +++ head/astro/libosmpbf/files/patch-src-Makefile Wed Oct 16 01:10:29 2013 (r330468) @@ -19,12 +19,12 @@ - install -m 644 -g root -o root ../include/osmpbf/osmpbf.h $(DESTDIR)/usr/include/osmpbf - install -m 644 -g root -o root ../include/osmpbf/fileformat.pb.h $(DESTDIR)/usr/include/osmpbf - install -m 644 -g root -o root ../include/osmpbf/osmformat.pb.h $(DESTDIR)/usr/include/osmpbf -+ install -m 755 -d $(PREFIX)/lib -+ install -m 644 libosmpbf.a $(PREFIX)/lib -+ install -m 755 -d $(PREFIX)/include/osmpbf -+ install -m 644 ../include/osmpbf/osmpbf.h $(PREFIX)/include/osmpbf -+ install -m 644 ../include/osmpbf/fileformat.pb.h $(PREFIX)/include/osmpbf -+ install -m 644 ../include/osmpbf/osmformat.pb.h $(PREFIX)/include/osmpbf ++ install -m 755 -d $(DESTDIR)$(PREFIX)/lib ++ install -m 644 libosmpbf.a $(DESTDIR)$(PREFIX)/lib ++ install -m 755 -d $(DESTDIR)$(PREFIX)/include/osmpbf ++ install -m 644 ../include/osmpbf/osmpbf.h $(DESTDIR)$(PREFIX)/include/osmpbf ++ install -m 644 ../include/osmpbf/fileformat.pb.h $(DESTDIR)$(PREFIX)/include/osmpbf ++ install -m 644 ../include/osmpbf/osmformat.pb.h $(DESTDIR)$(PREFIX)/include/osmpbf clean: rm -f *.pb.h *.pb.cc *.pb.o libosmpbf.a