Index: head/devel/psptoolchain-newlib/Makefile
===================================================================
--- head/devel/psptoolchain-newlib/Makefile	(revision 396915)
+++ head/devel/psptoolchain-newlib/Makefile	(revision 396916)
@@ -1,43 +1,41 @@
 # Created by: Tassilo Philipp <tphilipp@potion-studios.com>
 # $FreeBSD$
 
 PORTNAME=		newlib
 PORTVERSION=		1.20.0
 PORTREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		ftp://sources.redhat.com/pub/ \
 			SOURCEWARE/${PORTNAME}
 PKGNAMEPREFIX=		psptoolchain-
 
 MAINTAINER=		tphilipp@potion-studios.com
 COMMENT=		PlayStation Portable development toolchain ${PORTNAME}
 
 PSP_GCC_STAGE_PREFIX=	psp/stage1
 PSP_SDK_STAGE_PREFIX=	psp/stage1
 
 BUILD_DEPENDS+=		${LOCALBASE}/${PSP_SDK_STAGE_PREFIX}/sdk/include/pspsdk.h:${PORTSDIR}/devel/psptoolchain-pspsdk-stage1 \
 			psp-ar:${PORTSDIR}/devel/psptoolchain-binutils \
 			psp-as:${PORTSDIR}/devel/psptoolchain-binutils \
 			psp-ld:${PORTSDIR}/devel/psptoolchain-binutils \
 			${LOCALBASE}/${PSP_GCC_STAGE_PREFIX}/bin/psp-gcc:${PORTSDIR}/devel/psptoolchain-gcc-stage1
 
 USES=			gmake makeinfo
 HAS_CONFIGURE=		yes
 CONFIGURE_ENV=		PATH=${LOCALBASE}/${PSP_GCC_STAGE_PREFIX}/bin:${PATH}
 MAKE_ENV=		PATH=${LOCALBASE}/${PSP_GCC_STAGE_PREFIX}/bin:${PATH}
 CONFIGURE_ARGS=		--prefix=${PREFIX} --target="psp"
 MAKE_ARGS+=		CC="${CC}" CFLAGS="${CFLAGS} -g" # Apparently, it doesn't work on the PSP without debug information
 
 # Disable installation of .info files and fix includedir reference.
 post-patch:
 	@${REINPLACE_CMD} -E 's/^(install.*:.*)install-info(.*)/\1\2/' ${WRKSRC}/etc/Makefile.in
 	@${REINPLACE_CMD} -E 's#(-I\$${prefix}/)psp(/sdk/include)#-I${LOCALBASE}/${PSP_SDK_STAGE_PREFIX:S,/,\\/,}\2#' ${WRKSRC}/newlib/configure.host
 
-.include <bsd.port.pre.mk>
-
 # Rename installed crt0.o as real crt0.o used by PSP code comes with psptoolchain-pspsdk-stage2
 # and would overwrite the one from this port.
 post-install:
 	@${MV} ${STAGEDIR}${PREFIX}/psp/lib/crt0.o ${STAGEDIR}${PREFIX}/psp/lib/crt0.newlib.o
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: head/devel/psptoolchain-newlib/pkg-plist
===================================================================
--- head/devel/psptoolchain-newlib/pkg-plist	(revision 396915)
+++ head/devel/psptoolchain-newlib/pkg-plist	(revision 396916)
@@ -1,112 +1,114 @@
 psp/lib/libm.a
 psp/lib/libg.a
 psp/lib/libc.a
 psp/lib/crt0.newlib.o
 psp/include/wordexp.h
 psp/include/wctype.h
 psp/include/wchar.h
 psp/include/utmp.h
 psp/include/utime.h
 psp/include/unistd.h
 psp/include/unctrl.h
 psp/include/time.h
 psp/include/termios.h
 psp/include/tar.h
 psp/include/sys/wait.h
 psp/include/sys/utime.h
 psp/include/sys/unistd.h
 psp/include/sys/types.h
 psp/include/sys/times.h
 psp/include/sys/timeb.h
 psp/include/sys/time.h
 psp/include/sys/syslimits.h
 psp/include/sys/string.h
 psp/include/sys/stdio.h
 psp/include/sys/stat.h
 psp/include/sys/socket.h
 psp/include/sys/signal.h
 psp/include/sys/select.h
 psp/include/sys/sched.h
 psp/include/sys/resource.h
 psp/include/sys/reent.h
 psp/include/sys/queue.h
 psp/include/sys/param.h
 psp/include/sys/lock.h
 psp/include/sys/ioctl.h
 psp/include/sys/iconvnls.h
 psp/include/sys/file.h
 psp/include/sys/features.h
 psp/include/sys/fd_set.h
 psp/include/sys/fcntl.h
 psp/include/sys/errno.h
 psp/include/sys/dirent.h
 psp/include/sys/dir.h
 psp/include/sys/custom_file.h
 psp/include/sys/config.h
 psp/include/sys/cdefs.h
 psp/include/sys/_types.h
 psp/include/sys/_default_fcntl.h
 psp/include/strings.h
 psp/include/string.h
 psp/include/stdlib.h
 psp/include/stdio_ext.h
 psp/include/stdio.h
 psp/include/stdint.h
 psp/include/signal.h
 psp/include/setjmp.h
 psp/include/search.h
 psp/include/sched.h
 psp/include/regex.h
 psp/include/regdef.h
 psp/include/reent.h
 psp/include/pwd.h
 psp/include/pthread.h
 psp/include/process.h
 psp/include/paths.h
 psp/include/newlib.h
 psp/include/netinet/tcp.h
 psp/include/netinet/in.h
 psp/include/netdb.h
 psp/include/math.h
 psp/include/malloc.h
 psp/include/machine/types.h
 psp/include/machine/time.h
 psp/include/machine/termios.h
 psp/include/machine/stdlib.h
 psp/include/machine/setjmp.h
 psp/include/machine/setjmp-dj.h
 psp/include/machine/regdef.h
 psp/include/machine/param.h
 psp/include/machine/malloc.h
 psp/include/machine/ieeefp.h
 psp/include/machine/fastmath.h
 psp/include/machine/endian.h
 psp/include/machine/ansi.h
 psp/include/machine/_types.h
 psp/include/machine/_default_types.h
 psp/include/locale.h
 psp/include/limits.h
 psp/include/libgen.h
 psp/include/langinfo.h
 psp/include/inttypes.h
 psp/include/ieeefp.h
 psp/include/iconv.h
 psp/include/grp.h
 psp/include/glob.h
 psp/include/getopt.h
 psp/include/fnmatch.h
 psp/include/fcntl.h
 psp/include/fastmath.h
 psp/include/errno.h
 psp/include/envz.h
 psp/include/envlock.h
 psp/include/dirent.h
 psp/include/ctype.h
 psp/include/complex.h
 psp/include/assert.h
 psp/include/arpa/inet.h
 psp/include/argz.h
 psp/include/ar.h
 psp/include/alloca.h
 psp/include/_syslist.h
 psp/include/_ansi.h
+@dir psp/include/rpc
+@dir psp/include/bits