- Makefile cosmetic changes.

- Move pkg-message to FILESDIR.
- Bump PORTREVISION.

PR:		ports/121753
Submitted by:	myself
Approved by:	araujo (mentor), Konstantinos Konstantinidis <kkonstan@duth.gr> (maintainer)

x11-fonts/webfonts/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	webfonts
 PORTVERSION=	0.30
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_NETBSD:S/%SUBDIR%/ms-ttf/}:group1 \
 		${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/corefonts/}:group1 \
@@ -22,11 +22,6 @@ DISTFILES=	andale32.exe:group1  arial32.exe:group1 arialb32.exe:group1 \
 		comic32.exe:group1 courie32.exe:group1 georgi32.exe:group1 \
 		impact32.exe:group1  times32.exe:group1 trebuc32.exe:group1 \
 		verdan32.exe:group1 webdin32.exe:group1
-
-.if defined(WITH_MSWINDOWS_LICENSE)
-DISTFILES+=	ielpkth.cab:group2
-.endif
-
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	kkonstan@duth.gr
@@ -37,7 +32,7 @@ BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
 NO_BUILD=	yes
-RESTRICTED=	"Restrictive license - cannot sell for profit or distribute in modified form"
+RESTRICTED=	Restrictive license - cannot sell for profit or distribute in modified form
 
 EXTRACT_CMD=		${LOCALBASE}/bin/cabextract
 EXTRACT_BEFORE_ARGS=	-qLF '*.ttf' -d ${WRKSRC}
@@ -54,13 +49,17 @@ PLIST_SUB=	FONTNAME="${FONTNAME}" \
 		FONTSDIR="${FONTSDIR:S|${PREFIX}/||}" \
 		TTFONTSDIR="${TTFONTSDIR:S|${X11BASE}/||}"
 
-MSG_FILE=	${PKGDIR}/pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_LIST=	FONTSDIR="${FONTSDIR}" DOCSDIR="${DOCSDIR}"
+SUB_FILES=	pkg-message
 
 FONTS_FILE=	${WRKDIR}/fonts.dir
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_MSWINDOWS_LICENSE)
+DISTFILES+=	ielpkth.cab:group2
+.endif
+
 .SILENT:
 
 #
@@ -73,9 +72,6 @@ post-extract:
 # Post-patch
 #
 post-patch:
-	${SED}	-e 's|%%FONTSDIR%%|${FONTSDIR}|g' \
-		-e 's|%%DOCSDIR%%|${DOCSDIR}|g' \
-		${MSG_FILE} > ${PKGMESSAGE}
 .if defined(WITH_MSWINDOWS_LICENSE)
 	${SORT} ${FILESDIR}/fonts.dir ${FILESDIR}/tahoma.dir > ${FONTS_FILE}
 .else
@@ -98,11 +94,14 @@ PLIST_SUB+=	EXTRAFONTS="@comment "
 # Install
 #
 do-install:
-	${MKDIR} ${FONTSDIR} ${DOCSDIR}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/licen.txt ${DOCSDIR}/LICENSE
+.endif
+	${MKDIR} ${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTSDIR}
 	${INSTALL_DATA} ${FONTS_FILE} ${FONTSDIR}
 	${INSTALL_DATA} ${FONTS_FILE} ${FONTSDIR}/fonts.scale
-	${INSTALL_DATA} ${WRKSRC}/licen.txt ${DOCSDIR}/LICENSE
 
 #
 # Post-install