From d554951e03571e529f5b1b4cdf8834375c256986 Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Tue, 12 Apr 2005 16:26:21 +0000
Subject: Support WITHOUT_X11 knob and bump PORTREVISION.

---
 print/cmpsfont/Makefile  | 20 +++++++++++++++++---
 print/cmpsfont/pkg-plist |  6 +++---
 2 files changed, 20 insertions(+), 6 deletions(-)

(limited to 'print/cmpsfont')

diff --git a/print/cmpsfont/Makefile b/print/cmpsfont/Makefile
index 93c7674f7d23..4e0893fa8d2f 100644
--- a/print/cmpsfont/Makefile
+++ b/print/cmpsfont/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cmpsfont
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	print x11-fonts
 MASTER_SITES=	ftp://ftp.ams.org/pub/tex/psfonts/cm/
 DISTNAME=	cmps
@@ -16,16 +16,28 @@ EXTRACT_SUFX=	-unix.tar.gz
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Computer Modern PostScript Fonts (Adobe Type 1 format)
 
+.if !defined(WITHOUT_X11)
 BUILD_DEPENDS=	${LOCALBASE}/bin/type1inst:${PORTSDIR}/x11-fonts/p5-type1inst
-
-SUB_FILES=	pkg-message
+.endif
 
 WRKSRC=		${WRKDIR}/cmpsfont
+PLIST_SUB=	PLIST_X11=${PLIST_X11}
+
+.if !defined(WITHOUT_X11)
+PLIST_X11=	""
+SUB_FILES=	pkg-message
+.else
+PLIST_X11=	"@comment "
+.endif
 
 FONTSDIR=	share/fonts/${PORTNAME}
 
 do-build:
+.if !defined(WITHOUT_X11)
 	(cd ${WRKSRC}/pfb; ${LOCALBASE}/bin/type1inst -nolog)
+.else
+	@${DO_NADA}
+.endif
 
 do-install:
 	${MKDIR} ${PREFIX}/${FONTSDIR}
@@ -35,7 +47,9 @@ do-install:
 		${WRKSRC}/README ${WRKSRC}/cmsample.tex \
 		${PREFIX}/${FONTSDIR}/
 
+.if !defined(WITHOUT_X11)
 post-install:
 	@${CAT} ${PKGMESSAGE}
+.endif
 
 .include <bsd.port.mk>
diff --git a/print/cmpsfont/pkg-plist b/print/cmpsfont/pkg-plist
index f7edca37ff86..32e92fe1eff6 100644
--- a/print/cmpsfont/pkg-plist
+++ b/print/cmpsfont/pkg-plist
@@ -189,8 +189,8 @@ share/fonts/cmpsfont/logo8.pfb
 share/fonts/cmpsfont/logo9.pfb
 share/fonts/cmpsfont/logobf10.pfb
 share/fonts/cmpsfont/logosl10.pfb
-share/fonts/cmpsfont/Fontmap
-share/fonts/cmpsfont/fonts.dir
-share/fonts/cmpsfont/fonts.scale
+%%PLIST_X11%%share/fonts/cmpsfont/Fontmap
+%%PLIST_X11%%share/fonts/cmpsfont/fonts.dir
+%%PLIST_X11%%share/fonts/cmpsfont/fonts.scale
 @dirrm share/fonts/cmpsfont
 @unexec /bin/rmdir %D/share/fonts 2> /dev/null || /usr/bin/true
-- 
cgit v1.2.3