6 files changed, 207 insertions, 152 deletions

diff --git a/lang/bigloo/Makefile b/lang/bigloo/Makefile
index 57b6ceae9b66..8ff6bf7a656b 100644
--- a/lang/bigloo/Makefile
+++ b/lang/bigloo/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	bigloo
-PORTVERSION=	2.6b
-PORTREVISION=	3
+PORTVERSION=	3.0c
 CATEGORIES=	lang scheme
 MASTER_SITES=	ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/ \
 		ftp://kaolin.unice.fr/pub/Bigloo/
@@ -16,28 +15,28 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Scheme interpreter and native code compiler
 
-USE_GMAKE=	yes
-ALL_TARGET=
-INSTALL_TARGET=	install compile-bee install-bee
 USE_EMACS=	yes
-EMACS_PORT_NAME?=	emacs21
-MAN1=		bigloo.1
-INFO=		bigloo
-PLIST_SUB=	BIGLOO_VERSION=${PORTVERSION}
-INSTALLS_SHLIB=	yes
-LDCONFIG_DIRS=	%%PREFIX%%/lib/bigloo/%%BIGLOO_VERSION%%
-
+USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--emacs=${EMACS_NAME} \
 		--lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}/bigloo \
 		--native=yes \
 		--jvm=no
+ALL_TARGET=	# empty
+INSTALL_TARGET=	install-progs compile-bee install-bee
+USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/bigloo/${PORTVERSION}
+PLIST_SUB=	BIGLOO_VERSION="${PORTVERSION}"
 
-INSTALL_INFO?=	install-info
+MAN1=		bigloo.1
+INFO=		bigloo
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|prefix/doc|prefix/share/doc|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|"-O3"|""|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|"-pthread"|"${PTHREAD_LIBS}"|g' \
+		${WRKSRC}/autoconf/pthread
+	@${REINPLACE_CMD} -e 's|machine/soundcard|sys/soundcard|g' \
+		${WRKSRC}/api/multimedia/src/Unix/bglmixer.c
 
 post-configure:
 	@${REINPLACE_CMD} -e 's/BGL_HAVE_SENDFILE 1/BGL_HAVE_SENDFILE 0/' \
@@ -46,12 +45,17 @@ post-configure:
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != "i386"
-BROKEN=		"Does not compile on !i386"
+BROKEN=		Does not compile on !i386
 .endif
 
 post-install:
