diff --git a/general.ent b/general.ent
index e257b0fabc..95560c6031 100644
--- a/general.ent
+++ b/general.ent
@@ -208,7 +208,7 @@ $Date$
-
+
diff --git a/general/genlib/nspr.xml b/general/genlib/nspr.xml
index 41fb32ebb3..422ea7761c 100644
--- a/general/genlib/nspr.xml
+++ b/general/genlib/nspr.xml
@@ -4,11 +4,13 @@
%general-entities;
-
-
-
+
+
+
-
+
]>
@@ -29,91 +31,119 @@
Introduction to NSPR
- Netscape Portable Runtime (NSPR) provides
- a platform-neutral API for system level and libc like functions.
+
+ Netscape Portable Runtime (NSPR) provides
+ a platform-neutral API for system level and libc like functions.
+
&lfs70_checked;
Package Information
- Download (HTTP):
+
+ Download (HTTP):
+
- Download (FTP):
+
+ Download (FTP):
+
- Download MD5 sum: &nspr-md5sum;
+
+ Download MD5 sum: &nspr-md5sum;
+
- Download size: &nspr-size;
+
+ Download size: &nspr-size;
+
- Estimated disk space required: &nspr-buildsize;
+
+ Estimated disk space required: &nspr-buildsize;
+
- Estimated build time: &nspr-time;
+
+ Estimated build time: &nspr-time;
+
- Additional Downloads
-
-
- Required patch:
-
-
-
-
- User Notes:
-
-
+
+ User Notes:
+
Installation of NSPR
- Install NSPR by running the following
- commands:
+
+ Install NSPR by running the following commands:
+
-patch -Np1 -i ../nspr-&nspr-version;-pkgconfig-2.patch &&
-cd mozilla/nsprpub &&
+cd mozilla/nsprpub &&
sed -i 's#^\(RELEASE_BINS =\).*#\1#' pr/src/misc/Makefile.in &&
+sed -i 's#$(LIBRARY) ##' config/rules.mk &&
./configure --prefix=/usr --with-mozilla --with-pthreads \
$([ $(arch) = x86_64 ] && echo --enable-64bit) &&
make
- This package does not come with a test suite.
+
+ This package does not come with a test suite.
+
- Now, as the root user:
+
+ Now, as the root user:
+
make install &&
-cp -v -LR dist/include/nspr /usr/include
+cat > /usr/lib/pkgconfig/nspr.pc << "HERE_DOC"
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include/nspr
+Name: NSPR
+Description: The Netscape Portable Runtime
+Version: &nspr-version;.0
+Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread
+Cflags: -I${includedir}
+HERE_DOC
Command Explanations
- --with-mozilla: This parameter adds Mozilla
- support to the libraries (required if you want to build any other Mozilla
- products and link them to these libraries).
+
+ --with-mozilla: This parameter adds Mozilla support
+ to the libraries (required if you want to build any other Mozilla products
+ and link them to these libraries).
+
- --with-pthreads: This parameter forces use of
- the system pthreads library.
+
+ --with-pthreads: This parameter forces use of the
+ system pthreads library.
+
- $([ $(arch) ... --enable-64bit: This parameter
- is required on an x86_64 system to prevent
- configure failing with a claim that this is a system
- without pthread support. It has no effect on a 32 bit system.
+
+ $([ $(arch) ... --enable-64bit: This parameter is
+ required on an x86_64 system to prevent
+ configure failing with a claim that this is a system
+ without pthread support. It has no effect on a 32 bit system.
+
- sed -i 's#^\(RELEASE_BINS ...: This disables
- installing two unneeded scripts.
-
- If you don't want to compile and install the static versions of the
- libraries you can disable them with a sed:
- sed -i '/^TARGETS/s# $(LIBRARY)##' config/rules.mk
+
+ sed -i 's#^\(RELEASE_BINS ...: This disables installing
+ two unneeded scripts.
+
+
+ sed -i 's#$(LIBRARY) ##' config/rules.mk: This disables
+ installing the static libraries.
+
@@ -126,7 +156,7 @@ cp -v -LR dist/include/nspr /usr/include
nspr-config
- libnspr4.{a,so}, libplc4.{a,so}, and libplds4.{a.so}
+ libnspr4.so, libplc4.so, and libplds4.so
/usr/include/nspr
@@ -139,8 +169,10 @@ cp -v -LR dist/include/nspr /usr/include
nspr-config
- provides compiler and linker options to other packages that
- use NSPR.
+
+ provides compiler and linker options to other packages that use
+ NSPR.
+
nspr-config
@@ -148,42 +180,44 @@ cp -v -LR dist/include/nspr /usr/include
- libnspr4.{so,a}
+ libnspr4.so
- contains functions that provide platform independence for
- non-GUI operating system facilities such as threads, thread
- synchronization, normal file and network I/O, interval timing and
- calendar time, basic memory management (malloc and free) and shared
- library linking.
+
+ contains functions that provide platform independence for non-GUI
+ operating system facilities such as threads, thread synchronization,
+ normal file and network I/O, interval timing and calendar time,
+ basic memory management and shared library linking.
+
- libnspr4.{so,a}
+ libnspr4.so
- libplc4.{so,a}
+ libplc4.so
- contains functions that implement many of the features offered
- by libnspr4
+
+ contains functions that implement many of the features offered by
+ libnspr4
+
- libplc4.{so,a}
+ libplc4.so
- libplds4.{so,a}
+ libplds4.so
- contains functions that provide data structures.
+
+ contains functions that provide data structures.
+
- libplds4.{so,a}
+ libplds4.so
-
-
-
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 567422c1ce..640c0d741a 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -45,11 +45,15 @@
March 4th, 2012
- [rthomsen] - Modified configuration of polkit. Thanks to Armin K. for creating the patch.
+ [rthomsen] - Modified configuration of polkit. Thanks to
+ Armin K. for creating the patch.
-
+
[rthomsen] - Updated to akonadi 1.7.1.
+
+ [abenton] - NSPR 4.9.
+
@@ -60,19 +64,20 @@
[rthomsen] - Updated to polkit-0.104.
-
- [rthomsen] - Updated to XChat 2.8.8. Thanks to Armin K. for creating the patch.
+
+ [rthomsen] - Updated to XChat 2.8.8. Thanks to Armin K. for
+ creating the patch.
-
+
[rthomsen] - Updated to Strigi 0.7.5.
-
+
[rthomsen] - Added patch for Raptor 1.4.21.
-
+
[rthomsen] - Updated to Soprano 2.7.4.
-
+
[rthomsen] - Updated to Kde4libs 4.8.0.
@@ -864,11 +869,11 @@
[ken] - Add autogen-5.12, clutter-gst-1.4.4, colord-0.1.14,
- lcms2-2.2 and mx-1.2.1 from Wayne, and mention Cantarell fonts in the
+ lcms2-2.2 and mx-1.2.1 from Wayne, and mention Cantarell fonts in the
Xft Font Protocol part of xorg-config.
- [ken] - Merge clutter-1.8.2, clutter-gtk-1.0.4 and eviv2-0.22
+ [ken] - Merge clutter-1.8.2, clutter-gtk-1.0.4 and eviv2-0.22
from Wayne.