svn commit: r332332 - in head/x11-fonts/artwiz-fonts: . files

[Renato Botelho]

Author: garga
Date: Thu Oct 31 23:56:00 2013
New Revision: 332332
URL: http://svnweb.freebsd.org/changeset/ports/332332

Log:
  . Support STAGE
  . Simplify Makefile
  . Move pkg-message to files/pkg-message.in and use SUB_FILES

Added:
  head/x11-fonts/artwiz-fonts/files/pkg-message.in   (contents, props changed)
     - copied, changed from r332116, head/x11-fonts/artwiz-fonts/pkg-message
Deleted:
  head/x11-fonts/artwiz-fonts/pkg-message
Modified:
  head/x11-fonts/artwiz-fonts/Makefile   (contents, props changed)

Modified: head/x11-fonts/artwiz-fonts/Makefile
==============================================================================
--- head/x11-fonts/artwiz-fonts/Makefile	Thu Oct 31 23:55:01 2013	(r332331)
+++ head/x11-fonts/artwiz-fonts/Makefile	Thu Oct 31 23:56:00 2013	(r332332)
@@ -20,18 +20,14 @@ WRKSRC=		${WRKDIR}/fluxbox-${PORTNAME}
 FONTS=		anorexia aqui cure cursor drift edges gelly glisp-bold \
 		glisp lime mints-mild mints-strong nu snap
 FONTDIR=	${LOCALBASE}/lib/X11/fonts/${PORTNAME}/
-FILES=		${FONTS:S,$,.pcf.gz,} ${FILESDIR}/fonts.dir
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+SUB_FILES=	pkg-message
 
 do-install:
-	@${MKDIR} ${FONTDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${FILES} ${FONTDIR}
+	@${MKDIR} ${STAGEDIR}${FONTDIR}
+.for f in ${FONTS}
+	${INSTALL_DATA} ${WRKSRC}/${f}.pcf.gz ${STAGEDIR}${FONTDIR}
+.endfor
+	${INSTALL_DATA} ${FILESDIR}/fonts.dir ${STAGEDIR}${FONTDIR}
 
-post-install:
-	@${SED} 's|$${LOCALBASE}|${LOCALBASE}|g' \
-		${PKGDIR}/pkg-message >${PKGMESSAGE}
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Copied and modified: head/x11-fonts/artwiz-fonts/files/pkg-message.in (from r332116, head/x11-fonts/artwiz-fonts/pkg-message)
==============================================================================
--- head/x11-fonts/artwiz-fonts/pkg-message	Wed Oct 30 14:24:19 2013	(r332116, copy source)
+++ head/x11-fonts/artwiz-fonts/files/pkg-message.in	Thu Oct 31 23:56:00 2013	(r332332)
@@ -6,6 +6,6 @@
 
  Add the following line to the "Files" section and restart XFree86.
 
- FontPath "${LOCALBASE}/lib/X11/fonts/artwiz-fonts"
+ FontPath "%%LOCALBASE%%/lib/X11/fonts/artwiz-fonts"
 
 ------------------------------------------------------------------