-	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/bigloo.sh | ${SED} "s|%%BIGLOO_VERSION%%|${PORTVERSION}|g" > ${PREFIX}/etc/rc.d/000.bigloo.sh
-	@${CHMOD} 750 ${PREFIX}/etc/rc.d/000.bigloo.sh
+	${INSTALL_MAN} ${WRKSRC}/manuals/bigloo.man ${MANPREFIX}/man/man1/${MAN1}
+	${INSTALL_DATA} ${WRKSRC}/manuals/bigloo.info ${PREFIX}/${INFO_PATH}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/manuals/*.html ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/manuals/*.sui ${DOCSDIR}
+.endif
 
 test: build
 	@(cd ${WRKSRC}; ${GMAKE} test)
diff --git a/lang/bigloo/distinfo b/lang/bigloo/distinfo
index e92412e1d686..a17584dcf474 100644
--- a/lang/bigloo/distinfo
+++ b/lang/bigloo/distinfo
@@ -1,3 +1,3 @@
-MD5 (bigloo2.6b.tar.gz) = bbb788e70fafe2191f1da87c6fdb3f01
-SHA256 (bigloo2.6b.tar.gz) = efa1298b2e947623693d1d4bc9ea20d5ab4cfe4d8be5f241ea4327cafbb696ae
-SIZE (bigloo2.6b.tar.gz) = 8712699
+MD5 (bigloo3.0c.tar.gz) = 11300e657ba37eb5c8a4847986980e18
+SHA256 (bigloo3.0c.tar.gz) = 53018455dbc728e05d901eb734f779a41387a6db8595fddb1430713f6705092b
+SIZE (bigloo3.0c.tar.gz) = 11771507
diff --git a/lang/bigloo/files/bigloo.sh b/lang/bigloo/files/bigloo.sh
deleted file mode 100644
index 0d27a0a84d56..000000000000
--- a/lang/bigloo/files/bigloo.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-	start)
-		/sbin/ldconfig -m %%PREFIX%%/lib/bigloo/%%BIGLOO_VERSION%%
-		;;
-	stop)
-		;;
-	*)
-		echo ""
-		echo "Usage: `basename $0` { start | stop }"
-		echo ""
-		exit 64
-		;;
-esac
diff --git a/lang/bigloo/files/patch-aa b/lang/bigloo/files/patch-aa
deleted file mode 100644
index ce425a69c1e1..000000000000
--- a/lang/bigloo/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- autoconf/pthread.orig	Mon Jul 15 21:08:08 2002
-+++ autoconf/pthread	Mon Jul 15 21:08:16 2002
-@@ -14,7 +14,7 @@
- #*---------------------------------------------------------------------*/
- cc=gcc
- cflags=
--pthreadlibs="-lpthread"
-+pthreadlibs="-pthread"
- tmp=/tmp
- user=bigloo
- 
diff --git a/lang/bigloo/files/patch-ad b/lang/bigloo/files/patch-ad
deleted file mode 100644
index 4b7e6b39f1b7..000000000000
--- a/lang/bigloo/files/patch-ad
+++ /dev/null
@@ -1,30 +0,0 @@
---- runtime/Clib/cdate.c.orig
-+++ runtime/Clib/cdate.c
-@@ -22,7 +22,7 @@
-    date = GC_MALLOC_ATOMIC( BGL_DATE_SIZE );
-    date->date_t.header = MAKE_HEADER( DATE_TYPE, 0 );
- 
--   date->date_t.timezone = timezone;
-+   date->date_t.timezone = tm->tm_gmtoff;
-       
-    date->date_t.sec = tm->tm_sec;
-    date->date_t.min = tm->tm_min;
-@@ -46,7 +46,7 @@
- BGL_RUNTIME_DEF
- obj_t
- bgl_seconds_to_date( long sec ) {
--   return tm_to_date( localtime( (time_t *)&sec ), &sec );
-+   return tm_to_date( localtime( (time_t *)&sec ), (time_t *)&sec );
- }
- 
- /*---------------------------------------------------------------------*/
-@@ -115,7 +115,7 @@
-    struct tm *t;
-    char *s;
- 
--   t = gmtime( &((time_t)sec) );
-+   t = gmtime( (time_t *)&sec );
-    s = asctime( t );
- 
-    return string_to_bstring_len( s, (int)strlen( s ) - 1 );
-
diff --git a/lang/bigloo/pkg-plist b/lang/bigloo/pkg-plist
index 949126a8506f..0860caa5c6de 100644
--- a/lang/bigloo/pkg-plist
+++ b/lang/bigloo/pkg-plist
@@ -1,87 +1,30 @@
-bin/bigloo%%BIGLOO_VERSION%%
+bin/bglafile
+bin/bgldepend
+bin/bgljas
+bin/bgljfile
+bin/bglmake
+bin/bglmco
+bin/bglmem
+bin/bglmemrun
+bin/bglpkg
+bin/bglpp
+bin/bglprof
+bin/bgltags
 bin/bigloo
-bin/bmem
-bin/bmemrun
+bin/bigloo%%BIGLOO_VERSION%%
 bin/cigloo
-bin/afile
-bin/jfile
-bin/bdepend
-bin/bmake
-bin/bprof
-bin/mco
-bin/bpp
-bin/btags
-bin/jas
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-1.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-10.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-11.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-12.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-13.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-14.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-15.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-16.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-17.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-18.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-19.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-2.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-20.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-21.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-22.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-23.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-24.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-25.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-26.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-3.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-4.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-5.1.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-5.10.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-5.11.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-5.2.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-5.3.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-5.4.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-5.5.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-5.6.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-5.7.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-5.8.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-5.9.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-5.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-6.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-7.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-8.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo-9.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/bigloo.sui
-share/doc/bigloo-%%BIGLOO_VERSION%%/r5rs-1.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/r5rs-10.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/r5rs-2.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/r5rs-3.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/r5rs-4.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/r5rs-5.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/r5rs-6.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/r5rs-7.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/r5rs-8.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/r5rs-9.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/r5rs.html
-share/doc/bigloo-%%BIGLOO_VERSION%%/r5rs.sui
-etc/rc.d/000.bigloo.sh
-lib/libbigloo_s-%%BIGLOO_VERSION%%.so
-lib/libbigloo_u-%%BIGLOO_VERSION%%.so
-lib/libbigloobdl_s-%%BIGLOO_VERSION%%.so
-lib/libbigloobdl_u-%%BIGLOO_VERSION%%.so
-lib/libbigloofth_s-%%BIGLOO_VERSION%%.so
-lib/libbigloofth_u-%%BIGLOO_VERSION%%.so
-lib/libbigloogc-%%BIGLOO_VERSION%%.so
-lib/libbigloogc_fth-%%BIGLOO_VERSION%%.so
 lib/bigloo/%%BIGLOO_VERSION%%/Makefile.config
 lib/bigloo/%%BIGLOO_VERSION%%/Makefile.misc
