diff --git a/lang/egcs/stable/Makefile b/lang/egcs/stable/Makefile
index 3176e69d2cd..cc61dfda100 100644
--- a/lang/egcs/stable/Makefile
+++ b/lang/egcs/stable/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.81 2004/01/31 14:58:03 espie Exp $
+# $OpenBSD: Makefile,v 1.82 2004/09/15 19:06:57 espie Exp $
 
 ONLY_FOR_ARCHS=	alpha i386 m68k sparc sparc64 powerpc vax
 
@@ -331,15 +331,15 @@ send-results:
 
 
 .if ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "sparc"
-SED_PLIST=|sed -e '/^IFPIC:/s///'
+PKG_ARGS+=-DPIC=1
 .else
-SED_PLIST=|sed -e '/^IFPIC:/d'
+PKG_ARGS+=-DPIC=0
 .endif
 
 .if ${MACHINE_ARCH} == "powerpc"
-SED_PLIST+=|sed -e '/^IFPPC:/s///'
+PKG_ARGS+=-DPPC=1
 .else
-SED_PLIST+=|sed -e '/^IFPPC:/d'
+PKG_ARGS+=-DPPC=0
 .endif
 
 GCC_NAME=${WRKBUILD}/gcc/xgcc
diff --git a/lang/egcs/stable/pkg/PFRAG.PIC b/lang/egcs/stable/pkg/PFRAG.PIC
new file mode 100644
index 00000000000..fe73cecb94f
--- /dev/null
+++ b/lang/egcs/stable/pkg/PFRAG.PIC
@@ -0,0 +1,3 @@
+@comment $OpenBSD: PFRAG.PIC,v 1.1 2004/09/15 19:06:57 espie Exp $
+lib/gcc-lib/${CONFIG}/${V}/fpic/
+lib/gcc-lib/${CONFIG}/${V}/fpic/libgcc.a
diff --git a/lang/egcs/stable/pkg/PFRAG.PIC-c++ b/lang/egcs/stable/pkg/PFRAG.PIC-c++
new file mode 100644
index 00000000000..c57f510a3a9
--- /dev/null
+++ b/lang/egcs/stable/pkg/PFRAG.PIC-c++
@@ -0,0 +1,6 @@
+@comment $OpenBSD: PFRAG.PIC-c++,v 1.1 2004/09/15 19:06:57 espie Exp $
+lib/fpic/libestdc++.a
+@comment lib/fpic/libestdc++.la
+lib/fpic/libiberty.a
+lib/fpic/libsupc++.a
+@comment lib/fpic/libsupc++.la
diff --git a/lang/egcs/stable/pkg/PFRAG.PIC-g77 b/lang/egcs/stable/pkg/PFRAG.PIC-g77
new file mode 100644
index 00000000000..c806f85f937
--- /dev/null
+++ b/lang/egcs/stable/pkg/PFRAG.PIC-g77
@@ -0,0 +1,4 @@
+@comment $OpenBSD: PFRAG.PIC-g77,v 1.1 2004/09/15 19:06:57 espie Exp $
+lib/fpic/libfrtbegin.a
+lib/fpic/libg2c.a
+lib/fpic/libg2c.la
diff --git a/lang/egcs/stable/pkg/PFRAG.PIC-java b/lang/egcs/stable/pkg/PFRAG.PIC-java
new file mode 100644
index 00000000000..a601b4af820
--- /dev/null
+++ b/lang/egcs/stable/pkg/PFRAG.PIC-java
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PFRAG.PIC-java,v 1.1 2004/09/15 19:06:57 espie Exp $
+lib/fpic/lib-org-w3c-dom.a
+lib/fpic/lib-org-w3c-dom.la
+lib/fpic/lib-org-xml-sax.a
+lib/fpic/lib-org-xml-sax.la
+lib/fpic/libffi.a
+lib/fpic/libffi.la
diff --git a/lang/egcs/stable/pkg/PFRAG.PIC-objc b/lang/egcs/stable/pkg/PFRAG.PIC-objc
new file mode 100644
index 00000000000..584dc700e03
--- /dev/null
+++ b/lang/egcs/stable/pkg/PFRAG.PIC-objc
@@ -0,0 +1,3 @@
+@comment $OpenBSD: PFRAG.PIC-objc,v 1.1 2004/09/15 19:06:57 espie Exp $
+lib/fpic/libobjc.a
+lib/fpic/libobjc.la
diff --git a/lang/egcs/stable/pkg/PFRAG.PPC b/lang/egcs/stable/pkg/PFRAG.PPC
new file mode 100644
index 00000000000..f35f2b73616
--- /dev/null
+++ b/lang/egcs/stable/pkg/PFRAG.PPC
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.PPC,v 1.1 2004/09/15 19:06:57 espie Exp $
+lib/gcc-lib/${CONFIG}/${V}/crtsavres.o
diff --git a/lang/egcs/stable/pkg/PLIST b/lang/egcs/stable/pkg/PLIST
index 48c314e8c84..46cbbcd5656 100644
--- a/lang/egcs/stable/pkg/PLIST
+++ b/lang/egcs/stable/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.20 2004/08/09 00:02:22 espie Exp $
+@comment $OpenBSD: PLIST,v 1.21 2004/09/15 19:06:57 espie Exp $
 @pkgcfl egcs-*-core
 bin/ecpp
 bin/egcc
