- Update to 0.91.1

PR:		155855
Submitted by:	Ports Fury

7 files changed, 121 insertions, 140 deletions

diff --git a/lang/librep/Makefile b/lang/librep/Makefile
index 986f5771e23e..aa831be6dcff 100644
--- a/lang/librep/Makefile
+++ b/lang/librep/Makefile
@@ -6,37 +6,48 @@
 #    $MCom: ports/lang/librep/Makefile,v 1.2 2006/09/10 00:51:12 mezz Exp $
 
 PORTNAME=	librep
-PORTVERSION=	0.90.2
-PORTREVISION=	2
+PORTVERSION=	0.91.1
 CATEGORIES=	lang elisp gnome
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	http://download.tuxfamily.org/librep/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An Emacs Lisp like runtime library
 
 LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm \
-    		gmp.10:${PORTSDIR}/math/gmp \
-		ffi.5:${PORTSDIR}/devel/libffi
+		ffi.5:${PORTSDIR}/devel/libffi \
+    		gmp.10:${PORTSDIR}/math/gmp
 RUN_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
 
-PLIST_SUB=	GNUHOST=${ARCH}-pc-freebsd${OSREL:C/\..*//} VERSION=${PORTVERSION}
-
+USE_XZ=		yes
+USE_GNOME=	gnomehack
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_LDCONFIG=	yes
-USE_BZIP2=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lintl ${PTHREAD_LIBS}"
+USE_AUTOTOOLS=	libtool
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-aclocaldir=${PREFIX}/share/aclocal
-CONFIGURE_TARGET=	${ARCH}-pc-freebsd${OSREL:C/\..*//}
+CONFIGURE_TARGET=	${GNUHOST}
+USE_LDCONFIG=	yes
 
+PLIST_SUB=	GNUHOST="${GNUHOST}" VERSION="${PORTVERSION}"
+
+MANCOMPRESSED=	yes
+MAN1=		rep.1 rep-remote.1 rep-xgettext.1 repdoc.1
 INFO=		librep
 
+CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+GNUHOST=	${ARCH}-pc-freebsd${OSREL:C/\..*//}
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == ia64
 BROKEN=		Does not build on ia64
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e \
+		'/GDBM_LIBS/s|"-lgdbm"|"$$LIBS -lgdbm"|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|/share/man/|/man/|g' ${WRKSRC}/man/Makefile.in
+
 .include <bsd.port.post.mk>
diff --git a/lang/librep/distinfo b/lang/librep/distinfo
index 57266c7cf2c2..5c04dfb8bbfd 100644
--- a/lang/librep/distinfo
+++ b/lang/librep/distinfo
@@ -1,3 +1,2 @@
-MD5 (librep-0.90.2.tar.bz2) = 3e1e10a0ad7b47a089d559b7944d1287
-SHA256 (librep-0.90.2.tar.bz2) = 9da97f0f4f82f796e484d18a79c9170d7d479395df921141a51920c0c0a993d5
-SIZE (librep-0.90.2.tar.bz2) = 696044
+SHA256 (librep-0.91.1.tar.xz) = bfad5a00f439025f7a904e232ac38dc24ef85074ce0fd297ac794ce96afcfee2
+SIZE (librep-0.91.1.tar.xz) = 602064
diff --git a/lang/librep/files/patch-Makefile.in b/lang/librep/files/patch-Makefile.in
deleted file mode 100644
index 44dd786ac14f..000000000000
--- a/lang/librep/files/patch-Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.in.orig	2009-03-28 23:00:23.000000000 +0200
-+++ Makefile.in	2009-03-28 23:00:39.000000000 +0200
-@@ -54,8 +54,7 @@
- 	$(INSTALL_DATA) rules.mk $(DESTDIR)$(repcommonexecdir)
- 	$(INSTALL_SCRIPT) install-aliases $(DESTDIR)$(repcommonexecdir)
- 	$(INSTALL_DATA) rep-debugger.el $(DESTDIR)$(emacssitelispdir)
--	mkdir -p $(DESTDIR)$(libdir)/pkgconfig
--	$(INSTALL_DATA) $(top_srcdir)/librep.pc $(DESTDIR)$(libdir)/pkgconfig/
-+	$(INSTALL_DATA) $(top_srcdir)/librep.pc $(DESTDIR)$(PREFIX)/libdata/pkgconfig/
- 
- installdirs : mkinstalldirs
- 	$(SHELL) $< $(DESTDIR)$(repdir)/$(version) \
diff --git a/lang/librep/files/patch-configure b/lang/librep/files/patch-configure
deleted file mode 100644
index 0ba88e560109..000000000000
--- a/lang/librep/files/patch-configure
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.orig	2009-08-25 19:33:59.000000000 +0300
-+++ configure	2009-10-15 17:47:07.000000000 +0300
-@@ -7969,6 +7969,7 @@
-       hardcode_libdir_flag_spec='-R$libdir'
-       hardcode_direct=yes
-       hardcode_shlibpath_var=no
-+      archive_cmds_need_lc=no
-       ;;
- 
-     hpux9*)
-@@ -11675,7 +11676,7 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdbm_gdbm_open" >&5
- $as_echo "$ac_cv_lib_gdbm_gdbm_open" >&6; }
- if test "x$ac_cv_lib_gdbm_gdbm_open" = x""yes; then :
--  GDBM_LIBS="-lgdbm"
-+  GDBM_LIBS="$LIBS -lgdbm"
- else
-   as_fn_error "Cannot find GDBM library" "$LINENO" 5
- fi
diff --git a/lang/librep/files/patch-ltmain.sh b/lang/librep/files/patch-ltmain.sh
deleted file mode 100644
index bb2407590cad..000000000000
--- a/lang/librep/files/patch-ltmain.sh
+++ /dev/null
@@ -1,19 +0,0 @@
---- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
-+++ ltmain.sh	Sun Feb  3 01:44:17 2002
-@@ -1037,8 +1037,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+	compile_command="$compile_command -pthread"
-+	finalize_command="$finalize_command -pthread"
-+	compiler_flags="$compiler_flags -pthread"
-+	continue
-+	;;
-+
-       -module)
- 	module=yes
-+	build_old_libs=no
- 	continue
- 	;;
- 
diff --git a/lang/librep/pkg-descr b/lang/librep/pkg-descr
index d2878a6cd12e..8e86f2be9210 100644
--- a/lang/librep/pkg-descr
+++ b/lang/librep/pkg-descr
@@ -1,3 +1,3 @@
 An Emacs Lisp like runtime library
 
