3 files changed, 55 insertions, 37 deletions

diff --git a/textproc/skribe/Makefile b/textproc/skribe/Makefile
index 0796a243388e..0ed13fcb1ee7 100644
--- a/textproc/skribe/Makefile
+++ b/textproc/skribe/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	skribe
-PORTVERSION=	1.0a
-PORTREVISION=	2
+PORTVERSION=	1.2g
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp-sop.inria.fr/mimosa/fp/Skribe/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -16,26 +15,31 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A highly programmable document processing system
 
 BUILD_DEPENDS=	bigloo:${PORTSDIR}/lang/bigloo
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	bigloo:${PORTSDIR}/lang/bigloo
 
+USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-bigloo --prefix=${PREFIX} --docdir=${DOCSDIR}
-USE_GMAKE=	yes
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
+.SILENT:
+
+post-extract:
+	${CHMOD} -R a+r ${WRKSRC}/doc
+
 post-patch:
 	${REINPLACE_CMD} -e 's|^function ||' ${WRKSRC}/etc/skribe-config.in
-	${REINPLACE_CMD} -e 's|$$prefix/doc/skribe-$$release|${DOCSDIR}|' \
-		${WRKSRC}/configure
-	${REINPLACE_CMD} -e 's|.*prcs.*|beta=|' ${WRKSRC}/etc/bigloo/configure
-.if defined(NOPORTDOCS)
-	${REINPLACE_CMD} -e 's/= doc/=/' ${WRKSRC}/Makefile
-.endif
+	${REINPLACE_CMD} -e '/doc/d' ${WRKSRC}/Makefile
 
 post-build:
