Attachment 153314 Details for Bug 197707 – simplify

[patch] simplify

simplify.diff (text/plain), 5.91 KB, created by Jan Beich on 2015-02-22 14:20:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2015-02-22 14:20:05 UTC

Size: 5.91 KB

patch

obsolete

>diff --git devel/libosmo-netif/Makefile devel/libosmo-netif/Makefile
>index f7d42d7..ef6cfc7 100644
>--- devel/libosmo-netif/Makefile
>+++ devel/libosmo-netif/Makefile
>@@ -15,17 +15,13 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> LIB_DEPENDS=	libosmocore.so:${PORTSDIR}/devel/libosmocore \
> 		libosmoabis.so:${PORTSDIR}/devel/libosmo-abis
> 
>-USES=		libtool pkgconfig
>-
>-USE_AUTOTOOLS=	aclocal autoconf automake libtoolize autoheader
>-AUTOMAKE_ARGS=	--gnu --add-missing --copy
>+USES=		autoreconf 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/libosmonetif.so.2.0.0
>-
> .include <bsd.port.mk>
>diff --git devel/libosmo-netif/files/patch-abis-ipa-stream-client.c devel/libosmo-netif/files/patch-abis-ipa-stream-client.c
>index 65ebc3c..b0b3009 100644
>--- devel/libosmo-netif/files/patch-abis-ipa-stream-client.c
>+++ devel/libosmo-netif/files/patch-abis-ipa-stream-client.c
>@@ -1,10 +1,8 @@
> --- src/channel/abis/ipa_stream_client.c.orig	2015-02-16 17:12:17.000000000 +0200
> +++ src/channel/abis/ipa_stream_client.c	2015-02-16 17:09:59.000000000 +0200
>-@@ -1,4 +1,7 @@
>+@@ -1,4 +1,5 @@
>  #include <stdlib.h>
>-+#ifdef __FreeBSD__
> +#include <sys/types.h>
>-+#endif
>  #include <netinet/in.h>
>  #include <netinet/tcp.h>
>  #include <sys/socket.h>
>diff --git devel/libosmo-netif/files/patch-abis-ipa-stream-server.c devel/libosmo-netif/files/patch-abis-ipa-stream-server.c
>index 32bb7c3..fd1d0b9 100644
>--- devel/libosmo-netif/files/patch-abis-ipa-stream-server.c
>+++ devel/libosmo-netif/files/patch-abis-ipa-stream-server.c
>@@ -1,10 +1,8 @@
> --- src/channel/abis/ipa_stream_server.c.orig	2015-02-16 17:09:48.000000000 +0200
> +++ src/channel/abis/ipa_stream_server.c	2015-02-16 17:08:09.000000000 +0200
>-@@ -1,4 +1,7 @@
>+@@ -1,4 +1,5 @@
>  #include <stdlib.h>
>-+#ifdef __FreeBSD__
> +#include <sys/types.h>
>-+#endif
>  #include <netinet/in.h>
>  #include <netinet/tcp.h>
>  #include <sys/socket.h>
>diff --git devel/libosmo-netif/files/patch-configure.ac devel/libosmo-netif/files/patch-configure.ac
>index 2ab2beb..069b0e5 100644
>--- devel/libosmo-netif/files/patch-configure.ac
>+++ devel/libosmo-netif/files/patch-configure.ac
>@@ -5,7 +5,7 @@
>  AC_SUBST(SYMBOL_VISIBILITY)
>  
> -AC_CHECK_HEADER([endian.h], [], [AC_MSG_ERROR([endian.h not found!]) ])
>-+AC_CHECK_HEADER([sys/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)
>diff --git devel/libosmo-netif/files/patch-datagram.c devel/libosmo-netif/files/patch-datagram.c
>index 7ad1e05..1988c16 100644
>--- devel/libosmo-netif/files/patch-datagram.c
>+++ devel/libosmo-netif/files/patch-datagram.c
>@@ -1,12 +1,10 @@
> --- src/datagram.c.orig	2015-02-16 11:44:42.000000000 +0200
> +++ src/datagram.c	2015-02-16 11:44:12.000000000 +0200
>-@@ -19,6 +19,10 @@
>+@@ -19,6 +19,8 @@
>  
>  #include <osmocom/netif/datagram.h>
>  
>-+#ifdef __FreeBSD__
> +#include <netinet/in.h>
>-+#endif
> +
>  /*
>   * Client side.
>diff --git devel/libosmo-netif/files/patch-ipa-stream-client.c devel/libosmo-netif/files/patch-ipa-stream-client.c
>index fb420a5..d3cc8d2 100644
>--- devel/libosmo-netif/files/patch-ipa-stream-client.c
>+++ devel/libosmo-netif/files/patch-ipa-stream-client.c
>@@ -1,13 +1,11 @@
> --- examples/ipa-stream-client.c.orig	2014-09-08 08:52:08.000000000 +0300
> +++ examples/ipa-stream-client.c	2015-02-16 17:06:50.000000000 +0200
>-@@ -6,6 +6,10 @@
>+@@ -6,6 +6,8 @@
>  #include <signal.h>
>  #include <sys/time.h>
>  #include <arpa/inet.h>
>-+#ifdef __FreeBSD__
> +#include <sys/types.h>
> +#include <netinet/in.h>
>-+#endif
>  #include <netinet/tcp.h>
>  
>  #include <osmocom/core/select.h>
>diff --git devel/libosmo-netif/files/patch-ipa-stream-server.c devel/libosmo-netif/files/patch-ipa-stream-server.c
>index 2a5f28b..b763b94 100644
>--- devel/libosmo-netif/files/patch-ipa-stream-server.c
>+++ devel/libosmo-netif/files/patch-ipa-stream-server.c
>@@ -1,13 +1,11 @@
> --- examples/ipa-stream-server.c.orig	2014-09-08 08:52:08.000000000 +0300
> +++ examples/ipa-stream-server.c	2015-02-16 17:05:21.000000000 +0200
>-@@ -4,6 +4,10 @@
>+@@ -4,6 +4,8 @@
>  #include <string.h>
>  #include <unistd.h>
>  #include <arpa/inet.h>
>-+#ifdef __FreeBSD__
> +#include <sys/types.h>
> +#include <netinet/in.h>
>-+#endif
>  #include <netinet/tcp.h>
>  
>  #include <osmocom/core/select.h>
>diff --git devel/libosmo-netif/files/patch-rtp.c devel/libosmo-netif/files/patch-rtp.c
>index 32e696d..1cbfe8f 100644
>--- devel/libosmo-netif/files/patch-rtp.c
>+++ devel/libosmo-netif/files/patch-rtp.c
>@@ -1,9 +1,12 @@
> --- 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,10 @@
>+@@ -1,6 +1,13 @@
>  #include <stdint.h>
>  #include <sys/time.h>
>-+#ifdef __FreeBSD__
>++#ifdef HAVE_CONFIG_H
>++#include "config.h"
>++#endif
>++#ifdef HAVE_SYS_ENDIAN_H
> +#include <sys/endian.h>
> +#else
>  #include <endian.h>
>diff --git devel/libosmo-netif/files/patch-stream.c devel/libosmo-netif/files/patch-stream.c
>index 97f3b96..b8dca9e 100644
>--- devel/libosmo-netif/files/patch-stream.c
>+++ devel/libosmo-netif/files/patch-stream.c
>@@ -1,12 +1,10 @@
> --- src/stream.c.orig	2015-02-16 11:47:30.000000000 +0200
> +++ src/stream.c	2015-02-16 11:48:03.000000000 +0200
>-@@ -19,6 +19,10 @@
>+@@ -19,6 +19,8 @@
>  
>  #include <osmocom/netif/stream.h>
>  
>-+#ifdef __FreeBSD__
> +#include <netinet/in.h>
>-+#endif
> +
>  /*
>   * Client side.
>diff --git devel/libosmo-netif/pkg-descr devel/libosmo-netif/pkg-descr
>index 44fac4f..310561c 100644
>--- devel/libosmo-netif/pkg-descr
>+++ devel/libosmo-netif/pkg-descr
>@@ -1,5 +1,3 @@
> Library containing common/shared code regarding network interface.
>-Development headers for Osmocom network interface.
>-Debug symbols for Osmocom network interface.
> 
> WWW: http://git.osmocom.org/libosmo-netif/

Actions: View | Diff

Attachments on bug 197707: 153038 | 153314