-WWW: http://librep.sourceforge.net/
+WWW: http://sawfish.wikia.com/
diff --git a/lang/librep/pkg-plist b/lang/librep/pkg-plist
index f548e2afceac..9e442ff9baaa 100644
--- a/lang/librep/pkg-plist
+++ b/lang/librep/pkg-plist
@@ -1,59 +1,76 @@
 bin/rep
-bin/rep-config
 bin/rep-remote
 bin/rep-xgettext
 bin/repdoc
-include/rep.h
-include/rep_gh.h
-include/rep_lisp.h
-include/rep_regexp.h
-include/rep_subrs.h
+include/rep/rep.h
+include/rep/rep_config.h
+include/rep/rep_gh.h
+include/rep/rep_lisp.h
+include/rep/rep_regexp.h
+include/rep/rep_subrs.h
 lib/librep.a
 lib/librep.la
 lib/librep.so
-lib/librep.so.13
-libexec/rep/%%VERSION%%/%%GNUHOST%%/doc-strings
-libexec/rep/%%VERSION%%/%%GNUHOST%%/emulate-gnu-tar
-libexec/rep/%%VERSION%%/%%GNUHOST%%/gdbm.la
-libexec/rep/%%VERSION%%/%%GNUHOST%%/gdbm.so
-libexec/rep/%%VERSION%%/%%GNUHOST%%/gettext.la
-libexec/rep/%%VERSION%%/%%GNUHOST%%/gettext.so
-libexec/rep/%%VERSION%%/%%GNUHOST%%/readline.la
-libexec/rep/%%VERSION%%/%%GNUHOST%%/readline.so
-libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/data/tables.la
-libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/data/tables.so
-libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/ffi.la
-libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/ffi.so
-libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/i18n/gettext.la
-libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/i18n/gettext.so
-libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/io/db/gdbm.la
-libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/io/db/gdbm.so
-libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/io/db/sdbm.la
-libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/io/db/sdbm.so
-libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/io/readline.la
-libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/io/readline.so
-libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/io/sockets.la
-libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/io/sockets.so
-libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/io/timers.la
-libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/io/timers.so
-libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/lang/record-profile.la
-libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/lang/record-profile.so
-libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/util/md5.la
-libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/util/md5.so
-libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/util/utf8.la
-libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/util/utf8.so
-libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/vm/safe-interpreter.la
-libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/vm/safe-interpreter.so
-libexec/rep/%%VERSION%%/%%GNUHOST%%/sdbm.la
-libexec/rep/%%VERSION%%/%%GNUHOST%%/sdbm.so
-libexec/rep/%%VERSION%%/%%GNUHOST%%/tables.la
-libexec/rep/%%VERSION%%/%%GNUHOST%%/tables.so
-libexec/rep/%%VERSION%%/%%GNUHOST%%/timers.la
-libexec/rep/%%VERSION%%/%%GNUHOST%%/timers.so
-libexec/rep/%%GNUHOST%%/install-aliases
-libexec/rep/%%GNUHOST%%/libtool
-libexec/rep/%%GNUHOST%%/rep_config.h
-libexec/rep/%%GNUHOST%%/rules.mk
+lib/librep.so.15
+lib/rep/%%VERSION%%/%%GNUHOST%%/doc-strings
+lib/rep/%%VERSION%%/%%GNUHOST%%/emulate-gnu-tar
+lib/rep/%%VERSION%%/%%GNUHOST%%/gdbm.a
+lib/rep/%%VERSION%%/%%GNUHOST%%/gdbm.la
+lib/rep/%%VERSION%%/%%GNUHOST%%/gdbm.so
+lib/rep/%%VERSION%%/%%GNUHOST%%/gettext.a
+lib/rep/%%VERSION%%/%%GNUHOST%%/gettext.la
+lib/rep/%%VERSION%%/%%GNUHOST%%/gettext.so
+lib/rep/%%VERSION%%/%%GNUHOST%%/readline.a
+lib/rep/%%VERSION%%/%%GNUHOST%%/readline.la
+lib/rep/%%VERSION%%/%%GNUHOST%%/readline.so
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/data/tables.a
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/data/tables.la
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/data/tables.so
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/ffi.a
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/ffi.la
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/ffi.so
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/i18n/gettext.a
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/i18n/gettext.la
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/i18n/gettext.so
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/io/db/gdbm.a
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/io/db/gdbm.la
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/io/db/gdbm.so
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/io/db/sdbm.a
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/io/db/sdbm.la
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/io/db/sdbm.so
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/io/readline.a
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/io/readline.la
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/io/readline.so
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/io/sockets.a
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/io/sockets.la
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/io/sockets.so
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/io/timers.a
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/io/timers.la
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/io/timers.so
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/lang/record-profile.a
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/lang/record-profile.la
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/lang/record-profile.so
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/util/md5.a
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/util/md5.la
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/util/md5.so
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/util/utf8.a
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/util/utf8.la
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/util/utf8.so
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/vm/safe-interpreter.a
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/vm/safe-interpreter.la
+lib/rep/%%VERSION%%/%%GNUHOST%%/rep/vm/safe-interpreter.so
+lib/rep/%%VERSION%%/%%GNUHOST%%/sdbm.a
+lib/rep/%%VERSION%%/%%GNUHOST%%/sdbm.la
+lib/rep/%%VERSION%%/%%GNUHOST%%/sdbm.so
+lib/rep/%%VERSION%%/%%GNUHOST%%/tables.a
+lib/rep/%%VERSION%%/%%GNUHOST%%/tables.la
+lib/rep/%%VERSION%%/%%GNUHOST%%/tables.so
+lib/rep/%%VERSION%%/%%GNUHOST%%/timers.a
+lib/rep/%%VERSION%%/%%GNUHOST%%/timers.la
+lib/rep/%%VERSION%%/%%GNUHOST%%/timers.so
+lib/rep/%%GNUHOST%%/install-aliases
+lib/rep/%%GNUHOST%%/libtool
+lib/rep/%%GNUHOST%%/rules.mk
 libdata/pkgconfig/librep.pc
 share/emacs/site-lisp/rep-debugger.el
 share/rep/%%VERSION%%/lisp/cgi-get.jl
