Module Name:	pkgsrc
Committed By:	jschauma
Date:		Tue Jan 25 14:50:39 UTC 2005

Modified Files:
	pkgsrc/devel/nspr: Makefile PLIST distinfo
Added Files:
	pkgsrc/devel/nspr: buildlink3.mk
	pkgsrc/devel/nspr/patches: patch-aa patch-ab patch-ac patch-ad patch-ae
	    patch-af

Log Message:
Merge with / update using the package provided by matthewluckie in
pkgsrc-wip.


To generate a diff of this commit:
cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/devel/nspr/Makefile pkgsrc/devel/nspr/PLIST \
    pkgsrc/devel/nspr/distinfo
cvs rdiff -r0 -r1.1 pkgsrc/devel/nspr/buildlink3.mk
cvs rdiff -r0 -r1.1 pkgsrc/devel/nspr/patches/patch-aa \
    pkgsrc/devel/nspr/patches/patch-ab pkgsrc/devel/nspr/patches/patch-ac \
    pkgsrc/devel/nspr/patches/patch-ad pkgsrc/devel/nspr/patches/patch-ae \
    pkgsrc/devel/nspr/patches/patch-af

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.