diff options
| author | amdmi3 <amdmi3@FreeBSD.org> | 2013-10-16 09:10:29 +0800 |
|---|---|---|
| committer | amdmi3 <amdmi3@FreeBSD.org> | 2013-10-16 09:10:29 +0800 |
| commit | af244903aee1879aad5b3af92e8c629d6d8616d5 (patch) | |
| tree | 08858ba566c4369f173525392a8bfbccb833eb9c /astro/libosmpbf | |
| parent | b88dd272659eca8535b50556379d374675a62ddd (diff) | |
| download | freebsd-ports-gnome-af244903aee1879aad5b3af92e8c629d6d8616d5.tar.gz freebsd-ports-gnome-af244903aee1879aad5b3af92e8c629d6d8616d5.tar.zst freebsd-ports-gnome-af244903aee1879aad5b3af92e8c629d6d8616d5.zip | |
- Support staging
- Use new LIB_DEPENDS syntax
Diffstat (limited to 'astro/libosmpbf')
| -rw-r--r-- | astro/libosmpbf/Makefile | 12 | ||||
| -rw-r--r-- | astro/libosmpbf/files/patch-src-Makefile | 12 |
2 files changed, 11 insertions, 13 deletions
diff --git a/astro/libosmpbf/Makefile b/astro/libosmpbf/Makefile index 06b28e9088fd..7fd27c44c637 100644 --- a/astro/libosmpbf/Makefile +++ b/astro/libosmpbf/Makefile @@ -10,7 +10,7 @@ COMMENT= Library for handling binary OpenStreetMap data 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> diff --git a/astro/libosmpbf/files/patch-src-Makefile b/astro/libosmpbf/files/patch-src-Makefile index 94efec6ebf1f..99a8a1bb0523 100644 --- a/astro/libosmpbf/files/patch-src-Makefile +++ b/astro/libosmpbf/files/patch-src-Makefile @@ -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 |