- Upgrade to v352. This is a bug-fix release.

- Tweak the port's build to detect and use libpng and
  libjpeg present in $LOCALBASE.
- Build this port for the amd64 architecture in addition to i386.

7 files changed, 244 insertions, 22 deletions

diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile
index b10d5b02d4c3..7f1b31beef25 100644
--- a/lang/drscheme/Makefile
+++ b/lang/drscheme/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	drscheme
-PORTVERSION=	351
-PORTREVISION=	1
+PORTVERSION=	352
 CATEGORIES=	lang scheme
 MASTER_SITES=	http://download.plt-scheme.org/bundles/${PORTVERSION}/plt/ \
 		http://www.cs.utah.edu/plt/download/${PORTVERSION}/plt/ \
@@ -23,14 +22,21 @@ EXTRACT_ONLY=	plt-${PORTVERSION}-src-unix.tgz
 MAINTAINER=	jkoshy@FreeBSD.org
 COMMENT=	An interactive, integrated, graphical Scheme programming environment
 
-LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft	\
+		jpeg.9:${PORTSDIR}/graphics/jpeg	\
+		png.5:${PORTSDIR}/graphics/png
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} --enable-shared --x-includes=${X11BASE}/include \
-		--x-libraries=${X11BASE}/lib --enable-lt=${LIBTOOL} --disable-libpng \
-		--disable-libjpeg
+CONFIGURE_ARGS=	--prefix=${PREFIX} --enable-shared \
+		--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib \
+		--enable-lt=${LIBTOOL} CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		CPPFLAGS="-I${LOCALBASE}/include"
+
+# Force the "configure" script to look in $LOCALBASE for -lpng and -ljpeg
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 WRKSRC=		${WRKDIR}/plt/src
+USE_ICONV=	yes
 USE_LDCONFIG=	yes
 USE_XLIB=	yes
 USE_AUTOTOOLS=	libtool:15:env
@@ -40,7 +46,9 @@ MAN1=		drscheme.1 help-desk.1 mred.1 mzscheme.1 tex2page.1
 OPTIONS=	CAIRO "use Cairo graphics" off \
 		MMM "use 3m garbage collection" off
 
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS=	i386 amd64
+
+PLIST_SUB+=	ARCH=${ARCH}
 
 PLTPATCHES=	# none yet for this version
 
