diff options
| author | Jeremy Messenger <mezz@FreeBSD.org> | 2011-06-04 22:38:53 +0000 |
|---|---|---|
| committer | Jeremy Messenger <mezz@FreeBSD.org> | 2011-06-04 22:38:53 +0000 |
| commit | 93d721ee8e715fe68420cd9229f546b88c0d4eb4 (patch) | |
| tree | b0a5c2e18785f1de80cdd976f923a1f42f0cbc79 | |
| parent | 16af45bc28554ba3faa24e44a0b647e39e5f1138 (diff) | |
| download | ports-93d721ee8e715fe68420cd9229f546b88c0d4eb4.tar.gz ports-93d721ee8e715fe68420cd9229f546b88c0d4eb4.zip | |
Notes
| -rw-r--r-- | devel/nspr/Makefile | 10 | ||||
| -rw-r--r-- | devel/nspr/files/patch-.._pr_include_md__freebsd.h | 2 |
2 files changed, 3 insertions, 9 deletions
diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile index 8b7c62c70a67..af2d6ab1c420 100644 --- a/devel/nspr/Makefile +++ b/devel/nspr/Makefile @@ -8,8 +8,7 @@ PORTNAME= nspr 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 +33,6 @@ LIBS= libnspr4.so.1 libplc4.so.1 libplds4.so.1 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 +56,7 @@ do-install: .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 --git a/devel/nspr/files/patch-.._pr_include_md__freebsd.h b/devel/nspr/files/patch-.._pr_include_md__freebsd.h index 04dfc4a88644..610d1edeef59 100644 --- a/devel/nspr/files/patch-.._pr_include_md__freebsd.h +++ b/devel/nspr/files/patch-.._pr_include_md__freebsd.h @@ -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 |