@@ -82,10 +99,6 @@ share/rep/%%VERSION%%/lisp/remote-ftp.jl
 share/rep/%%VERSION%%/lisp/remote-ftp.jlc
 share/rep/%%VERSION%%/lisp/remote-rep.jl
 share/rep/%%VERSION%%/lisp/remote-rep.jlc
-share/rep/%%VERSION%%/lisp/rep.jl
-share/rep/%%VERSION%%/lisp/rep.jlc
-share/rep/%%VERSION%%/lisp/rep/data.jl
-share/rep/%%VERSION%%/lisp/rep/data.jlc
 share/rep/%%VERSION%%/lisp/rep/data/objects.jl
 share/rep/%%VERSION%%/lisp/rep/data/objects.jlc
 share/rep/%%VERSION%%/lisp/rep/data/queues.jl
@@ -102,12 +115,12 @@ share/rep/%%VERSION%%/lisp/rep/data/symbol-table.jl
 share/rep/%%VERSION%%/lisp/rep/data/symbol-table.jlc
 share/rep/%%VERSION%%/lisp/rep/data/trie.jl
 share/rep/%%VERSION%%/lisp/rep/data/trie.jlc
+share/rep/%%VERSION%%/lisp/rep/data.jl
+share/rep/%%VERSION%%/lisp/rep/data.jlc
+share/rep/%%VERSION%%/lisp/rep/ffi/util.jl
+share/rep/%%VERSION%%/lisp/rep/ffi/util.jlc
 share/rep/%%VERSION%%/lisp/rep/i18n/xgettext.jl
 share/rep/%%VERSION%%/lisp/rep/i18n/xgettext.jlc
