- Update to version 20060325.

- Don't reinstall system headers (causes pkg-plist changes between different
  FreeBSD versions).

4 files changed, 260 insertions, 71 deletions

diff --git a/lang/gpc/Makefile b/lang/gpc/Makefile
index 7978eadb2c2b..0a897b07cbac 100644
--- a/lang/gpc/Makefile
+++ b/lang/gpc/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gpc
-PORTVERSION=	20050331
-PORTREVISION=	1
+PORTVERSION=	20060325
 CATEGORIES=	lang
 MASTER_SITES=	http://www.gnu-pascal.de/alpha/:gpc \
 		${MASTER_SITE_GCC}
@@ -19,6 +18,7 @@ MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	GNU Pascal compiler
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
+		gsed:${PORTSDIR}/textproc/gsed \
 		help2man:${PORTSDIR}/misc/help2man
 
 USE_BISON=	yes
@@ -51,19 +51,17 @@ CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .endif
 
 post-extract:
-	@${MV} ${WRKDIR}/p ${WRKSRC}/gcc
+	@${MV} ${WRKDIR}/${DISTNAME}/p ${WRKSRC}/gcc
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|read junk||' ${WRKSRC}/gcc/p/config-lang.in
-	@${REINPLACE_CMD} -Ee 's|^(sed=)"`.*`"|\1sed|' \
-		${WRKSRC}/gcc/p/script/extract-doc-demos
-.if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -Ee 's|^(PASCAL_INSTALL_DOC=).*|\1|' \
-		${WRKSRC}/gcc/p/Make-lang.in
-.else
+	@${REINPLACE_CMD} -e 's|sed -|gsed -|' ${WRKSRC}/gcc/p/utils/mk-t-inc
 	@${REINPLACE_CMD} -Ee \
 		's|^(P_DOC_DIR=).*|\1${DOCSDIR:S/${PREFIX}\///}|' \
 		${WRKSRC}/gcc/p/Make-lang.in
+.if defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -Ee 's|^(PASCAL_INSTALL_DOC=).*|\1|' \
+		${WRKSRC}/gcc/p/Make-lang.in
 .endif
 
 post-install:
diff --git a/lang/gpc/distinfo b/lang/gpc/distinfo
index 35c861751a7b..2e2478c856fc 100644
--- a/lang/gpc/distinfo
+++ b/lang/gpc/distinfo
@@ -1,6 +1,6 @@
-MD5 (gpc-20050331.tar.bz2) = cdc1460ba7b3cc099d404c5fa1202f8a
-SHA256 (gpc-20050331.tar.bz2) = 8e3fdf78a7cee1fb6d313a21f0ca07ac64e8434881bea389dccb44ea6d0aa878
-SIZE (gpc-20050331.tar.bz2) = 2670786
+MD5 (gpc-20060325.tar.bz2) = 8a564824c66e804caf27e14befc0a007
+SHA256 (gpc-20060325.tar.bz2) = 18fddcb63e1f718905f191a0ca7734c4ec59cf7488742a969d070150f99d4ded
+SIZE (gpc-20060325.tar.bz2) = 2767216
 MD5 (gcc-core-3.4.3.tar.bz2) = d2cbfe8fc3205c1d7969b26377405778
 SHA256 (gcc-core-3.4.3.tar.bz2) = 42e1259c15a59096e3115eec4d0b87afd04d39567a07665ca5d9b358fd02bce0
 SIZE (gcc-core-3.4.3.tar.bz2) = 13040222
