fix pkg-plist

Pointed out by:	pointyhat via kris

2 files changed, 67 insertions, 68 deletions

diff --git a/lang/pnet-base/Makefile b/lang/pnet-base/Makefile
index f83902de202..80fe911a1ca 100644
--- a/lang/pnet-base/Makefile
+++ b/lang/pnet-base/Makefile
@@ -55,6 +55,9 @@ MLINKS=	ilasm.1 al.1 \
 .if ${ARCH} != "i386"
 CONFIGURE_ARGS+=	--without-libffi \
 			--without-libgc
+PLIST_SUB=	I386="@comment "
+.else
+PLIST_SUB=	I386=""
 .endif
 
 post-everything::
diff --git a/lang/pnet-base/pkg-plist b/lang/pnet-base/pkg-plist
index 83695c695b8..a668f99f55d 100644
--- a/lang/pnet-base/pkg-plist
+++ b/lang/pnet-base/pkg-plist
@@ -28,31 +28,31 @@ bin/ilsize
 bin/ilstrip
 bin/ilverify
 bin/resgen
-include/pnet/ffi.h
-include/pnet/ffi_mips.h
-include/pnet/fficonfig.h
-include/pnet/gc.h
-include/pnet/gc/gc.h
-include/pnet/gc/gc_alloc.h
-include/pnet/gc/gc_allocator.h
-include/pnet/gc/gc_amiga_redirects.h
-include/pnet/gc/gc_backptr.h
-include/pnet/gc/gc_config_macros.h
-include/pnet/gc/gc_cpp.h
-include/pnet/gc/gc_gcj.h
-include/pnet/gc/gc_inl.h
-include/pnet/gc/gc_inline.h
-include/pnet/gc/gc_local_alloc.h
-include/pnet/gc/gc_mark.h
-include/pnet/gc/gc_pthread_redirects.h
-include/pnet/gc/gc_typed.h
-include/pnet/gc/leak_detector.h
-include/pnet/gc/new_gc_alloc.h
-include/pnet/gc/weakpointer.h
-include/pnet/gc_config_macros.h
-include/pnet/gc_local_alloc.h
-include/pnet/gc_pthread_redirects.h
-include/pnet/gc_typed.h
+%%I386%%include/pnet/ffi.h
+%%I386%%include/pnet/ffi_mips.h
+%%I386%%include/pnet/fficonfig.h
+%%I386%%include/pnet/gc.h
+%%I386%%include/pnet/gc/gc.h
+%%I386%%%%I386%%include/pnet/gc/gc_alloc.h
+%%I386%%include/pnet/gc/gc_allocator.h
+%%I386%%include/pnet/gc/gc_amiga_redirects.h
+%%I386%%include/pnet/gc/gc_backptr.h
+%%I386%%include/pnet/gc/gc_config_macros.h
+%%I386%%include/pnet/gc/gc_cpp.h
+%%I386%%include/pnet/gc/gc_gcj.h
+%%I386%%include/pnet/gc/gc_inl.h
+%%I386%%include/pnet/gc/gc_inline.h
+%%I386%%include/pnet/gc/gc_local_alloc.h
+%%I386%%include/pnet/gc/gc_mark.h
+%%I386%%include/pnet/gc/gc_pthread_redirects.h
+%%I386%%include/pnet/gc/gc_typed.h
+%%I386%%include/pnet/gc/leak_detector.h
+%%I386%%include/pnet/gc/new_gc_alloc.h
+%%I386%%include/pnet/gc/weakpointer.h
+%%I386%%include/pnet/gc_config_macros.h
+%%I386%%include/pnet/gc_local_alloc.h
+%%I386%%include/pnet/gc_pthread_redirects.h
+%%I386%%include/pnet/gc_typed.h
 include/pnet/il_align.h
 include/pnet/il_bignum.h
 include/pnet/il_coder.h
@@ -83,7 +83,7 @@ include/pnet/il_utils.h
 include/pnet/il_values.h
 include/pnet/il_writer.h
 include/pnet/il_xml.h
-include/pnet/leak_detector.h
+%%I386%%include/pnet/leak_detector.h
 lib/cscc/plugins/cscc-b
 lib/cscc/plugins/cscc-bf
 lib/cscc/plugins/cscc-c-s
@@ -98,48 +98,44 @@ lib/libILEngine.a
 lib/libILImage.a
 lib/libILLink.a
 lib/libILSupport.a
-lib/pnet/elf/libffi.a
-lib/pnet/elf/libffi.la
-lib/pnet/libgc.a
-lib/pnet/libgc.la
-lib/pnet/libgc.so
-lib/pnet/libgc.so.1
-share/gc/README
-share/gc/README.DGUX386
-share/gc/README.Mac
-share/gc/README.MacOSX
-share/gc/README.OS2
-share/gc/README.amiga
-share/gc/README.arm.cross
-share/gc/README.autoconf
-share/gc/README.changes
-share/gc/README.contributors
-share/gc/README.cords
-share/gc/README.darwin
-share/gc/README.dj
-share/gc/README.environment
-share/gc/README.ews4800
-share/gc/README.hp
-share/gc/README.linux
-share/gc/README.macros
-share/gc/README.rs6000
-share/gc/README.sgi
-share/gc/README.solaris2
-share/gc/README.uts
-share/gc/README.win32
-share/gc/barrett_diagram
-share/gc/debugging.html
-share/gc/gc.man
-share/gc/gcdescr.html
-share/gc/gcinterface.html
-share/gc/leak.html
-share/gc/scale.html
-share/gc/simple_example.html
-share/gc/tree.html
-@dirrm share/gc
-@dirrm lib/pnet/elf
-@dirrm lib/pnet
+%%I386%%lib/pnet/elf/libffi.a
+%%I386%%lib/pnet/elf/libffi.la
+%%I386%%lib/pnet/libgc.a
+%%I386%%lib/pnet/libgc.la
+%%I386%%lib/pnet/libgc.so
+%%I386%%lib/pnet/libgc.so.1
+%%I386%%share/gc/README
+%%I386%%share/gc/README.DGUX386
+%%I386%%share/gc/README.Mac
+%%I386%%share/gc/README.MacOSX
+%%I386%%share/gc/README.OS2
+%%I386%%share/gc/README.amiga
+%%I386%%share/gc/README.arm.cross
+%%I386%%share/gc/README.autoconf
+%%I386%%share/gc/README.changes
+%%I386%%share/gc/README.contributors
+%%I386%%share/gc/README.cords
+%%I386%%share/gc/README.darwin
+%%I386%%share/gc/README.dj
+%%I386%%share/gc/README.environment
+%%I386%%share/gc/README.ews4800
+%%I386%%share/gc/README.hp
+%%I386%%share/gc/README.linux
+%%I386%%share/gc/README.macros
+%%I386%%share/gc/README.rs6000
+%%I386%%share/gc/README.sgi
+%%I386%%share/gc/README.solaris2
+%%I386%%share/gc/README.uts
+%%I386%%share/gc/README.win32
+%%I386%%share/gc/barrett_diagram
+%%I386%%share/gc/debugging.html
+%%I386%%share/gc/gc.man
+%%I386%%share/gc/gcdescr.html
+%%I386%%share/gc/gcinterface.html
+%%I386%%share/gc/leak.html
+%%I386%%share/gc/scale.html
+%%I386%%share/gc/simple_example.html
+%%I386%%share/gc/tree.html
 @dirrm lib/cscc/plugins
 @unexec rmdir %D/lib/cscc 2>/dev/null || true
-@dirrm include/pnet/gc
 @dirrm include/pnet