- Update to 20111215.

Submitted by:   Tassilo Philipp <tphilipp@potion-studios.com> (maintainer via email)

8 files changed, 418 insertions, 412 deletions

diff --git a/devel/psptoolchain-pspsdk-stage1/Makefile b/devel/psptoolchain-pspsdk-stage1/Makefile
index 77df5e83e036..a6627378f0c7 100644
--- a/devel/psptoolchain-pspsdk-stage1/Makefile
+++ b/devel/psptoolchain-pspsdk-stage1/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=		pspsdk
-PORTVERSION=		20090127
-PORTREVISION=	1
+PORTVERSION=		20111215
 CATEGORIES=		devel
 MASTER_SITES=		http://www.potion-studios.com/
 PKGNAMEPREFIX=		psptoolchain-
@@ -21,7 +20,8 @@ PSP_SDK_STAGE_PREFIX=	psp/stage1
 USE_AUTOTOOLS=		libtool:env aclocal:env autoheader:env automake:env autoconf:env
 USE_GMAKE=		yes
 HAS_CONFIGURE=		yes
-CONFIGURE_ARGS?=	--prefix=${PREFIX}/${PSP_SDK_STAGE_PREFIX} --with-pspdev="${PREFIX}/${PSP_SDK_STAGE_PREFIX}"
+CONFIGURE_ARGS?=	--prefix=${PREFIX}/${PSP_SDK_STAGE_PREFIX} \
+			--with-pspdev="${LOCALBASE}/${PSP_SDK_STAGE_PREFIX}"
 
 # First stage only needs to install some data needed to compile newlib.
 # Patch a hardcoded prefix, such that we can set our own stage1 subdir.
diff --git a/devel/psptoolchain-pspsdk-stage1/distinfo b/devel/psptoolchain-pspsdk-stage1/distinfo
index 10175ba03b6c..21d8889e536f 100644
--- a/devel/psptoolchain-pspsdk-stage1/distinfo
+++ b/devel/psptoolchain-pspsdk-stage1/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pspsdk-20090127.tar.gz) = c18cf11c3a0dec950b913349e9d801e2d1b1d7acd0e9c8f57802b422dc5fd612
-SIZE (pspsdk-20090127.tar.gz) = 601708
+SHA256 (pspsdk-20111215.tar.gz) = ddee6fe47ee4daa31691acdfa1832182692cefe2a0b153db96c492107e420abd
+SIZE (pspsdk-20111215.tar.gz) = 643465
diff --git a/devel/psptoolchain-pspsdk-stage1/files/patch-src-libc-libcglue.c b/devel/psptoolchain-pspsdk-stage1/files/patch-src-libc-libcglue.c
deleted file mode 100644
index a5d7486b57f3..000000000000
--- a/devel/psptoolchain-pspsdk-stage1/files/patch-src-libc-libcglue.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/libc/libcglue.c.orig	2009-02-23 12:12:45.000000000 +0100
-+++ src/libc/libcglue.c	2009-02-23 12:11:39.000000000 +0100
-@@ -42,7 +42,7 @@
- 
- /* If we're being built for PSPSDK's libc this function isn't defined. */
- #ifdef F_glue_gettimeofday
--int gettimeofday(struct timeval *tp, void *tzp)
-+int gettimeofday(struct timeval *tp, struct timezone *tzp)
- {
- 	return sceKernelLibcGettimeofday(tp, tzp);
- }
diff --git a/devel/psptoolchain-pspsdk-stage1/files/patch-tools-PrxEncrypter-kirk_engine.c b/devel/psptoolchain-pspsdk-stage1/files/patch-tools-PrxEncrypter-kirk_engine.c
new file mode 100644
index 000000000000..08c73a587dc2
--- /dev/null
+++ b/devel/psptoolchain-pspsdk-stage1/files/patch-tools-PrxEncrypter-kirk_engine.c
@@ -0,0 +1,10 @@
+--- tools/PrxEncrypter/kirk_engine.c.orig	2012-01-25 22:10:31.000000000 +0000
++++ tools/PrxEncrypter/kirk_engine.c	2012-01-25 22:10:49.000000000 +0000
+@@ -8,7 +8,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <time.h>
+-#include <malloc.h>
+ #include "types.h"
+ #include "kirk_engine.h"
+ #include "crypto.h"
diff --git a/devel/psptoolchain-pspsdk-stage1/pkg-plist b/devel/psptoolchain-pspsdk-stage1/pkg-plist
index 1c887ba2e017..6f17c171c5b2 100644
--- a/devel/psptoolchain-pspsdk-stage1/pkg-plist
+++ b/devel/psptoolchain-pspsdk-stage1/pkg-plist
@@ -176,6 +176,8 @@
 %%PSP_SDK_STAGE_PREFIX%%/sdk/samples/gu/blend/Makefile
 %%PSP_SDK_STAGE_PREFIX%%/sdk/samples/gu/beginobject/beginobject.c
 %%PSP_SDK_STAGE_PREFIX%%/sdk/samples/gu/beginobject/Makefile
+%%PSP_SDK_STAGE_PREFIX%%/sdk/samples/exceptions/main.cpp
+%%PSP_SDK_STAGE_PREFIX%%/sdk/samples/exceptions/Makefile
 %%PSP_SDK_STAGE_PREFIX%%/sdk/samples/debug/sio/readme.txt
 %%PSP_SDK_STAGE_PREFIX%%/sdk/samples/debug/sio/main.c
 %%PSP_SDK_STAGE_PREFIX%%/sdk/samples/debug/sio/Makefile
@@ -394,6 +396,7 @@
 @dirrm %%PSP_SDK_STAGE_PREFIX%%/sdk/samples/gu/blend
 @dirrm %%PSP_SDK_STAGE_PREFIX%%/sdk/samples/gu/beginobject
 @dirrm %%PSP_SDK_STAGE_PREFIX%%/sdk/samples/gu
+@dirrm %%PSP_SDK_STAGE_PREFIX%%/sdk/samples/exceptions
 @dirrm %%PSP_SDK_STAGE_PREFIX%%/sdk/samples/debug/sio
 @dirrm %%PSP_SDK_STAGE_PREFIX%%/sdk/samples/debug/prxdecrypt
 @dirrm %%PSP_SDK_STAGE_PREFIX%%/sdk/samples/debug/profiler
@@ -408,9 +411,9 @@
 @dirrm %%PSP_SDK_STAGE_PREFIX%%/sdk/samples/audio/polyphonic
 @dirrm %%PSP_SDK_STAGE_PREFIX%%/sdk/samples/audio
 @dirrm %%PSP_SDK_STAGE_PREFIX%%/sdk/samples