-	${CHMOD} a+r ${WRKSRC}/doc/html/img/*.gif
+.if !defined(NOPORTDOCS)
+	(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE})
+.endif
 
 post-install:
 	${TOUCH} ${DATADIR}/extensions/.keep_me
+.if !defined(NOPORTDOCS)
+	(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} install)
+.endif
 
 .include <bsd.port.mk>
diff --git a/textproc/skribe/distinfo b/textproc/skribe/distinfo
index 07d68b156ce8..f7c3379248c8 100644
--- a/textproc/skribe/distinfo
+++ b/textproc/skribe/distinfo
@@ -1,3 +1,3 @@
-MD5 (skribe1.0a.tar.gz) = b0e8efaf25679efa28a207e1732be20a
-SHA256 (skribe1.0a.tar.gz) = 4002c2d60ac4cb4c9c246b7b9c51f1ac4d21d063eab9fcc1702d2f497affba32
-SIZE (skribe1.0a.tar.gz) = 578781
+MD5 (skribe1.2g.tar.gz) = 435baec8c90e9432b4adb6bda7a4ccdc
+SHA256 (skribe1.2g.tar.gz) = 8474fa6664a15aededb1da8f5901f5a1fad1f7e8b0971ae48429379fb0c45c54
+SIZE (skribe1.2g.tar.gz) = 256454
diff --git a/textproc/skribe/pkg-plist b/textproc/skribe/pkg-plist
index ecdb270e1612..222d1a5ae65e 100644
--- a/textproc/skribe/pkg-plist
+++ b/textproc/skribe/pkg-plist
@@ -3,32 +3,14 @@ bin/skribe-config
 bin/skribe.bigloo
 bin/skribebibtex
 bin/skribebibtex.bigloo
-bin/skribeinfo
-bin/skribeinfo.bigloo
-share/emacs/site-lisp/bigloo/skribe.el
-%%DATADIR%%/%%VERSION%%/skr/acmproc.skr
-%%DATADIR%%/%%VERSION%%/skr/base.skr
-%%DATADIR%%/%%VERSION%%/skr/french.skr
-%%DATADIR%%/%%VERSION%%/skr/html.skr
-%%DATADIR%%/%%VERSION%%/skr/jfp.skr
-%%DATADIR%%/%%VERSION%%/skr/latex.skr
-%%DATADIR%%/%%VERSION%%/skr/letter.skr
-%%DATADIR%%/%%VERSION%%/skr/lncs.skr
-%%DATADIR%%/%%VERSION%%/skr/scribe.skr
-%%DATADIR%%/%%VERSION%%/skr/skribe.skr
-%%DATADIR%%/%%VERSION%%/skr/slide.skr
-%%DATADIR%%/%%VERSION%%/skr/sui.skr
-%%DATADIR%%/%%VERSION%%/skr/texinfo.skr
-%%DATADIR%%/%%VERSION%%/skr/web-book.skr
-%%DATADIR%%/%%VERSION%%/skr/xml.skr
-%%DATADIR%%/extensions/.keep_me
-@dirrm %%DATADIR%%/extensions
-@dirrm %%DATADIR%%/%%VERSION%%/skr
-@dirrm %%DATADIR%%/%%VERSION%%
-@dirrm %%DATADIR%%
+%%PORTDOCS%%%%DOCSDIR%%/Makefile.dir
+%%PORTDOCS%%%%DOCSDIR%%/bsd.gif
+%%PORTDOCS%%%%DOCSDIR%%/dir.html
+%%PORTDOCS%%%%DOCSDIR%%/dir.skb
 %%PORTDOCS%%%%DOCSDIR%%/img/bsd.gif
 %%PORTDOCS%%%%DOCSDIR%%/img/lambda.gif
 %%PORTDOCS%%%%DOCSDIR%%/img/linux.gif
+%%PORTDOCS%%%%DOCSDIR%%/linux.gif
 %%PORTDOCS%%%%DOCSDIR%%/user-1.html
 %%PORTDOCS%%%%DOCSDIR%%/user-10.html
 %%PORTDOCS%%%%DOCSDIR%%/user-11.html
@@ -53,6 +35,8 @@ share/emacs/site-lisp/bigloo/skribe.el
 %%PORTDOCS%%%%DOCSDIR%%/user-29.html
 %%PORTDOCS%%%%DOCSDIR%%/user-3.html
 %%PORTDOCS%%%%DOCSDIR%%/user-30.html
+%%PORTDOCS%%%%DOCSDIR%%/user-31.html
+%%PORTDOCS%%%%DOCSDIR%%/user-32.html
 %%PORTDOCS%%%%DOCSDIR%%/user-4.html
 %%PORTDOCS%%%%DOCSDIR%%/user-5.html
 %%PORTDOCS%%%%DOCSDIR%%/user-6.html
@@ -61,5 +45,35 @@ share/emacs/site-lisp/bigloo/skribe.el
 %%PORTDOCS%%%%DOCSDIR%%/user-9.html
 %%PORTDOCS%%%%DOCSDIR%%/user.html
 %%PORTDOCS%%%%DOCSDIR%%/user.sui
+share/emacs/site-lisp/bigloo/skribe.el
+%%DATADIR%%/%%VERSION%%/skr/acmproc.skr
+%%DATADIR%%/%%VERSION%%/skr/base.skr
+%%DATADIR%%/%%VERSION%%/skr/context.skr
+%%PORTDOCS%%%%DATADIR%%/%%VERSION%%/skr/doc/skr/api.skr
+%%PORTDOCS%%%%DATADIR%%/%%VERSION%%/skr/doc/skr/env.skr
+%%PORTDOCS%%%%DATADIR%%/%%VERSION%%/skr/doc/skr/extension.skr
+%%PORTDOCS%%%%DATADIR%%/%%VERSION%%/skr/doc/skr/manual.skr
+%%DATADIR%%/%%VERSION%%/skr/french.skr
+%%DATADIR%%/%%VERSION%%/skr/html.skr
+%%DATADIR%%/%%VERSION%%/skr/html4.skr
+%%DATADIR%%/%%VERSION%%/skr/jfp.skr
+%%DATADIR%%/%%VERSION%%/skr/latex-simple.skr
+%%DATADIR%%/%%VERSION%%/skr/latex.skr
+%%DATADIR%%/%%VERSION%%/skr/letter.skr
+%%DATADIR%%/%%VERSION%%/skr/lncs.skr
+%%DATADIR%%/%%VERSION%%/skr/scribe.skr
+%%DATADIR%%/%%VERSION%%/skr/sigplan.skr
+%%DATADIR%%/%%VERSION%%/skr/skribe.skr
+%%DATADIR%%/%%VERSION%%/skr/slide.skr
+%%DATADIR%%/%%VERSION%%/skr/web-article.skr
+%%DATADIR%%/%%VERSION%%/skr/web-book.skr
+%%DATADIR%%/%%VERSION%%/skr/xml.skr
+%%DATADIR%%/extensions/.keep_me
+@dirrm %%DATADIR%%/extensions
+%%PORTDOCS%%@dirrm %%DATADIR%%/%%VERSION%%/skr/doc/skr
+%%PORTDOCS%%@dirrm %%DATADIR%%/%%VERSION%%/skr/doc
+@dirrm %%DATADIR%%/%%VERSION%%/skr
+@dirrm %%DATADIR%%/%%VERSION%%
+@dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/img
 %%PORTDOCS%%@dirrm %%DOCSDIR%%