Bug 191568 - [MAINTAINER] stagify x11-fonts/isabella
Summary: [MAINTAINER] stagify x11-fonts/isabella
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Some People
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-07-02 19:14 UTC by lgfbsd
Modified: 2014-07-02 23:10 UTC (History)
1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description lgfbsd 2014-07-02 19:14:02 UTC 
Index: /usr/ports/x11-fonts/isabella/Makefile
===================================================================
--- /usr/ports/x11-fonts/isabella/Makefile      (revision 360172)
+++ /usr/ports/x11-fonts/isabella/Makefile      (working copy)
@@ -15,6 +15,7 @@
 RUN_DEPENDS:=  ${BUILD_DEPENDS}
 
 NO_BUILD=      yes
+USES=  uidfix
 WRKSRC=                ${WRKDIR}/Isabella
 FONTDIR=       ${PREFIX}/lib/X11/fonts/stracke
 PLIST_SUB=     FONTDIR="${FONTDIR:S|${PREFIX}/||}" \
@@ -24,14 +25,12 @@
 MKFONTSCL_CMD= ${LOCALBASE}/bin/mkfontscale
 MKFONTDIR_CMD= ${LOCALBASE}/bin/mkfontdir
 
-NO_STAGE=      yes
+
 do-install:
-       ${MKDIR} ${FONTDIR}
-       ${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTDIR}
-       cd ${FONTDIR} && ${MKFONTSCL_CMD} && ${MKFONTDIR_CMD}
-.if !defined(NOPORTDOCS)
-       ${MKDIR} ${DOCSDIR}
-       ${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCSDIR}
-.endif
+       @${MKDIR} ${STAGEDIR}${FONTDIR}
+       ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTDIR}
+       cd ${STAGEDIR}${FONTDIR} && ${MKFONTSCL_CMD} && ${MKFONTDIR_CMD}
+       ${MKDIR} ${STAGEDIR}${DOCSDIR}
+       ${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: /usr/ports/x11-fonts/isabella/pkg-plist
===================================================================
--- /usr/ports/x11-fonts/isabella/pkg-plist     (revision 360172)
+++ /usr/ports/x11-fonts/isabella/pkg-plist     (working copy)
@@ -1,4 +1,6 @@
 %%FONTDIR%%/Isabella.ttf
+%%FONTDIR%%/fonts.dir
+%%FONTDIR%%/fonts.scale
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @unexec %%MKFONTSCL_CMD%% %D/%%FONTDIR%% && %%MKFONTDIR_CMD%% %D/%%FONTDIR%%
Comment 1 Baptiste Daroussin freebsd_committer freebsd_triage 2014-07-02 23:10:20 UTC 
Committed with lots of simplification to the port
Comment 2 commit-hook freebsd_committer freebsd_triage 2014-07-02 23:10:51 UTC 
A commit references this bug:

Author: bapt
Date: Wed Jul  2 23:09:59 UTC 2014
New revision: 360309
URL: http://svnweb.freebsd.org/changeset/ports/360309

Log:
  Stagify
  While I'm here:
  - Reassign maintainership
  - Use @fontsdir instead of custom code
  - Do not run mkfontdir/mkfontscale while building the package
  - Remove mkfontdir/mkfontscale from build depends

  PR:		191568
  Submitted by:	lgfbsd@be-well.ilk.org

Changes:
  head/x11-fonts/isabella/Makefile
  head/x11-fonts/isabella/pkg-plist