diff --git a/lang/gpc/files/patch-gcc__p__Make-lang.in b/lang/gpc/files/patch-gcc__p__Make-lang.in
index a3d3f242f32b..6ffcc0359888 100644
--- a/lang/gpc/files/patch-gcc__p__Make-lang.in
+++ b/lang/gpc/files/patch-gcc__p__Make-lang.in
@@ -1,6 +1,15 @@
---- ./gcc/p/Make-lang.in.orig	Thu Mar 31 15:21:55 2005
-+++ ./gcc/p/Make-lang.in	Thu Jun 29 20:30:11 2006
-@@ -928,7 +928,7 @@
+--- gcc/p/Make-lang.in.orig	Sat Mar 25 00:33:50 2006
++++ gcc/p/Make-lang.in	Sat Jul 29 13:06:42 2006
+@@ -162,7 +162,7 @@
+ PASCAL_INSTALL_DOC=pascal.real-install-doc
+ 
+ # Where to install the documentation and demos (relative to the prefix)
+-P_DOC_DIR=doc/gpc
++P_DOC_DIR=share/doc/gpc
+ p_inst_docdir=$(prefix)/$(P_DOC_DIR)
+ p_inst_demodir=$(p_inst_docdir)/demos
+ p_inst_docdemodir=$(p_inst_docdir)/docdemos
+@@ -938,7 +938,7 @@
  	  chmod a+x $(DESTDIR)$(bindir)/$(GPC_INSTALL_NAME)$(exeext); \
  	fi
  	rm -f $(DESTDIR)$(bindir)/gpc-run
@@ -9,3 +18,12 @@
  	chmod a+x $(DESTDIR)$(bindir)/gpc-run
  
  pascal.install-utils: pascal.utils
+@@ -1114,7 +1114,7 @@
+ #    in pascal.install-normal for gcc-3.4, it would otherwise be missing here.
+ pascal.install: pascal.install-normal pascal.install-compiler; @true
+ 
+-pascal.install-with-gcc: $(INSTALL_HEADERS) pascal.install $(INSTALL_LIBGCC)
++pascal.install-with-gcc: pascal.install $(INSTALL_LIBGCC)
+ 	for file in $(GCC_PASSES); do \
+ 	  if [ x"$$file" != x"xgcc$(exeext)" ]; then \
+ 	    rm -f $(DESTDIR)$(libsubdir)/$$file; \
diff --git a/lang/gpc/pkg-plist b/lang/gpc/pkg-plist
index 059b033283a3..553a268d7954 100644
--- a/lang/gpc/pkg-plist
+++ b/lang/gpc/pkg-plist
@@ -7,49 +7,7 @@ lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/crtbegin.o
 lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/crtbeginS.o
 lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/crtend.o
 lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/crtendS.o
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include/README
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include/emmintrin.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include/float.h
 lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include/gpc-in-c.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include/iso646.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include/limits.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include/math.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include/mmintrin.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include/netinet/ip_compat.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include/netinet/ip_fil.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include/netinet/ip_lookup.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include/netinet/ip_nat.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include/netinet/ip_proxy.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include/netinet/ip_scan.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include/netinet/ip_state.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include/pmmintrin.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include/rpc/svc.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include/stdarg.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include/stdbool.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include/stddef.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include/stdio.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include/stdlib.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include/sys/types.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include/syslimits.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include/unistd.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include/unwind.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include/varargs.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include/xmmintrin.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/gsyslimits.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/include/README
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/include/emmintrin.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/include/float.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/include/iso646.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/include/limits.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/include/mmintrin.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/include/pmmintrin.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/include/stdarg.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/include/stdbool.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/include/stddef.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/include/unwind.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/include/varargs.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/include/xmmintrin.h
-lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders.conf
 lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/libgcc.a
 lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/libgcc_eh.a
 lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/libgcov.a
@@ -90,14 +48,10 @@ lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/units/trapc.c
 lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/units/turbo3.pas
 lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/units/wincrt.pas
 lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/units/windos.pas
-lib/libgcc_s.so
-lib/libgcc_s.so.1
+lib/gpc/libgcc_s.so
+lib/gpc/libgcc_s.so.1
 libexec/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/collect2
 libexec/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/gpc1
-libexec/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/gpcpp
-libexec/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixinc.sh
-libexec/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixincl
-libexec/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
@@ -165,22 +119,241 @@ libexec/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders
 %%PORTDOCS%%%%DOCSDIR%%/demos/tfdddemo.pas
 %%PORTDOCS%%%%DOCSDIR%%/demos/trapdemo.pas
 %%PORTDOCS%%%%DOCSDIR%%/demos/variantdemo.pas