@@ -13,11 +13,9 @@ bin/${CONFIG}-gcc-${V}
 lib/gcc-lib/
 lib/gcc-lib/${CONFIG}/
 lib/gcc-lib/${CONFIG}/${V}/
-IFPIC:lib/gcc-lib/${CONFIG}/${V}/fpic/
 lib/gcc-lib/${CONFIG}/${V}/cc1
 lib/gcc-lib/${CONFIG}/${V}/collect2
 lib/fpic/
-IFPIC:lib/gcc-lib/${CONFIG}/${V}/fpic/libgcc.a
 lib/gcc-lib/${CONFIG}/${V}/include/
 lib/gcc-lib/${CONFIG}/${V}/include/README
 lib/gcc-lib/${CONFIG}/${V}/include/limits.h
@@ -36,7 +34,6 @@ lib/gcc-lib/${CONFIG}/${V}/install-tools/include/limits.h
 lib/gcc-lib/${CONFIG}/${V}/install-tools/mkheaders
 lib/gcc-lib/${CONFIG}/${V}/install-tools/mkheaders.conf
 lib/gcc-lib/${CONFIG}/${V}/libgcc.a
-IFPPC:lib/gcc-lib/${CONFIG}/${V}/crtsavres.o
 lib/gcc-lib/${CONFIG}/${V}/specs
 lib/libiberty.a
 @man man/man1/cpp.1
@@ -45,3 +42,5 @@ lib/libiberty.a
 @comment @man man/man7/fsf-funding.7
 @comment @man man/man7/gfdl.7
 @comment @man man/man7/gpl.7
+%%PIC%%
+%%PPC%%
diff --git a/lang/egcs/stable/pkg/PLIST-c++ b/lang/egcs/stable/pkg/PLIST-c++
index 73c4aa14bbb..b7a755bd97c 100644
--- a/lang/egcs/stable/pkg/PLIST-c++
+++ b/lang/egcs/stable/pkg/PLIST-c++
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-c++,v 1.15 2004/08/09 00:02:22 espie Exp $
+@comment $OpenBSD: PLIST-c++,v 1.16 2004/09/15 19:06:57 espie Exp $
 @pkgcfl egcs-*-core
 bin/ec++
 bin/eg++
@@ -197,14 +197,10 @@ include/c++/${V}/typeinfo
 include/c++/${V}/utility
 include/c++/${V}/valarray
 include/c++/${V}/vector
-IFPIC:lib/fpic/libestdc++.a
-@comment IFPIC:lib/fpic/libestdc++.la
-IFPIC:lib/fpic/libiberty.a
-IFPIC:lib/fpic/libsupc++.a
-@comment IFPIC:lib/fpic/libsupc++.la
 lib/gcc-lib/${CONFIG}/${V}/cc1plus
 lib/libestdc++.a
 @comment lib/libestdc++.la
 lib/libsupc++.a
 @comment lib/libsupc++.la
 @man man/man1/eg++.1
