Attachment 115594 Details for Bug 157373 – file.diff

[patch] file.diff

file.diff (text/plain), 1.61 KB, created by R.Mahmatkhanov on 2011-05-27 21:10:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: R.Mahmatkhanov

Created: 2011-05-27 21:10:02 UTC

Size: 1.61 KB

patch

obsolete

>diff -ruNa nspr.orig/Makefile nspr/Makefile
>--- nspr.orig/Makefile	2011-03-02 16:51:28.000000000 +0300
>+++ nspr/Makefile	2011-05-27 23:45:00.000000000 +0400
>@@ -9,7 +9,7 @@
> DISTVERSION=	4.8.7
> CATEGORIES=	devel
> #MASTER_SITES=	LOCAL/ahze
>-MASTER_SITES=	${MASTER_SITE_MOZILLA}
>+MASTER_SITES=	MOZILLA
> MASTER_SITE_SUBDIR=	nspr/releases/v${PORTVERSION}/src
> 
> MAINTAINER=	gnome@FreeBSD.org
>@@ -34,11 +34,6 @@
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g ; s,echo aout,echo elf,g' ${WRKSRC}/${CONFIGURE_SCRIPT}
>-.if ${OSVERSION} < 601104
>-	@${REINPLACE_CMD} -e 's|pthread_cond_wait|_pthread_cond_wait|g' \
>-	    	${WRKSRC}/../pr/src/md/unix/pthreads_user.c \
>-		${WRKSRC}/../pr/src/pthreads/ptsynch.c
>-.endif
> 
> do-install:
> 	${MKDIR} ${PREFIX}/include/nspr
>@@ -62,7 +57,7 @@
> .endfor
> 
> prtests:
>-	env PTHREAD_LIBS="${PTHREAD_LIBS}" ${GMAKE} -C ${WRKSRC}/pr/tests
>+	${SETENV} PTHREAD_LIBS="${PTHREAD_LIBS}" ${GMAKE} -C ${WRKSRC}/pr/tests
> 	${LN} -sf libmy.so.1 ${WRKSRC}/pr/tests/dll/libmy.so
> 	cd ${WRKSRC}/pr/tests && ../../../pr/tests/runtests.sh
> 
>diff -ruNa nspr.orig/files/patch-.._pr_include_md__freebsd.h nspr/files/patch-.._pr_include_md__freebsd.h
>--- nspr.orig/files/patch-.._pr_include_md__freebsd.h	2010-07-29 01:32:09.000000000 +0400
>+++ nspr/files/patch-.._pr_include_md__freebsd.h	2011-05-27 23:46:10.000000000 +0400
>@@ -15,7 +15,7 @@
>  #define _PR_IPV6_V6ONLY_PROBE
>  #endif
>  
>-+#if (__FreeBSD_version >= 700016) || (__FreeBSD_version < 700000 && __FreeBSD_version >= 601103)
>++#if (__FreeBSD_version >= 700016)
> +#if defined(_PR_PTHREADS)
> +#define _PR_HAVE_GETPROTO_R
> +#define _PR_HAVE_5_ARG_GETPROTO_R

Actions: View | Diff

Attachments on bug 157373: 115594