-@dirrm share/nls/en_US.US-ASCII
-@dirrm share/nls/POSIX
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/README
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/absdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/absolutedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/addrdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/alignofdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/and_thendemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/andbug.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/anddemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/andoperatordemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/andproceduredemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/andthendemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/ansichardemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/anyfiledemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/appenddemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/arccosdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/arcsindemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/arctandemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/argdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/arraydemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/assigneddemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/assigntextdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/attributedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/begindemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/bindingdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/bitoperatorproceduredemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/bitsizeofdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/booleandemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/bpabsolutedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/bparrayinitdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/bpepbasedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/bpinitvardemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/bpvariantrecorddemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/breakdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/bytebooldemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/bytecarddemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/bytedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/byteintdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/callc.c
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/callc.h
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/callcdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/callcudemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/callcunit.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/carddemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/cardinaldemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/casedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/caseotherwisedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/cbooleandemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/ccardinaldemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/chardemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/chdirdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/chrdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/cintegerdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/cmplxdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/commandlineargumentsdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/compdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/compilerassertdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/complexdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/complexoperationsdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/concatdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/conjugatedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/constdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/continuedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/copydemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/cosdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/cstringdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/currentroutinenamedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/cworddemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/cycledemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/decdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/demomod2.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/demomod3.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/demomodule.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/demounit.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/directaccessfiledemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/divdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/doubledemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/dpmidemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/elsedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/enddemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/enumsubrangedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/eparrayinitdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/epbasedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/epvariantrecorddemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/excludedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/exitdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/expdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/exportdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/extenddemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/extendeddemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/falsedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/fardemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/foo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/fordemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/fracdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/getmemdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/haltdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/hello1.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/hello2.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/highdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/ifdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/imdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/incdecdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/incdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/includedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/inittypedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/inlinedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/intdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/integerdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/integersizedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/integertypesdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/leavedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/lndemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/localproceduralparameterdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/longbooldemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/longcarddemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/longestbooldemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/longestcarddemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/longestintdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/longestrealdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/longestworddemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/longintdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/longrealdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/longworddemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/lowdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/macrodemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/medbooldemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/medcarddemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/medintdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/medrealdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/medworddemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/mkdirdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/moddemo2.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/moddemo3.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/moduledemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/namedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/neardemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/nildemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/nulldemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/objectdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/odddemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/operatordemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/optimizationdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/or_elsedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/orbug.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/orddemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/ordemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/orelsedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/otherwisedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/packeddemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/packedsubrangedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/pansichardemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/paramcountdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/parameterdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/paramstrdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/partialfreememdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/pchardemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/pointerarithmeticdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/pointerdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/preddemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/procptrdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/prog.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/ptrcarddemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/ptrdifftypedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/ptrintdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/ptrworddemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/pxscoperatordemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/realdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/recorddemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/redemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/repeatdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/resetdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/restricteddemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/rewritedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/rmdirdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/rounddemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/schema1demo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/schema2demo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/schema3demo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/schemaexoticdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/schemawithdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/setdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/setlengthdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/setopdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/settypedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/shldemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/shortbooldemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/shortcarddemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/shortintdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/shortrealdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/shortworddemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/shrdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/sindemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/sizeofdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/sizetypedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/slicewritedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/smallintdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/somemodule.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/sqrdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/sqrtdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/staticdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/stderrdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/stringdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/stringslicedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/subrangedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/substrdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/succdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/syscall.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/textdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/thendemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/timestampdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/truedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/truncdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/typecastdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/typecst2demo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/typedemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/typeofdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/typevarinitdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/unitdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/valdemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/vardemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/voiddemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/whiledemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/wordbooldemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/worddemo.pas
+%%PORTDOCS%%%%DOCSDIR%%/docdemos/xordemo.pas
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docdemos
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/demos
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm libexec/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools
 @dirrm libexec/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%
 @dirrm libexec/gpc/gcc/%%GNU_HOST%%
 @dirrm libexec/gpc/gcc
+@dirrm libexec/gpc
 @dirrm lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/units
-@dirrm lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/include
-@dirrm lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools
-@dirrm lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include/sys
-@dirrm lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include/rpc
-@dirrm lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include/netinet
 @dirrm lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/include
 @dirrm lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%
 @dirrm lib/gpc/gcc/%%GNU_HOST%%
 @dirrm lib/gpc/gcc
+@dirrm lib/gpc