diff --git a/lang/drscheme/distinfo b/lang/drscheme/distinfo
index 30fa88e5b9b6..d8fb4d04b72b 100644
--- a/lang/drscheme/distinfo
+++ b/lang/drscheme/distinfo
@@ -1,3 +1,3 @@
-MD5 (drscheme/351/plt-351-src-unix.tgz) = b4ca6a017c83815529fec43a4b39aaff
-SHA256 (drscheme/351/plt-351-src-unix.tgz) = 77e1d49c8ec6e1f3d9e7dabd8f6f83228226864577d67710d76272b97a9c05cc
-SIZE (drscheme/351/plt-351-src-unix.tgz) = 13334847
+MD5 (drscheme/352/plt-352-src-unix.tgz) = e79fd305fe431e0477f861902f2ef9e1
+SHA256 (drscheme/352/plt-352-src-unix.tgz) = f221a21667c19d763e204310055804c6f6eab9349eccf9481afd5104edb8e45d
+SIZE (drscheme/352/plt-352-src-unix.tgz) = 13661695
diff --git a/lang/drscheme/files/patch-configure b/lang/drscheme/files/patch-configure
new file mode 100644
index 000000000000..5797d065df0b
--- /dev/null
+++ b/lang/drscheme/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure--	Mon Jul 17 18:53:27 2006
++++ configure	Fri Sep 22 14:10:56 2006
+@@ -5331,6 +5331,7 @@
+     ;;
+   FreeBSD)
+     LIBS="$LIBS -rdynamic"
++    DYN_CFLAGS="-fPIC"
+     ;;
+   OpenBSD)
+     LIBS="$LIBS -rdynamic"
diff --git a/lang/drscheme/files/patch-foreign-gcc-libffi-configure b/lang/drscheme/files/patch-foreign-gcc-libffi-configure
new file mode 100644
index 000000000000..63a9310cd1db
--- /dev/null
+++ b/lang/drscheme/files/patch-foreign-gcc-libffi-configure
@@ -0,0 +1,28 @@
+--- foreign/gcc/libffi/configure.orig	Mon Apr 17 22:28:43 2006
++++ foreign/gcc/libffi/configure	Thu Sep 21 13:48:18 2006
+@@ -5377,6 +5377,7 @@
+ 
+ TARGETDIR="unknown"
+ case "$host" in
++amd64-*-freebsd* ) TARGET=X86_64; TARGETDIR=x86;;
+ i*86-*-linux*) TARGET=X86; TARGETDIR=x86;;
+ i*86-*-gnu*) TARGET=X86; TARGETDIR=x86;;
+ i*86-*-solaris2.1[0-9]*) TARGET=X86_64; TARGETDIR=x86;;
+@@ -5395,7 +5396,7 @@
+ sparc*-sun-*) TARGET=SPARC; TARGETDIR=sparc;;
+ sparc-*-linux* | sparc-*-netbsdelf* | sparc-*-knetbsd*-gnu) TARGET=SPARC; TARGETDIR=sparc;;
+ sparc*-*-rtems*) TARGET=SPARC; TARGETDIR=sparc;;
+-sparc64-*-linux* | sparc64-*-netbsd* | sparc64-*-knetbsd*-gnu) TARGET=SPARC; TARGETDIR=sparc;;
++sparc64-*-freebsd* | sparc64-*-linux* | sparc64-*-netbsd* | sparc64-*-knetbsd*-gnu) TARGET=SPARC; TARGETDIR=sparc;;
+ alpha*-*-linux* | alpha*-*-osf* | alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu | alpha*-*-netbsd* | alpha*-*-knetbsd*-gnu) TARGET=ALPHA; TARGETDIR=alpha;;
+ ia64*-*-*) TARGET=IA64; TARGETDIR=ia64;;
+ m32r*-*-linux* ) TARGET=M32R; TARGETDIR=m32r;;
+@@ -5416,7 +5417,7 @@
+ cris-*-*) TARGET=LIBFFI_CRIS; TARGETDIR=cris;;
+ s390-*-linux-*) TARGET=S390; TARGETDIR=s390;;
+ s390x-*-linux-*) TARGET=S390; TARGETDIR=s390;;
+-x86_64-*-linux* | x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) TARGET=X86_64; TARGETDIR=x86;;
++x86_64-*-linux* | x86_64-*-kfreebsd*-gnu) TARGET=X86_64; TARGETDIR=x86;;
+ sh-*-linux* | sh[34]*-*-linux*) TARGET=SH; TARGETDIR=sh;;
+ sh-*-rtems*) TARGET=SH; TARGETDIR=sh;;
+ sh64-*-linux* | sh5*-*-linux*) TARGET=SH64; TARGETDIR=sh64;;
diff --git a/lang/drscheme/files/patch-mzscheme-gc-include-private-gcconfig.h b/lang/drscheme/files/patch-mzscheme-gc-include-private-gcconfig.h
new file mode 100644
index 000000000000..5cad0d26802d
--- /dev/null
+++ b/lang/drscheme/files/patch-mzscheme-gc-include-private-gcconfig.h
@@ -0,0 +1,36 @@
+--- mzscheme/gc/include/private/gcconfig.h.orig	Fri Jul  7 02:38:23 2006
++++ mzscheme/gc/include/private/gcconfig.h	Fri Sep 22 12:45:27 2006
+@@ -335,10 +335,14 @@
+ #    define X86_64
+ #    define mach_type_known
+ # endif
++# if defined(FREEBSD) && defined(__amd64__)
++#    define X86_64
++#    define mach_type_known
++# endif
+ # if defined(FREEBSD) && defined(__sparc__)
+ #    define SPARC
+ #    define mach_type_known
+-#endif
++# endif
+ # if defined(bsdi) && (defined(i386) || defined(__i386__))
+ #    define I386
+ #    define BSDI
+@@ -1992,6 +1996,17 @@
+ #	    define PREFETCH(x) __builtin_prefetch((x), 0, 0)
+ #	    define PREFETCH_FOR_WRITE(x) __builtin_prefetch((x), 1)
+ #	endif
++#   endif
++#   ifdef FREEBSD
++#       define OS_TYPE "FREEBSD"
++#       define SIG_SUSPEND SIGUSR1
++#       define SIG_THR_RESTART SIGUSR2
++#       ifdef __ELF__
++#           define DYNAMIC_LOADING
++#       endif
++#       define HEURISTIC2
++        extern char etext[];
++#       define SEARCH_FOR_DATA_START
+ #   endif
+ #   ifdef NETBSD
+ #	define OS_TYPE "NETBSD"
diff --git a/lang/drscheme/files/patch-mzscheme-sconfig.h b/lang/drscheme/files/patch-mzscheme-sconfig.h
new file mode 100644
index 000000000000..398877b63283
--- /dev/null
+++ b/lang/drscheme/files/patch-mzscheme-sconfig.h
@@ -0,0 +1,46 @@
+--- mzscheme/sconfig.h.orig	Wed Jul 26 18:00:43 2006
++++ mzscheme/sconfig.h	Fri Sep 22 15:23:14 2006
+@@ -302,9 +302,23 @@
+ 
+   /************** x86/FreeBSD with gcc ****************/
+ 
+-# if defined(__FreeBSD__) && defined(i386)
++# if defined(__FreeBSD__)
+ 
+-# define SCHEME_PLATFORM_LIBRARY_SUBPATH "i386-freebsd"
++#  if defined(__i386__)
++#   define SCHEME_PLATFORM_LIBRARY_SUBPATH "i386-freebsd"
++#   define REGISTER_POOR_MACHINE
++#   define MZ_USE_JIT_I386
++#   define FREEBSD_CONTROL_387
++#  elif defined(__amd64__)
++#   define SCHEME_PLATFORM_LIBRARY_SUBPATH "amd64-freebsd"
++#   define REGISTER_POOR_MACHINE
++#   define MZ_USE_JIT_X86_64
++#  elif defined(__sparc64__)
++#   define SCHEME_PLATFORM_LIBRARY_SUBPATH "sparc64-freebsd"
++#   define FLUSH_SPARC_REGISTER_WINDOWS
++#  else
++#   error Unported platform.
++#  endif
+ 
+ # include "uconfig.h"
+ # undef HAS_STANDARD_IOB
+@@ -318,7 +332,6 @@
+ # define USE_UNDERSCORE_SETJMP
+ 
+ # define USE_IEEE_FP_PREDS
+-# define FREEBSD_CONTROL_387
+ # define POW_HANDLES_INF_CORRECTLY
+ 
+ # define USE_DYNAMIC_FDSET_SIZE
+@@ -327,9 +340,6 @@
+ 
+ # define USE_TM_GMTOFF_FIELD
+ 
+-# define REGISTER_POOR_MACHINE
+-
+-# define MZ_USE_JIT_I386
+ # define MZ_JIT_USE_MPROTECT
+ 
+ # define FLAGS_ALREADY_SET
diff --git a/lang/drscheme/pkg-plist b/lang/drscheme/pkg-plist
index 00a5a3aaf93d..9962d4e4673c 100644
--- a/lang/drscheme/pkg-plist
+++ b/lang/drscheme/pkg-plist
@@ -18,14 +18,15 @@
 %%MMM%%bin/slideshow3m
 %%MMM%%bin/swindle3m
 %%MMM%%bin/tex2page3m