-@dirrmtry %%PSP_SDK_STAGE_PREFIX%%/sdk/lib
 @dirrm %%PSP_SDK_STAGE_PREFIX%%/sdk/include/libc
 @dirrm %%PSP_SDK_STAGE_PREFIX%%/sdk/include
+@dirrmtry %%PSP_SDK_STAGE_PREFIX%%/sdk/lib
 @dirrmtry %%PSP_SDK_STAGE_PREFIX%%/sdk
 @dirrmtry %%PSP_SDK_STAGE_PREFIX%%
 @dirrmtry psp
diff --git a/devel/psptoolchain-pspsdk-stage2/Makefile b/devel/psptoolchain-pspsdk-stage2/Makefile
index 2f875767fedf..52fbd233eca0 100644
--- a/devel/psptoolchain-pspsdk-stage2/Makefile
+++ b/devel/psptoolchain-pspsdk-stage2/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS=		psp-cpp:${PORTSDIR}/devel/psptoolchain-gcc-stage2 \
 			psp-ar:${PORTSDIR}/devel/psptoolchain-binutils \
 			${LOCALBASE}/psp/lib/libc.a:${PORTSDIR}/devel/psptoolchain-newlib
 
-CONFIGURE_ARGS=		--prefix=${PREFIX} --with-pspdev="${PREFIX}"
+CONFIGURE_ARGS=		--prefix=${PREFIX} --with-pspdev="${LOCALBASE}"
 
 PLIST=			${.CURDIR}/pkg-plist
 MASTERDIR=		${.CURDIR}/../psptoolchain-pspsdk-stage1
