Date: Fri, 27 May 2011 20:00:39 GMT From: Ruslan Mahmatkhanov <cvs-src@yandex.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/157373: [PATCH] devel/nspr: cleanup unsupported FreeBSD versions Message-ID: <201105272000.p4RK0dUT018165@red.freebsd.org> Resent-Message-ID: <201105272010.p4RKA225086588@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 157373
>Category: ports
>Synopsis: [PATCH] devel/nspr: cleanup unsupported FreeBSD versions
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri May 27 20:10:02 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Ruslan Mahmatkhanov
>Release: 9.0-CURRENT
>Organization:
>Environment:
9.0-CURRENT i386
>Description:
- cleanup unsupported FreeBSD versions
- change `env` with ${SETENV}
- change ${MASTER_SITE_MOZILLA} with just MOZILLA
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105272000.p4RK0dUT018165>