-%%MMM%%lib/libmred3m-351.so
+%%MMM%%lib/libmred3m-352.so
 %%MMM%%lib/libmred3m.a
 %%MMM%%lib/libmred3m.la
 %%MMM%%lib/libmred3m.so
-%%MMM%%lib/libmzscheme3m-351.so
+%%MMM%%lib/libmzscheme3m-352.so
 %%MMM%%lib/libmzscheme3m.a
 %%MMM%%lib/libmzscheme3m.la
 %%MMM%%lib/libmzscheme3m.so
+%%MMM%%lib/plt/collects/sgl/compiled/native/%%ARCH%%-freebsd/3m/make-gl-info-helper.so
 %%MMM%%lib/plt/mzdyn3m.o
 bin/drscheme
 bin/gmzc
@@ -62,15 +63,15 @@ include/plt/schvers.h
 include/plt/sconfig.h
 include/plt/stypes.h
 include/plt/uconfig.h
-lib/libmred-351.so
+lib/libmred-352.so
 lib/libmred.a
 lib/libmred.la
 lib/libmred.so
-lib/libmzgc-351.so
+lib/libmzgc-352.so
 lib/libmzgc.a
 lib/libmzgc.la
 lib/libmzgc.so
-lib/libmzscheme-351.so
+lib/libmzscheme-352.so
 lib/libmzscheme.a
 lib/libmzscheme.la
 lib/libmzscheme.so
@@ -3183,8 +3184,8 @@ lib/plt/collects/plot/compiled/info.dep
 lib/plt/collects/plot/compiled/info.zo
 lib/plt/collects/plot/compiled/math.dep
 lib/plt/collects/plot/compiled/math.zo
