3 files changed, 60 insertions, 58 deletions

diff --git a/print/pmw/Makefile b/print/pmw/Makefile
index 4588ce0fef92..e63af0aef602 100644
--- a/print/pmw/Makefile
+++ b/print/pmw/Makefile
@@ -6,30 +6,29 @@
 #
 
 PORTNAME=	pmw
-PORTVERSION=	4.05
+PORTVERSION=	4.06
 CATEGORIES=	print audio
 MASTER_SITES=	http://www.quercite.com/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	High quality music typesetting program
 
-ALL_TARGET=	build
-GNU_CONFIGURE=	yes
-MAN1=		pmw.1
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-.if !defined(NOPORTDOCS)
-PORTDOCS=	ChangeLog spec.pdf
-.endif
+GNU_CONFIGURE=	yes
+ALL_TARGET=	build
+
+MAN1=		pmw.1
 
 post-patch:
-	@${CAT} ${MASTERDIR}/pkg-message | ${SED} 's|%%PREFIX%%|${PREFIX}|g ; s|%%LOCALBASE%%|${LOCALBASE}|g' > ${PKGMESSAGE}
+	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; \
+		s|%%LOCALBASE%%|${LOCALBASE}|g' ${MASTERDIR}/pkg-message > ${PKGMESSAGE}
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for i in ${PORTDOCS}
-	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${DOCSDIR}/
+	@${MKDIR} ${DOCSDIR}
+.for file in ChangeLog spec.pdf
+	${INSTALL_MAN} ${WRKSRC}/doc/${file} ${DOCSDIR}
 .endfor
 .endif
 	@${CAT} ${PKGMESSAGE}
diff --git a/print/pmw/distinfo b/print/pmw/distinfo
index f08040651fe5..537ecbe058bd 100644
--- a/print/pmw/distinfo
+++ b/print/pmw/distinfo
@@ -1,2 +1,2 @@
-MD5 (pmw-4.05.tar.gz) = 39887de89e856b88dd06d600f42d0251
-SIZE (pmw-4.05.tar.gz) = 1098749
+MD5 (pmw-4.06.tar.gz) = a7cddfacf17def145997eb22ba37afc7
+SIZE (pmw-4.06.tar.gz) = 1098917
diff --git a/print/pmw/pkg-plist b/print/pmw/pkg-plist
index bdce1a5518d3..6a3451e91fdc 100644
--- a/print/pmw/pkg-plist
+++ b/print/pmw/pkg-plist
@@ -1,46 +1,49 @@
 bin/pmw