-share/rep/%%VERSION%%/lisp/rep/io/file-handlers.jl
-share/rep/%%VERSION%%/lisp/rep/io/file-handlers.jlc
-share/rep/%%VERSION%%/lisp/rep/io/file-handlers/remote.jl
-share/rep/%%VERSION%%/lisp/rep/io/file-handlers/remote.jlc
 share/rep/%%VERSION%%/lisp/rep/io/file-handlers/remote/ftp.jl
 share/rep/%%VERSION%%/lisp/rep/io/file-handlers/remote/ftp.jlc
 share/rep/%%VERSION%%/lisp/rep/io/file-handlers/remote/rcp.jl
@@ -116,10 +129,14 @@ share/rep/%%VERSION%%/lisp/rep/io/file-handlers/remote/rep.jl
 share/rep/%%VERSION%%/lisp/rep/io/file-handlers/remote/rep.jlc
 share/rep/%%VERSION%%/lisp/rep/io/file-handlers/remote/utils.jl
 share/rep/%%VERSION%%/lisp/rep/io/file-handlers/remote/utils.jlc
+share/rep/%%VERSION%%/lisp/rep/io/file-handlers/remote.jl
+share/rep/%%VERSION%%/lisp/rep/io/file-handlers/remote.jlc
 share/rep/%%VERSION%%/lisp/rep/io/file-handlers/tar.jl
 share/rep/%%VERSION%%/lisp/rep/io/file-handlers/tar.jlc
 share/rep/%%VERSION%%/lisp/rep/io/file-handlers/tilde.jl
 share/rep/%%VERSION%%/lisp/rep/io/file-handlers/tilde.jlc
+share/rep/%%VERSION%%/lisp/rep/io/file-handlers.jl
+share/rep/%%VERSION%%/lisp/rep/io/file-handlers.jlc
 share/rep/%%VERSION%%/lisp/rep/io/files.jl
 share/rep/%%VERSION%%/lisp/rep/io/files.jlc
 share/rep/%%VERSION%%/lisp/rep/io/streams.jl
@@ -154,12 +171,12 @@ share/rep/%%VERSION%%/lisp/rep/regexp.jl
 share/rep/%%VERSION%%/lisp/rep/regexp.jlc
 share/rep/%%VERSION%%/lisp/rep/structures.jl
 share/rep/%%VERSION%%/lisp/rep/structures.jlc
-share/rep/%%VERSION%%/lisp/rep/system.jl
-share/rep/%%VERSION%%/lisp/rep/system.jlc
 share/rep/%%VERSION%%/lisp/rep/system/environ.jl
 share/rep/%%VERSION%%/lisp/rep/system/environ.jlc
 share/rep/%%VERSION%%/lisp/rep/system/pwd-prompt.jl
 share/rep/%%VERSION%%/lisp/rep/system/pwd-prompt.jlc
+share/rep/%%VERSION%%/lisp/rep/system.jl
+share/rep/%%VERSION%%/lisp/rep/system.jlc
 share/rep/%%VERSION%%/lisp/rep/test/autoload.jl
 share/rep/%%VERSION%%/lisp/rep/test/data.jl
 share/rep/%%VERSION%%/lisp/rep/test/data.jlc
@@ -199,8 +216,6 @@ share/rep/%%VERSION%%/lisp/rep/vm/bytecode-defs.jl
 share/rep/%%VERSION%%/lisp/rep/vm/bytecode-defs.jlc
 share/rep/%%VERSION%%/lisp/rep/vm/bytecodes.jl
 share/rep/%%VERSION%%/lisp/rep/vm/bytecodes.jlc
