aboutsummaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
Diffstat (limited to 'print')
-rw-r--r--print/cm-super/Makefile58
-rw-r--r--print/cm-super/pkg-plist6
2 files changed, 27 insertions, 37 deletions
diff --git a/print/cm-super/Makefile b/print/cm-super/Makefile
index 858ee72315cc..6be2f8944e43 100644
--- a/print/cm-super/Makefile
+++ b/print/cm-super/Makefile
@@ -14,21 +14,15 @@ MASTER_SITE_SUBDIR= hrs
MAINTAINER= hrs@FreeBSD.org
COMMENT= Computer Modern Font Families in Type 1 Fonts
-.if !defined(WITHOUT_X11)
-BUILD_DEPENDS= ${LOCALBASE}/bin/type1inst:${PORTSDIR}/x11-fonts/p5-type1inst
-.endif
+OPTIONS_DEFINE= X11
+OPTIONS_SUB= yes
+X11_BUILD_DEPENDS= ${LOCALBASE}/bin/type1inst:${PORTSDIR}/x11-fonts/p5-type1inst
USES= zip
USE_TEX= base texmf tetex
WRKSRC= ${WRKDIR}/${PORTNAME}
-.if !defined(WITHOUT_X11)
-PLIST_X11= ""
-.else
-PLIST_X11= "@comment "
-.endif
-PLIST_SUB= PLIST_X11=${PLIST_X11} \
- UPDMAP_SYS="${UPDMAP_SYS}" \
+PLIST_SUB= UPDMAP_SYS="${UPDMAP_SYS}" \
MAPFILES="${MAPFILES}" \
MKTEXLSR="${MKTEXLSR}" \
TEXMFDIR=${TEXMFDIR} \
@@ -51,9 +45,10 @@ MAPFILES= cm-super-t1.map \
cm-super-ts1.map \
cm-super-x2.map
-NO_STAGE= yes
+.include <bsd.port.options.mk>
+
do-build:
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
${TOUCH} ${WRKSRC}/pfb/fonts.dir
(cd ${WRKSRC}/pfb; ${LOCALBASE}/bin/type1inst -nolog -quiet)
.else
@@ -64,37 +59,32 @@ post-extract:
${GZIP_CMD} -d ${WRKSRC}/afm/*.gz
do-install:
- ${MKDIR} ${PREFIX}/${FONTSDIR}/afm
- ${INSTALL_DATA} ${WRKSRC}/afm/* ${PREFIX}/${FONTSDIR}/afm
+ ${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}/afm
+ ${MKDIR} ${STAGEDIR}${PREFIX}/${TEXMFDIR}/fonts/afm/public
+ ${INSTALL_DATA} ${WRKSRC}/afm/* ${STAGEDIR}${PREFIX}/${FONTSDIR}/afm
${LN} -s -f ${PREFIX}/${FONTSDIR}/afm \
- ${PREFIX}/${AFMDIR}
- ${MKDIR} ${PREFIX}/${FONTSDIR}/type1
- ${INSTALL_DATA} ${WRKSRC}/pfb/* ${PREFIX}/${FONTSDIR}/type1
+ ${STAGEDIR}${PREFIX}/${AFMDIR}
+ ${MKDIR} ${STAGEDIR}${PREFIX}/${FONTSDIR}/type1
+ ${INSTALL_DATA} ${WRKSRC}/pfb/* ${STAGEDIR}${PREFIX}/${FONTSDIR}/type1
+ ${MKDIR} ${STAGEDIR}${PREFIX}/${TEXMFDIR}/fonts/type1/public
${LN} -s -f ${PREFIX}/${FONTSDIR}/type1 \
- ${PREFIX}/${TYPE1DIR}
- ${MKDIR} ${PREFIX}/${DVIPSMAPDIR}
+ ${STAGEDIR}${PREFIX}/${TYPE1DIR}
+ ${MKDIR} ${STAGEDIR}${PREFIX}/${DVIPSMAPDIR}
${INSTALL_DATA} \
${WRKSRC}/dvips/*.map \
- ${PREFIX}/${DVIPSMAPDIR}
- ${MKDIR} ${PREFIX}/${DVIPSENCDIR}
+ ${STAGEDIR}${PREFIX}/${DVIPSMAPDIR}
+ ${MKDIR} ${STAGEDIR}${PREFIX}/${DVIPSENCDIR}
${INSTALL_DATA} \
${WRKSRC}/dvips/*.enc \
- ${PREFIX}/${DVIPSENCDIR}
- ${MKDIR} ${PREFIX}/${DVIPDFMMAPDIR}
+ ${STAGEDIR}${PREFIX}/${DVIPSENCDIR}
+ ${MKDIR} ${STAGEDIR}${PREFIX}/${DVIPDFMMAPDIR}
${INSTALL_DATA} \
${WRKSRC}/dvipdfm/*.map \
- ${PREFIX}/${DVIPDFMMAPDIR}
- ${MKDIR} ${PREFIX}/${MACRODIR}
+ ${STAGEDIR}${PREFIX}/${DVIPDFMMAPDIR}
+ ${MKDIR} ${STAGEDIR}${PREFIX}/${MACRODIR}
${INSTALL_DATA} \
${WRKSRC}/type1ec.sty \
- ${PREFIX}/${MACRODIR}
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/${FONTSDIR}/
- ${MKTEXLSR} ${PREFIX}/${TEXMFDIR}
-.for F in ${MAPFILES}
- @${ECHO_CMD} "Adding $F..."
- @${UPDMAP_SYS} --nohash --nomkmap --enable Map=${F} || true
-.endfor
- @${ECHO_CMD} "Regenerating mapfiles..."
- @${UPDMAP_SYS}
+ ${STAGEDIR}${PREFIX}/${MACRODIR}
+ ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${PREFIX}/${FONTSDIR}/
.include <bsd.port.mk>
diff --git a/print/cm-super/pkg-plist b/print/cm-super/pkg-plist
index 5e238ab8ffc0..b4a411828c87 100644
--- a/print/cm-super/pkg-plist
+++ b/print/cm-super/pkg-plist
@@ -409,9 +409,9 @@ share/fonts/cm-super/afm/sfxc2488.afm
share/fonts/cm-super/afm/sfxc2986.afm
share/fonts/cm-super/afm/sfxc3583.afm
@dirrm share/fonts/cm-super/afm
-%%PLIST_X11%%share/fonts/cm-super/type1/Fontmap
-%%PLIST_X11%%share/fonts/cm-super/type1/fonts.dir
-%%PLIST_X11%%share/fonts/cm-super/type1/fonts.scale
+%%X11%%share/fonts/cm-super/type1/Fontmap
+%%X11%%share/fonts/cm-super/type1/fonts.dir
+%%X11%%share/fonts/cm-super/type1/fonts.scale
share/fonts/cm-super/type1/isflb8.pfb
share/fonts/cm-super/type1/isfli8.pfb
share/fonts/cm-super/type1/isflo8.pfb