Backport and fix-up lang/pypy* ports.

pypy:
 - fix sysconfig.py's include path
 - bump PORTREVISION due to above fix

pypy-devel:
 - remove duplicate '-e' when creating pkg-plist
 - ancillary port functionality (thus no PORTREVISION bump)

pypy3-devel:
 - add missing patch
 - fix pkg-plist
 - build fails without above patch (thus no PORTREVISION bump)

5 files changed, 34 insertions, 6 deletions

diff --git a/lang/pypy-devel/Makefile b/lang/pypy-devel/Makefile
index 690639cf7fb6..be2fa730abe8 100644
--- a/lang/pypy-devel/Makefile
+++ b/lang/pypy-devel/Makefile
@@ -307,8 +307,8 @@ pkg-plist: build
 			${WRKDIR}/.plist-dirs-gen
 	${SORT} ${WRKDIR}/.plist-files-gen > ${WRKDIR}/pkg-plist
 	${SORT} -r ${WRKDIR}/.plist-dirs-gen >> ${WRKDIR}/pkg-plist
-	${REINPLACE_CMD} -i '' \
-		-e -e 's|^@dirrm %%PYPY_LIBDIR%%/site-packages$$|@dirrmtry %%PYPY_LIBDIR%%/site-packages|' \
+	${REINPLACE_CMD} \
+		-e 's|^@dirrm %%PYPY_LIBDIR%%/site-packages$$|@dirrmtry %%PYPY_LIBDIR%%/site-packages|' \
 		-e 's|^@dirrm %%PYPY_LIBDIR%%$$|@dirrmtry %%PYPY_LIBDIR%%|' \
 		-e 's|^@dirrm %%PYPY_INCLUDEDIR%%$$|@dirrmtry %%PYPY_INCLUDEDIR%%|' \
 			${WRKDIR}/pkg-plist
diff --git a/lang/pypy/Makefile b/lang/pypy/Makefile
index fa47346f0e14..d8ff16db6ff8 100644
--- a/lang/pypy/Makefile
+++ b/lang/pypy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pypy
 DISTVERSION=	2.1
+PORTREVISION=	1
 CATEGORIES=	lang python java
 MASTER_SITES=	http://cdn.bitbucket.org/pypy/pypy/downloads/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-src
diff --git a/lang/pypy/files/patch-lib__pypyX.Y__sysconfig.py b/lang/pypy/files/patch-lib__pypyX.Y__sysconfig.py
index ea589ab54e6a..7540690f7180 100644
--- a/lang/pypy/files/patch-lib__pypyX.Y__sysconfig.py
+++ b/lang/pypy/files/patch-lib__pypyX.Y__sysconfig.py
@@ -14,7 +14,7 @@
 +        'platstdlib': '{platbase}/lib/pypy-{pypy_version_short}',
 +        'purelib': '{base}/lib/pypy-{pypy_version_short}',
 +        'platlib': '{platbase}/lib/pypy-{pypy_version_short}',
-+        'include': '{base}/include-{pypy_version_short}',
++        'include': '{base}/include/pypy-{pypy_version_short}',
 +        'platinclude': '{platbase}/include/pypy-{pypy_version_short}',
          'scripts': '{base}/bin',
          'data'   : '{base}',
diff --git a/lang/pypy3-devel/files/patch-pypy__module___posixsubprocess__interp_subprocess.py b/lang/pypy3-devel/files/patch-pypy__module___posixsubprocess__interp_subprocess.py
new file mode 100644
index 000000000000..9cb2209650a0
--- /dev/null
+++ b/lang/pypy3-devel/files/patch-pypy__module___posixsubprocess__interp_subprocess.py
@@ -0,0 +1,27 @@
+--- pypy/module/_posixsubprocess/interp_subprocess.py~	2013-08-09 19:13:04.000000000 +0200
++++ pypy/module/_posixsubprocess/interp_subprocess.py	2013-08-09 19:20:31.000000000 +0200
+@@ -12,8 +12,10 @@
+ 
+ class CConfig:
+     _compilation_info_ = ExternalCompilationInfo(
+-        includes=['unistd.h', 'sys/syscall.h'])
++        includes=['unistd.h', 'sys/stat.h', 'sys/syscall.h', 'sys/types.h'])
++    HAVE_SYS_STAT_H = platform.Has('stat')
+     HAVE_SYS_SYSCALL_H = platform.Has("syscall")
++    HAVE_SYS_TYPES_H = platform.Has('types')
+     HAVE_SETSID = platform.Has("setsid")
+ 
+ config = platform.configure(CConfig)
+@@ -26,8 +28,12 @@
+                     ])
+ 
+ compile_extra = []
++if config['HAVE_SYS_STAT_H']:
++    compile_extra.append('-DHAVE_SYS_STAT_H')
+ if config['HAVE_SYS_SYSCALL_H']:
+     compile_extra.append("-DHAVE_SYS_SYSCALL_H")
++if config['HAVE_SYS_TYPES_H']:
++    compile_extra.append('-DHAVE_SYS_TYPES_H')
+ if config['HAVE_SETSID']:
+     compile_extra.append("-DHAVE_SETSID")
+ 
diff --git a/lang/pypy3-devel/pkg-plist b/lang/pypy3-devel/pkg-plist
index 14ff16f05e3a..8ce4afbb825b 100644
--- a/lang/pypy3-devel/pkg-plist
+++ b/lang/pypy3-devel/pkg-plist
@@ -1409,9 +1409,9 @@
 %%PYPY_LIBDIR%%/lib_pypy/__init__.py
 %%PYPY_LIBDIR%%/lib_pypy/__init__.pyc
 %%PYPY_LIBDIR%%/lib_pypy/__pycache__/__init__.pypy-%%PYPY_VER%%.pyc
-%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__gb56459ffx310af836.pypy-21.so
-%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__gb61d9cdcx1fd01a91.pypy-21.so
-%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__gd9aba7e0xad93c709.pypy-21.so
+%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__gb56459ffx310af836.pypy-%%PYPY_VER%%.so
+%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__gb61d9cdcx1fd01a91.pypy-%%PYPY_VER%%.so
+%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__gd9aba7e0xad93c709.pypy-%%PYPY_VER%%.so
 %%PYPY_LIBDIR%%/lib_pypy/__pycache__/_codecs_cn.pypy-%%PYPY_VER%%.pyc
 %%PYPY_LIBDIR%%/lib_pypy/__pycache__/_codecs_hk.pypy-%%PYPY_VER%%.pyc
 %%PYPY_LIBDIR%%/lib_pypy/__pycache__/_codecs_iso2022.pypy-%%PYPY_VER%%.pyc