-share/rep/%%VERSION%%/lisp/rep/vm/compiler.jl
-share/rep/%%VERSION%%/lisp/rep/vm/compiler.jlc
 share/rep/%%VERSION%%/lisp/rep/vm/compiler/basic.jl
 share/rep/%%VERSION%%/lisp/rep/vm/compiler/basic.jlc
 share/rep/%%VERSION%%/lisp/rep/vm/compiler/bindings.jl
@@ -219,6 +234,8 @@ share/rep/%%VERSION%%/lisp/rep/vm/compiler/src.jl
 share/rep/%%VERSION%%/lisp/rep/vm/compiler/src.jlc
 share/rep/%%VERSION%%/lisp/rep/vm/compiler/utils.jl
 share/rep/%%VERSION%%/lisp/rep/vm/compiler/utils.jlc
+share/rep/%%VERSION%%/lisp/rep/vm/compiler.jl
+share/rep/%%VERSION%%/lisp/rep/vm/compiler.jlc
 share/rep/%%VERSION%%/lisp/rep/vm/disassembler.jl
 share/rep/%%VERSION%%/lisp/rep/vm/disassembler.jlc
 share/rep/%%VERSION%%/lisp/rep/vm/peephole.jl
@@ -233,6 +250,8 @@ share/rep/%%VERSION%%/lisp/rep/xml/printer.jl
 share/rep/%%VERSION%%/lisp/rep/xml/printer.jlc
 share/rep/%%VERSION%%/lisp/rep/xml/reader.jl
 share/rep/%%VERSION%%/lisp/rep/xml/reader.jlc
+share/rep/%%VERSION%%/lisp/rep.jl
+share/rep/%%VERSION%%/lisp/rep.jlc
 share/rep/%%VERSION%%/lisp/ring.jl
 share/rep/%%VERSION%%/lisp/ring.jlc
 share/rep/%%VERSION%%/lisp/symbol-table.jl
@@ -252,6 +271,7 @@ share/rep/%%VERSION%%/lisp/symbol-table.jlc
 @dirrm share/rep/%%VERSION%%/lisp/rep/io/file-handlers
 @dirrm share/rep/%%VERSION%%/lisp/rep/io
 @dirrm share/rep/%%VERSION%%/lisp/rep/i18n
+@dirrm share/rep/%%VERSION%%/lisp/rep/ffi
 @dirrm share/rep/%%VERSION%%/lisp/rep/data
 @dirrm share/rep/%%VERSION%%/lisp/rep
 @dirrm share/rep/%%VERSION%%/lisp
@@ -259,15 +279,16 @@ share/rep/%%VERSION%%/lisp/symbol-table.jlc
 @dirrm share/rep
 @dirrmtry share/emacs/site-lisp
 @dirrmtry share/emacs
-@dirrmtry libexec/rep/%%GNUHOST%%
-@dirrm libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/vm
-@dirrm libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/util
-@dirrm libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/lang
-@dirrm libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/io/db
-@dirrm libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/io
-@dirrm libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/i18n
-@dirrm libexec/rep/%%VERSION%%/%%GNUHOST%%/rep/data
-@dirrm libexec/rep/%%VERSION%%/%%GNUHOST%%/rep
-@dirrm libexec/rep/%%VERSION%%/%%GNUHOST%%
-@dirrm libexec/rep/%%VERSION%%
-@dirrmtry libexec/rep
+@dirrmtry lib/rep/%%GNUHOST%%
+@dirrm lib/rep/%%VERSION%%/%%GNUHOST%%/rep/vm
+@dirrm lib/rep/%%VERSION%%/%%GNUHOST%%/rep/util
+@dirrm lib/rep/%%VERSION%%/%%GNUHOST%%/rep/lang
+@dirrm lib/rep/%%VERSION%%/%%GNUHOST%%/rep/io/db
+@dirrm lib/rep/%%VERSION%%/%%GNUHOST%%/rep/io
+@dirrm lib/rep/%%VERSION%%/%%GNUHOST%%/rep/i18n
+@dirrm lib/rep/%%VERSION%%/%%GNUHOST%%/rep/data
+@dirrm lib/rep/%%VERSION%%/%%GNUHOST%%/rep
+@dirrm lib/rep/%%VERSION%%/%%GNUHOST%%
+@dirrm lib/rep/%%VERSION%%
+@dirrmtry lib/rep
+@dirrm include/rep