-lib/plt/collects/plot/compiled/native/i386-freebsd/libfit.so
-lib/plt/collects/plot/compiled/native/i386-freebsd/libplplot.so
+lib/plt/collects/plot/compiled/native/%%ARCH%%-freebsd/libfit.so
+lib/plt/collects/plot/compiled/native/%%ARCH%%-freebsd/libplplot.so
 lib/plt/collects/plot/compiled/plot-extend.dep
 lib/plt/collects/plot/compiled/plot-extend.zo
 lib/plt/collects/plot/compiled/plot.dep
@@ -3838,8 +3839,7 @@ lib/plt/collects/sgl/compiled/make-gl-info.dep
 lib/plt/collects/sgl/compiled/make-gl-info.zo
 lib/plt/collects/sgl/compiled/makefile.dep
 lib/plt/collects/sgl/compiled/makefile.zo
-%%MMM%%lib/plt/collects/sgl/compiled/native/i386-freebsd/3m/make-gl-info-helper.so
-lib/plt/collects/sgl/compiled/native/i386-freebsd/make-gl-info-helper.so
+lib/plt/collects/sgl/compiled/native/%%ARCH%%-freebsd/make-gl-info-helper.so
 lib/plt/collects/sgl/compiled/sgl.dep
 lib/plt/collects/sgl/compiled/sgl.zo
 lib/plt/collects/sgl/doc.txt
@@ -4748,6 +4748,96 @@ lib/plt/collects/tests/mzscheme/beg-intml.ss
 lib/plt/collects/tests/mzscheme/bega-adv.ss
 lib/plt/collects/tests/mzscheme/beginner-abbr.ss
 lib/plt/collects/tests/mzscheme/beginner.ss
+lib/plt/collects/tests/mzscheme/benchmarks/common/README.txt
+lib/plt/collects/tests/mzscheme/benchmarks/common/browse.sch
+lib/plt/collects/tests/mzscheme/benchmarks/common/conform.sch
+lib/plt/collects/tests/mzscheme/benchmarks/common/conform.ss
+lib/plt/collects/tests/mzscheme/benchmarks/common/cpstack.sch
+lib/plt/collects/tests/mzscheme/benchmarks/common/cpstack.ss
+lib/plt/collects/tests/mzscheme/benchmarks/common/ctak.sch
+lib/plt/collects/tests/mzscheme/benchmarks/common/ctak.ss
+lib/plt/collects/tests/mzscheme/benchmarks/common/dderiv.ss
+lib/plt/collects/tests/mzscheme/benchmarks/common/deriv.sch
+lib/plt/collects/tests/mzscheme/benchmarks/common/deriv.ss
+lib/plt/collects/tests/mzscheme/benchmarks/common/destruct.sch
+lib/plt/collects/tests/mzscheme/benchmarks/common/destruct.ss
+lib/plt/collects/tests/mzscheme/benchmarks/common/div.ss
+lib/plt/collects/tests/mzscheme/benchmarks/common/dynamic-input.txt.gz
+lib/plt/collects/tests/mzscheme/benchmarks/common/dynamic.sch
+lib/plt/collects/tests/mzscheme/benchmarks/common/dynamic.ss
+lib/plt/collects/tests/mzscheme/benchmarks/common/earley.sch
+lib/plt/collects/tests/mzscheme/benchmarks/common/earley.ss
+lib/plt/collects/tests/mzscheme/benchmarks/common/fft.sch
+lib/plt/collects/tests/mzscheme/benchmarks/common/fft.ss
+lib/plt/collects/tests/mzscheme/benchmarks/common/graphs.sch
+lib/plt/collects/tests/mzscheme/benchmarks/common/graphs.ss
+lib/plt/collects/tests/mzscheme/benchmarks/common/nboyer.sch
+lib/plt/collects/tests/mzscheme/benchmarks/common/nboyer.ss
+lib/plt/collects/tests/mzscheme/benchmarks/common/nestedloop.sch
+lib/plt/collects/tests/mzscheme/benchmarks/common/nestedloop.ss
+lib/plt/collects/tests/mzscheme/benchmarks/common/nfa.sch
+lib/plt/collects/tests/mzscheme/benchmarks/common/nfa.ss
+lib/plt/collects/tests/mzscheme/benchmarks/common/nucleic2.sch
+lib/plt/collects/tests/mzscheme/benchmarks/common/nucleic2.ss
+lib/plt/collects/tests/mzscheme/benchmarks/common/puzzle.sch
+lib/plt/collects/tests/mzscheme/benchmarks/common/puzzle.ss
+lib/plt/collects/tests/mzscheme/benchmarks/common/sboyer.sch
+lib/plt/collects/tests/mzscheme/benchmarks/common/sboyer.ss
+lib/plt/collects/tests/mzscheme/benchmarks/common/sort1.sch
+lib/plt/collects/tests/mzscheme/benchmarks/common/sort1.ss
+lib/plt/collects/tests/mzscheme/benchmarks/common/tak.sch
+lib/plt/collects/tests/mzscheme/benchmarks/common/tak.ss
+lib/plt/collects/tests/mzscheme/benchmarks/common/takl.sch
+lib/plt/collects/tests/mzscheme/benchmarks/common/takl.ss
+lib/plt/collects/tests/mzscheme/benchmarks/common/takr.sch
+lib/plt/collects/tests/mzscheme/benchmarks/common/takr.ss
+lib/plt/collects/tests/mzscheme/benchmarks/common/traverse.sch
+lib/plt/collects/tests/mzscheme/benchmarks/common/triangle.sch
+lib/plt/collects/tests/mzscheme/benchmarks/common/triangle.ss
+lib/plt/collects/tests/mzscheme/benchmarks/common/wrap.ss
+lib/plt/collects/tests/mzscheme/benchmarks/mz/expand-class.scm
+lib/plt/collects/tests/mzscheme/benchmarks/mz/input.xml
+lib/plt/collects/tests/mzscheme/benchmarks/mz/parsing.scm
+lib/plt/collects/tests/mzscheme/benchmarks/mz/redsem.scm
+lib/plt/collects/tests/mzscheme/benchmarks/mz/ssax.scm
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/README.txt
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/ackermann.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/ary.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/binarytrees.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/chameneos.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/cheapconcurrency.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/echo.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/except.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/fannkuch.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/fasta.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/fibo.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/hash.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/hash2.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/heapsort.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/lists.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/mandelbrot.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/matrix.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/moments.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/nbody.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/nestedloop.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/nsieve.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/nsievebits.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/partialsums.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/pidigits.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/pidigits1.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/random.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/recursive.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/regexmatch.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/regexpdna.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/reversecomplement.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/reversefile.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/run.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/sieve.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/spellcheck.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/strcat.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/sumcol.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/wc.ss
+lib/plt/collects/tests/mzscheme/benchmarks/shootout/wordfreq.ss
 lib/plt/collects/tests/mzscheme/binc.ss
 lib/plt/collects/tests/mzscheme/boundmap-test.ss
 lib/plt/collects/tests/mzscheme/cache-image-snip-test.ss
