Index: head/devel/meta-cvs/Makefile
===================================================================
--- head/devel/meta-cvs/Makefile	(revision 345815)
+++ head/devel/meta-cvs/Makefile	(revision 345816)
@@ -1,61 +1,67 @@
 # Created by: johs
 # $FreeBSD$
 
 PORTNAME=	meta-cvs
 PORTVERSION=	1.1.98
 CATEGORIES=	devel
 MASTER_SITES=	http://common-lisp.net/project/meta-cvs/downloads/
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	A more capable version control system than CVS, built around CVS
 
-BROKEN=	loop on install
+LICENSE=	GPLv2
 
-OPTIONS_DEFINE=	PDFDOC
-PDFDOC_DESC=	Build PDF documentation
-
 BUILD_DEPENDS=	clisp:${PORTSDIR}/lang/clisp \
     		lndir:${PORTSDIR}/devel/lndir
 RUN_DEPENDS=	clisp:${PORTSDIR}/lang/clisp
 
-USE_GMAKE=	yes
+OPTIONS_DEFINE=	DOCS
+
+USES=		gmake
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	bin/mcvs \
 		bin/mcvs-debug \
 		${DATADIR:C/${PREFIX}\///}/mcvs.mem \
 		${DATADIR:C/${PREFIX}\///}/mcvs-debug.mem
 PLIST_DIRS=	${DATADIR:C/${PREFIX}\///}
 
-PORTDOCS=	Meta-CVS-PAPER \
-		PORTING \
-		QUICK-GUIDE \
-		SCRIPTING
+PORTDOCS=	*
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MPDFDOC} && !defined(NOPORTDOCS)
-USE_TEX=	latex:build
-PORTDOCS+=	meta-cvs.pdf
-.endif
-
 post-patch:
+#	libc.so is now a symlink, see
+#	http://svnweb.freebsd.org/base/head/lib/libc/libc.ldscript?revision=251668&view=markup
+	(if [ -h /usr/lib/libc.so ]; then \
+	    rep=libc.so; \
+	else \
+	    rep=`${SED} -e '1d; s|^.*\(/lib/libc\.so\.[0-9]*\).*$$|\1|' /usr/lib/libc.so`; \
+	fi; \
+	${REINPLACE_CMD} -e "s|libc.so.6|$$rep|" ${WRKSRC}/code/clisp-ffi.lisp)
+
 	${REINPLACE_CMD} -e '232s|make|${GMAKE}|g' ${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|type -P|which|g;s|$$(prefix)/lib|${DATADIR}|g' ${WRKSRC}/Makefile
-	${REINPLACE_CMD} -e 's|libc.so.6|libc.so|' ${WRKSRC}/code/clisp-ffi.lisp
-	${REINPLACE_CMD} -e '12s|latex|pdflatex|' ${WRKSRC}/docs/tex-manual/Makefile
 
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.    if !defined(WITHOUT_PDFDOC)
-	(cd ${WRKSRC}/docs/tex-manual && ${GMAKE} && \
-	    ${CP} ${WRKSRC}/docs/tex-manual/meta-cvs.pdf ${WRKSRC}/docs/misc-text-files)
-.    endif
-.for doc in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/docs/misc-text-files/${doc} ${DOCSDIR}
-.endfor
+.if ${PORT_OPTIONS:MDOCS}
+USE_TEX=	latex:build
+post-build:
+	cd ${WRKSRC}/docs/tex-manual && \
+	    pdflatex meta-cvs.latex && \
+	    pdflatex meta-cvs.latex && \
+	    pdflatex meta-cvs.latex
+.endif
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/mcvs ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/mcvs-debug ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/mcvs.mem ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/mcvs-debug.mem ${STAGEDIR}${DATADIR}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/misc-text-files/* ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/tex-manual/*.pdf ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>