diff --git a/devel/psptoolchain-pspsdk-stage2/pkg-plist b/devel/psptoolchain-pspsdk-stage2/pkg-plist
index b8924878c871..e2fd83e6e86c 100644
--- a/devel/psptoolchain-pspsdk-stage2/pkg-plist
+++ b/devel/psptoolchain-pspsdk-stage2/pkg-plist
@@ -1,394 +1,398 @@
-psp/sdk/samples/wlan/main.c
-psp/sdk/samples/wlan/Makefile
-psp/sdk/samples/utility/systemparam/main.c
-psp/sdk/samples/utility/systemparam/Makefile
-psp/sdk/samples/utility/osk/main.c
-psp/sdk/samples/utility/osk/Makefile
-psp/sdk/samples/utility/netdialog/main.c
-psp/sdk/samples/utility/netdialog/Makefile
-psp/sdk/samples/utility/netconf/main.c
-psp/sdk/samples/utility/netconf/Makefile
-psp/sdk/samples/utility/msgdialog/main.c
-psp/sdk/samples/utility/msgdialog/Makefile
-psp/sdk/samples/utility/htmlviewer/main.c
-psp/sdk/samples/utility/htmlviewer/Makefile
-psp/sdk/samples/utility/gamesharing/main.c
-psp/sdk/samples/utility/gamesharing/Makefile
-psp/sdk/samples/usb/storage/main.c
-psp/sdk/samples/usb/storage/Makefile
-psp/sdk/samples/template/prx_template/main.c
-psp/sdk/samples/template/prx_template/Makefile
-psp/sdk/samples/template/lib_template/template.h
-psp/sdk/samples/template/lib_template/template.c
-psp/sdk/samples/template/lib_template/Makefile
-psp/sdk/samples/template/kprx_template/main.c
-psp/sdk/samples/template/kprx_template/exports.exp
-psp/sdk/samples/template/kprx_template/Makefile
-psp/sdk/samples/template/elf_template/main.c
-psp/sdk/samples/template/elf_template/Makefile
-psp/sdk/samples/savedata/utility/main.c
-psp/sdk/samples/savedata/utility/data.h
-psp/sdk/samples/savedata/utility/Makefile
-psp/sdk/samples/savedata/encrypt/psf.h
-psp/sdk/samples/savedata/encrypt/psf.c
-psp/sdk/samples/savedata/encrypt/main.c
-psp/sdk/samples/savedata/encrypt/hash.h
-psp/sdk/samples/savedata/encrypt/hash.c
-psp/sdk/samples/savedata/encrypt/encrypt.h
-psp/sdk/samples/savedata/encrypt/encrypt.c
-psp/sdk/samples/savedata/encrypt/README.txt
-psp/sdk/samples/savedata/encrypt/Makefile
-psp/sdk/samples/savedata/decrypt/main.c
-psp/sdk/samples/savedata/decrypt/decrypt.h
-psp/sdk/samples/savedata/decrypt/decrypt.c
-psp/sdk/samples/savedata/decrypt/README.txt
-psp/sdk/samples/savedata/decrypt/Makefile
-psp/sdk/samples/prx/testprx/main.c
-psp/sdk/samples/prx/testprx/exports.exp
-psp/sdk/samples/prx/testprx/Makefile
-psp/sdk/samples/prx/prx_loader/main.c
-psp/sdk/samples/prx/prx_loader/MyLib.S
-psp/sdk/samples/prx/prx_loader/Makefile
-psp/sdk/samples/power/main.c
-psp/sdk/samples/power/Makefile
-psp/sdk/samples/net/wlanscan_elf/main.c
-psp/sdk/samples/net/wlanscan_elf/Makefile
-psp/sdk/samples/net/wlanscan/main.c
-psp/sdk/samples/net/wlanscan/Makefile
-psp/sdk/samples/net/simple_prx/main.c
-psp/sdk/samples/net/simple_prx/exports.exp
-psp/sdk/samples/net/simple_prx/Makefile
-psp/sdk/samples/net/simple/main.c
-psp/sdk/samples/net/simple/Makefile
-psp/sdk/samples/net/resolver/main.c
-psp/sdk/samples/net/resolver/Makefile
-psp/sdk/samples/nand/dumpipl/main.c
-psp/sdk/samples/nand/dumpipl/README
-psp/sdk/samples/nand/dumpipl/Makefile
-psp/sdk/samples/ms/callback/main.c
-psp/sdk/samples/ms/callback/Makefile
-psp/sdk/samples/mp3/main.c
-psp/sdk/samples/mp3/Makefile
-psp/sdk/samples/me/basic/me.S
-psp/sdk/samples/me/basic/main.c
-psp/sdk/samples/me/basic/Makefile
-psp/sdk/samples/kernel/threadstatus/main.c
-psp/sdk/samples/kernel/threadstatus/Makefile
-psp/sdk/samples/kernel/systimer/main.c
-psp/sdk/samples/kernel/systimer/Makefile
-psp/sdk/samples/kernel/sysevent/main.c
-psp/sdk/samples/kernel/sysevent/Makefile
-psp/sdk/samples/kernel/registry/main.c
-psp/sdk/samples/kernel/registry/Makefile
-psp/sdk/samples/kernel/regenum/main.c
-psp/sdk/samples/kernel/regenum/Makefile
-psp/sdk/samples/kernel/messagebox/main.c
-psp/sdk/samples/kernel/messagebox/Makefile
-psp/sdk/samples/kernel/loadmodule/main.c
-psp/sdk/samples/kernel/loadmodule/Makefile
-psp/sdk/samples/kernel/kdumper/main.c
-psp/sdk/samples/kernel/kdumper/Makefile
-psp/sdk/samples/kernel/idstorage/main.c
-psp/sdk/samples/kernel/idstorage/Makefile
-psp/sdk/samples/kernel/fileio/main.c
-psp/sdk/samples/kernel/fileio/Makefile
-psp/sdk/samples/kernel/cwd/main.c
-psp/sdk/samples/kernel/cwd/Makefile
-psp/sdk/samples/ir/sircs/main.c
-psp/sdk/samples/ir/sircs/Makefile
-psp/sdk/samples/ir/irda/main.c
-psp/sdk/samples/ir/irda/Makefile
-psp/sdk/samples/gu/zbufferfog/zbufferfog.c
-psp/sdk/samples/gu/zbufferfog/Makefile
-psp/sdk/samples/gu/vertex/vertex.c
-psp/sdk/samples/gu/vertex/Makefile
-psp/sdk/samples/gu/timing/timing.c
-psp/sdk/samples/gu/timing/Makefile
-psp/sdk/samples/gu/text/main.c
-psp/sdk/samples/gu/text/font.raw
-psp/sdk/samples/gu/text/Makefile
-psp/sdk/samples/gu/sprite/sprite.c
-psp/sdk/samples/gu/sprite/ball.raw
-psp/sdk/samples/gu/sprite/Makefile
-psp/sdk/samples/gu/splinesurface/splinesurface.c
-psp/sdk/samples/gu/splinesurface/Makefile
-psp/sdk/samples/gu/spharm/spharm.c
-psp/sdk/samples/gu/spharm/readme
-psp/sdk/samples/gu/spharm/mt19937.h
-psp/sdk/samples/gu/spharm/mt19937.c
-psp/sdk/samples/gu/spharm/logo.raw
-psp/sdk/samples/gu/spharm/disablefpu.S
-psp/sdk/samples/gu/spharm/cube.c
-psp/sdk/samples/gu/spharm/Makefile
-psp/sdk/samples/gu/spharm/Image2.raw
-psp/sdk/samples/gu/spharm/Image1.raw
-psp/sdk/samples/gu/speed/speed.c
-psp/sdk/samples/gu/speed/Makefile
-psp/sdk/samples/gu/skinning/skinning.c
-psp/sdk/samples/gu/skinning/Makefile
-psp/sdk/samples/gu/signals/signals.c
-psp/sdk/samples/gu/signals/ball.raw
-psp/sdk/samples/gu/signals/Makefile
-psp/sdk/samples/gu/shadowprojection/shadowprojection.c
-psp/sdk/samples/gu/shadowprojection/Makefile
-psp/sdk/samples/gu/rendertarget/rendertarget.c
-psp/sdk/samples/gu/rendertarget/Makefile
-psp/sdk/samples/gu/reflection/reflection.c
-psp/sdk/samples/gu/reflection/Makefile
-psp/sdk/samples/gu/ortho/ortho.c
-psp/sdk/samples/gu/ortho/Makefile
-psp/sdk/samples/gu/morphskin/morphskin.c
-psp/sdk/samples/gu/morphskin/Makefile
-psp/sdk/samples/gu/morph/morph.c
-psp/sdk/samples/gu/morph/Makefile
-psp/sdk/samples/gu/logic/logic.c
-psp/sdk/samples/gu/logic/Makefile
-psp/sdk/samples/gu/lines/lines.c
-psp/sdk/samples/gu/lines/Makefile
-psp/sdk/samples/gu/lights/lights.c
-psp/sdk/samples/gu/lights/Makefile
-psp/sdk/samples/gu/integerdrawing/integerdrawing.c
-psp/sdk/samples/gu/integerdrawing/Makefile
-psp/sdk/samples/gu/envmap/envmap.c
-psp/sdk/samples/gu/envmap/env0.raw
-psp/sdk/samples/gu/envmap/Makefile
-psp/sdk/samples/gu/cube/logo.raw
-psp/sdk/samples/gu/cube/cube.c
-psp/sdk/samples/gu/cube/Makefile
-psp/sdk/samples/gu/copy/copy.c
-psp/sdk/samples/gu/copy/Makefile
-psp/sdk/samples/gu/common/vram.h
-psp/sdk/samples/gu/common/vram.c
-psp/sdk/samples/gu/common/menu.h
-psp/sdk/samples/gu/common/menu.c
-psp/sdk/samples/gu/common/geometry.h
-psp/sdk/samples/gu/common/geometry.c
-psp/sdk/samples/gu/common/callbacks.h
-psp/sdk/samples/gu/common/callbacks.c
-psp/sdk/samples/gu/clut/clut.c
-psp/sdk/samples/gu/clut/Makefile
-psp/sdk/samples/gu/celshading/lightmap.raw
-psp/sdk/samples/gu/celshading/celshading.c
-psp/sdk/samples/gu/celshading/Makefile
-psp/sdk/samples/gu/blit/blit.c
-psp/sdk/samples/gu/blit/Makefile
-psp/sdk/samples/gu/blend/blend.c
-psp/sdk/samples/gu/blend/Makefile
-psp/sdk/samples/gu/beginobject/beginobject.c
-psp/sdk/samples/gu/beginobject/Makefile
-psp/sdk/samples/debug/sio/readme.txt
-psp/sdk/samples/debug/sio/main.c
-psp/sdk/samples/debug/sio/Makefile
-psp/sdk/samples/debug/prxdecrypt/main.c
-psp/sdk/samples/debug/prxdecrypt/Makefile
-psp/sdk/samples/debug/profiler/main.c
-psp/sdk/samples/debug/profiler/Makefile
-psp/sdk/samples/debug/kprintf/main.c
-psp/sdk/samples/debug/kprintf/Makefile
-psp/sdk/samples/debug/gdb/main.c
-psp/sdk/samples/debug/gdb/Makefile
-psp/sdk/samples/debug/exception/main.c
-psp/sdk/samples/debug/exception/Makefile
-psp/sdk/samples/debug/debugkb/main.c
-psp/sdk/samples/debug/debugkb/Makefile
-psp/sdk/samples/controller/basic/main.c
-psp/sdk/samples/controller/basic/Makefile
-psp/sdk/samples/audio/wavegen/main.c
-psp/sdk/samples/audio/wavegen/Makefile
-psp/sdk/samples/audio/polyphonic/main.c
-psp/sdk/samples/audio/polyphonic/Makefile
-psp/sdk/lib/prxspecs
-psp/sdk/lib/prxexports.o
-psp/sdk/lib/linkfile.prx
-psp/sdk/lib/libpspwlan.a
-psp/sdk/lib/libpspvshbridge.a
-psp/sdk/lib/libpspvideocodec.a
-psp/sdk/lib/libpspvfpu.a
-psp/sdk/lib/libpsputility.a
-psp/sdk/lib/libpspuser.a
-psp/sdk/lib/libpspusbstor.a
-psp/sdk/lib/libpspusbcam.a
-psp/sdk/lib/libpspusbbus_driver.a
-psp/sdk/lib/libpspusb_driver.a
-psp/sdk/lib/libpspusb.a
-psp/sdk/lib/libpspumd_driver.a
-psp/sdk/lib/libpspumd.a
-psp/sdk/lib/libpspssl.a
-psp/sdk/lib/libpspsircs.a
-psp/sdk/lib/libpspsdk.a
-psp/sdk/lib/libpsprtc_driver.a
-psp/sdk/lib/libpsprtc.a
-psp/sdk/lib/libpspreg_driver.a
-psp/sdk/lib/libpspreg.a
-psp/sdk/lib/libpspprof.a
-psp/sdk/lib/libpsppower_driver.a
-psp/sdk/lib/libpsppower.a
-psp/sdk/lib/libpsppaf.a
-psp/sdk/lib/libpspopenpsid.a
-psp/sdk/lib/libpspnet_resolver.a
-psp/sdk/lib/libpspnet_inet.a
-psp/sdk/lib/libpspnet_apctl.a
-psp/sdk/lib/libpspnet_adhocmatching.a
-psp/sdk/lib/libpspnet_adhocctl.a
-psp/sdk/lib/libpspnet_adhoc.a
-psp/sdk/lib/libpspnet.a
-psp/sdk/lib/libpspnand_driver.a
-psp/sdk/lib/libpspmpegbase_driver.a
-psp/sdk/lib/libpspmpegbase.a
-psp/sdk/lib/libpspmpeg.a
-psp/sdk/lib/libpspmp3.a
-psp/sdk/lib/libpsplibc.a
-psp/sdk/lib/libpspkernel.a
-psp/sdk/lib/libpspjpeg.a
-psp/sdk/lib/libpsphttp.a
-psp/sdk/lib/libpsphprm_driver.a
-psp/sdk/lib/libpsphprm.a
-psp/sdk/lib/libpspgum_vfpu.a
-psp/sdk/lib/libpspgum.a
-psp/sdk/lib/libpspgu.a
-psp/sdk/lib/libpspge_driver.a
-psp/sdk/lib/libpspge.a
-psp/sdk/lib/libpspgdb_user.a
-psp/sdk/lib/libpspgdb_kernel.a
-psp/sdk/lib/libpspgdb.a
-psp/sdk/lib/libpspfpu.a
-psp/sdk/lib/libpspdisplay_driver.a
-psp/sdk/lib/libpspdisplay.a
-psp/sdk/lib/libpspdebugkb.a
-psp/sdk/lib/libpspdebug.a
-psp/sdk/lib/libpspctrl_driver.a
-psp/sdk/lib/libpspctrl.a
-psp/sdk/lib/libpspchnnlsv.a
-psp/sdk/lib/libpspaudiolib.a
-psp/sdk/lib/libpspaudiocodec.a
-psp/sdk/lib/libpspaudio_driver.a
-psp/sdk/lib/libpspaudio.a
-psp/sdk/lib/libpspatrac3.a
-psp/sdk/lib/build_prx.mak
-psp/sdk/lib/build.mak
-psp/sdk/include/pspwlan.h
-psp/sdk/include/pspvideocodec.h
-psp/sdk/include/pspvfpu.h
-psp/sdk/include/psputilsforkernel.h
-psp/sdk/include/psputils.h
-psp/sdk/include/psputility_usbmodules.h
-psp/sdk/include/psputility_sysparam.h
-psp/sdk/include/psputility_savedata.h
-psp/sdk/include/psputility_osk.h
-psp/sdk/include/psputility_netparam.h
-psp/sdk/include/psputility_netmodules.h
-psp/sdk/include/psputility_netconf.h
-psp/sdk/include/psputility_msgdialog.h
-psp/sdk/include/psputility_modules.h
-psp/sdk/include/psputility_htmlviewer.h
-psp/sdk/include/psputility_gamesharing.h
-psp/sdk/include/psputility_avmodules.h
-psp/sdk/include/psputility.h
-psp/sdk/include/pspuser.h
-psp/sdk/include/pspusbstor.h
-psp/sdk/include/pspusbcam.h
-psp/sdk/include/pspusbbus.h
-psp/sdk/include/pspusbacc.h
-psp/sdk/include/pspusb.h
-psp/sdk/include/pspumd.h
-psp/sdk/include/psptypes.h
-psp/sdk/include/pspthreadman_kernel.h
-psp/sdk/include/pspthreadman.h
-psp/sdk/include/pspsystimer.h
-psp/sdk/include/pspsysreg.h
-psp/sdk/include/pspsysmem_kernel.h
-psp/sdk/include/pspsysmem.h
-psp/sdk/include/pspsysevent.h
-psp/sdk/include/pspsyscon.h
-psp/sdk/include/pspsysclib.h
-psp/sdk/include/pspsuspend.h
-psp/sdk/include/pspstub.s
-psp/sdk/include/pspstdio_kernel.h
-psp/sdk/include/pspstdio.h
-psp/sdk/include/pspssl.h
-psp/sdk/include/pspsircs.h
-psp/sdk/include/pspsdk.h
-psp/sdk/include/psprtc.h
-psp/sdk/include/pspreg.h
-psp/sdk/include/pspprof.h
-psp/sdk/include/psppower.h
-psp/sdk/include/pspopenpsid.h
-psp/sdk/include/pspnet_resolver.h
-psp/sdk/include/pspnet_inet.h
-psp/sdk/include/pspnet_apctl.h
-psp/sdk/include/pspnet_adhocmatching.h
-psp/sdk/include/pspnet_adhocctl.h
-psp/sdk/include/pspnet_adhoc.h
-psp/sdk/include/pspnet.h
-psp/sdk/include/pspnand_driver.h
-psp/sdk/include/pspmscm.h
-psp/sdk/include/pspmpegbase.h
-psp/sdk/include/pspmpeg.h
-psp/sdk/include/pspmp3.h
-psp/sdk/include/pspmodulemgr_kernel.h
-psp/sdk/include/pspmodulemgr.h
-psp/sdk/include/pspmoduleinfo.h
-psp/sdk/include/pspmoduleexport.h
-psp/sdk/include/psploadexec_kernel.h
-psp/sdk/include/psploadexec.h
-psp/sdk/include/psploadcore.h
-psp/sdk/include/pspkerror.h
-psp/sdk/include/pspkerneltypes.h
-psp/sdk/include/pspkernel.h
-psp/sdk/include/pspkdebug.h
-psp/sdk/include/pspjpeg.h
-psp/sdk/include/pspiofilemgr_stat.h
-psp/sdk/include/pspiofilemgr_kernel.h
-psp/sdk/include/pspiofilemgr_fcntl.h
-psp/sdk/include/pspiofilemgr_dirent.h
-psp/sdk/include/pspiofilemgr.h
-psp/sdk/include/pspintrman_kernel.h
-psp/sdk/include/pspintrman.h
-psp/sdk/include/pspinit.h
-psp/sdk/include/pspimpose_driver.h
-psp/sdk/include/pspimport.s
-psp/sdk/include/pspidstorage.h
-psp/sdk/include/psphttp.h
-psp/sdk/include/psphprm.h
-psp/sdk/include/pspgum.h
-psp/sdk/include/pspgu.h
-psp/sdk/include/pspge.h
-psp/sdk/include/pspfpu.h
-psp/sdk/include/pspexception.h
-psp/sdk/include/pspdisplay_kernel.h
-psp/sdk/include/pspdisplay.h
-psp/sdk/include/pspdebugkb.h
-psp/sdk/include/pspdebug.h
-psp/sdk/include/pspctrl_kernel.h
-psp/sdk/include/pspctrl.h
-psp/sdk/include/pspchnnlsv.h
-psp/sdk/include/pspaudiorouting.h
-psp/sdk/include/pspaudiolib.h
-psp/sdk/include/pspaudiocodec.h
-psp/sdk/include/pspaudio_kernel.h
-psp/sdk/include/pspaudio.h
-psp/sdk/include/pspatrac3.h
-psp/sdk/include/libc/unistd.h
-psp/sdk/include/libc/time.h
-psp/sdk/include/libc/string.h
-psp/sdk/include/libc/stdlib.h
-psp/sdk/include/libc/stdio.h
-psp/sdk/include/libc/malloc.h
-psp/sdk/include/libc/ctype.h
-psp/sdk/include/libc/assert.h
-psp/sdk/include/as_reg_compat.h
-psp/lib/crt0_prx.o
-bin/unpack-pbp
-bin/psp-prxgen
-bin/psp-fixup-imports
-bin/psp-config
-bin/psp-build-exports
-bin/pack-pbp
-bin/mksfoex
-bin/mksfo
-bin/bin2s
-bin/bin2o
+bin/PrxEncrypter
 bin/bin2c