@@ -7387,7 +7477,7 @@ share/plt/doc/web-server/keywords
 @dirrm lib/plt/collects/plot/src/all
 @dirrm lib/plt/collects/plot/src/fit
 @dirrm lib/plt/collects/plot/src
-@dirrm lib/plt/collects/plot/compiled/native/i386-freebsd
+@dirrm lib/plt/collects/plot/compiled/native/%%ARCH%%-freebsd
 @dirrm lib/plt/collects/plot/compiled/native
 @dirrm lib/plt/collects/plot/compiled
 @dirrm lib/plt/collects/plot
@@ -7420,8 +7510,8 @@ share/plt/doc/web-server/keywords
 @dirrm lib/plt/collects/setup/compiled
 @dirrm lib/plt/collects/setup
 @dirrm lib/plt/collects/sgl/examples
-%%MMM%%@dirrm lib/plt/collects/sgl/compiled/native/i386-freebsd/3m
-@dirrm lib/plt/collects/sgl/compiled/native/i386-freebsd
+%%MMM%%@dirrm lib/plt/collects/sgl/compiled/native/%%ARCH%%-freebsd/3m
+@dirrm lib/plt/collects/sgl/compiled/native/%%ARCH%%-freebsd
 @dirrm lib/plt/collects/sgl/compiled/native
 @dirrm lib/plt/collects/sgl/compiled
 @dirrm lib/plt/collects/sgl
@@ -7532,6 +7622,10 @@ share/plt/doc/web-server/keywords
 @dirrm lib/plt/collects/tests/framework/compiled
 @dirrm lib/plt/collects/tests/framework
 @dirrm lib/plt/collects/tests/mred
+@dirrm lib/plt/collects/tests/mzscheme/benchmarks/common
+@dirrm lib/plt/collects/tests/mzscheme/benchmarks/mz
+@dirrm lib/plt/collects/tests/mzscheme/benchmarks/shootout
+@dirrm lib/plt/collects/tests/mzscheme/benchmarks
 @dirrm lib/plt/collects/tests/mzscheme/match
 @dirrm lib/plt/collects/tests/mzscheme/ttt
 @dirrm lib/plt/collects/tests/mzscheme