3 files changed, 12 insertions, 144 deletions

diff --git a/textproc/metauml/Makefile b/textproc/metauml/Makefile
index 5df14225d69e..8075c5448940 100644
--- a/textproc/metauml/Makefile
+++ b/textproc/metauml/Makefile
@@ -15,7 +15,7 @@ DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${PORTNAME}_lib_${PORTVERSION}.tgz lop-release.tgz
 
 MAINTAINER=	tota@FreeBSD.org
-COMMENT=	A MetaPost library for typesetting UML diagrams
+COMMENT=	MetaPost library for typesetting UML diagrams
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/thrunk/License
@@ -29,22 +29,17 @@ MPDIR=		${TEXMFDIR}/metapost/${PORTNAME}
 
 NO_BUILD=	yes
 WRKSRC=	${WRKDIR}/${PORTNAME}_lib
-EXAMPLES=	*.1 *.jpg *.mp lop lop.html lop.pdf lop.tex
+PORTDOCS=	${PORTNAME}_manual_${PORTVERSION}.pdf
+PORTEXAMPLES=	*.1 *.jpg *.mp lop lop.html lop.pdf lop.tex
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${PREFIX}/${MPDIR}
-	${INSTALL_DATA} ${WRKSRC}/thrunk/*.mp ${PREFIX}/${MPDIR}
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}_manual_${PORTVERSION}.pdf ${DOCSDIR}
-	${MKDIR} ${EXAMPLESDIR}
-.for example in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKDIR}/${example} ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${MPDIR}
+	${INSTALL_DATA} ${WRKSRC}/thrunk/*.mp ${STAGEDIR}${PREFIX}/${MPDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+.for example in ${PORTEXAMPLES}
+	${INSTALL_DATA} ${WRKDIR}/${example} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
-.endif
-
-post-install:
-	${MKTEXLSR} ${PREFIX}/${TEXMFDIR}
 
 .include <bsd.port.mk>
diff --git a/textproc/metauml/pkg-descr b/textproc/metauml/pkg-descr
index 8743ac2c6a1d..8ce1c2209afb 100644
--- a/textproc/metauml/pkg-descr
+++ b/textproc/metauml/pkg-descr
@@ -7,4 +7,4 @@ Here's what you can do with MetaUML (also see the FAQ):
     * Create independent PDF-s
     * Create jpeg-s, png-s etc.
 
-WWW:	http://metauml.sourceforge.net/
+WWW: http://metauml.sourceforge.net/
diff --git a/textproc/metauml/pkg-plist b/textproc/metauml/pkg-plist
index f21bf963975a..972d8103a8ca 100644
--- a/textproc/metauml/pkg-plist
+++ b/textproc/metauml/pkg-plist
@@ -32,132 +32,5 @@
 %%MPDIR%%/util_positioning.mp
 %%MPDIR%%/util_shade.mp
 @dirrm %%MPDIR%%
-%%PORTDOCS%%%%DOCSDIR%%/metauml_manual_0.2.5.pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/AbstractFactory.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/AbstractFactory.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/AbstractFactory.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Adapter1.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Adapter1.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Adapter1.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Adapter2.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Adapter2.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Adapter2.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Bridge1.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Bridge1.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Bridge1.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Bridge2.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Bridge2.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Bridge2.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Bridge3.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Bridge3.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Bridge3.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Builder1.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Builder1.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Builder1.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Builder2.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Builder2.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Builder2.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Chain1.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Chain1.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Chain1.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Chain2.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Chain2.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Chain2.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Command1.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Command1.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Command1.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Command2.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Command2.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Command2.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Command3.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Command3.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Command3.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Composite.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Composite.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Composite.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Decorator.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Decorator.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Decorator.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/FactoryMethod1.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/FactoryMethod1.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/FactoryMethod1.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/FactoryMethod2.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/FactoryMethod2.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/FactoryMethod2.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Flyweight1.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Flyweight1.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Flyweight1.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Flyweight2.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Flyweight2.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Flyweight2.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Iterator1.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Iterator1.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Iterator1.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Iterator2.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Iterator2.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Iterator2.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Iterator3.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Iterator3.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Iterator3.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Mediator1.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Mediator1.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Mediator1.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Mediator2.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Mediator2.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Mediator2.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Mediator3.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Mediator3.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Mediator3.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Memento.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Memento.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Memento.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Observer.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Observer.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Observer.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Prototype.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Prototype.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Prototype.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Proxy.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Proxy.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Proxy.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Singleton.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Singleton.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Singleton.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/State1.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/State1.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/State1.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/State2.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/State2.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/State2.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Strategy1.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Strategy1.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Strategy1.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Strategy2.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Strategy2.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Strategy2.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TemplateMethod1.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TemplateMethod1.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TemplateMethod1.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TemplateMethod2.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TemplateMethod2.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/TemplateMethod2.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Visitor1.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Visitor1.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Visitor1.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Visitor2.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Visitor2.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Visitor2.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Visitor3.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Visitor3.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Visitor3.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Visitor4.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Visitor4.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Visitor4.mp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lop
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lop.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lop.pdf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lop.tex
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-@exec %%MKTEXLSR%% %D/%%TEXMFDIR%%
 @unexec %%MKTEXLSR%% %D/%%TEXMFDIR%%
+@exec %%MKTEXLSR%% %D/%%TEXMFDIR%%