svn commit: r359563 - head/x11-fonts/junicode

[Martin Wilke]

Author: miwi
Date: Fri Jun 27 16:08:58 2014
New Revision: 359563
URL: http://svnweb.freebsd.org/changeset/ports/359563
QAT: https://qat.redports.org/buildarchive/r359563/

Log:
  - Stage support
  
  PR:		190782

Modified:
  head/x11-fonts/junicode/Makefile
  head/x11-fonts/junicode/pkg-plist

Modified: head/x11-fonts/junicode/Makefile
==============================================================================
--- head/x11-fonts/junicode/Makefile	Fri Jun 27 16:08:43 2014	(r359562)
+++ head/x11-fonts/junicode/Makefile	Fri Jun 27 16:08:58 2014	(r359563)
@@ -3,6 +3,7 @@
 
 PORTNAME=	junicode
 PORTVERSION=	0.7.6
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:S|.|-|g} \
 		http://anthesphoria.net/FreeBSD/ports/distfiles/
@@ -14,26 +15,20 @@ COMMENT=	Unicode/MUFI OpenType font for 
 BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
+OPTIONS_DEFINE=	DOCS
+
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 USES=		zip
 
 PLIST_SUB=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
 
-FONTSDIR?=	${PREFIX}/lib/X11/fonts/${PORTNAME}
+FONTSDIR?=	lib/X11/fonts/${PORTNAME}
 
-NO_STAGE=	yes
 do-install:
-	@${MKDIR} ${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts/*.ttf ${FONTSDIR}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
-.endif
-
-post-install:
-	@${ECHO_MSG} "===> Running fc-cache"
-	-${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR}
-	@${ECHO_MSG}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/fonts/*.ttf ${STAGEDIR}${PREFIX}/${FONTSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/x11-fonts/junicode/pkg-plist
==============================================================================
--- head/x11-fonts/junicode/pkg-plist	Fri Jun 27 16:08:43 2014	(r359562)
+++ head/x11-fonts/junicode/pkg-plist	Fri Jun 27 16:08:58 2014	(r359563)
@@ -9,6 +9,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/homer_sample.pdf
 %%PORTDOCS%%%%DOCSDIR%%/homer_sample.tex
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
- at exec %%LOCALBASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true
 @unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
 @dirrm %%FONTSDIR%%
+ at exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% 2>/dev/null || /usr/bin/true