Page MenuHomeFreeBSD
Files F147819116

D1947.diff
No OneTemporary
Actions

D1947.diff
View Options

Index: devel/libosmo-abis/Makefile
===================================================================
--- devel/libosmo-abis/Makefile
+++ devel/libosmo-abis/Makefile
@@ -15,19 +15,13 @@
LIB_DEPENDS= libosmocore.so:${PORTSDIR}/devel/libosmocore \
libortp.so:${PORTSDIR}/net/ortp
-USES= gmake libtool pkgconfig
-
-USE_AUTOTOOLS= aclocal autoconf automake libtoolize autoheader
-AUTOMAKE_ARGS= --gnu --add-missing --copy
+USES= autoreconf gmake libtool pathfix pkgconfig
+PATHFIX_MAKEFILEIN=Makefile.am
+GNU_CONFIGURE= yes
+INSTALL_TARGET= install-strip
USE_LDCONFIG= yes
post-patch:
- ${REINPLACE_CMD} -e 's|pkgconfigdir.*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g' \
- ${WRKSRC}/Makefile.am
${ECHO_CMD} ${PORTVERSION} > ${WRKSRC}/.tarball-version
-post-stage:
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libosmoabis.so.4
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libosmotrau.so.0
-
.include <bsd.port.mk>
Index: devel/libosmo-netif/Makefile
===================================================================
--- devel/libosmo-netif/Makefile
+++ devel/libosmo-netif/Makefile
@@ -22,6 +22,16 @@
USE_LDCONFIG= yes
post-patch:
+ ${REINPLACE_CMD} -e 's,endian\.h,sys/endian.h,' \
+ -e 's,__BYTE_ORDER,BYTE_ORDER,' \
+ -e 's,__LITTLE_ENDIAN,LITTLE_ENDIAN,' \
+ -e 's,__BIG_ENDIAN,BIG_ENDIAN,' \
+ ${WRKSRC}/configure.ac \
+ ${WRKSRC}/examples/rs232-write.c \
+ ${WRKSRC}/include/osmocom/netif/amr.h \
+ ${WRKSRC}/include/osmocom/netif/rtp.h \
+ ${WRKSRC}/include/osmocom/netif/osmux.h \
+ ${WRKSRC}/src/rtp.c
${ECHO_CMD} ${PORTVERSION} > ${WRKSRC}/.tarball-version
.include <bsd.port.mk>
Index: devel/libosmo-netif/files/patch-configure.ac
===================================================================
--- devel/libosmo-netif/files/patch-configure.ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig 2014-09-08 08:52:08.000000000 +0300
-+++ configure.ac 2015-02-16 17:04:01.000000000 +0200
-@@ -32,7 +32,7 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([char
- CFLAGS="$saved_CFLAGS"
- AC_SUBST(SYMBOL_VISIBILITY)
-
--AC_CHECK_HEADER([endian.h], [], [AC_MSG_ERROR([endian.h not found!]) ])
-+AC_CHECK_HEADERS(endian.h sys/endian.h)
-
- dnl Generate the output
- AM_CONFIG_HEADER(config.h)
Index: devel/libosmo-netif/files/patch-rtp.c
===================================================================
--- devel/libosmo-netif/files/patch-rtp.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/rtp.c.orig 2014-09-08 08:52:08.000000000 +0300
-+++ src/rtp.c 2015-02-16 11:54:11.000000000 +0200
-@@ -1,6 +1,13 @@
- #include <stdint.h>
- #include <sys/time.h>
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+#ifdef HAVE_SYS_ENDIAN_H
-+#include <sys/endian.h>
-+#else
- #include <endian.h>
-+#endif
- #include <errno.h>
- #include <string.h> /* for memcpy. */
- #include <arpa/inet.h> /* for ntohs. */
Index: devel/libosmo-sccp/Makefile
===================================================================
--- devel/libosmo-sccp/Makefile
+++ devel/libosmo-sccp/Makefile
@@ -2,9 +2,9 @@
PORTNAME= libosmo-sccp
PORTVERSION= 0.0.6.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
-MASTER_SITES= http://chaosophia.net/downloads/osmocom/${PORTNAME}/ \
+MASTER_SITES= http://chaosophia.net/downloads/osmocom/${PORTNAME}/ \
http://ns1.chaosophia.net/downloads/osmocom/${PORTNAME}/
MAINTAINER= koue@chaosophia.net
@@ -15,14 +15,19 @@
LIB_DEPENDS= libosmocore.so:${PORTSDIR}/devel/libosmocore
-USES= gmake pkgconfig
+CONFLICTS_INSTALL=libmtp-[0-9]* # lib/libmtp.a
-USE_AUTOTOOLS= aclocal autoconf automake libtoolize
-AUTOMAKE_ARGS= --gnu --add-missing --copy
+USES= alias autoreconf gmake pathfix pkgconfig
+PATHFIX_MAKEFILEIN=Makefile.am
+GNU_CONFIGURE= yes
post-patch:
- ${REINPLACE_CMD} -e 's|pkgconfigdir.*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|g' \
- ${WRKSRC}/Makefile.am
+ ${REINPLACE_CMD} -e 's,endian\.h,sys/endian.h,' \
+ -e 's,__BYTE_ORDER,BYTE_ORDER,' \
+ -e 's,__LITTLE_ENDIAN,LITTLE_ENDIAN,' \
+ -e 's,__BIG_ENDIAN,BIG_ENDIAN,' \
+ ${WRKSRC}/include/mtp/mtp_level3.h \
+ ${WRKSRC}/include/sccp/sccp_types.h
${ECHO_CMD} ${PORTVERSION} > ${WRKSRC}/.tarball-version
.include <bsd.port.mk>
Index: devel/libosmo-sccp/files/patch-mtp_leve3.c
===================================================================
--- devel/libosmo-sccp/files/patch-mtp_leve3.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- include/mtp/mtp_level3.h.org
-+++ include/mtp/mtp_level3.h
-@@ -23,7 +23,11 @@
- #ifndef mtp_level3_h
- #define mtp_level3_h
-
-+#ifdef __FreeBSD__
-+#include <sys/endian.h>
-+#else
- #include <endian.h>
-+#endif
- #include <stdint.h>
- #include <sys/types.h>
Index: devel/libosmo-sccp/files/patch-sccp_types.c
===================================================================
--- devel/libosmo-sccp/files/patch-sccp_types.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- include/sccp/sccp_types.h.org
-+++ include/sccp/sccp_types.h
-@@ -24,7 +24,11 @@
- #ifndef SCCP_TYPES_H
- #define SCCP_TYPES_H
-
-+#ifdef __FreeBSD__
-+#include <sys/endian.h>
-+#else
- #include <endian.h>
-+#endif
-
- /* Table 1/Q.713 - SCCP message types */
- enum sccp_message_types {
Index: devel/libosmocore/Makefile
===================================================================
--- devel/libosmocore/Makefile
+++ devel/libosmocore/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libosmocore
PORTVERSION= 0.8.0
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://git.osmocom.org/libosmocore/snapshot/ \
http://chaosophia.net/downloads/osmocom/${PORTNAME}/
@@ -14,39 +15,20 @@
LIB_DEPENDS= libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
-USES= gmake libtool pkgconfig execinfo
-USE_AUTOTOOLS= aclocal autoconf automake libtoolize autoheader
-AUTOMAKE_ARGS= --gnu --add-missing --copy
+USES= alias autoreconf execinfo gmake libtool pathfix pkgconfig
+PATHFIX_MAKEFILEIN=Makefile.am
+GNU_CONFIGURE= yes
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 \
+OPTIONS_DEFINE= DOXYGEN
+DOXYGEN_BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen \
dot:${PORTSDIR}/graphics/graphviz
-.endif
+DOXYGEN_CONFIGURE_ENV_OFF=ac_cv_path_DOXYGEN=false
+PORTDOCS= *
post-patch:
-.if ${PORT_OPTIONS:MDOCS}
- ${CP} ${WRKSRC}/Makefile.am.orig ${WRKSRC}/Makefile.am
-.endif
- ${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>
Index: devel/libosmocore/files/patch-Makefile.am
===================================================================
--- devel/libosmocore/files/patch-Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
---- Makefile.am.orig 2015-01-22 11:13:28.000000000 +0200
-+++ Makefile.am 2015-01-22 11:15:29.000000000 +0200
-@@ -14,43 +14,3 @@ dist-hook:
- echo $(VERSION) > $(distdir)/.tarball-version
-
- EXTRA_DIST = git-version-gen .version
--
--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 doc/{core,gsm,vty,codec}/doxygen_sqlite3.db
--endif
--
--MOSTLYCLEANFILES = $(DX_CLEAN)
Index: multimedia/libmtp/Makefile
===================================================================
--- multimedia/libmtp/Makefile
+++ multimedia/libmtp/Makefile
@@ -12,6 +12,8 @@
LICENSE= LGPL21 # or any later version
+CONFLICTS_INSTALL=libosmo-sccp-[0-9]* # lib/libmtp.a
+
OPTIONS_DEFINE= MTPZ
OPTIONS_DEFAULT= MTPZ
MTPZ_DESC= Enable functionality to connect to MTPZ devices

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 14, 9:58 PM (13 h, 11 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29688675
Default Alt Text
D1947.diff (8 KB)

Event Timeline