Attachment 53623 Details for Bug 81120 – file.diff

[patch] file.diff

file.diff (text/plain), 4.82 KB, created by tkato432 on 2005-05-16 19:10:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2005-05-16 19:10:05 UTC

Size: 4.82 KB

patch

obsolete

>diff -urN /usr/ports/devel/libopendaap/Makefile devel/libopendaap/Makefile
>--- /usr/ports/devel/libopendaap/Makefile	Wed Feb  9 23:02:53 2005
>+++ devel/libopendaap/Makefile	Mon May 16 19:58:56 2005
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	libopendaap
>-PORTVERSION=	0.3.0
>-PORTREVISION=	1
>+PORTVERSION=	0.4.0
> CATEGORIES=	devel net
> MASTER_SITES=	http://craz.net/programs/itunes/files/
> 
>@@ -15,25 +14,16 @@
> COMMENT=	C lib used to connect to iTunes(R) music shares
> 
> USE_BZIP2=	yes
>-USE_REINPLACE=	yes
> USE_GNOME=	gnomehack gnometarget pkgconfig
>-USE_INC_LIBTOOL_VER=15
>-USE_GCC=	3.4
>-MAN3=		libopendaap.3
>-
>-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}"
>-
>+USE_REINPLACE=	yes
>+USE_LIBTOOL_VER=	15
> INSTALLS_SHLIB=	yes
> 
>-pre-configure:
>-# Broken libtool fix
>-	@cd ${WRKSRC} && \
>-		${LIBTOOLIZE} --force
>+MAN3=		libopendaap.3
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \
>-		${WRKSRC}/Makefile.am \
>-		${WRKSRC}/Makefile.in \
>-		${WRKSRC}/opendaap.pc.in
>+.for file in Makefile.in opendaap.pc.in
>+	@${REINPLACE_CMD} -e 's|-lpthread||g' ${WRKSRC}/${file}
>+.endfor
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/devel/libopendaap/distinfo devel/libopendaap/distinfo
>--- /usr/ports/devel/libopendaap/distinfo	Thu Feb  3 19:53:33 2005
>+++ devel/libopendaap/distinfo	Mon May 16 19:14:12 2005
>@@ -1,2 +1,2 @@
>-MD5 (libopendaap-0.3.0.tar.bz2) = a722ee6171f946a1f415d7c4d88f150a
>-SIZE (libopendaap-0.3.0.tar.bz2) = 365682
>+MD5 (libopendaap-0.4.0.tar.bz2) = 4edf92ac18c6ab8c05be7a4eb64a8a8d
>+SIZE (libopendaap-0.4.0.tar.bz2) = 241953
>diff -urN /usr/ports/devel/libopendaap/files/patch-client.c devel/libopendaap/files/patch-client.c
>--- /usr/ports/devel/libopendaap/files/patch-client.c	Thu Jan  1 09:00:00 1970
>+++ devel/libopendaap/files/patch-client.c	Mon May 16 19:20:19 2005
>@@ -0,0 +1,28 @@
>+--- client.c.orig	Thu May 12 15:46:29 2005
>++++ client.c	Mon May 16 19:20:04 2005
>+@@ -1380,10 +1380,10 @@
>+ 
>+     HTTP_Connection *http_connection;
>+ 
>+-    if (strlen(songformat) > 4) return -1;
>+-
>+     HTTP_GetResult *httpRes;
>+ 
>++    if (strlen(songformat) > 4) return -1;
>++
>+     if (pCHThis->version_major != 3)
>+     {
>+         buf = safe_sprintf(songUrl_42, databaseid, songid, songformat,
>+@@ -1643,10 +1643,11 @@
>+ static void AsyncWaitUpdate(void *pv_pCHThis, void *unused)
>+ {
>+     DAAP_SClientHost *pCHThis = (DAAP_SClientHost*)pv_pCHThis;
>+-    TRACE("()\n");
>+     char hash[33] = {0};
>+     char updateUrl[] = "/update?session-id=%i&revision-number=%i&delta=%i";
>+     char *buf;
>++
>++    TRACE("()\n");
>+ 
>+     buf = safe_sprintf(updateUrl, pCHThis->sessionid, pCHThis->revision_number,
>+                        pCHThis->revision_number);
>diff -urN /usr/ports/devel/libopendaap/files/patch-ioloop.c devel/libopendaap/files/patch-ioloop.c
>--- /usr/ports/devel/libopendaap/files/patch-ioloop.c	Thu Jan  1 09:00:00 1970
>+++ devel/libopendaap/files/patch-ioloop.c	Mon May 16 19:24:35 2005
>@@ -0,0 +1,13 @@
>+--- ioloop.c.orig	Tue Dec 14 13:39:31 2004
>++++ ioloop.c	Mon May 16 19:24:20 2005
>+@@ -113,9 +113,9 @@
>+ 
>+ void fd_event_reset(fd_event *event)
>+ {
>+-    event->signalled = 0;
>+     char buf[1] = {0};
>+     int flags;
>++    event->signalled = 0;
>+ 
>+     /* set non-blocking on read pipe */
>+     flags = fcntl(event->pipe[0], F_GETFL, 0);
>diff -urN /usr/ports/devel/libopendaap/files/patch-mDNS-mDNSClientAPI.h devel/libopendaap/files/patch-mDNS-mDNSClientAPI.h
>--- /usr/ports/devel/libopendaap/files/patch-mDNS-mDNSClientAPI.h	Thu Mar 18 07:53:11 2004
>+++ devel/libopendaap/files/patch-mDNS-mDNSClientAPI.h	Thu Jan  1 09:00:00 1970
>@@ -1,13 +0,0 @@
>---- mDNS/mDNSClientAPI.h.orig	Wed Mar 17 23:45:20 2004
>-+++ mDNS/mDNSClientAPI.h	Wed Mar 17 23:45:36 2004
>-@@ -480,8 +480,8 @@
>- typedef unsigned char  mDNSu8;
>- typedef   signed short mDNSs16;
>- typedef unsigned short mDNSu16;
>--typedef   signed long  mDNSs32;
>--typedef unsigned long  mDNSu32;
>-+typedef   signed int  mDNSs32;
>-+typedef unsigned int  mDNSu32;
>- 
>- // To enforce useful type checking, we make mDNSInterfaceID be a pointer to a dummy struct
>- // This way, mDNSInterfaceIDs can be assigned, and compared with each other, but not with other types
>diff -urN /usr/ports/devel/libopendaap/files/patch-threadpool.c devel/libopendaap/files/patch-threadpool.c
>--- /usr/ports/devel/libopendaap/files/patch-threadpool.c	Thu Jan  1 09:00:00 1970
>+++ devel/libopendaap/files/patch-threadpool.c	Mon May 16 19:23:47 2005
>@@ -0,0 +1,14 @@
>+--- threadpool.c.orig	Tue Dec 14 13:56:23 2004
>++++ threadpool.c	Mon May 16 19:23:22 2005
>+@@ -279,9 +279,9 @@
>+ void CP_ThreadPool_QueueWorkItem(CP_SThreadPool *pTPThis, CP_TPfnJob pfnCallback,
>+                                  void *arg1, void *arg2)
>+ {
>+-    ts_mutex_lock(pTPThis->mtJobQueueMutex);
>+-
>+     CP_STPJobQueue *pTPJQNewJob = malloc(sizeof(CP_STPJobQueue));
>++
>++    ts_mutex_lock(pTPThis->mtJobQueueMutex);
>+ 
>+     pTPJQNewJob->fnJobCallback = pfnCallback;
>+     pTPJQNewJob->arg1 = arg1;

Actions: View | Diff

Attachments on bug 81120: 53623