-lib/bigloo/%%BIGLOO_VERSION%%/Makefile.srfi
 lib/bigloo/%%BIGLOO_VERSION%%/bdl.heap
 lib/bigloo/%%BIGLOO_VERSION%%/bdl.init
 lib/bigloo/%%BIGLOO_VERSION%%/bigloo.h
 lib/bigloo/%%BIGLOO_VERSION%%/bigloo.heap
 lib/bigloo/%%BIGLOO_VERSION%%/bigloo_config.h
+lib/bigloo/%%BIGLOO_VERSION%%/bigloo_gc.h
 lib/bigloo/%%BIGLOO_VERSION%%/bmem/bmem.css
 lib/bigloo/%%BIGLOO_VERSION%%/bmem/bmem.so
+lib/bigloo/%%BIGLOO_VERSION%%/calendar.heap
+lib/bigloo/%%BIGLOO_VERSION%%/calendar.init
 lib/bigloo/%%BIGLOO_VERSION%%/fthread.heap
 lib/bigloo/%%BIGLOO_VERSION%%/fthread.init
 lib/bigloo/%%BIGLOO_VERSION%%/libbigloo_s-%%BIGLOO_VERSION%%.a
@@ -92,6 +35,12 @@ lib/bigloo/%%BIGLOO_VERSION%%/libbigloobdl_s-%%BIGLOO_VERSION%%.a
 lib/bigloo/%%BIGLOO_VERSION%%/libbigloobdl_s-%%BIGLOO_VERSION%%.so
 lib/bigloo/%%BIGLOO_VERSION%%/libbigloobdl_u-%%BIGLOO_VERSION%%.a
 lib/bigloo/%%BIGLOO_VERSION%%/libbigloobdl_u-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloocalendar_e-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloocalendar_s-%%BIGLOO_VERSION%%.a
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloocalendar_s-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloocalendar_u-%%BIGLOO_VERSION%%.a
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloocalendar_u-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloofth_e-%%BIGLOO_VERSION%%.so
 lib/bigloo/%%BIGLOO_VERSION%%/libbigloofth_s-%%BIGLOO_VERSION%%.a
 lib/bigloo/%%BIGLOO_VERSION%%/libbigloofth_s-%%BIGLOO_VERSION%%.so
 lib/bigloo/%%BIGLOO_VERSION%%/libbigloofth_u-%%BIGLOO_VERSION%%.a