+%%PIC%%
diff --git a/lang/egcs/stable/pkg/PLIST-g77 b/lang/egcs/stable/pkg/PLIST-g77
index ef2d8d28b59..0baa5250f0a 100644
--- a/lang/egcs/stable/pkg/PLIST-g77
+++ b/lang/egcs/stable/pkg/PLIST-g77
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-g77,v 1.12 2004/08/09 00:02:22 espie Exp $
+@comment $OpenBSD: PLIST-g77,v 1.13 2004/09/15 19:06:57 espie Exp $
 @pkgcfl egcs-*-core
 bin/eg77
 @info info/g77.info
@@ -8,7 +8,5 @@ lib/libfrtbegin.a
 lib/libg2c.a
 lib/libg2c.la
 @man man/man1/eg77.1
-IFPIC:lib/fpic/libfrtbegin.a
-IFPIC:lib/fpic/libg2c.a
-IFPIC:lib/fpic/libg2c.la
 %%SHARED%%
+%%PIC%%
diff --git a/lang/egcs/stable/pkg/PLIST-java b/lang/egcs/stable/pkg/PLIST-java
index 1bcde42df73..4a4b9d79d09 100644
--- a/lang/egcs/stable/pkg/PLIST-java
+++ b/lang/egcs/stable/pkg/PLIST-java
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-java,v 1.7 2004/08/09 00:02:22 espie Exp $
+@comment $OpenBSD: PLIST-java,v 1.8 2004/09/15 19:06:57 espie Exp $
 @pkgcfl egcs-*-core
 bin/${CONFIG}-egcj
 bin/eaddr2name.awk
@@ -1825,12 +1825,6 @@ lib/gcc-lib/${CONFIG}/${V}/include/gcj/
 lib/gcc-lib/${CONFIG}/${V}/include/gcj/libgcj-config.h
 lib/gcc-lib/${CONFIG}/${V}/jc1
 lib/gcc-lib/${CONFIG}/${V}/jvgenmain
-IFPIC:lib/fpic/lib-org-w3c-dom.a
-IFPIC:lib/fpic/lib-org-w3c-dom.la
-IFPIC:lib/fpic/lib-org-xml-sax.a
-IFPIC:lib/fpic/lib-org-xml-sax.la
-IFPIC:lib/fpic/libffi.a
-IFPIC:lib/fpic/libffi.la
 lib/libgcj.a
 lib/libgcj.la
 lib/libgcj.spec
@@ -1890,3 +1884,4 @@ lib/security/libgcj.security
 share/java/
 share/java/libgcj-${V}.jar
 %%SHARED%%
+%%PIC%%
diff --git a/lang/egcs/stable/pkg/PLIST-objc b/lang/egcs/stable/pkg/PLIST-objc
index 84634a512b5..7e484dfa08d 100644
--- a/lang/egcs/stable/pkg/PLIST-objc
+++ b/lang/egcs/stable/pkg/PLIST-objc
@@ -1,7 +1,5 @@
-@comment $OpenBSD: PLIST-objc,v 1.12 2004/08/09 00:02:22 espie Exp $
+@comment $OpenBSD: PLIST-objc,v 1.13 2004/09/15 19:06:57 espie Exp $
 @pkgcfl egcs-*-core
-IFPIC:lib/fpic/libobjc.a
-IFPIC:lib/fpic/libobjc.la
 lib/gcc-lib/${CONFIG}/${V}/cc1obj
 lib/gcc-lib/${CONFIG}/${V}/include/objc/
 lib/gcc-lib/${CONFIG}/${V}/include/objc/NXConstStr.h
@@ -18,3 +16,4 @@ lib/gcc-lib/${CONFIG}/${V}/include/objc/typedstream.h
 lib/libobjc.a
 lib/libobjc.la
 %%SHARED%%
+%%PIC%%