-share/pmw/MIDIperc
-share/pmw/MIDIvoices
-share/pmw/PSheader
-share/pmw/fontmetrics/AvantGarde-Book.afm
-share/pmw/fontmetrics/AvantGarde-BookOblique.afm
-share/pmw/fontmetrics/AvantGarde-Demi.afm
-share/pmw/fontmetrics/AvantGarde-DemiOblique.afm
-share/pmw/fontmetrics/Bookman-Demi.afm
-share/pmw/fontmetrics/Bookman-DemiItalic.afm
-share/pmw/fontmetrics/Bookman-Light.afm
-share/pmw/fontmetrics/Bookman-LightItalic.afm
-share/pmw/fontmetrics/Courier-Bold.afm
-share/pmw/fontmetrics/Courier-BoldOblique.afm
-share/pmw/fontmetrics/Courier-Oblique.afm
-share/pmw/fontmetrics/Courier.afm
-share/pmw/fontmetrics/Helvetica-Bold.afm
-share/pmw/fontmetrics/Helvetica-BoldOblique.afm
-share/pmw/fontmetrics/Helvetica-Oblique.afm
-share/pmw/fontmetrics/Helvetica.afm
-share/pmw/fontmetrics/NewCenturySchlbk-Bold.afm
-share/pmw/fontmetrics/NewCenturySchlbk-BoldItalic.afm
-share/pmw/fontmetrics/NewCenturySchlbk-Italic.afm
-share/pmw/fontmetrics/NewCenturySchlbk-Roman.afm
-share/pmw/fontmetrics/PMW-Alpha.afm
-share/pmw/fontmetrics/PMW-Music.afm
-share/pmw/fontmetrics/Palatino-Bold.afm
-share/pmw/fontmetrics/Palatino-BoldItalic.afm
-share/pmw/fontmetrics/Palatino-Italic.afm
-share/pmw/fontmetrics/Palatino-Roman.afm
-share/pmw/fontmetrics/Symbol.afm
-share/pmw/fontmetrics/Times-Bold.afm
-share/pmw/fontmetrics/Times-BoldItalic.afm
-share/pmw/fontmetrics/Times-Italic.afm
-share/pmw/fontmetrics/Times-Roman.afm
-share/pmw/fontmetrics/Utopia-Bold.afm
-share/pmw/fontmetrics/Utopia-BoldItalic.afm
-share/pmw/fontmetrics/Utopia-Italic.afm
-share/pmw/fontmetrics/Utopia-Regular.afm
-share/pmw/fontmetrics/ZapfChancery-MediumItalic.afm
-share/pmw/fontmetrics/ZapfDingbats.afm
-share/pmw/psfonts/PMW-Music.pfa
-share/pmw/psfonts/PMW-Alpha
-@dirrm share/pmw/fontmetrics
-@dirrm share/pmw/psfonts
-@dirrm share/pmw
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/spec.pdf
+%%DATADIR%%/MIDIperc
+%%DATADIR%%/MIDIvoices
+%%DATADIR%%/PSheader
+%%DATADIR%%/fontmetrics/AvantGarde-Book.afm
+%%DATADIR%%/fontmetrics/AvantGarde-BookOblique.afm
+%%DATADIR%%/fontmetrics/AvantGarde-Demi.afm
+%%DATADIR%%/fontmetrics/AvantGarde-DemiOblique.afm
+%%DATADIR%%/fontmetrics/Bookman-Demi.afm
+%%DATADIR%%/fontmetrics/Bookman-DemiItalic.afm
+%%DATADIR%%/fontmetrics/Bookman-Light.afm
+%%DATADIR%%/fontmetrics/Bookman-LightItalic.afm
+%%DATADIR%%/fontmetrics/Courier-Bold.afm
+%%DATADIR%%/fontmetrics/Courier-BoldOblique.afm
+%%DATADIR%%/fontmetrics/Courier-Oblique.afm
+%%DATADIR%%/fontmetrics/Courier.afm
+%%DATADIR%%/fontmetrics/Helvetica-Bold.afm
+%%DATADIR%%/fontmetrics/Helvetica-BoldOblique.afm
+%%DATADIR%%/fontmetrics/Helvetica-Oblique.afm
+%%DATADIR%%/fontmetrics/Helvetica.afm
+%%DATADIR%%/fontmetrics/NewCenturySchlbk-Bold.afm
+%%DATADIR%%/fontmetrics/NewCenturySchlbk-BoldItalic.afm
+%%DATADIR%%/fontmetrics/NewCenturySchlbk-Italic.afm
+%%DATADIR%%/fontmetrics/NewCenturySchlbk-Roman.afm
+%%DATADIR%%/fontmetrics/PMW-Alpha.afm
+%%DATADIR%%/fontmetrics/PMW-Music.afm
+%%DATADIR%%/fontmetrics/Palatino-Bold.afm
+%%DATADIR%%/fontmetrics/Palatino-BoldItalic.afm
+%%DATADIR%%/fontmetrics/Palatino-Italic.afm
+%%DATADIR%%/fontmetrics/Palatino-Roman.afm
+%%DATADIR%%/fontmetrics/Symbol.afm
+%%DATADIR%%/fontmetrics/Times-Bold.afm
+%%DATADIR%%/fontmetrics/Times-BoldItalic.afm
+%%DATADIR%%/fontmetrics/Times-Italic.afm
+%%DATADIR%%/fontmetrics/Times-Roman.afm
+%%DATADIR%%/fontmetrics/Utopia-Bold.afm
+%%DATADIR%%/fontmetrics/Utopia-BoldItalic.afm
+%%DATADIR%%/fontmetrics/Utopia-Italic.afm
+%%DATADIR%%/fontmetrics/Utopia-Regular.afm
+%%DATADIR%%/fontmetrics/ZapfChancery-MediumItalic.afm
+%%DATADIR%%/fontmetrics/ZapfDingbats.afm
+%%DATADIR%%/psfonts/PMW-Music.pfa
+%%DATADIR%%/psfonts/PMW-Alpha
+@dirrm %%DATADIR%%/psfonts
+@dirrm %%DATADIR%%/fontmetrics
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%