+bin/bin2o
+bin/bin2s
+bin/mksfo
+bin/mksfoex
+bin/pack-pbp
+bin/psp-build-exports
+bin/psp-config
+bin/psp-fixup-imports
+bin/psp-prxgen
+bin/unpack-pbp
+psp/lib/crt0.o
+psp/lib/crt0_prx.o
+psp/sdk/include/as_reg_compat.h
+psp/sdk/include/libc/assert.h
+psp/sdk/include/libc/ctype.h
+psp/sdk/include/libc/malloc.h
+psp/sdk/include/libc/stdio.h
+psp/sdk/include/libc/stdlib.h
+psp/sdk/include/libc/string.h
+psp/sdk/include/libc/time.h
+psp/sdk/include/libc/unistd.h
+psp/sdk/include/pspatrac3.h
+psp/sdk/include/pspaudio.h
+psp/sdk/include/pspaudio_kernel.h
+psp/sdk/include/pspaudiocodec.h
+psp/sdk/include/pspaudiolib.h
+psp/sdk/include/pspaudiorouting.h
+psp/sdk/include/pspchnnlsv.h
+psp/sdk/include/pspctrl.h
+psp/sdk/include/pspctrl_kernel.h
+psp/sdk/include/pspdebug.h
+psp/sdk/include/pspdebugkb.h
+psp/sdk/include/pspdisplay.h
+psp/sdk/include/pspdisplay_kernel.h
+psp/sdk/include/pspexception.h
+psp/sdk/include/pspfpu.h
+psp/sdk/include/pspge.h
+psp/sdk/include/pspgu.h
+psp/sdk/include/pspgum.h
+psp/sdk/include/psphprm.h
+psp/sdk/include/psphttp.h
+psp/sdk/include/pspidstorage.h
+psp/sdk/include/pspimport.s
+psp/sdk/include/pspimpose_driver.h
+psp/sdk/include/pspinit.h
+psp/sdk/include/pspintrman.h
+psp/sdk/include/pspintrman_kernel.h
+psp/sdk/include/pspiofilemgr.h
+psp/sdk/include/pspiofilemgr_dirent.h
+psp/sdk/include/pspiofilemgr_fcntl.h
+psp/sdk/include/pspiofilemgr_kernel.h
+psp/sdk/include/pspiofilemgr_stat.h
+psp/sdk/include/pspjpeg.h
+psp/sdk/include/pspkdebug.h
+psp/sdk/include/pspkernel.h
+psp/sdk/include/pspkerneltypes.h
+psp/sdk/include/pspkerror.h
+psp/sdk/include/psploadcore.h
+psp/sdk/include/psploadexec.h
+psp/sdk/include/psploadexec_kernel.h
+psp/sdk/include/pspmoduleexport.h
+psp/sdk/include/pspmoduleinfo.h
+psp/sdk/include/pspmodulemgr.h
+psp/sdk/include/pspmodulemgr_kernel.h
+psp/sdk/include/pspmp3.h
+psp/sdk/include/pspmpeg.h
+psp/sdk/include/pspmpegbase.h
+psp/sdk/include/pspmscm.h
+psp/sdk/include/pspnand_driver.h
+psp/sdk/include/pspnet.h
+psp/sdk/include/pspnet_adhoc.h
+psp/sdk/include/pspnet_adhocctl.h
+psp/sdk/include/pspnet_adhocmatching.h
+psp/sdk/include/pspnet_apctl.h
+psp/sdk/include/pspnet_inet.h
+psp/sdk/include/pspnet_resolver.h
+psp/sdk/include/pspopenpsid.h
+psp/sdk/include/psppower.h
+psp/sdk/include/pspprof.h
+psp/sdk/include/pspreg.h
+psp/sdk/include/psprtc.h
+psp/sdk/include/pspsdk.h
+psp/sdk/include/pspsircs.h
+psp/sdk/include/pspssl.h
+psp/sdk/include/pspstdio.h
+psp/sdk/include/pspstdio_kernel.h
+psp/sdk/include/pspstub.s
+psp/sdk/include/pspsuspend.h
+psp/sdk/include/pspsysclib.h
+psp/sdk/include/pspsyscon.h
+psp/sdk/include/pspsysevent.h
+psp/sdk/include/pspsysmem.h
+psp/sdk/include/pspsysmem_kernel.h
+psp/sdk/include/pspsysreg.h
+psp/sdk/include/pspsystimer.h
+psp/sdk/include/pspthreadman.h
+psp/sdk/include/pspthreadman_kernel.h
+psp/sdk/include/psptypes.h
+psp/sdk/include/pspumd.h
+psp/sdk/include/pspusb.h
+psp/sdk/include/pspusbacc.h
+psp/sdk/include/pspusbbus.h
+psp/sdk/include/pspusbcam.h
+psp/sdk/include/pspusbstor.h
+psp/sdk/include/pspuser.h
+psp/sdk/include/psputility.h
+psp/sdk/include/psputility_avmodules.h
+psp/sdk/include/psputility_gamesharing.h
+psp/sdk/include/psputility_htmlviewer.h
+psp/sdk/include/psputility_modules.h
+psp/sdk/include/psputility_msgdialog.h
+psp/sdk/include/psputility_netconf.h
+psp/sdk/include/psputility_netmodules.h
+psp/sdk/include/psputility_netparam.h
+psp/sdk/include/psputility_osk.h
+psp/sdk/include/psputility_savedata.h
+psp/sdk/include/psputility_sysparam.h
+psp/sdk/include/psputility_usbmodules.h
+psp/sdk/include/psputils.h
+psp/sdk/include/psputilsforkernel.h
+psp/sdk/include/pspvfpu.h
+psp/sdk/include/pspvideocodec.h
+psp/sdk/include/pspwlan.h
+psp/sdk/lib/build.mak
+psp/sdk/lib/build_prx.mak
+psp/sdk/lib/libpspatrac3.a
+psp/sdk/lib/libpspaudio.a
+psp/sdk/lib/libpspaudio_driver.a
+psp/sdk/lib/libpspaudiocodec.a
+psp/sdk/lib/libpspaudiolib.a
+psp/sdk/lib/libpspchnnlsv.a
+psp/sdk/lib/libpspctrl.a
+psp/sdk/lib/libpspctrl_driver.a
+psp/sdk/lib/libpspdebug.a
+psp/sdk/lib/libpspdebugkb.a
+psp/sdk/lib/libpspdisplay.a
+psp/sdk/lib/libpspdisplay_driver.a
+psp/sdk/lib/libpspfpu.a
+psp/sdk/lib/libpspgdb.a
+psp/sdk/lib/libpspgdb_kernel.a
+psp/sdk/lib/libpspgdb_user.a
+psp/sdk/lib/libpspge.a
+psp/sdk/lib/libpspge_driver.a
+psp/sdk/lib/libpspgu.a
+psp/sdk/lib/libpspgum.a
+psp/sdk/lib/libpspgum_vfpu.a
+psp/sdk/lib/libpsphprm.a
+psp/sdk/lib/libpsphprm_driver.a
+psp/sdk/lib/libpsphttp.a
+psp/sdk/lib/libpspjpeg.a
+psp/sdk/lib/libpspkernel.a
+psp/sdk/lib/libpsplibc.a
+psp/sdk/lib/libpspmp3.a
+psp/sdk/lib/libpspmpeg.a
+psp/sdk/lib/libpspmpegbase.a
+psp/sdk/lib/libpspmpegbase_driver.a
+psp/sdk/lib/libpspnand_driver.a
+psp/sdk/lib/libpspnet.a
+psp/sdk/lib/libpspnet_adhoc.a
+psp/sdk/lib/libpspnet_adhocctl.a
+psp/sdk/lib/libpspnet_adhocmatching.a
+psp/sdk/lib/libpspnet_apctl.a
+psp/sdk/lib/libpspnet_inet.a
+psp/sdk/lib/libpspnet_resolver.a
+psp/sdk/lib/libpspopenpsid.a
+psp/sdk/lib/libpsppaf.a
+psp/sdk/lib/libpsppower.a
+psp/sdk/lib/libpsppower_driver.a
+psp/sdk/lib/libpspprof.a
+psp/sdk/lib/libpspreg.a
+psp/sdk/lib/libpspreg_driver.a
+psp/sdk/lib/libpsprtc.a
+psp/sdk/lib/libpsprtc_driver.a
+psp/sdk/lib/libpspsdk.a
+psp/sdk/lib/libpspsircs.a
+psp/sdk/lib/libpspssl.a
+psp/sdk/lib/libpspumd.a
+psp/sdk/lib/libpspumd_driver.a
+psp/sdk/lib/libpspusb.a
+psp/sdk/lib/libpspusb_driver.a
+psp/sdk/lib/libpspusbbus_driver.a
+psp/sdk/lib/libpspusbcam.a
+psp/sdk/lib/libpspusbstor.a
+psp/sdk/lib/libpspuser.a
+psp/sdk/lib/libpsputility.a
+psp/sdk/lib/libpspvfpu.a
+psp/sdk/lib/libpspvideocodec.a
+psp/sdk/lib/libpspvshbridge.a
+psp/sdk/lib/libpspwlan.a
+psp/sdk/lib/linkfile.prx
+psp/sdk/lib/prxexports.o
+psp/sdk/lib/prxspecs
+psp/sdk/samples/audio/polyphonic/Makefile
+psp/sdk/samples/audio/polyphonic/main.c
+psp/sdk/samples/audio/wavegen/Makefile
+psp/sdk/samples/audio/wavegen/main.c
+psp/sdk/samples/controller/basic/Makefile
+psp/sdk/samples/controller/basic/main.c
+psp/sdk/samples/debug/debugkb/Makefile
+psp/sdk/samples/debug/debugkb/main.c
+psp/sdk/samples/debug/exception/Makefile
+psp/sdk/samples/debug/exception/main.c
+psp/sdk/samples/debug/gdb/Makefile
+psp/sdk/samples/debug/gdb/main.c
+psp/sdk/samples/debug/kprintf/Makefile
+psp/sdk/samples/debug/kprintf/main.c
+psp/sdk/samples/debug/profiler/Makefile
+psp/sdk/samples/debug/profiler/main.c
+psp/sdk/samples/debug/prxdecrypt/Makefile
+psp/sdk/samples/debug/prxdecrypt/main.c
+psp/sdk/samples/debug/sio/Makefile
+psp/sdk/samples/debug/sio/main.c
+psp/sdk/samples/debug/sio/readme.txt
+psp/sdk/samples/exceptions/Makefile
+psp/sdk/samples/exceptions/main.cpp
+psp/sdk/samples/gu/beginobject/Makefile
+psp/sdk/samples/gu/beginobject/beginobject.c
+psp/sdk/samples/gu/blend/Makefile
+psp/sdk/samples/gu/blend/blend.c
+psp/sdk/samples/gu/blit/Makefile
+psp/sdk/samples/gu/blit/blit.c
+psp/sdk/samples/gu/celshading/Makefile
+psp/sdk/samples/gu/celshading/celshading.c
+psp/sdk/samples/gu/celshading/lightmap.raw
+psp/sdk/samples/gu/clut/Makefile
+psp/sdk/samples/gu/clut/clut.c
+psp/sdk/samples/gu/common/callbacks.c
+psp/sdk/samples/gu/common/callbacks.h
+psp/sdk/samples/gu/common/geometry.c
+psp/sdk/samples/gu/common/geometry.h
+psp/sdk/samples/gu/common/menu.c
+psp/sdk/samples/gu/common/menu.h
+psp/sdk/samples/gu/common/vram.c
+psp/sdk/samples/gu/common/vram.h
+psp/sdk/samples/gu/copy/Makefile
+psp/sdk/samples/gu/copy/copy.c
+psp/sdk/samples/gu/cube/Makefile
+psp/sdk/samples/gu/cube/cube.c
+psp/sdk/samples/gu/cube/logo.raw
+psp/sdk/samples/gu/envmap/Makefile
+psp/sdk/samples/gu/envmap/env0.raw
+psp/sdk/samples/gu/envmap/envmap.c
+psp/sdk/samples/gu/integerdrawing/Makefile
+psp/sdk/samples/gu/integerdrawing/integerdrawing.c
+psp/sdk/samples/gu/lights/Makefile
+psp/sdk/samples/gu/lights/lights.c
+psp/sdk/samples/gu/lines/Makefile
+psp/sdk/samples/gu/lines/lines.c
+psp/sdk/samples/gu/logic/Makefile
+psp/sdk/samples/gu/logic/logic.c
+psp/sdk/samples/gu/morph/Makefile
+psp/sdk/samples/gu/morph/morph.c
+psp/sdk/samples/gu/morphskin/Makefile
+psp/sdk/samples/gu/morphskin/morphskin.c
+psp/sdk/samples/gu/ortho/Makefile
+psp/sdk/samples/gu/ortho/ortho.c
+psp/sdk/samples/gu/reflection/Makefile
+psp/sdk/samples/gu/reflection/reflection.c
+psp/sdk/samples/gu/rendertarget/Makefile
+psp/sdk/samples/gu/rendertarget/rendertarget.c
+psp/sdk/samples/gu/shadowprojection/Makefile
+psp/sdk/samples/gu/shadowprojection/shadowprojection.c
+psp/sdk/samples/gu/signals/Makefile
+psp/sdk/samples/gu/signals/ball.raw
+psp/sdk/samples/gu/signals/signals.c
+psp/sdk/samples/gu/skinning/Makefile
+psp/sdk/samples/gu/skinning/skinning.c
+psp/sdk/samples/gu/speed/Makefile
+psp/sdk/samples/gu/speed/speed.c
+psp/sdk/samples/gu/spharm/Image1.raw
+psp/sdk/samples/gu/spharm/Image2.raw
+psp/sdk/samples/gu/spharm/Makefile
+psp/sdk/samples/gu/spharm/cube.c
+psp/sdk/samples/gu/spharm/disablefpu.S
+psp/sdk/samples/gu/spharm/logo.raw
+psp/sdk/samples/gu/spharm/mt19937.c
+psp/sdk/samples/gu/spharm/mt19937.h
+psp/sdk/samples/gu/spharm/readme
+psp/sdk/samples/gu/spharm/spharm.c
+psp/sdk/samples/gu/splinesurface/Makefile
+psp/sdk/samples/gu/splinesurface/splinesurface.c
+psp/sdk/samples/gu/sprite/Makefile
+psp/sdk/samples/gu/sprite/ball.raw
+psp/sdk/samples/gu/sprite/sprite.c
+psp/sdk/samples/gu/text/Makefile
+psp/sdk/samples/gu/text/font.raw
+psp/sdk/samples/gu/text/main.c
+psp/sdk/samples/gu/timing/Makefile
+psp/sdk/samples/gu/timing/timing.c
+psp/sdk/samples/gu/vertex/Makefile
+psp/sdk/samples/gu/vertex/vertex.c
+psp/sdk/samples/gu/zbufferfog/Makefile
+psp/sdk/samples/gu/zbufferfog/zbufferfog.c
+psp/sdk/samples/ir/irda/Makefile
+psp/sdk/samples/ir/irda/main.c
+psp/sdk/samples/ir/sircs/Makefile
+psp/sdk/samples/ir/sircs/main.c
+psp/sdk/samples/kernel/cwd/Makefile
+psp/sdk/samples/kernel/cwd/main.c
+psp/sdk/samples/kernel/fileio/Makefile
+psp/sdk/samples/kernel/fileio/main.c
+psp/sdk/samples/kernel/idstorage/Makefile
+psp/sdk/samples/kernel/idstorage/main.c
+psp/sdk/samples/kernel/kdumper/Makefile
+psp/sdk/samples/kernel/kdumper/main.c
+psp/sdk/samples/kernel/loadmodule/Makefile
+psp/sdk/samples/kernel/loadmodule/main.c
+psp/sdk/samples/kernel/messagebox/Makefile
+psp/sdk/samples/kernel/messagebox/main.c
+psp/sdk/samples/kernel/regenum/Makefile
+psp/sdk/samples/kernel/regenum/main.c
+psp/sdk/samples/kernel/registry/Makefile
+psp/sdk/samples/kernel/registry/main.c
+psp/sdk/samples/kernel/sysevent/Makefile
+psp/sdk/samples/kernel/sysevent/main.c
+psp/sdk/samples/kernel/systimer/Makefile
+psp/sdk/samples/kernel/systimer/main.c
+psp/sdk/samples/kernel/threadstatus/Makefile
+psp/sdk/samples/kernel/threadstatus/main.c
+psp/sdk/samples/me/basic/Makefile
+psp/sdk/samples/me/basic/main.c
+psp/sdk/samples/me/basic/me.S
+psp/sdk/samples/mp3/Makefile
+psp/sdk/samples/mp3/main.c
+psp/sdk/samples/ms/callback/Makefile
+psp/sdk/samples/ms/callback/main.c
+psp/sdk/samples/nand/dumpipl/Makefile
+psp/sdk/samples/nand/dumpipl/README
+psp/sdk/samples/nand/dumpipl/main.c
+psp/sdk/samples/net/resolver/Makefile
+psp/sdk/samples/net/resolver/main.c
+psp/sdk/samples/net/simple/Makefile
+psp/sdk/samples/net/simple/main.c
+psp/sdk/samples/net/simple_prx/Makefile
+psp/sdk/samples/net/simple_prx/exports.exp
+psp/sdk/samples/net/simple_prx/main.c
+psp/sdk/samples/net/wlanscan/Makefile
+psp/sdk/samples/net/wlanscan/main.c
+psp/sdk/samples/net/wlanscan_elf/Makefile
+psp/sdk/samples/net/wlanscan_elf/main.c
+psp/sdk/samples/power/Makefile
+psp/sdk/samples/power/main.c
+psp/sdk/samples/prx/prx_loader/Makefile
+psp/sdk/samples/prx/prx_loader/MyLib.S
+psp/sdk/samples/prx/prx_loader/main.c
+psp/sdk/samples/prx/testprx/Makefile
+psp/sdk/samples/prx/testprx/exports.exp
+psp/sdk/samples/prx/testprx/main.c
+psp/sdk/samples/savedata/decrypt/Makefile
+psp/sdk/samples/savedata/decrypt/README.txt
+psp/sdk/samples/savedata/decrypt/decrypt.c
+psp/sdk/samples/savedata/decrypt/decrypt.h
+psp/sdk/samples/savedata/decrypt/main.c
+psp/sdk/samples/savedata/encrypt/Makefile
+psp/sdk/samples/savedata/encrypt/README.txt
+psp/sdk/samples/savedata/encrypt/encrypt.c
+psp/sdk/samples/savedata/encrypt/encrypt.h
+psp/sdk/samples/savedata/encrypt/hash.c
+psp/sdk/samples/savedata/encrypt/hash.h
+psp/sdk/samples/savedata/encrypt/main.c
+psp/sdk/samples/savedata/encrypt/psf.c
+psp/sdk/samples/savedata/encrypt/psf.h
+psp/sdk/samples/savedata/utility/Makefile
+psp/sdk/samples/savedata/utility/data.h
+psp/sdk/samples/savedata/utility/main.c
+psp/sdk/samples/template/elf_template/Makefile
+psp/sdk/samples/template/elf_template/main.c
+psp/sdk/samples/template/kprx_template/Makefile
+psp/sdk/samples/template/kprx_template/exports.exp
+psp/sdk/samples/template/kprx_template/main.c
+psp/sdk/samples/template/lib_template/Makefile
+psp/sdk/samples/template/lib_template/template.c
+psp/sdk/samples/template/lib_template/template.h
+psp/sdk/samples/template/prx_template/Makefile
+psp/sdk/samples/template/prx_template/main.c
+psp/sdk/samples/usb/storage/Makefile
+psp/sdk/samples/usb/storage/main.c
+psp/sdk/samples/utility/gamesharing/Makefile
+psp/sdk/samples/utility/gamesharing/main.c
+psp/sdk/samples/utility/htmlviewer/Makefile
+psp/sdk/samples/utility/htmlviewer/main.c
+psp/sdk/samples/utility/msgdialog/Makefile
+psp/sdk/samples/utility/msgdialog/main.c
+psp/sdk/samples/utility/netconf/Makefile
+psp/sdk/samples/utility/netconf/main.c
+psp/sdk/samples/utility/netdialog/Makefile
+psp/sdk/samples/utility/netdialog/main.c
+psp/sdk/samples/utility/osk/Makefile
+psp/sdk/samples/utility/osk/main.c
+psp/sdk/samples/utility/systemparam/Makefile
+psp/sdk/samples/utility/systemparam/main.c
+psp/sdk/samples/wlan/Makefile
+psp/sdk/samples/wlan/main.c
 @dirrm psp/sdk/samples/wlan
 @dirrm psp/sdk/samples/utility/systemparam
 @dirrm psp/sdk/samples/utility/osk
