[Midnightbsd-cvs] mports: devel/nspr: Update to 4.6.7

[laffer1 at midnightbsd.org]

Log Message:
-----------
Update to 4.6.7

Modified Files:
--------------
    mports/devel/nspr:
        Makefile (r1.3 -> r1.4)
        distinfo (r1.1 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/nspr/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L devel/nspr/Makefile -L devel/nspr/Makefile -u -r1.3 -r1.4
--- devel/nspr/Makefile
+++ devel/nspr/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	nspr
-PORTVERSION=	4.6.1
-PORTREVISION=	2
+PORTVERSION=	4.6.7
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	nspr/releases/v${PORTVERSION}/src
@@ -30,6 +29,14 @@
 
 LIBS=		libnspr4.so.1 libplc4.so.1 libplds4.so.1
 
+.include <bsd.port.pre.mk>
+
+post-patch:
+	@${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g ; s,echo aout,echo elf,g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${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
+
 do-install:
 	${MKDIR} ${PREFIX}/include/nspr
 	${TAR} -C ${WRKSRC}/dist/include --dereference -cf - . | \
@@ -44,7 +51,7 @@
 .endfor
 
 prtests:
-	${GMAKE} -C ${WRKSRC}/pr/tests
+	env 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
 
@@ -60,7 +67,7 @@
 
 test: libtests prtests
 
-#.if defined(PARALLEL_PACKAGE_BUILD)
+#.if defined(PACKAGE_BUILDING)
 #post-build: test
 #.else
 post-build:
@@ -70,4 +77,4 @@
 	#
 #.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/devel/nspr/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/nspr/distinfo -L devel/nspr/distinfo -u -r1.1 -r1.2
--- devel/nspr/distinfo
+++ devel/nspr/distinfo
@@ -1,3 +1,3 @@
-MD5 (nspr-4.6.1.tar.gz) = 267a63dec54e72b02831d3083fd9faaf
-SHA256 (nspr-4.6.1.tar.gz) = 30c70a5a241016d0968d148c3bdaf9d9692b5aa44426d40c01ec51654e0e0479
-SIZE (nspr-4.6.1.tar.gz) = 1327028
+MD5 (nspr-4.6.7.tar.gz) = 75d5de21ebc1a21886a25673920490ff
+SHA256 (nspr-4.6.7.tar.gz) = 314e078f954677f469f2a60e8aca8efa3dd1807f7e1a109cc688a2469e2e3b70
+SIZE (nspr-4.6.7.tar.gz) = 1303759