Fix building on the Alpha.

Submitted by:	gallatin

22 files changed, 110 insertions, 44 deletions

diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile
index 82dcf8db72d..b3762575659 100644
--- a/lang/python-devel/Makefile
+++ b/lang/python-devel/Makefile
@@ -95,4 +95,10 @@ post-install:
 		(cd ${DEMODIR}; tar xf -)
 .endif
 
+.if ${ARCH} == i386
+PLIST_SUB+=	X86_ONLY=""
+.else
+PLIST_SUB+=	X86_ONLY="@comment "
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/lang/python-devel/pkg-plist b/lang/python-devel/pkg-plist
index 2340b770981..f9e58fd9f9c 100644
--- a/lang/python-devel/pkg-plist
+++ b/lang/python-devel/pkg-plist
@@ -986,7 +986,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/_socket.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_testcapi.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_weakref.so
 lib/%%PYTHON_VERSION%%/lib-dynload/array.so
-lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/binascii.so
 lib/%%PYTHON_VERSION%%/lib-dynload/bsddb.so
 lib/%%PYTHON_VERSION%%/lib-dynload/cPickle.so
@@ -996,9 +996,9 @@ lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
 lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
 lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
 lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
-lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/math.so
 lib/%%PYTHON_VERSION%%/lib-dynload/md5.so
 lib/%%PYTHON_VERSION%%/lib-dynload/mmap.so
@@ -1010,7 +1010,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/pwd.so
 lib/%%PYTHON_VERSION%%/lib-dynload/readline.so
 lib/%%PYTHON_VERSION%%/lib-dynload/regex.so
 lib/%%PYTHON_VERSION%%/lib-dynload/resource.so
-lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so
 lib/%%PYTHON_VERSION%%/lib-dynload/rotor.so
 lib/%%PYTHON_VERSION%%/lib-dynload/select.so
 lib/%%PYTHON_VERSION%%/lib-dynload/sha.so
diff --git a/lang/python/Makefile b/lang/python/Makefile
index 82dcf8db72d..b3762575659 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -95,4 +95,10 @@ post-install:
 		(cd ${DEMODIR}; tar xf -)
 .endif
 
+.if ${ARCH} == i386
+PLIST_SUB+=	X86_ONLY=""
+.else
+PLIST_SUB+=	X86_ONLY="@comment "
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/lang/python/pkg-plist b/lang/python/pkg-plist
index 2340b770981..f9e58fd9f9c 100644
--- a/lang/python/pkg-plist
+++ b/lang/python/pkg-plist
@@ -986,7 +986,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/_socket.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_testcapi.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_weakref.so
 lib/%%PYTHON_VERSION%%/lib-dynload/array.so
-lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/binascii.so
 lib/%%PYTHON_VERSION%%/lib-dynload/bsddb.so
 lib/%%PYTHON_VERSION%%/lib-dynload/cPickle.so
@@ -996,9 +996,9 @@ lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
 lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
 lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
 lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
-lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/math.so
 lib/%%PYTHON_VERSION%%/lib-dynload/md5.so
 lib/%%PYTHON_VERSION%%/lib-dynload/mmap.so
@@ -1010,7 +1010,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/pwd.so
 lib/%%PYTHON_VERSION%%/lib-dynload/readline.so
 lib/%%PYTHON_VERSION%%/lib-dynload/regex.so
 lib/%%PYTHON_VERSION%%/lib-dynload/resource.so
-lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so
 lib/%%PYTHON_VERSION%%/lib-dynload/rotor.so
 lib/%%PYTHON_VERSION%%/lib-dynload/select.so
 lib/%%PYTHON_VERSION%%/lib-dynload/sha.so
diff --git a/lang/python22/Makefile b/lang/python22/Makefile
index 82dcf8db72d..b3762575659 100644
--- a/lang/python22/Makefile
+++ b/lang/python22/Makefile
@@ -95,4 +95,10 @@ post-install:
 		(cd ${DEMODIR}; tar xf -)
 .endif
 
+.if ${ARCH} == i386
+PLIST_SUB+=	X86_ONLY=""
+.else
+PLIST_SUB+=	X86_ONLY="@comment "
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/lang/python22/pkg-plist b/lang/python22/pkg-plist
index 2340b770981..f9e58fd9f9c 100644
--- a/lang/python22/pkg-plist
+++ b/lang/python22/pkg-plist
@@ -986,7 +986,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/_socket.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_testcapi.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_weakref.so
 lib/%%PYTHON_VERSION%%/lib-dynload/array.so
-lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/binascii.so
 lib/%%PYTHON_VERSION%%/lib-dynload/bsddb.so
 lib/%%PYTHON_VERSION%%/lib-dynload/cPickle.so
@@ -996,9 +996,9 @@ lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
 lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
 lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
 lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
-lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/math.so
 lib/%%PYTHON_VERSION%%/lib-dynload/md5.so
 lib/%%PYTHON_VERSION%%/lib-dynload/mmap.so
@@ -1010,7 +1010,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/pwd.so
 lib/%%PYTHON_VERSION%%/lib-dynload/readline.so
 lib/%%PYTHON_VERSION%%/lib-dynload/regex.so
 lib/%%PYTHON_VERSION%%/lib-dynload/resource.so
-lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so
 lib/%%PYTHON_VERSION%%/lib-dynload/rotor.so
 lib/%%PYTHON_VERSION%%/lib-dynload/select.so
 lib/%%PYTHON_VERSION%%/lib-dynload/sha.so
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index 82dcf8db72d..b3762575659 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -95,4 +95,10 @@ post-install:
 		(cd ${DEMODIR}; tar xf -)
 .endif
 
+.if ${ARCH} == i386
+PLIST_SUB+=	X86_ONLY=""
+.else
+PLIST_SUB+=	X86_ONLY="@comment "
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/lang/python23/pkg-plist b/lang/python23/pkg-plist
index 2340b770981..f9e58fd9f9c 100644
--- a/lang/python23/pkg-plist
+++ b/lang/python23/pkg-plist
@@ -986,7 +986,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/_socket.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_testcapi.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_weakref.so
 lib/%%PYTHON_VERSION%%/lib-dynload/array.so
-lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/binascii.so
 lib/%%PYTHON_VERSION%%/lib-dynload/bsddb.so
 lib/%%PYTHON_VERSION%%/lib-dynload/cPickle.so
@@ -996,9 +996,9 @@ lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
 lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
 lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
 lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
-lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/math.so
 lib/%%PYTHON_VERSION%%/lib-dynload/md5.so
 lib/%%PYTHON_VERSION%%/lib-dynload/mmap.so
@@ -1010,7 +1010,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/pwd.so
 lib/%%PYTHON_VERSION%%/lib-dynload/readline.so
 lib/%%PYTHON_VERSION%%/lib-dynload/regex.so
 lib/%%PYTHON_VERSION%%/lib-dynload/resource.so
-lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so
 lib/%%PYTHON_VERSION%%/lib-dynload/rotor.so
 lib/%%PYTHON_VERSION%%/lib-dynload/select.so
 lib/%%PYTHON_VERSION%%/lib-dynload/sha.so
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 82dcf8db72d..b3762575659 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -95,4 +95,10 @@ post-install:
 		(cd ${DEMODIR}; tar xf -)
 .endif
 
+.if ${ARCH} == i386
+PLIST_SUB+=	X86_ONLY=""
+.else
+PLIST_SUB+=	X86_ONLY="@comment "
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/lang/python24/pkg-plist b/lang/python24/pkg-plist
index 2340b770981..f9e58fd9f9c 100644
--- a/lang/python24/pkg-plist
+++ b/lang/python24/pkg-plist
@@ -986,7 +986,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/_socket.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_testcapi.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_weakref.so
 lib/%%PYTHON_VERSION%%/lib-dynload/array.so
-lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/binascii.so
 lib/%%PYTHON_VERSION%%/lib-dynload/bsddb.so
 lib/%%PYTHON_VERSION%%/lib-dynload/cPickle.so
@@ -996,9 +996,9 @@ lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
 lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
 lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
 lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
-lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/math.so
 lib/%%PYTHON_VERSION%%/lib-dynload/md5.so
 lib/%%PYTHON_VERSION%%/lib-dynload/mmap.so
@@ -1010,7 +1010,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/pwd.so
 lib/%%PYTHON_VERSION%%/lib-dynload/readline.so
 lib/%%PYTHON_VERSION%%/lib-dynload/regex.so
 lib/%%PYTHON_VERSION%%/lib-dynload/resource.so
-lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so
 lib/%%PYTHON_VERSION%%/lib-dynload/rotor.so
 lib/%%PYTHON_VERSION%%/lib-dynload/select.so
 lib/%%PYTHON_VERSION%%/lib-dynload/sha.so
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index 82dcf8db72d..b3762575659 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -95,4 +95,10 @@ post-install:
 		(cd ${DEMODIR}; tar xf -)
 .endif
 
+.if ${ARCH} == i386
+PLIST_SUB+=	X86_ONLY=""
+.else
+PLIST_SUB+=	X86_ONLY="@comment "
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/lang/python25/pkg-plist b/lang/python25/pkg-plist
index 2340b770981..f9e58fd9f9c 100644
--- a/lang/python25/pkg-plist
+++ b/lang/python25/pkg-plist
@@ -986,7 +986,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/_socket.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_testcapi.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_weakref.so
 lib/%%PYTHON_VERSION%%/lib-dynload/array.so
-lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/binascii.so
 lib/%%PYTHON_VERSION%%/lib-dynload/bsddb.so
 lib/%%PYTHON_VERSION%%/lib-dynload/cPickle.so
@@ -996,9 +996,9 @@ lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
 lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
 lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
 lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
-lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/math.so
 lib/%%PYTHON_VERSION%%/lib-dynload/md5.so
 lib/%%PYTHON_VERSION%%/lib-dynload/mmap.so
@@ -1010,7 +1010,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/pwd.so
 lib/%%PYTHON_VERSION%%/lib-dynload/readline.so
 lib/%%PYTHON_VERSION%%/lib-dynload/regex.so
 lib/%%PYTHON_VERSION%%/lib-dynload/resource.so
-lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so
 lib/%%PYTHON_VERSION%%/lib-dynload/rotor.so
 lib/%%PYTHON_VERSION%%/lib-dynload/select.so
 lib/%%PYTHON_VERSION%%/lib-dynload/sha.so
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index 82dcf8db72d..b3762575659 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -95,4 +95,10 @@ post-install:
 		(cd ${DEMODIR}; tar xf -)
 .endif
 
+.if ${ARCH} == i386
+PLIST_SUB+=	X86_ONLY=""
+.else
+PLIST_SUB+=	X86_ONLY="@comment "
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/lang/python26/pkg-plist b/lang/python26/pkg-plist
index 2340b770981..f9e58fd9f9c 100644
--- a/lang/python26/pkg-plist
+++ b/lang/python26/pkg-plist
@@ -986,7 +986,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/_socket.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_testcapi.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_weakref.so
 lib/%%PYTHON_VERSION%%/lib-dynload/array.so
-lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/binascii.so
 lib/%%PYTHON_VERSION%%/lib-dynload/bsddb.so
 lib/%%PYTHON_VERSION%%/lib-dynload/cPickle.so
@@ -996,9 +996,9 @@ lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
 lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
 lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
 lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
-lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/math.so
 lib/%%PYTHON_VERSION%%/lib-dynload/md5.so
 lib/%%PYTHON_VERSION%%/lib-dynload/mmap.so
@@ -1010,7 +1010,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/pwd.so
 lib/%%PYTHON_VERSION%%/lib-dynload/readline.so
 lib/%%PYTHON_VERSION%%/lib-dynload/regex.so
 lib/%%PYTHON_VERSION%%/lib-dynload/resource.so
-lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so
 lib/%%PYTHON_VERSION%%/lib-dynload/rotor.so
 lib/%%PYTHON_VERSION%%/lib-dynload/select.so
 lib/%%PYTHON_VERSION%%/lib-dynload/sha.so
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 82dcf8db72d..b3762575659 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -95,4 +95,10 @@ post-install:
 		(cd ${DEMODIR}; tar xf -)
 .endif
 
+.if ${ARCH} == i386
+PLIST_SUB+=	X86_ONLY=""
+.else
+PLIST_SUB+=	X86_ONLY="@comment "
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/lang/python27/pkg-plist b/lang/python27/pkg-plist
index 2340b770981..f9e58fd9f9c 100644
--- a/lang/python27/pkg-plist
+++ b/lang/python27/pkg-plist
@@ -986,7 +986,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/_socket.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_testcapi.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_weakref.so
 lib/%%PYTHON_VERSION%%/lib-dynload/array.so
-lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/binascii.so
 lib/%%PYTHON_VERSION%%/lib-dynload/bsddb.so
 lib/%%PYTHON_VERSION%%/lib-dynload/cPickle.so
@@ -996,9 +996,9 @@ lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
 lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
 lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
 lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
-lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/math.so
 lib/%%PYTHON_VERSION%%/lib-dynload/md5.so
 lib/%%PYTHON_VERSION%%/lib-dynload/mmap.so
@@ -1010,7 +1010,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/pwd.so
 lib/%%PYTHON_VERSION%%/lib-dynload/readline.so
 lib/%%PYTHON_VERSION%%/lib-dynload/regex.so
 lib/%%PYTHON_VERSION%%/lib-dynload/resource.so
-lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so
 lib/%%PYTHON_VERSION%%/lib-dynload/rotor.so
 lib/%%PYTHON_VERSION%%/lib-dynload/select.so
 lib/%%PYTHON_VERSION%%/lib-dynload/sha.so
diff --git a/lang/python30/Makefile b/lang/python30/Makefile
index 82dcf8db72d..b3762575659 100644
--- a/lang/python30/Makefile
+++ b/lang/python30/Makefile
@@ -95,4 +95,10 @@ post-install:
 		(cd ${DEMODIR}; tar xf -)
 .endif
 
