From 09d9cf048cb2caa5d4a11069acc5aa19afefa314 Mon Sep 17 00:00:00 2001
From: tg <tg@FreeBSD.org>
Date: Mon, 16 Sep 2002 12:05:28 +0000
Subject: Add WITHOUT_X11 knob.

PR:		42608
Submitted by:	Joe Kelsey <joek@mail.flyingcroc.net>
---
 lang/icon/Makefile  | 19 ++++++++++++++++---
 lang/icon/pkg-plist | 20 ++++++++++----------
 2 files changed, 26 insertions(+), 13 deletions(-)

(limited to 'lang/icon')

diff --git a/lang/icon/Makefile b/lang/icon/Makefile
index 645b57fa28a9..029587f7f0a1 100644
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@@ -16,10 +16,18 @@ MAINTAINER=	ports@FreeBSD.org
 
 ONLY_FOR_ARCHS=	alpha i386
 
+.ifdef WITHOUT_X11
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
+CONFIG_CMD=	Configure
+PLIST_SUB=	WITHOUT_X11="@comment "
+.else
 USE_XLIB=	yes
-USE_REINPLACE=	yes
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -I${X11BASE}/include" \
 		XLIBS="-L${X11BASE}/lib -lX11"
+CONFIG_CMD=	X-Configure
+PLIST_SUB=	WITHOUT_X11=
+.endif
+USE_REINPLACE=	yes
 ALL_TARGET=	All
 
 MAN1=		icont.1
@@ -35,7 +43,7 @@ pre-patch:
 
 do-configure:
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
-		${MAKEFILE} ${MAKE_ARGS} X-Configure name=${ARCH_NAME})
+		${MAKEFILE} ${MAKE_ARGS} ${CONFIG_CMD} name=${ARCH_NAME})
 
 do-install:
 	${INSTALL_MAN} ${WRKSRC}/man/man1/icont.1 ${PREFIX}/man/man1
@@ -43,12 +51,17 @@ do-install:
 .for file in icont iconx patchstr
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${file} ${ICONDIR}/bin
 .endfor
+.ifndef WITHOUT_X11
 .for file in colrbook colrpick fontpick ipatch palette vib wevents xgamma
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${file} ${ICONDIR}/bin
 .endfor
-.for file in icont iconx vib
+.endif
+.for file in icont iconx
 	@${LN} -sf ${ICONDIR}/bin/${file} ${PREFIX}/bin/${file}
 .endfor
+.ifndef WITHOUT_X11
+	@${LN} -sf ${ICONDIR}/bin/vib ${PREFIX}/bin/vib
+.endif
 	@${MKDIR} ${ICONDIR}/lib
 	${INSTALL_DATA} ${WRKSRC}/lib/*.* ${ICONDIR}/lib
 .if !defined(NOPORTDOCS)
diff --git a/lang/icon/pkg-plist b/lang/icon/pkg-plist
index 814d2785cfbb..9caf0f2f2919 100644
--- a/lang/icon/pkg-plist
+++ b/lang/icon/pkg-plist
@@ -1,20 +1,20 @@
-lib/icon/bin/colrbook
-lib/icon/bin/colrpick
-lib/icon/bin/fontpick
+%%WITHOUT_X11%%lib/icon/bin/colrbook
+%%WITHOUT_X11%%lib/icon/bin/colrpick
+%%WITHOUT_X11%%lib/icon/bin/fontpick
 lib/icon/bin/icont
 @exec ln -sf %B/%f %D/bin/%f
 @unexec rm -f %D/bin/%f
 lib/icon/bin/iconx
 @exec ln -sf %B/%f %D/bin/%f
 @unexec rm -f %D/bin/%f
-lib/icon/bin/ipatch
-lib/icon/bin/palette
+%%WITHOUT_X11%%lib/icon/bin/ipatch
+%%WITHOUT_X11%%lib/icon/bin/palette
 lib/icon/bin/patchstr
-lib/icon/bin/vib
-@exec ln -sf %B/%f %D/bin/%f
-@unexec rm -f %D/bin/%f
-lib/icon/bin/wevents
-lib/icon/bin/xgamma
+%%WITHOUT_X11%%lib/icon/bin/vib
+%%WITHOUT_X11%%@exec ln -sf %B/%f %D/bin/%f
+%%WITHOUT_X11%%@unexec rm -f %D/bin/%f
+%%WITHOUT_X11%%lib/icon/bin/wevents
+%%WITHOUT_X11%%lib/icon/bin/xgamma
 lib/icon/lib/abkform.u1
 lib/icon/lib/abkform.u2
 lib/icon/lib/adjuncts.u1
-- 
cgit