Date: Wed, 16 Oct 2013 01:10:29 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330468 - in head/astro/libosmpbf: . files Message-ID: <201310160110.r9G1AToG042915@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk> +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 <bsd.port.mk> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310160110.r9G1AToG042915>