@@ -471,6 +475,7 @@ bin/bin2c
 @dirrm psp/sdk/samples/gu/blend
 @dirrm psp/sdk/samples/gu/beginobject
 @dirrm psp/sdk/samples/gu
+@dirrm psp/sdk/samples/exceptions
 @dirrm psp/sdk/samples/debug/sio
 @dirrm psp/sdk/samples/debug/prxdecrypt
 @dirrm psp/sdk/samples/debug/profiler
@@ -485,9 +490,9 @@ bin/bin2c
 @dirrm psp/sdk/samples/audio/polyphonic
 @dirrm psp/sdk/samples/audio
 @dirrm psp/sdk/samples
+@dirrm psp/sdk/lib
 @dirrm psp/sdk/include/libc
 @dirrm psp/sdk/include
-@dirrmtry psp/sdk/lib
-@dirrmtry psp/sdk
+@dirrm psp/sdk
 @dirrmtry psp/lib
 @dirrmtry psp
diff --git a/devel/psptoolchain/Makefile b/devel/psptoolchain/Makefile
index a18dcb840879..ac3451084bf8 100644
--- a/devel/psptoolchain/Makefile
+++ b/devel/psptoolchain/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		psptoolchain
-PORTVERSION=		20090127
+PORTVERSION=		20111215
 CATEGORIES=		devel
 MASTER_SITES=		# none
 DISTFILES=		# none
@@ -20,7 +20,6 @@ RUN_DEPENDS=		psp-gdb:${PORTSDIR}/devel/psptoolchain-gdb \
 			psp-ar:${PORTSDIR}/devel/psptoolchain-binutils \
 			psp-as:${PORTSDIR}/devel/psptoolchain-binutils \
 			psp-c++filt:${PORTSDIR}/devel/psptoolchain-binutils \
-			psp-gprof:${PORTSDIR}/devel/psptoolchain-binutils \
 			psp-ld:${PORTSDIR}/devel/psptoolchain-binutils \
 			psp-nm:${PORTSDIR}/devel/psptoolchain-binutils \
 			psp-objcopy:${PORTSDIR}/devel/psptoolchain-binutils \