Attachment #135134 for bug #179916

View | Details | Raw Unified | Return to bug 179916
Collapse All | Expand All




# Created by: trasz <trasz@pin.if.uz.zgora.pl>
# Date created:		2006-12-04
# Whom:			trasz <trasz@pin.if.uz.zgora.pl>
#
# $FreeBSD: head/audio/liblo/Makefile 314640 2013-03-19 13:04:30Z eadler $
#

PORTNAME=	liblo
PORTVERSION=	0.27
CATEGORIES=	audio
MASTER_SITES=	SF

MAINTAINER=	nemysis@gmx.ch
COMMENT=	Lightweight Open Sound Control implementation

LICENSE=	LGPL21

BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen

USES=		pathfix
GNU_CONFIGURE=	yes
USE_GMAKE=	yes
USE_LDCONFIG=	yes

MAN3=		liblo.3 liblolowlevel.3 lo.h.3 lo_arg.3 lo_lowlevel.h.3 \
		lo_osc_types.h.3 lo_timetag.3 lo_types.h.3 pp.3

PORTDOCS=	*

DOCSRCDIR1=	${WRKSRC}
DOC_FILES1=	AUTHORS ChangeLog NEWS README TODO

PORTEXAMPLES=	example_client example_server \
		example_tcp_echo_server nonblocking_server_example

OPTIONS_DEFINE=	DOCS DOXYGEN EXAMPLES

.include <bsd.port.options.mk>

post-install:
	cd ${WRKSRC}/doc/man/man3 && ${INSTALL_MAN} ${MAN3} ${MAN3PREFIX}/man/man3

.if ${PORT_OPTIONS:MDOCS}
	@${MKDIR} ${DOCSDIR}
	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR}
.endif

.if ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MDOCS}
	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${DOCSDIR})
.endif

.if ${PORT_OPTIONS:MEXAMPLES}
	@${MKDIR} ${EXAMPLESDIR}
	${INSTALL_SCRIPT} ${PORTEXAMPLES:S|^|${WRKSRC}/examples/|} ${EXAMPLESDIR}
.endif

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (liblo-0.26.tar.gz) = a636fb09f8178ad0d5303e94fec37b182d3062a0e3daee85eed2a39ab6232258	1	SHA256 (liblo-0.27.tar.gz) = 67b48e1e63fddea60bb4a0f0c25fba32ea42d2a55877752aa342c478b59374b6
2	SIZE (liblo-0.26.tar.gz) = 519750	2	SIZE (liblo-0.27.tar.gz) = 533684

Lines 1-10 Link Here

(-)./files/patch-src-lo_types_internal.h (-4 / +12 lines)
1	--- src/lo_types_internal.h.orig Mon Dec 4 23:29:22 2006	1	--- src/lo_types_internal.h.orig 2013-05-22 18:34:31.000000000 +0200
2	+++ src/lo_types_internal.h Mon Dec 4 23:29:32 2006	2	+++ src/lo_types_internal.h 2013-06-24 01:54:53.000000000 +0200
3	@@ -9,6 +9,7 @@	3	@@ -20,6 +20,7 @@
		4	#else
		5	#define closesocket close
		6	#include <netdb.h>
		7	+#include <netinet/in.h>
		8	#include <arpa/inet.h>
4	#endif	9	#endif
5		10
		11	@@ -33,6 +34,7 @@
		12
		13	#ifdef ENABLE_THREADS
6	#include <pthread.h>	14	#include <pthread.h>
7	+#include <sys/socket.h>	15	+#include <sys/socket.h>
		16	#endif
8		17
9	#include "lo/lo_osc_types.h"	18	#include "lo/lo_osc_types.h"
10




