2 files changed, 364 insertions, 303 deletions

diff --git a/lang/sr/Makefile b/lang/sr/Makefile
index fac6ec3c7070..84f0b5d7e768 100644
--- a/lang/sr/Makefile
+++ b/lang/sr/Makefile
@@ -15,27 +15,25 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A parallel language "Synchronization Resources"
 
-BROKEN=		Broken pkg-plist
-
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	prefix
 NO_WRKSUBDIR=	yes
 MAN1 =		sr.1 srl.1 srm.1 srprof.1 srtex.1 srlatex.1 srgrind.1 \
 		ccr2sr.1 m2sr.1 csp2sr.1
 MAN3 =		sranimator.3 srgetopt.3 srwin.3
-MAN5 =		srmap.5 srtrace.5 
+MAN5 =		srmap.5 srtrace.5
 
 pre-install:
 	@${MKDIR} ${PREFIX}/lib/sr
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/sr/notes
-	${MKDIR} ${PREFIX}/share/doc/sr/ps
-	${INSTALL_DATA} ${WRKSRC}/notes/* ${PREFIX}/share/doc/sr/notes
-	${INSTALL_DATA} ${WRKSRC}/ps/* ${PREFIX}/share/doc/sr/ps
-	${MKDIR} ${PREFIX}/share/examples/sr
-	${CP} -pR ${WRKSRC}/examples/* ${PREFIX}/share/examples/sr
+	${MKDIR} ${DOCSDIR}/notes
+	${MKDIR} ${DOCSDIR}/ps
+	${INSTALL_DATA} ${WRKSRC}/notes/* ${DOCSDIR}/notes
+	${INSTALL_DATA} ${WRKSRC}/ps/* ${DOCSDIR}/ps
+	${MKDIR} ${EXAMPLESDIR}
+	${CP} -pR ${WRKSRC}/examples/* ${EXAMPLESDIR}
 .endif
 
 .include<bsd.port.mk>
diff --git a/lang/sr/pkg-plist b/lang/sr/pkg-plist
index 07d84f39db20..bf19921adea2 100644
--- a/lang/sr/pkg-plist
+++ b/lang/sr/pkg-plist
@@ -28,298 +28,361 @@ lib/sr/srmap
 lib/sr/srmulti.h
 lib/sr/srwin.o
 lib/sr/srx
-share/doc/sr/notes/Memory
-share/doc/sr/notes/Questions
-share/doc/sr/notes/README
-share/doc/sr/notes/Termination
-share/doc/sr/notes/Tour
-share/doc/sr/notes/VM
-share/doc/sr/notes/Vsuite
-share/doc/sr/notes/coding.ms
-share/doc/sr/notes/csw860.txt
-share/doc/sr/ps/README
-share/doc/sr/ps/impl.ps
-share/doc/sr/ps/install.ps
-share/doc/sr/ps/language.ps
-share/doc/sr/ps/manpages.ps
-share/doc/sr/ps/port.ps
-share/doc/sr/ps/rel_2_0.ps
-share/doc/sr/ps/rel_2_1.ps
-share/doc/sr/ps/rel_2_2.ps
-share/doc/sr/ps/release.ps
-share/doc/sr/ps/runtime.ps
-share/doc/sr/ps/sranimator.ps
-share/doc/sr/ps/srwin.ps
-share/examples/sr/README
-share/examples/sr/ccr2sr/1/No_input.std
-share/examples/sr/ccr2sr/1/Script
-share/examples/sr/ccr2sr/1/a.ccr
-share/examples/sr/ccr2sr/2/Script
-share/examples/sr/ccr2sr/2/a.ccr
-share/examples/sr/ccr2sr/3/Script
-share/examples/sr/ccr2sr/3/a.ccr
-share/examples/sr/ccr2sr/4/Script
-share/examples/sr/ccr2sr/4/a.ccr
-share/examples/sr/ccr2sr/5/Script
-share/examples/sr/ccr2sr/5/a.ccr
-share/examples/sr/ccr2sr/rw/No_input.std
-share/examples/sr/ccr2sr/rw/Script
-share/examples/sr/ccr2sr/rw/rw.ccr
-share/examples/sr/chap01/CS.sr
-share/examples/sr/chap01/cgrep.sr
-share/examples/sr/chap01/factorial.sr
-share/examples/sr/chap01/hello.sr
-share/examples/sr/chap01/matrix.sr
-share/examples/sr/chap04/center.sr
-share/examples/sr/chap04/differ.sr
-share/examples/sr/chap04/evaluator.sr
-share/examples/sr/chap04/fact.sr
-share/examples/sr/chap04/factorial.sr
-share/examples/sr/chap04/insert.sr
-share/examples/sr/chap04/left.sr
-share/examples/sr/chap04/search.sr
-share/examples/sr/chap04/sigma.sr
-share/examples/sr/chap04/sort1.sr
-share/examples/sr/chap04/sort2.sr
-share/examples/sr/chap04/trapezoidal.sr
-share/examples/sr/chap05/Diagonal.sr
-share/examples/sr/chap05/Screen.sr
-share/examples/sr/chap05/Stack.sr
-share/examples/sr/chap05/Stack_User.sr
-share/examples/sr/chap05/foo.sr
-share/examples/sr/chap07/compressor.sr
-share/examples/sr/chap07/foo1.sr
-share/examples/sr/chap07/foo2.sr
-share/examples/sr/chap07/mult.sr
-share/examples/sr/chap07/partial_sums.sr
-share/examples/sr/chap07/quick.sr
-share/examples/sr/chap08/CS.sr
-share/examples/sr/chap08/CS_Ordered.sr
-share/examples/sr/chap08/barrier1.sr
-share/examples/sr/chap08/barrier2.sr
-share/examples/sr/chap09/CS.sr
-share/examples/sr/chap09/buffer.sr
-share/examples/sr/chap09/cs1.sr
-share/examples/sr/chap09/cs2.sr
-share/examples/sr/chap09/cs3.sr
-share/examples/sr/chap09/cs4.sr
-share/examples/sr/chap09/quadrature.sr
-share/examples/sr/chap09/stream_merge.sr
-share/examples/sr/chap10/Stack.sr
-share/examples/sr/chap10/Stack_User.sr
-share/examples/sr/chap10/conversation.sr
-share/examples/sr/chap10/fun1.sr
-share/examples/sr/chap10/fun2.sr
-share/examples/sr/chap10/pipeline_sort.sr
-share/examples/sr/chap11/RW_allocator.sr
-share/examples/sr/chap11/bounded_buffer.sr
-share/examples/sr/chap11/cs.sr
-share/examples/sr/chap11/mailbox.sr
-share/examples/sr/chap11/main1.sr
-share/examples/sr/chap11/main2.sr
-share/examples/sr/chap11/sieve.sr
-share/examples/sr/chap11/swap.sr
-share/examples/sr/chap12/foo.sr
-share/examples/sr/chap12/glob.sr
-share/examples/sr/chap12/main1.sr
-share/examples/sr/chap12/main2.sr
-share/examples/sr/chap13/centralized.sr
-share/examples/sr/chap13/decentralized.sr
-share/examples/sr/chap13/distributed.sr
-share/examples/sr/chap14/bag.sr
-share/examples/sr/chap14/broadcast.sr
-share/examples/sr/chap14/heartbeat.sr
-share/examples/sr/chap14/strip.sr
-share/examples/sr/chap15/co.sr
-share/examples/sr/chap15/gs.sr
-share/examples/sr/chap15/heartbeat.sr
-share/examples/sr/chap15/hosts
-share/examples/sr/chap15/strip.sr
-share/examples/sr/chap15/vm.sr
-share/examples/sr/chap16/cities14
-share/examples/sr/chap16/cities3
-share/examples/sr/chap16/cities4
-share/examples/sr/chap16/cities6
-share/examples/sr/chap16/cities8
-share/examples/sr/chap16/distributed.sr
-share/examples/sr/chap16/sequential.sr
-share/examples/sr/chap16/shared.sr
-share/examples/sr/chap17/ci.sr
-share/examples/sr/chap17/ds.sr
-share/examples/sr/chap17/fs.sr
-share/examples/sr/chap17/globals.sr
-share/examples/sr/chap17/login.sr
-share/examples/sr/chap17/main.sr
-share/examples/sr/chap18/Bus.sr
-share/examples/sr/chap18/Processor.sr
-share/examples/sr/chap18/Scheduler.sr
-share/examples/sr/csp2sr/1/Script
-share/examples/sr/csp2sr/1/a.csp
-share/examples/sr/csp2sr/2/Script
-share/examples/sr/csp2sr/2/b.csp
-share/examples/sr/csp2sr/3/Script
-share/examples/sr/csp2sr/3/c.csp
-share/examples/sr/csp2sr/4/Script
-share/examples/sr/csp2sr/4/d.csp
-share/examples/sr/csp2sr/5/Script
-share/examples/sr/csp2sr/5/e.csp
-share/examples/sr/csp2sr/6/Script
-share/examples/sr/csp2sr/6/i.csp
-share/examples/sr/csp2sr/7/Script
-share/examples/sr/csp2sr/7/f.csp
-share/examples/sr/csp2sr/8/Script
-share/examples/sr/csp2sr/8/f.csp
-share/examples/sr/csp2sr/dp1/Script
-share/examples/sr/csp2sr/dp1/dp.csp
-share/examples/sr/csp2sr/dp1/te.std
-share/examples/sr/csp2sr/dp1/ti.std
-share/examples/sr/csp2sr/dp2/Script
-share/examples/sr/csp2sr/dp2/dp.csp
-share/examples/sr/csp2sr/nest/Script
-share/examples/sr/csp2sr/nest/nest.csp
-share/examples/sr/csp2sr/pair1/Script
-share/examples/sr/csp2sr/pair1/pair.csp
-share/examples/sr/csp2sr/pair2/Script
-share/examples/sr/csp2sr/pair2/pair.csp
-share/examples/sr/csp2sr/pair3/Script
-share/examples/sr/csp2sr/pair3/pair.csp
-share/examples/sr/csp2sr/sieve/Script
-share/examples/sr/csp2sr/sieve/sieve.csp
-share/examples/sr/csp2sr/sort1/Script
-share/examples/sr/csp2sr/sort1/sort.csp
-share/examples/sr/csp2sr/sort2/Script
-share/examples/sr/csp2sr/sort2/sort.csp
-share/examples/sr/csp2sr/wxe1/Script
-share/examples/sr/csp2sr/wxe1/both.std
-share/examples/sr/csp2sr/wxe1/g.csp
-share/examples/sr/csp2sr/wxe2/Script
-share/examples/sr/csp2sr/wxe2/h.csp
-share/examples/sr/m2sr/barrier1/Script
-share/examples/sr/m2sr/barrier1/b.sr
-share/examples/sr/m2sr/barrier1/barrier.m
-share/examples/sr/m2sr/barrier1/test.sr
-share/examples/sr/m2sr/barrier2/Script
-share/examples/sr/m2sr/barrier2/barrier.m
-share/examples/sr/m2sr/barrier2/sc.std
-share/examples/sr/m2sr/barrier2/test.sr
-share/examples/sr/m2sr/bb1/Script
-share/examples/sr/m2sr/bb1/a.m
-share/examples/sr/m2sr/bb1/test.sr
-share/examples/sr/m2sr/bb2/Script
-share/examples/sr/m2sr/bb2/a.m
-share/examples/sr/m2sr/bb2/test.sr
-share/examples/sr/m2sr/critsec/Script
-share/examples/sr/m2sr/critsec/a.m
-share/examples/sr/m2sr/critsec/all.std
-share/examples/sr/m2sr/critsec/test.sr
-share/examples/sr/m2sr/cscan1/Script
-share/examples/sr/m2sr/cscan1/a.m
-share/examples/sr/m2sr/cscan1/test.sr
-share/examples/sr/m2sr/cscan2/Script
-share/examples/sr/m2sr/cscan2/a.m
-share/examples/sr/m2sr/cscan2/all.std
-share/examples/sr/m2sr/cscan2/test.sr
-share/examples/sr/m2sr/nocv/Script
-share/examples/sr/m2sr/nocv/nocv.m
-share/examples/sr/m2sr/nocv/test.sr
-share/examples/sr/m2sr/noproc/Script
-share/examples/sr/m2sr/noproc/noproc.m
-share/examples/sr/m2sr/noproc/test.sr
-share/examples/sr/m2sr/timer/Script
-share/examples/sr/m2sr/timer/test.sr
-share/examples/sr/m2sr/timer/timer.m
-share/examples/sr/other/heartbeat/Script
-share/examples/sr/other/heartbeat/in1.1.std
-share/examples/sr/other/heartbeat/in1.3.std
-share/examples/sr/other/heartbeat/in2.2.std
-share/examples/sr/other/heartbeat/in2.4.std
-share/examples/sr/other/heartbeat/in3.3.std
-share/examples/sr/other/heartbeat/in4.3.std
-share/examples/sr/other/heartbeat/in4.4.std
-share/examples/sr/other/heartbeat/in4.5.std
-share/examples/sr/other/heartbeat/in5.1.std
-share/examples/sr/other/heartbeat/in5.4.std
-share/examples/sr/other/heartbeat/in6.2.std
-share/examples/sr/other/heartbeat/in6.7.std
-share/examples/sr/other/heartbeat/input1
-share/examples/sr/other/heartbeat/input2
-share/examples/sr/other/heartbeat/input3
-share/examples/sr/other/heartbeat/input4
-share/examples/sr/other/heartbeat/input5
-share/examples/sr/other/heartbeat/input6
-share/examples/sr/other/heartbeat/main.sr
-share/examples/sr/other/heartbeat/node.sr
-share/examples/sr/other/heartbeat/printer.sr
-share/examples/sr/other/mbrot/No_input.std
-share/examples/sr/other/mbrot/Script
-share/examples/sr/other/mbrot/bkend.c
-share/examples/sr/other/mbrot/main.sr
-share/examples/sr/other/mbrot/mbrot.c
-share/examples/sr/other/mbrot/remote.sr
-share/examples/sr/other/probe/Script
-share/examples/sr/other/probe/in1.1.std
-share/examples/sr/other/probe/in1.3.std
-share/examples/sr/other/probe/in2.2.std
-share/examples/sr/other/probe/in2.4.std
-share/examples/sr/other/probe/in3.3.std
-share/examples/sr/other/probe/in4.3.std
-share/examples/sr/other/probe/in4.4.std
-share/examples/sr/other/probe/in4.5.std
-share/examples/sr/other/probe/in5.1.std
-share/examples/sr/other/probe/in5.4.std
-share/examples/sr/other/probe/in6.2.std
-share/examples/sr/other/probe/in6.7.std
-share/examples/sr/other/probe/input1
-share/examples/sr/other/probe/input2
-share/examples/sr/other/probe/input3
-share/examples/sr/other/probe/input4
-share/examples/sr/other/probe/input5
-share/examples/sr/other/probe/input6
-share/examples/sr/other/probe/main.sr
-share/examples/sr/other/probe/node.sr
-share/examples/sr/other/probe/printer.sr
-share/examples/sr/other/queens/No_input.std
-share/examples/sr/other/queens/Script
-share/examples/sr/other/queens/queens.sr
-share/examples/sr/other/remote/Script
-share/examples/sr/other/remote/remote.sr
-share/examples/sr/other/tty/No_input.std
-share/examples/sr/other/tty/Script
-share/examples/sr/other/tty/tty.sr
-share/examples/sr/other/wondrous/No_input.std
-share/examples/sr/other/wondrous/Script
-share/examples/sr/other/wondrous/wondrous.sr
-share/examples/sr/sranimator/Makefile
-share/examples/sr/sranimator/README
-share/examples/sr/sranimator/bbdriver.sr
-share/examples/sr/sranimator/bbin.sr
-share/examples/sr/sranimator/bbproc.sr
-share/examples/sr/sranimator/bubblesort.sr
-share/examples/sr/sranimator/dining.sr
-share/examples/sr/sranimator/hello.sr
-share/examples/sr/sranimator/quicksort.sr
-share/examples/sr/sranimator/rwdriver.sr
-share/examples/sr/sranimator/rwfair.sr
-share/examples/sr/sranimator/rwstarve.sr
-share/examples/sr/sranimator/tfonts.sr
-share/examples/sr/sranimator/tlines.sr
-share/examples/sr/sranimator/tresize.sr
-share/examples/sr/sranimator/tsteps.sr
-share/examples/sr/sranimator/tzoom.sr
-share/examples/sr/srwin/Makefile
-share/examples/sr/srwin/README
-share/examples/sr/srwin/button.sr
-share/examples/sr/srwin/colors.100
-share/examples/sr/srwin/colors.20
-share/examples/sr/srwin/colors.50
-share/examples/sr/srwin/demo.sr
-share/examples/sr/srwin/gauss.sr
-share/examples/sr/srwin/hello.sr
-share/examples/sr/srwin/mandel.sr
-share/examples/sr/srwin/qsort.sr
-share/examples/sr/srwin/winquad.sr
+%%PORTDOCS%%%%DOCSDIR%%/notes/Memory
+%%PORTDOCS%%%%DOCSDIR%%/notes/Questions
+%%PORTDOCS%%%%DOCSDIR%%/notes/README
+%%PORTDOCS%%%%DOCSDIR%%/notes/Termination
+%%PORTDOCS%%%%DOCSDIR%%/notes/Tour
+%%PORTDOCS%%%%DOCSDIR%%/notes/VM
+%%PORTDOCS%%%%DOCSDIR%%/notes/Vsuite
+%%PORTDOCS%%%%DOCSDIR%%/notes/coding.ms
+%%PORTDOCS%%%%DOCSDIR%%/notes/csw860.txt
+%%PORTDOCS%%%%DOCSDIR%%/ps/README
+%%PORTDOCS%%%%DOCSDIR%%/ps/impl.ps
+%%PORTDOCS%%%%DOCSDIR%%/ps/install.ps
+%%PORTDOCS%%%%DOCSDIR%%/ps/language.ps
+%%PORTDOCS%%%%DOCSDIR%%/ps/manpages.ps
+%%PORTDOCS%%%%DOCSDIR%%/ps/port.ps
+%%PORTDOCS%%%%DOCSDIR%%/ps/rel_2_0.ps
+%%PORTDOCS%%%%DOCSDIR%%/ps/rel_2_1.ps
+%%PORTDOCS%%%%DOCSDIR%%/ps/rel_2_2.ps
+%%PORTDOCS%%%%DOCSDIR%%/ps/release.ps
+%%PORTDOCS%%%%DOCSDIR%%/ps/runtime.ps
+%%PORTDOCS%%%%DOCSDIR%%/ps/sranimator.ps
+%%PORTDOCS%%%%DOCSDIR%%/ps/srwin.ps
+%%EXAMPLESDIR%%/README
+%%EXAMPLESDIR%%/ccr2sr/1/No_input.std
+%%EXAMPLESDIR%%/ccr2sr/1/Script
+%%EXAMPLESDIR%%/ccr2sr/1/a.ccr
+%%EXAMPLESDIR%%/ccr2sr/2/Script
+%%EXAMPLESDIR%%/ccr2sr/2/a.ccr
+%%EXAMPLESDIR%%/ccr2sr/3/Script
+%%EXAMPLESDIR%%/ccr2sr/3/a.ccr
+%%EXAMPLESDIR%%/ccr2sr/4/Script
+%%EXAMPLESDIR%%/ccr2sr/4/a.ccr
+%%EXAMPLESDIR%%/ccr2sr/5/Script
+%%EXAMPLESDIR%%/ccr2sr/5/a.ccr
+%%EXAMPLESDIR%%/ccr2sr/rw/No_input.std
+%%EXAMPLESDIR%%/ccr2sr/rw/Script
+%%EXAMPLESDIR%%/ccr2sr/rw/rw.ccr
+%%EXAMPLESDIR%%/chap01/CS.sr
+%%EXAMPLESDIR%%/chap01/cgrep.sr
+%%EXAMPLESDIR%%/chap01/factorial.sr
+%%EXAMPLESDIR%%/chap01/hello.sr
+%%EXAMPLESDIR%%/chap01/matrix.sr
+%%EXAMPLESDIR%%/chap04/center.sr
+%%EXAMPLESDIR%%/chap04/differ.sr
+%%EXAMPLESDIR%%/chap04/evaluator.sr
+%%EXAMPLESDIR%%/chap04/fact.sr
+%%EXAMPLESDIR%%/chap04/factorial.sr
+%%EXAMPLESDIR%%/chap04/insert.sr
+%%EXAMPLESDIR%%/chap04/left.sr
+%%EXAMPLESDIR%%/chap04/search.sr
+%%EXAMPLESDIR%%/chap04/sigma.sr
+%%EXAMPLESDIR%%/chap04/sort1.sr
+%%EXAMPLESDIR%%/chap04/sort2.sr
+%%EXAMPLESDIR%%/chap04/trapezoidal.sr
+%%EXAMPLESDIR%%/chap05/Diagonal.sr
+%%EXAMPLESDIR%%/chap05/Screen.sr
+%%EXAMPLESDIR%%/chap05/Stack.sr
+%%EXAMPLESDIR%%/chap05/Stack_User.sr
+%%EXAMPLESDIR%%/chap05/foo.sr
+%%EXAMPLESDIR%%/chap07/compressor.sr
+%%EXAMPLESDIR%%/chap07/foo1.sr
+%%EXAMPLESDIR%%/chap07/foo2.sr
+%%EXAMPLESDIR%%/chap07/mult.sr
+%%EXAMPLESDIR%%/chap07/partial_sums.sr
+%%EXAMPLESDIR%%/chap07/quick.sr
+%%EXAMPLESDIR%%/chap08/CS.sr
+%%EXAMPLESDIR%%/chap08/CS_Ordered.sr
+%%EXAMPLESDIR%%/chap08/barrier1.sr
+%%EXAMPLESDIR%%/chap08/barrier2.sr
+%%EXAMPLESDIR%%/chap09/CS.sr
+%%EXAMPLESDIR%%/chap09/buffer.sr
+%%EXAMPLESDIR%%/chap09/cs1.sr
+%%EXAMPLESDIR%%/chap09/cs2.sr
+%%EXAMPLESDIR%%/chap09/cs3.sr
+%%EXAMPLESDIR%%/chap09/cs4.sr
+%%EXAMPLESDIR%%/chap09/quadrature.sr
+%%EXAMPLESDIR%%/chap09/stream_merge.sr
+%%EXAMPLESDIR%%/chap10/Stack.sr
+%%EXAMPLESDIR%%/chap10/Stack_User.sr
+%%EXAMPLESDIR%%/chap10/conversation.sr
+%%EXAMPLESDIR%%/chap10/fun1.sr
+%%EXAMPLESDIR%%/chap10/fun2.sr
+%%EXAMPLESDIR%%/chap10/pipeline_sort.sr
+%%EXAMPLESDIR%%/chap11/RW_allocator.sr
+%%EXAMPLESDIR%%/chap11/bounded_buffer.sr
+%%EXAMPLESDIR%%/chap11/cs.sr
+%%EXAMPLESDIR%%/chap11/mailbox.sr
+%%EXAMPLESDIR%%/chap11/main1.sr
+%%EXAMPLESDIR%%/chap11/main2.sr
+%%EXAMPLESDIR%%/chap11/sieve.sr
+%%EXAMPLESDIR%%/chap11/swap.sr
+%%EXAMPLESDIR%%/chap12/foo.sr
+%%EXAMPLESDIR%%/chap12/glob.sr
+%%EXAMPLESDIR%%/chap12/main1.sr
+%%EXAMPLESDIR%%/chap12/main2.sr
+%%EXAMPLESDIR%%/chap13/centralized.sr
+%%EXAMPLESDIR%%/chap13/decentralized.sr
+%%EXAMPLESDIR%%/chap13/distributed.sr
+%%EXAMPLESDIR%%/chap14/bag.sr
+%%EXAMPLESDIR%%/chap14/broadcast.sr
+%%EXAMPLESDIR%%/chap14/heartbeat.sr
+%%EXAMPLESDIR%%/chap14/strip.sr
+%%EXAMPLESDIR%%/chap15/co.sr
+%%EXAMPLESDIR%%/chap15/gs.sr
+%%EXAMPLESDIR%%/chap15/heartbeat.sr
+%%EXAMPLESDIR%%/chap15/hosts
+%%EXAMPLESDIR%%/chap15/strip.sr
+%%EXAMPLESDIR%%/chap15/vm.sr
+%%EXAMPLESDIR%%/chap16/cities14
+%%EXAMPLESDIR%%/chap16/cities3
+%%EXAMPLESDIR%%/chap16/cities4
+%%EXAMPLESDIR%%/chap16/cities6
+%%EXAMPLESDIR%%/chap16/cities8
+%%EXAMPLESDIR%%/chap16/distributed.sr
+%%EXAMPLESDIR%%/chap16/sequential.sr
+%%EXAMPLESDIR%%/chap16/shared.sr
+%%EXAMPLESDIR%%/chap17/ci.sr
+%%EXAMPLESDIR%%/chap17/ds.sr
+%%EXAMPLESDIR%%/chap17/fs.sr
+%%EXAMPLESDIR%%/chap17/globals.sr
+%%EXAMPLESDIR%%/chap17/login.sr
+%%EXAMPLESDIR%%/chap17/main.sr
+%%EXAMPLESDIR%%/chap18/Bus.sr
+%%EXAMPLESDIR%%/chap18/Processor.sr
+%%EXAMPLESDIR%%/chap18/Scheduler.sr
+%%EXAMPLESDIR%%/csp2sr/1/Script
+%%EXAMPLESDIR%%/csp2sr/1/a.csp
+%%EXAMPLESDIR%%/csp2sr/2/Script
+%%EXAMPLESDIR%%/csp2sr/2/b.csp
+%%EXAMPLESDIR%%/csp2sr/3/Script
+%%EXAMPLESDIR%%/csp2sr/3/c.csp
+%%EXAMPLESDIR%%/csp2sr/4/Script
+%%EXAMPLESDIR%%/csp2sr/4/d.csp
+%%EXAMPLESDIR%%/csp2sr/5/Script
+%%EXAMPLESDIR%%/csp2sr/5/e.csp
+%%EXAMPLESDIR%%/csp2sr/6/Script
+%%EXAMPLESDIR%%/csp2sr/6/i.csp
+%%EXAMPLESDIR%%/csp2sr/7/Script
+%%EXAMPLESDIR%%/csp2sr/7/f.csp
+%%EXAMPLESDIR%%/csp2sr/8/Script
+%%EXAMPLESDIR%%/csp2sr/8/f.csp
+%%EXAMPLESDIR%%/csp2sr/dp1/Script
+%%EXAMPLESDIR%%/csp2sr/dp1/dp.csp
+%%EXAMPLESDIR%%/csp2sr/dp1/te.std
+%%EXAMPLESDIR%%/csp2sr/dp1/ti.std
+%%EXAMPLESDIR%%/csp2sr/dp2/Script
+%%EXAMPLESDIR%%/csp2sr/dp2/dp.csp
+%%EXAMPLESDIR%%/csp2sr/nest/Script
+%%EXAMPLESDIR%%/csp2sr/nest/nest.csp
+%%EXAMPLESDIR%%/csp2sr/pair1/Script
+%%EXAMPLESDIR%%/csp2sr/pair1/pair.csp
+%%EXAMPLESDIR%%/csp2sr/pair2/Script
+%%EXAMPLESDIR%%/csp2sr/pair2/pair.csp
+%%EXAMPLESDIR%%/csp2sr/pair3/Script
+%%EXAMPLESDIR%%/csp2sr/pair3/pair.csp
+%%EXAMPLESDIR%%/csp2sr/sieve/Script
+%%EXAMPLESDIR%%/csp2sr/sieve/sieve.csp
+%%EXAMPLESDIR%%/csp2sr/sort1/Script
+%%EXAMPLESDIR%%/csp2sr/sort1/sort.csp
+%%EXAMPLESDIR%%/csp2sr/sort2/Script
+%%EXAMPLESDIR%%/csp2sr/sort2/sort.csp
+%%EXAMPLESDIR%%/csp2sr/wxe1/Script
+%%EXAMPLESDIR%%/csp2sr/wxe1/both.std
+%%EXAMPLESDIR%%/csp2sr/wxe1/g.csp
+%%EXAMPLESDIR%%/csp2sr/wxe2/Script
+%%EXAMPLESDIR%%/csp2sr/wxe2/h.csp
+%%EXAMPLESDIR%%/m2sr/barrier1/Script
+%%EXAMPLESDIR%%/m2sr/barrier1/b.sr
+%%EXAMPLESDIR%%/m2sr/barrier1/barrier.m
+%%EXAMPLESDIR%%/m2sr/barrier1/test.sr
+%%EXAMPLESDIR%%/m2sr/barrier2/Script
+%%EXAMPLESDIR%%/m2sr/barrier2/barrier.m
+%%EXAMPLESDIR%%/m2sr/barrier2/sc.std
+%%EXAMPLESDIR%%/m2sr/barrier2/test.sr
+%%EXAMPLESDIR%%/m2sr/bb1/Script
+%%EXAMPLESDIR%%/m2sr/bb1/a.m
+%%EXAMPLESDIR%%/m2sr/bb1/test.sr
+%%EXAMPLESDIR%%/m2sr/bb2/Script
+%%EXAMPLESDIR%%/m2sr/bb2/a.m
+%%EXAMPLESDIR%%/m2sr/bb2/test.sr
+%%EXAMPLESDIR%%/m2sr/critsec/Script
+%%EXAMPLESDIR%%/m2sr/critsec/a.m
+%%EXAMPLESDIR%%/m2sr/critsec/all.std
+%%EXAMPLESDIR%%/m2sr/critsec/test.sr
+%%EXAMPLESDIR%%/m2sr/cscan1/Script
+%%EXAMPLESDIR%%/m2sr/cscan1/a.m
+%%EXAMPLESDIR%%/m2sr/cscan1/test.sr
+%%EXAMPLESDIR%%/m2sr/cscan2/Script
+%%EXAMPLESDIR%%/m2sr/cscan2/a.m
+%%EXAMPLESDIR%%/m2sr/cscan2/all.std
+%%EXAMPLESDIR%%/m2sr/cscan2/test.sr
+%%EXAMPLESDIR%%/m2sr/nocv/Script
+%%EXAMPLESDIR%%/m2sr/nocv/nocv.m
+%%EXAMPLESDIR%%/m2sr/nocv/test.sr
+%%EXAMPLESDIR%%/m2sr/noproc/Script
+%%EXAMPLESDIR%%/m2sr/noproc/noproc.m
+%%EXAMPLESDIR%%/m2sr/noproc/test.sr
+%%EXAMPLESDIR%%/m2sr/timer/Script
+%%EXAMPLESDIR%%/m2sr/timer/test.sr
+%%EXAMPLESDIR%%/m2sr/timer/timer.m
+%%EXAMPLESDIR%%/other/heartbeat/Script
+%%EXAMPLESDIR%%/other/heartbeat/in1.1.std
+%%EXAMPLESDIR%%/other/heartbeat/in1.3.std
+%%EXAMPLESDIR%%/other/heartbeat/in2.2.std
+%%EXAMPLESDIR%%/other/heartbeat/in2.4.std
+%%EXAMPLESDIR%%/other/heartbeat/in3.3.std
+%%EXAMPLESDIR%%/other/heartbeat/in4.3.std
+%%EXAMPLESDIR%%/other/heartbeat/in4.4.std
+%%EXAMPLESDIR%%/other/heartbeat/in4.5.std
+%%EXAMPLESDIR%%/other/heartbeat/in5.1.std
+%%EXAMPLESDIR%%/other/heartbeat/in5.4.std
+%%EXAMPLESDIR%%/other/heartbeat/in6.2.std
+%%EXAMPLESDIR%%/other/heartbeat/in6.7.std
+%%EXAMPLESDIR%%/other/heartbeat/input1
+%%EXAMPLESDIR%%/other/heartbeat/input2
+%%EXAMPLESDIR%%/other/heartbeat/input3
+%%EXAMPLESDIR%%/other/heartbeat/input4
+%%EXAMPLESDIR%%/other/heartbeat/input5
+%%EXAMPLESDIR%%/other/heartbeat/input6
+%%EXAMPLESDIR%%/other/heartbeat/main.sr
+%%EXAMPLESDIR%%/other/heartbeat/node.sr
+%%EXAMPLESDIR%%/other/heartbeat/printer.sr
+%%EXAMPLESDIR%%/other/mbrot/No_input.std
+%%EXAMPLESDIR%%/other/mbrot/Script
+%%EXAMPLESDIR%%/other/mbrot/bkend.c
+%%EXAMPLESDIR%%/other/mbrot/main.sr
+%%EXAMPLESDIR%%/other/mbrot/mbrot.c
+%%EXAMPLESDIR%%/other/mbrot/remote.sr
+%%EXAMPLESDIR%%/other/probe/Script
+%%EXAMPLESDIR%%/other/probe/in1.1.std
+%%EXAMPLESDIR%%/other/probe/in1.3.std
+%%EXAMPLESDIR%%/other/probe/in2.2.std
+%%EXAMPLESDIR%%/other/probe/in2.4.std
+%%EXAMPLESDIR%%/other/probe/in3.3.std
+%%EXAMPLESDIR%%/other/probe/in4.3.std
+%%EXAMPLESDIR%%/other/probe/in4.4.std
+%%EXAMPLESDIR%%/other/probe/in4.5.std
+%%EXAMPLESDIR%%/other/probe/in5.1.std
+%%EXAMPLESDIR%%/other/probe/in5.4.std
+%%EXAMPLESDIR%%/other/probe/in6.2.std
+%%EXAMPLESDIR%%/other/probe/in6.7.std
+%%EXAMPLESDIR%%/other/probe/input1
+%%EXAMPLESDIR%%/other/probe/input2
+%%EXAMPLESDIR%%/other/probe/input3
+%%EXAMPLESDIR%%/other/probe/input4
+%%EXAMPLESDIR%%/other/probe/input5
+%%EXAMPLESDIR%%/other/probe/input6
+%%EXAMPLESDIR%%/other/probe/main.sr
+%%EXAMPLESDIR%%/other/probe/node.sr
+%%EXAMPLESDIR%%/other/probe/printer.sr
+%%EXAMPLESDIR%%/other/queens/No_input.std
+%%EXAMPLESDIR%%/other/queens/Script
+%%EXAMPLESDIR%%/other/queens/queens.sr
+%%EXAMPLESDIR%%/other/remote/Script
+%%EXAMPLESDIR%%/other/remote/remote.sr
+%%EXAMPLESDIR%%/other/tty/No_input.std
+%%EXAMPLESDIR%%/other/tty/Script
+%%EXAMPLESDIR%%/other/tty/tty.sr
+%%EXAMPLESDIR%%/other/wondrous/No_input.std
+%%EXAMPLESDIR%%/other/wondrous/Script
+%%EXAMPLESDIR%%/other/wondrous/wondrous.sr
+%%EXAMPLESDIR%%/sranimator/Makefile
+%%EXAMPLESDIR%%/sranimator/README
+%%EXAMPLESDIR%%/sranimator/bbdriver.sr
+%%EXAMPLESDIR%%/sranimator/bbin.sr
+%%EXAMPLESDIR%%/sranimator/bbproc.sr
+%%EXAMPLESDIR%%/sranimator/bubblesort.sr
+%%EXAMPLESDIR%%/sranimator/dining.sr
+%%EXAMPLESDIR%%/sranimator/hello.sr
+%%EXAMPLESDIR%%/sranimator/quicksort.sr
+%%EXAMPLESDIR%%/sranimator/rwdriver.sr
+%%EXAMPLESDIR%%/sranimator/rwfair.sr
+%%EXAMPLESDIR%%/sranimator/rwstarve.sr
+%%EXAMPLESDIR%%/sranimator/tfonts.sr
+%%EXAMPLESDIR%%/sranimator/tlines.sr
+%%EXAMPLESDIR%%/sranimator/tresize.sr
+%%EXAMPLESDIR%%/sranimator/tsteps.sr
+%%EXAMPLESDIR%%/sranimator/tzoom.sr
+%%EXAMPLESDIR%%/srwin/Makefile
+%%EXAMPLESDIR%%/srwin/README
+%%EXAMPLESDIR%%/srwin/button.sr
+%%EXAMPLESDIR%%/srwin/colors.100
+%%EXAMPLESDIR%%/srwin/colors.20
+%%EXAMPLESDIR%%/srwin/colors.50
+%%EXAMPLESDIR%%/srwin/demo.sr
+%%EXAMPLESDIR%%/srwin/gauss.sr
+%%EXAMPLESDIR%%/srwin/hello.sr
+%%EXAMPLESDIR%%/srwin/mandel.sr
+%%EXAMPLESDIR%%/srwin/qsort.sr
+%%EXAMPLESDIR%%/srwin/winquad.sr
 @dirrm lib/sr
-@dirrm share/doc/sr/notes
-@dirrm share/doc/sr/ps
-@dirrm share/doc/sr
-@unexec /bin/rm -rf %D/share/examples/sr
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/notes
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ps
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%EXAMPLESDIR%%/ccr2sr/1
+@dirrm %%EXAMPLESDIR%%/ccr2sr/2
+@dirrm %%EXAMPLESDIR%%/ccr2sr/3
+@dirrm %%EXAMPLESDIR%%/ccr2sr/4
+@dirrm %%EXAMPLESDIR%%/ccr2sr/5
+@dirrm %%EXAMPLESDIR%%/ccr2sr/rw
+@dirrm %%EXAMPLESDIR%%/ccr2sr
+@dirrm %%EXAMPLESDIR%%/chap01
+@dirrm %%EXAMPLESDIR%%/chap04
+@dirrm %%EXAMPLESDIR%%/chap05
+@dirrm %%EXAMPLESDIR%%/chap07
+@dirrm %%EXAMPLESDIR%%/chap08
+@dirrm %%EXAMPLESDIR%%/chap09
+@dirrm %%EXAMPLESDIR%%/chap10
+@dirrm %%EXAMPLESDIR%%/chap11
+@dirrm %%EXAMPLESDIR%%/chap12
+@dirrm %%EXAMPLESDIR%%/chap13
+@dirrm %%EXAMPLESDIR%%/chap14
+@dirrm %%EXAMPLESDIR%%/chap15
+@dirrm %%EXAMPLESDIR%%/chap16
+@dirrm %%EXAMPLESDIR%%/chap17
+@dirrm %%EXAMPLESDIR%%/chap18
+@dirrm %%EXAMPLESDIR%%/csp2sr/1
+@dirrm %%EXAMPLESDIR%%/csp2sr/2
+@dirrm %%EXAMPLESDIR%%/csp2sr/3
+@dirrm %%EXAMPLESDIR%%/csp2sr/4
+@dirrm %%EXAMPLESDIR%%/csp2sr/5
+@dirrm %%EXAMPLESDIR%%/csp2sr/6
+@dirrm %%EXAMPLESDIR%%/csp2sr/7
+@dirrm %%EXAMPLESDIR%%/csp2sr/8
+@dirrm %%EXAMPLESDIR%%/csp2sr/dp1
+@dirrm %%EXAMPLESDIR%%/csp2sr/dp2
+@dirrm %%EXAMPLESDIR%%/csp2sr/nest
+@dirrm %%EXAMPLESDIR%%/csp2sr/pair1
+@dirrm %%EXAMPLESDIR%%/csp2sr/pair2
+@dirrm %%EXAMPLESDIR%%/csp2sr/pair3
+@dirrm %%EXAMPLESDIR%%/csp2sr/sieve
+@dirrm %%EXAMPLESDIR%%/csp2sr/sort1
+@dirrm %%EXAMPLESDIR%%/csp2sr/sort2
+@dirrm %%EXAMPLESDIR%%/csp2sr/wxe1
+@dirrm %%EXAMPLESDIR%%/csp2sr/wxe2
+@dirrm %%EXAMPLESDIR%%/csp2sr
+@dirrm %%EXAMPLESDIR%%/m2sr/barrier1
+@dirrm %%EXAMPLESDIR%%/m2sr/barrier2
+@dirrm %%EXAMPLESDIR%%/m2sr/bb1
+@dirrm %%EXAMPLESDIR%%/m2sr/bb2
+@dirrm %%EXAMPLESDIR%%/m2sr/critsec
+@dirrm %%EXAMPLESDIR%%/m2sr/cscan1
+@dirrm %%EXAMPLESDIR%%/m2sr/cscan2
+@dirrm %%EXAMPLESDIR%%/m2sr/nocv
+@dirrm %%EXAMPLESDIR%%/m2sr/noproc
+@dirrm %%EXAMPLESDIR%%/m2sr/timer
+@dirrm %%EXAMPLESDIR%%/m2sr
+@dirrm %%EXAMPLESDIR%%/other/heartbeat
+@dirrm %%EXAMPLESDIR%%/other/mbrot
+@dirrm %%EXAMPLESDIR%%/other/probe
+@dirrm %%EXAMPLESDIR%%/other/queens
+@dirrm %%EXAMPLESDIR%%/other/remote
+@dirrm %%EXAMPLESDIR%%/other/tty
+@dirrm %%EXAMPLESDIR%%/other/wondrous
+@dirrm %%EXAMPLESDIR%%/other
+@dirrm %%EXAMPLESDIR%%/sranimator
+@dirrm %%EXAMPLESDIR%%/srwin
+@dirrm %%EXAMPLESDIR%%