[SVN-Commit] r483 - in branches/experimental/devel/nspr: . files
svn-freebsd-gecko at chruetertee.ch
svn-freebsd-gecko at chruetertee.ch
Sat Jan 15 13:09:20 UTC 2011
Author: beat
Date: Sat Jan 15 13:09:12 2011
New Revision: 483
Log:
- Update to 4.8.7
Modified:
branches/experimental/devel/nspr/Makefile
branches/experimental/devel/nspr/distinfo
branches/experimental/devel/nspr/files/patch-tests
Modified: branches/experimental/devel/nspr/Makefile
==============================================================================
--- branches/experimental/devel/nspr/Makefile Sat Jan 15 09:23:06 2011 (r482)
+++ branches/experimental/devel/nspr/Makefile Sat Jan 15 13:09:12 2011 (r483)
@@ -2,11 +2,11 @@
# Date created: 18 December 2001
# Whom: Maxim Sobolev <sobomax at FreeBSD.org>
#
-# $FreeBSD: ports/devel/nspr/Makefile,v 1.39 2009/11/11 05:36:52 mi Exp $
+# $FreeBSD: ports/devel/nspr/Makefile,v 1.41 2010/11/21 18:17:03 marcus Exp $
# $MCom: ports-experimental/devel/nspr/Makefile,v 1.6 2008/03/12 13:06:56 ahze Exp $
PORTNAME= nspr
-DISTVERSION= 4.8.6
+DISTVERSION= 4.8.7
CATEGORIES= devel
#MASTER_SITES= LOCAL/ahze
MASTER_SITES= ${MASTER_SITE_MOZILLA}
@@ -43,21 +43,20 @@
do-install:
${MKDIR} ${PREFIX}/include/nspr
${TAR} -C ${WRKSRC}/dist/include --dereference -cf - . | \
- ${TAR} -C ${PREFIX}/include -xf -
- ${FIND} ${PREFIX}/include/nspr | \
- ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP}
+ ${TAR} -C ${PREFIX}/include -xof -
${FIND} ${PREFIX}/include/nspr -type d | \
${XARGS} ${CHMOD} 0755
${FIND} ${PREFIX}/include/nspr -type f | \
${XARGS} ${CHMOD} ${SHAREMODE}
${TAR} -C ${WRKSRC}/dist/lib --dereference -cf - . | \
- ${TAR} -C ${PREFIX}/lib -xf -
+ ${TAR} -C ${PREFIX}/lib -xof -
${INSTALL_SCRIPT} ${WRKSRC}/config/nspr-config ${PREFIX}/bin
${MKDIR} ${PREFIX}/libdata/pkgconfig
${INSTALL_DATA} ${WRKSRC}/config/nspr.pc ${PREFIX}/libdata/pkgconfig
.for lib in ${LIBS}
+.if defined(STRIP) && ${STRIP} != ""
${STRIP_CMD} ${PREFIX}/lib/${lib}
- ${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/lib/${lib}
+.endif
${CHMOD} ${BINMODE} ${PREFIX}/lib/${lib}
${LN} -sf ${lib} ${PREFIX}/lib/${lib:R}
.endfor
Modified: branches/experimental/devel/nspr/distinfo
==============================================================================
--- branches/experimental/devel/nspr/distinfo Sat Jan 15 09:23:06 2011 (r482)
+++ branches/experimental/devel/nspr/distinfo Sat Jan 15 13:09:12 2011 (r483)
@@ -1,3 +1,2 @@
-MD5 (nspr-4.8.6.tar.gz) = 592c275728c29d193fdba8009165990b
-SHA256 (nspr-4.8.6.tar.gz) = d9040bb01536fa63881c423c4fa831ea459696b32d2097f614842f824e1a9f6d
-SIZE (nspr-4.8.6.tar.gz) = 1202257
+SHA256 (nspr-4.8.7.tar.gz) = eb9459c31d43d1000fb1304f1e0cedab0bdac3c54c71988259c1ac10c1fe16a3
+SIZE (nspr-4.8.7.tar.gz) = 1244150
Modified: branches/experimental/devel/nspr/files/patch-tests
==============================================================================
--- branches/experimental/devel/nspr/files/patch-tests Sat Jan 15 09:23:06 2011 (r482)
+++ branches/experimental/devel/nspr/files/patch-tests Sat Jan 15 13:09:12 2011 (r483)
@@ -1437,79 +1437,95 @@
+ DataRecord *Items;
PRStack *list1, *list2;
PRStackElem *node;
---- ../pr/tests/suspend.c Sun Apr 25 11:01:02 2004
-+++ ../pr/tests/suspend.c Mon Jul 25 22:28:14 2005
-@@ -74,5 +74,5 @@
+--- ../pr/tests/suspend.c.orig 2010-09-24 20:14:40.000000000 +0200
++++ ../pr/tests/suspend.c 2011-01-15 13:56:43.000000000 +0100
+@@ -62,14 +62,14 @@
+ Level_2_Thread(void *arg)
{
PR_Sleep(PR_MillisecondsToInterval(4 * 1000));
- printf("Level_2_Thread[0x%lx] exiting\n",PR_GetCurrentThread());
+ printf("Level_2_Thread[%p] exiting\n",PR_GetCurrentThread());
return;
}
-@@ -81,5 +81,5 @@
+
+ void PR_CALLBACK
Level_1_Thread(void *arg)
{
- PRUint32 tmp = (PRUint32)arg;
+ PRUint32 tmp = (PRUint32)(uintptr_t)arg;
PRThreadScope scope = (PRThreadScope) tmp;
PRThread *thr;
-@@ -96,5 +96,5 @@
+
+@@ -84,7 +84,7 @@
+ if (!thr) {
printf("Could not create thread!\n");
} else {
- printf("Level_1_Thread[0x%lx] created %15s thread 0x%lx\n",
+ printf("Level_1_Thread[%p] created %15s thread %p\n",
PR_GetCurrentThread(),
(scope == PR_GLOBAL_THREAD) ?
-@@ -107,5 +107,5 @@
+ "PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD",
+@@ -95,7 +95,7 @@
+ alive--;
PR_Notify(mon);
PR_ExitMonitor(mon);
- printf("Thread[0x%lx] exiting\n",PR_GetCurrentThread());
+ printf("Thread[%p] exiting\n",PR_GetCurrentThread());
}
-@@ -116,11 +116,12 @@
+ static PRStatus PR_CALLBACK print_thread(PRThread *thread, int i, void *arg)
+@@ -104,14 +104,15 @@
+ PRWord *registers;
printf(
- "\nprint_thread[0x%lx]: %-20s - i = %ld\n",thread,
-+ "\nprint_thread[%p]: %-20s - i = %d\n",thread,
++ "\nprint_thread[%p]: %-20s - i = %ld\n",thread,
(PR_GLOBAL_THREAD == PR_GetThreadScope(thread)) ?
"PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD", i);
registers = PR_GetGCRegisters(thread, 0, (int *)&words);
-- printf("Regsters R0 = 0x%x R1 = 0x%x R2 = 0x%x R3 = 0x%x\n",
-- registers[0],registers[1],registers[2],registers[3]);
+ if (registers)
+- printf("Registers R0 = 0x%x R1 = 0x%x R2 = 0x%x R3 = 0x%x\n",
+- registers[0],registers[1],registers[2],registers[3]);
- printf("Stack Pointer = 0x%lx\n", PR_GetSP(thread));
-+ printf("Regsters R0 = 0x%lx R1 = 0x%lx R2 = 0x%lx R3 = 0x%lx\n",
-+ (unsigned long)registers[0], (unsigned long)registers[1],
-+ (unsigned long)registers[2], (unsigned long)registers[3]);
++ printf("Regsters R0 = 0x%lx R1 = 0x%lx R2 = 0x%lx R3 = 0x%lx\n",
++ (unsigned long)registers[0], (unsigned long)registers[1],
++ (unsigned long)registers[2], (unsigned long)registers[3]);
+ printf("Stack Pointer = %p\n", PR_GetSP(thread));
return PR_SUCCESS;
}
-@@ -150,5 +151,5 @@
+
+@@ -139,7 +140,7 @@
+ printf("Could not create thread!\n");
alive--;
}
- printf("Level_0_Thread[0x%lx] created %15s thread 0x%lx\n",
+ printf("Level_0_Thread[%p] created %15s thread %p\n",
PR_GetCurrentThread(),
(scope1 == PR_GLOBAL_THREAD) ?
-@@ -161,7 +162,8 @@
+ "PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD",
+@@ -151,9 +152,10 @@
PR_EnumerateThreads(print_thread, NULL);
registers = PR_GetGCRegisters(me, 1, (int *)&words);
-- printf("My Registers: R0 = 0x%x R1 = 0x%x R2 = 0x%x R3 = 0x%x\n",
-- registers[0],registers[1],registers[2],registers[3]);
+ if (registers)
+- printf("My Registers: R0 = 0x%x R1 = 0x%x R2 = 0x%x R3 = 0x%x\n",
+- registers[0],registers[1],registers[2],registers[3]);
- printf("My Stack Pointer = 0x%lx\n", PR_GetSP(me));
-+ printf("My Registers: R0 = 0x%lx R1 = 0x%lx R2 = 0x%lx R3 = 0x%lx\n",
-+ (unsigned long)registers[0], (unsigned long)registers[1],
-+ (unsigned long)registers[2], (unsigned long)registers[3]);
++ printf("My Registers: R0 = 0x%lx R1 = 0x%lx R2 = 0x%lx R3 = 0x%lx\n",
++ (unsigned long)registers[0], (unsigned long)registers[1],
++ (unsigned long)registers[2], (unsigned long)registers[3]);
+ printf("My Stack Pointer = %p\n", PR_GetSP(me));
PR_ResumeAll();
-@@ -227,4 +229,6 @@
+ /* Wait for all threads to exit */
+@@ -212,6 +214,8 @@
+ CreateThreadsUU();
CreateThreadsKU();
PR_Cleanup();
+
+ return 0;
}
+ #endif /* XP_BEOS */
--- ../pr/tests/testfile.c Tue Jun 20 17:46:54 2000
+++ ../pr/tests/testfile.c Mon Jul 25 22:36:39 2005
@@ -69,4 +69,7 @@
More information about the freebsd-gecko
mailing list