@@ -100,6 +49,164 @@ lib/bigloo/%%BIGLOO_VERSION%%/libbigloogc-%%BIGLOO_VERSION%%.a
 lib/bigloo/%%BIGLOO_VERSION%%/libbigloogc-%%BIGLOO_VERSION%%.so
 lib/bigloo/%%BIGLOO_VERSION%%/libbigloogc_fth-%%BIGLOO_VERSION%%.a
 lib/bigloo/%%BIGLOO_VERSION%%/libbigloogc_fth-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloomail_e-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloomail_s-%%BIGLOO_VERSION%%.a
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloomail_s-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloomail_u-%%BIGLOO_VERSION%%.a
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloomail_u-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloomultimedia_e-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloomultimedia_s-%%BIGLOO_VERSION%%.a
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloomultimedia_s-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloomultimedia_u-%%BIGLOO_VERSION%%.a
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloomultimedia_u-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloopkgcomp_e-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloopkgcomp_s-%%BIGLOO_VERSION%%.a
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloopkgcomp_s-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloopkgcomp_u-%%BIGLOO_VERSION%%.a
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloopkgcomp_u-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloopkglib_e-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloopkglib_s-%%BIGLOO_VERSION%%.a
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloopkglib_s-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloopkglib_u-%%BIGLOO_VERSION%%.a
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloopkglib_u-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloopth_e-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloopth_s-%%BIGLOO_VERSION%%.a
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloopth_s-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloopth_u-%%BIGLOO_VERSION%%.a
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloopth_u-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloosqlite_e-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloosqlite_s-%%BIGLOO_VERSION%%.a
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloosqlite_s-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloosqlite_u-%%BIGLOO_VERSION%%.a
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloosqlite_u-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloossl_e-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloossl_s-%%BIGLOO_VERSION%%.a
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloossl_s-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloossl_u-%%BIGLOO_VERSION%%.a
+lib/bigloo/%%BIGLOO_VERSION%%/libbigloossl_u-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbiglooweb_e-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbiglooweb_s-%%BIGLOO_VERSION%%.a
+lib/bigloo/%%BIGLOO_VERSION%%/libbiglooweb_s-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/libbiglooweb_u-%%BIGLOO_VERSION%%.a
+lib/bigloo/%%BIGLOO_VERSION%%/libbiglooweb_u-%%BIGLOO_VERSION%%.so
+lib/bigloo/%%BIGLOO_VERSION%%/mail.heap
+lib/bigloo/%%BIGLOO_VERSION%%/mail.init
+lib/bigloo/%%BIGLOO_VERSION%%/multimedia.heap
+lib/bigloo/%%BIGLOO_VERSION%%/multimedia.init
+lib/bigloo/%%BIGLOO_VERSION%%/pkgcomp.heap
+lib/bigloo/%%BIGLOO_VERSION%%/pkgcomp.init
+lib/bigloo/%%BIGLOO_VERSION%%/pkglib.heap
+lib/bigloo/%%BIGLOO_VERSION%%/pkglib.init
+lib/bigloo/%%BIGLOO_VERSION%%/pthread.heap
+lib/bigloo/%%BIGLOO_VERSION%%/pthread.init
+lib/bigloo/%%BIGLOO_VERSION%%/sqlite.heap
+lib/bigloo/%%BIGLOO_VERSION%%/sqlite.init
+lib/bigloo/%%BIGLOO_VERSION%%/ssl.heap
+lib/bigloo/%%BIGLOO_VERSION%%/ssl.init
+lib/bigloo/%%BIGLOO_VERSION%%/web.heap
+lib/bigloo/%%BIGLOO_VERSION%%/web.init
+lib/libbigloo_s-%%BIGLOO_VERSION%%.so
+lib/libbigloo_u-%%BIGLOO_VERSION%%.so
+lib/libbigloobdl_s-%%BIGLOO_VERSION%%.so
+lib/libbigloobdl_u-%%BIGLOO_VERSION%%.so
+lib/libbigloocalendar_e-%%BIGLOO_VERSION%%.so
+lib/libbigloocalendar_s-%%BIGLOO_VERSION%%.so
+lib/libbigloocalendar_u-%%BIGLOO_VERSION%%.so
+lib/libbigloofth_e-%%BIGLOO_VERSION%%.so
+lib/libbigloofth_s-%%BIGLOO_VERSION%%.so
+lib/libbigloofth_u-%%BIGLOO_VERSION%%.so
+lib/libbigloogc-%%BIGLOO_VERSION%%.so
+lib/libbigloogc_fth-%%BIGLOO_VERSION%%.so
+lib/libbigloomail_e-%%BIGLOO_VERSION%%.so
+lib/libbigloomail_s-%%BIGLOO_VERSION%%.so
+lib/libbigloomail_u-%%BIGLOO_VERSION%%.so
+lib/libbigloomultimedia_e-%%BIGLOO_VERSION%%.so
+lib/libbigloomultimedia_s-%%BIGLOO_VERSION%%.so
+lib/libbigloomultimedia_u-%%BIGLOO_VERSION%%.so
+lib/libbigloopkgcomp_e-%%BIGLOO_VERSION%%.so
+lib/libbigloopkgcomp_s-%%BIGLOO_VERSION%%.so
+lib/libbigloopkgcomp_u-%%BIGLOO_VERSION%%.so
+lib/libbigloopkglib_e-%%BIGLOO_VERSION%%.so
+lib/libbigloopkglib_s-%%BIGLOO_VERSION%%.so
+lib/libbigloopkglib_u-%%BIGLOO_VERSION%%.so
+lib/libbigloopth_e-%%BIGLOO_VERSION%%.so
+lib/libbigloopth_s-%%BIGLOO_VERSION%%.so
+lib/libbigloopth_u-%%BIGLOO_VERSION%%.so
+lib/libbigloosqlite_e-%%BIGLOO_VERSION%%.so
+lib/libbigloosqlite_s-%%BIGLOO_VERSION%%.so
+lib/libbigloosqlite_u-%%BIGLOO_VERSION%%.so
+lib/libbigloossl_e-%%BIGLOO_VERSION%%.so
+lib/libbigloossl_s-%%BIGLOO_VERSION%%.so
+lib/libbigloossl_u-%%BIGLOO_VERSION%%.so
+lib/libbiglooweb_e-%%BIGLOO_VERSION%%.so
+lib/libbiglooweb_s-%%BIGLOO_VERSION%%.so
+lib/libbiglooweb_u-%%BIGLOO_VERSION%%.so
+%%PORTDOCS%%%%DOCSDIR%%/bdb-1.html
+%%PORTDOCS%%%%DOCSDIR%%/bdb-10.html
+%%PORTDOCS%%%%DOCSDIR%%/bdb-2.html
+%%PORTDOCS%%%%DOCSDIR%%/bdb-3.html
+%%PORTDOCS%%%%DOCSDIR%%/bdb-4.html
+%%PORTDOCS%%%%DOCSDIR%%/bdb-5.html
+%%PORTDOCS%%%%DOCSDIR%%/bdb-6.html
+%%PORTDOCS%%%%DOCSDIR%%/bdb-7.html
+%%PORTDOCS%%%%DOCSDIR%%/bdb-8.html
+%%PORTDOCS%%%%DOCSDIR%%/bdb-9.html
+%%PORTDOCS%%%%DOCSDIR%%/bdb.html
+%%PORTDOCS%%%%DOCSDIR%%/bdb.sui
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-1.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-10.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-11.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-12.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-13.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-14.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-15.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-16.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-17.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-18.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-19.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-2.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-20.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-21.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-22.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-23.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-24.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-25.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-26.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-27.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-28.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-29.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-3.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-30.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-31.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-32.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-33.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-34.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-4.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-5.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-6.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-7.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-8.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo-9.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo.html
+%%PORTDOCS%%%%DOCSDIR%%/bigloo.sui
+%%PORTDOCS%%%%DOCSDIR%%/r5rs-1.html
+%%PORTDOCS%%%%DOCSDIR%%/r5rs-10.html
+%%PORTDOCS%%%%DOCSDIR%%/r5rs-11.html
+%%PORTDOCS%%%%DOCSDIR%%/r5rs-12.html
+%%PORTDOCS%%%%DOCSDIR%%/r5rs-13.html
+%%PORTDOCS%%%%DOCSDIR%%/r5rs-14.html
+%%PORTDOCS%%%%DOCSDIR%%/r5rs-15.html
+%%PORTDOCS%%%%DOCSDIR%%/r5rs-16.html
+%%PORTDOCS%%%%DOCSDIR%%/r5rs-2.html
+%%PORTDOCS%%%%DOCSDIR%%/r5rs-3.html
+%%PORTDOCS%%%%DOCSDIR%%/r5rs-4.html
+%%PORTDOCS%%%%DOCSDIR%%/r5rs-5.html
+%%PORTDOCS%%%%DOCSDIR%%/r5rs-6.html
+%%PORTDOCS%%%%DOCSDIR%%/r5rs-7.html
+%%PORTDOCS%%%%DOCSDIR%%/r5rs-8.html
+%%PORTDOCS%%%%DOCSDIR%%/r5rs-9.html
+%%PORTDOCS%%%%DOCSDIR%%/r5rs.html
+%%PORTDOCS%%%%DOCSDIR%%/r5rs.sui
 %%EMACS_SITE_LISPDIR%%/bigloo/bee-about-icon.el
 %%EMACS_SITE_LISPDIR%%/bigloo/bee-about-icon.elc
 %%EMACS_SITE_LISPDIR%%/bigloo/bee-autoload.el
@@ -296,9 +403,9 @@ lib/bigloo/%%BIGLOO_VERSION%%/libbigloogc_fth-%%BIGLOO_VERSION%%.so
 %%EMACS_SITE_LISPDIR%%/bigloo/ude-version.el
 %%EMACS_SITE_LISPDIR%%/bigloo/ude-version.elc
 %%EMACS_SITE_LISPDIR%%/bigloo/xemacs-etags.el
-@dirrm share/doc/bigloo-%%BIGLOO_VERSION%%
+@dirrm %%EMACS_SITE_LISPDIR%%/bigloo/etc
+@dirrm %%EMACS_SITE_LISPDIR%%/bigloo
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/bigloo/%%BIGLOO_VERSION%%/bmem
 @dirrm lib/bigloo/%%BIGLOO_VERSION%%
 @dirrm lib/bigloo
-@dirrm %%EMACS_SITE_LISPDIR%%/bigloo/etc
-@dirrm %%EMACS_SITE_LISPDIR%%/bigloo