--- src/server.c.orig	2009-03-06 08:09:26.000000000 +0100
+++ src/server.c	2009-03-28 10:19:58.000000000 +0100
@@ -958,38 +958,11 @@ static void dispatch_method(lo_server s,
 
     //inet_ntop(s->addr.ss_family, &s->addr.padding, hostname, sizeof(hostname));
     if (s->protocol == LO_UDP && s->addr_len>0) {
-	err = getnameinfo((struct sockaddr *)&s->addr, sizeof(s->addr),
+	err = getnameinfo((struct sockaddr *)&s->addr, s->addr.ss_len,
 	    hostname, sizeof(hostname), portname, sizeof(portname),
 	    NI_NUMERICHOST | NI_NUMERICSERV);
 	if (err) {
-	    switch (err) {
-	    case EAI_AGAIN:
-		lo_throw(s, err, "Try again", path);
-		break;
-	    case EAI_BADFLAGS:
-		lo_throw(s, err, "Bad flags", path);
-		break;
-	    case EAI_FAIL:
-		lo_throw(s, err, "Failed", path);
-		break;
-	    case EAI_FAMILY:
-		lo_throw(s, err, "Cannot resolve address family", path);
-		break;
-	    case EAI_MEMORY:
-		lo_throw(s, err, "Out of memory", path);
-		break;
-	    case EAI_NONAME:
-		lo_throw(s, err, "Cannot resolve", path);
-		break;
-#ifndef WIN32
-	    case EAI_SYSTEM:
-		lo_throw(s, err, strerror(err), path);
-		break;
-#endif
-	    default:
-		lo_throw(s, err, "Unknown error", path);
-		break;
-	    }
+	    lo_throw(s, err, gai_strerror(err), path);
 
 	    return;
 	}

Lines 1-4 Link Here

(-)./pkg-descr (-2 / +6 lines)
1	liblo is an implementation of the Open Sound Control	1	liblo is a lightweight library that provides an easy to use implementation of
2	protocol for POSIX systems.	2	the Open Sound Control protocol for POSIX systems. For more information about
		3	the Open Sound Control protocol, please see:
		4
		5	- [OSC at CNMAT](http://www.cnmat.berkeley.edu/OpenSoundControl/)
		6	- [opensoundcontrol.org](http://www.opensoundcontrol.org/)
3		7
4	WWW: http://liblo.sourceforge.net/	8	WWW: http://liblo.sourceforge.net/

Lines 1-15 Link Here

(-)./pkg-plist (-6 / +7 lines)
1	bin/oscdump	1	bin/oscdump
2	bin/oscsend	2	bin/oscsend
3	include/lo/lo_errors.h
4	include/lo/lo.h	3	include/lo/lo.h
		4	include/lo/lo_endian.h
		5	include/lo/lo_errors.h
5	include/lo/lo_lowlevel.h	6	include/lo/lo_lowlevel.h
		7	include/lo/lo_macros.h
		8	include/lo/lo_osc_types.h
		9	include/lo/lo_serverthread.h
6	include/lo/lo_throw.h	10	include/lo/lo_throw.h
7	include/lo/lo_types.h	11	include/lo/lo_types.h
8	include/lo/lo_osc_types.h
9	include/lo/lo_endian.h
10	include/lo/lo_macros.h
11	lib/liblo.so.7
12	lib/liblo.so
13	lib/liblo.la	12	lib/liblo.la
		13	lib/liblo.so
		14	lib/liblo.so.8
14	libdata/pkgconfig/liblo.pc	15	libdata/pkgconfig/liblo.pc
15	@dirrm include/lo	16	@dirrm include/lo

Return to bug 179916

Lines 1-21 Link Here

(-)./Makefile (-8 / +40 lines)
1	# New ports collection makefile for: liblo	1	# Created by: trasz <trasz@pin.if.uz.zgora.pl>
2	# Date created: 2006-12-04
3	# Whom: trasz <trasz@pin.if.uz.zgora.pl>
4	#
5	# $FreeBSD: head/audio/liblo/Makefile 314640 2013-03-19 13:04:30Z eadler $	2	# $FreeBSD: head/audio/liblo/Makefile 314640 2013-03-19 13:04:30Z eadler $
6	#
7		3
8	PORTNAME= liblo	4	PORTNAME= liblo
9	PORTVERSION= 0.26	5	PORTVERSION= 0.27
10	CATEGORIES= audio	6	CATEGORIES= audio
11	MASTER_SITES= SF	7	MASTER_SITES= SF
12		8
13	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= nemysis@gmx.ch
14	COMMENT= Lightweight Open Sound Control implementation	10	COMMENT= Lightweight Open Sound Control implementation
15		11
		12	LICENSE= LGPL21
		13
		14	BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen
		15
		16	USES= pathfix
16	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
17	USE_GMAKE= yes	18	USE_GMAKE= yes
18	USE_LDCONFIG= yes	19	USE_LDCONFIG= yes
19	USES= pathfix	20
		21	MAN3= liblo.3 liblolowlevel.3 lo.h.3 lo_arg.3 lo_lowlevel.h.3 \
		22	lo_osc_types.h.3 lo_timetag.3 lo_types.h.3 pp.3
		23
		24	PORTDOCS= *
		25
		26	DOCSRCDIR1= ${WRKSRC}
		27	DOC_FILES1= AUTHORS ChangeLog NEWS README TODO
		28
		29	PORTEXAMPLES= example_client example_server \
		30	example_tcp_echo_server nonblocking_server_example
		31
		32	OPTIONS_DEFINE= DOCS DOXYGEN EXAMPLES
		33
		34	.include <bsd.port.options.mk>
		35
		36	post-install:
		37	cd ${WRKSRC}/doc/man/man3 && ${INSTALL_MAN} ${MAN3} ${MAN3PREFIX}/man/man3
		38
		39	.if ${PORT_OPTIONS:MDOCS}
		40	@${MKDIR} ${DOCSDIR}
		41	${INSTALL_DATA} ${DOC_FILES1:S\|^\|${DOCSRCDIR1}/\|} ${DOCSDIR}
		42	.endif
		43
		44	.if ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MDOCS}
		45	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${DOCSDIR})
		46	.endif
		47
		48	.if ${PORT_OPTIONS:MEXAMPLES}
		49	@${MKDIR} ${EXAMPLESDIR}
		50	${INSTALL_SCRIPT} ${PORTEXAMPLES:S\|^\|${WRKSRC}/examples/\|} ${EXAMPLESDIR}
		51	.endif
20		52
21	.include <bsd.port.mk>	53	.include <bsd.port.mk>

Lines 1-43 Link Here

(-)./files/patch-src-server.c (-43 lines)
1	--- src/server.c.orig 2009-03-06 08:09:26.000000000 +0100
2	+++ src/server.c 2009-03-28 10:19:58.000000000 +0100
3	@@ -958,38 +958,11 @@ static void dispatch_method(lo_server s,
4
5	//inet_ntop(s->addr.ss_family, &s->addr.padding, hostname, sizeof(hostname));
6	if (s->protocol == LO_UDP && s->addr_len>0) {
7	- err = getnameinfo((struct sockaddr *)&s->addr, sizeof(s->addr),
8	+ err = getnameinfo((struct sockaddr *)&s->addr, s->addr.ss_len,
9	hostname, sizeof(hostname), portname, sizeof(portname),
10	NI_NUMERICHOST \| NI_NUMERICSERV);
11	if (err) {
12	- switch (err) {
13	- case EAI_AGAIN:
14	- lo_throw(s, err, "Try again", path);
15	- break;
16	- case EAI_BADFLAGS:
17	- lo_throw(s, err, "Bad flags", path);
18	- break;
19	- case EAI_FAIL:
20	- lo_throw(s, err, "Failed", path);
21	- break;
22	- case EAI_FAMILY:
23	- lo_throw(s, err, "Cannot resolve address family", path);
24	- break;
25	- case EAI_MEMORY:
26	- lo_throw(s, err, "Out of memory", path);
27	- break;
28	- case EAI_NONAME:
29	- lo_throw(s, err, "Cannot resolve", path);
30	- break;
31	-#ifndef WIN32
32	- case EAI_SYSTEM:
33	- lo_throw(s, err, strerror(err), path);
34	- break;
35	-#endif
36	- default:
37	- lo_throw(s, err, "Unknown error", path);
38	- break;
39	- }
40	+ lo_throw(s, err, gai_strerror(err), path);
41
42	return;
43	}