+.if ${ARCH} == i386
+PLIST_SUB+=	X86_ONLY=""
+.else
+PLIST_SUB+=	X86_ONLY="@comment "
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/lang/python30/pkg-plist b/lang/python30/pkg-plist
index 2340b770981..f9e58fd9f9c 100644
--- a/lang/python30/pkg-plist
+++ b/lang/python30/pkg-plist
@@ -986,7 +986,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/_socket.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_testcapi.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_weakref.so
 lib/%%PYTHON_VERSION%%/lib-dynload/array.so
-lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/binascii.so
 lib/%%PYTHON_VERSION%%/lib-dynload/bsddb.so
 lib/%%PYTHON_VERSION%%/lib-dynload/cPickle.so
@@ -996,9 +996,9 @@ lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
 lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
 lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
 lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
-lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/math.so
 lib/%%PYTHON_VERSION%%/lib-dynload/md5.so
 lib/%%PYTHON_VERSION%%/lib-dynload/mmap.so
@@ -1010,7 +1010,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/pwd.so
 lib/%%PYTHON_VERSION%%/lib-dynload/readline.so
 lib/%%PYTHON_VERSION%%/lib-dynload/regex.so
 lib/%%PYTHON_VERSION%%/lib-dynload/resource.so
-lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so
 lib/%%PYTHON_VERSION%%/lib-dynload/rotor.so
 lib/%%PYTHON_VERSION%%/lib-dynload/select.so
 lib/%%PYTHON_VERSION%%/lib-dynload/sha.so
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index 82dcf8db72d..b3762575659 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -95,4 +95,10 @@ post-install:
 		(cd ${DEMODIR}; tar xf -)
 .endif
 
+.if ${ARCH} == i386
+PLIST_SUB+=	X86_ONLY=""
+.else
+PLIST_SUB+=	X86_ONLY="@comment "
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/lang/python31/pkg-plist b/lang/python31/pkg-plist
index 2340b770981..f9e58fd9f9c 100644
--- a/lang/python31/pkg-plist
+++ b/lang/python31/pkg-plist
@@ -986,7 +986,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/_socket.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_testcapi.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_weakref.so
 lib/%%PYTHON_VERSION%%/lib-dynload/array.so
-lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/binascii.so
 lib/%%PYTHON_VERSION%%/lib-dynload/bsddb.so
 lib/%%PYTHON_VERSION%%/lib-dynload/cPickle.so
@@ -996,9 +996,9 @@ lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
 lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
 lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
 lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
-lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/math.so
 lib/%%PYTHON_VERSION%%/lib-dynload/md5.so
 lib/%%PYTHON_VERSION%%/lib-dynload/mmap.so
@@ -1010,7 +1010,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/pwd.so
 lib/%%PYTHON_VERSION%%/lib-dynload/readline.so
 lib/%%PYTHON_VERSION%%/lib-dynload/regex.so
 lib/%%PYTHON_VERSION%%/lib-dynload/resource.so
-lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so
 lib/%%PYTHON_VERSION%%/lib-dynload/rotor.so
 lib/%%PYTHON_VERSION%%/lib-dynload/select.so
 lib/%%PYTHON_VERSION%%/lib-dynload/sha.so
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index 82dcf8db72d..b3762575659 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -95,4 +95,10 @@ post-install:
 		(cd ${DEMODIR}; tar xf -)
 .endif
 
+.if ${ARCH} == i386
+PLIST_SUB+=	X86_ONLY=""
+.else
+PLIST_SUB+=	X86_ONLY="@comment "
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/lang/python32/pkg-plist b/lang/python32/pkg-plist
index 2340b770981..f9e58fd9f9c 100644
--- a/lang/python32/pkg-plist
+++ b/lang/python32/pkg-plist
@@ -986,7 +986,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/_socket.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_testcapi.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_weakref.so
 lib/%%PYTHON_VERSION%%/lib-dynload/array.so
-lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/audioop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/binascii.so
 lib/%%PYTHON_VERSION%%/lib-dynload/bsddb.so
 lib/%%PYTHON_VERSION%%/lib-dynload/cPickle.so
@@ -996,9 +996,9 @@ lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
 lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
 lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
 lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
-lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/math.so
 lib/%%PYTHON_VERSION%%/lib-dynload/md5.so
 lib/%%PYTHON_VERSION%%/lib-dynload/mmap.so
@@ -1010,7 +1010,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/pwd.so
 lib/%%PYTHON_VERSION%%/lib-dynload/readline.so
 lib/%%PYTHON_VERSION%%/lib-dynload/regex.so
 lib/%%PYTHON_VERSION%%/lib-dynload/resource.so
-lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so
 lib/%%PYTHON_VERSION%%/lib-dynload/rotor.so
 lib/%%PYTHON_VERSION%%/lib-dynload/select.so
 lib/%%PYTHON_VERSION%%/lib-dynload/sha.so