Date: Mon, 11 Aug 2014 18:08:33 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364632 - in head/devel/libosmocore: . files Message-ID: <53e906a2.2490.2d7fd4db@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Mon Aug 11 18:08:33 2014 New Revision: 364632 URL: http://svnweb.freebsd.org/changeset/ports/364632 QAT: https://qat.redports.org/buildarchive/r364632/ Log: devel/libosmocore: cleanup port - fix build dependencies - make DOCS optional and default-off - now builds on 8.4 and 9.1 PR: 191877 Submitted by: Nikola Kolev <koue@chaosophia.net> Added: head/devel/libosmocore/files/patch-Makefile.am (contents, props changed) Modified: head/devel/libosmocore/Makefile head/devel/libosmocore/files/patch-Doxyfile.codec.in head/devel/libosmocore/files/patch-Doxyfile.core.in head/devel/libosmocore/files/patch-Doxyfile.gsm.in head/devel/libosmocore/files/patch-Doxyfile.vty.in Modified: head/devel/libosmocore/Makefile ============================================================================== --- head/devel/libosmocore/Makefile Mon Aug 11 17:42:43 2014 (r364631) +++ head/devel/libosmocore/Makefile Mon Aug 11 18:08:33 2014 (r364632) @@ -12,27 +12,36 @@ COMMENT= Common library for all Osmocom LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +USES= gmake libtool pkgconfig execinfo USE_AUTOTOOLS= aclocal autoconf automake libtoolize autoheader AUTOMAKE_ARGS= --gnu --add-missing --copy - -USES= gmake libtool -LDFLAGS+= -lexecinfo +LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo USE_LDCONFIG= yes INSTALL_TARGET= install-strip +OPTIONS_DEFINE= DOCS +DOCS_DESC= Build documentation +OPTIONS_UNSET= DOCS + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MDOCS} BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen \ dot:${PORTSDIR}/graphics/graphviz +.endif post-patch: ${REINPLACE_CMD} -e 's|pkgconfigdir.*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g' \ ${WRKSRC}/Makefile.am ${ECHO_CMD} ${PORTVERSION} > ${WRKSRC}/.tarball-version +.if ${PORT_OPTIONS:MDOCS} post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in codec core gsm vty ${FIND} ${WRKSRC}/doc/${i}/html -not -type d | ${SED} \ 's,^${WRKSRC}/doc/${i}/html,${DOCSDIR_REL}/${i}/html,' >> ${TMPPLIST} .endfor +.endif .include <bsd.port.mk> Modified: head/devel/libosmocore/files/patch-Doxyfile.codec.in ============================================================================== --- head/devel/libosmocore/files/patch-Doxyfile.codec.in Mon Aug 11 17:42:43 2014 (r364631) +++ head/devel/libosmocore/files/patch-Doxyfile.codec.in Mon Aug 11 18:08:33 2014 (r364632) @@ -1,5 +1,5 @@ --- ./Doxyfile.codec.in.orig 2014-03-31 15:40:46.000000000 +0200 -+++ ./Doxyfile.codec.in 2014-08-10 08:28:34.000000000 +0200 ++++ ./Doxyfile.codec.in 2014-08-11 15:10:30.000000000 +0200 @@ -1,109 +1,129 @@ -# Doxyfile 1.7.4 +# Doxyfile 1.8.7 Modified: head/devel/libosmocore/files/patch-Doxyfile.core.in ============================================================================== --- head/devel/libosmocore/files/patch-Doxyfile.core.in Mon Aug 11 17:42:43 2014 (r364631) +++ head/devel/libosmocore/files/patch-Doxyfile.core.in Mon Aug 11 18:08:33 2014 (r364632) @@ -1,5 +1,5 @@ --- ./Doxyfile.core.in.orig 2014-03-31 15:40:46.000000000 +0200 -+++ ./Doxyfile.core.in 2014-08-10 08:27:43.000000000 +0200 ++++ ./Doxyfile.core.in 2014-08-11 15:10:30.000000000 +0200 @@ -1,109 +1,129 @@ -# Doxyfile 1.7.4 +# Doxyfile 1.8.7 Modified: head/devel/libosmocore/files/patch-Doxyfile.gsm.in ============================================================================== --- head/devel/libosmocore/files/patch-Doxyfile.gsm.in Mon Aug 11 17:42:43 2014 (r364631) +++ head/devel/libosmocore/files/patch-Doxyfile.gsm.in Mon Aug 11 18:08:33 2014 (r364632) @@ -1,5 +1,5 @@ --- ./Doxyfile.gsm.in.orig 2014-03-31 15:40:46.000000000 +0200 -+++ ./Doxyfile.gsm.in 2014-08-10 08:29:31.000000000 +0200 ++++ ./Doxyfile.gsm.in 2014-08-11 15:10:30.000000000 +0200 @@ -1,109 +1,129 @@ -# Doxyfile 1.7.4 +# Doxyfile 1.8.7 Modified: head/devel/libosmocore/files/patch-Doxyfile.vty.in ============================================================================== --- head/devel/libosmocore/files/patch-Doxyfile.vty.in Mon Aug 11 17:42:43 2014 (r364631) +++ head/devel/libosmocore/files/patch-Doxyfile.vty.in Mon Aug 11 18:08:33 2014 (r364632) @@ -1,5 +1,5 @@ --- ./Doxyfile.vty.in.orig 2014-03-31 15:40:46.000000000 +0200 -+++ ./Doxyfile.vty.in 2014-08-10 08:29:38.000000000 +0200 ++++ ./Doxyfile.vty.in 2014-08-11 15:10:30.000000000 +0200 @@ -1,109 +1,129 @@ -# Doxyfile 1.7.4 +# Doxyfile 1.8.7 Added: head/devel/libosmocore/files/patch-Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libosmocore/files/patch-Makefile.am Mon Aug 11 18:08:33 2014 (r364632) @@ -0,0 +1,45 @@ +--- ./Makefile.am.orig 2014-08-11 15:41:34.000000000 +0200 ++++ ./Makefile.am 2014-08-11 15:41:41.000000000 +0200 +@@ -15,42 +15,3 @@ + + EXTRA_DIST = git-version-gen + +-if HAVE_DOXYGEN +- +-html_DATA = $(top_builddir)/doc/html.tar +- +-$(html_DATA): $(top_builddir)/doc/core/html/index.html \ +- $(top_builddir)/doc/gsm/html/index.html \ +- $(top_builddir)/doc/vty/html/index.html \ +- $(top_builddir)/doc/codec/html/index.html +- cd $(top_builddir)/doc && tar cf html.tar */html +- +-$(top_builddir)/doc/core/html/index.html: $(SOURCES) Doxyfile.core +- @rm -rf doc/core +- mkdir -p doc/core +- $(DOXYGEN) Doxyfile.core +- +-$(top_builddir)/doc/gsm/html/index.html: $(SOURCES) Doxyfile.gsm +- @rm -rf doc/gsm +- mkdir -p doc/gsm +- $(DOXYGEN) Doxyfile.gsm +- +-$(top_builddir)/doc/vty/html/index.html: $(SOURCES) Doxyfile.vty +- @rm -rf doc/vty/{html,latex} +- $(DOXYGEN) Doxyfile.vty +- +-$(top_builddir)/doc/codec/html/index.html: $(SOURCES) Doxyfile.codec +- @rm -rf doc/codec +- mkdir -p doc/codec +- $(DOXYGEN) Doxyfile.codec +- +-install-data-hook: +- cd $(DESTDIR)$(htmldir) && tar xf html.tar && rm -f html.tar +- +-uninstall-hook: +- cd $(DESTDIR)$(htmldir) && rm -rf {core,gsm,vty,codec} +- +-DX_CLEAN = doc/{core,gsm,vty,codec}/{html,latex}/* doc/html.tar +-endif +- +-MOSTLYCLEANFILES = $(DX_CLEAN)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53e906a2.2490.2d7fd4db>