Displays verbose message when install, and also adds

the WITHOUT_X option.

Tested under:	current+XFree86-4

2 files changed, 27 insertions, 13 deletions

diff --git a/chinese/wangttf/Makefile b/chinese/wangttf/Makefile
index 45a9351253dc..fbc00e1e7d61 100644
--- a/chinese/wangttf/Makefile
+++ b/chinese/wangttf/Makefile
@@ -18,10 +18,6 @@ MAINTAINER=	keith@FreeBSD.org
 
 RUN_DEPENDS=	ttfm.sh:${PORTSDIR}/chinese/ttfm
 
-WANT_CJK?=	NO
-WANT_GS6?=	NO
-WANT_X?=	YES
-
 DIST_SUBDIR=	zh-wangttf
 USE_BZIP2=	yes
 USE_XLIB=	yes
@@ -30,20 +26,40 @@ SHAREMODE=	644
 FONTDIR=	${PREFIX}/share/fonts/TrueType
 XFONTDIR=	${X11BASE}/lib/X11/fonts/TrueType
 INSTALL_ENV=	PKG_PREFIX=${PREFIX} XFREE86_VERSION=${XFREE86_VERSION} \
-		WANT_CJK=${WANT_CJK} WANT_GS6=${WANT_GS6} WANT_X=${WANT_X}
+		DEFAULT=${DEFAULT} WANT_CJK=${WANT_CJK} WANT_GS6=${WANT_GS6} \
+		WITHOUT_X=${WITHOUT_X}
 
 .include <bsd.port.pre.mk>
 
-.if ${WANT_CJK} != "NO"
+.if defined(WANT_CJK)
 RUN_DEPENDS+=	bg5latex:${PORTSDIR}/chinese/CJK
 .endif
-.if ${WANT_GS6} != "NO"
+.if defined(WANT_GS6)
 RUN_DEPENDS+=	${LOCALBASE}/share/ghostscript/CJK/CMap/B5pc-H:${PORTSDIR}/chinese/ghostscript6
 .endif
-.if ${XFREE86_VERSION} == 3 && ${WANT_X} != "NO"
+.if ${XFREE86_VERSION} == 3 && !defined(WITHOUT_X)
 RUN_DEPENDS+=	mkfontdir.pl:${PORTSDIR}/x11-servers/XttXF86srv-common
 .endif
 
+pre-fetch:
+.if defined(WANT_CJK)
+	@${ECHO} "CJK support will be added."
+.endif
+.if defined(WANT_GS6)
+	@${ECHO} "Ghostscript6 support will be added."
+.endif
+.if defined(WITHOUT_X)
+	@${ECHO} "X Window support will NOT be added."
+.endif
+.if !defined(WANT_CJK) && !defined(WANT_GS6) && !defined(WITHOUT_X)
+	@${ECHO} --
+	@${ECHO} "Type \"make WANT_CJK=yes\" if you want CJK support."
+	@${ECHO} "Type \"make WANT_GS6=yes\" if you want Ghostscript6 support."
+	@${ECHO} "Type \"make WITHOUT_X=yes\" if you DONT want X Window support."
+	@${ECHO} "You can use them in combinations."
+	@${ECHO} --
+.endif
+
 do-install:
 	@${MKDIR} ${FONTDIR}
 .for i in ${DISTFILES}
diff --git a/chinese/wangttf/pkg-install b/chinese/wangttf/pkg-install
index 064dc1f454e3..5bbd84f0388c 100644
--- a/chinese/wangttf/pkg-install
+++ b/chinese/wangttf/pkg-install
@@ -13,8 +13,6 @@ FONTDIR=${PREFIX}/share/fonts/TrueType
 FONTS="wcl-01.ttf wcl-02.ttf wcl-03.ttf wcl-04.ttf wcl-05.ttf \
        wcl-06.ttf wcl-07.ttf wcl-08.ttf wcl-09.ttf wcl-10.ttf"
 
-[ "X$WANT_X" = "X" ] && WANT_X=YES
-
 if [ ! -x $TTFM ]; then
     echo "$TTFM not found!"
     exit 1
@@ -22,11 +20,11 @@ fi
 
 rm -f $FONTDIR/$PKGNAME
 
-if [ "$WANT_CJK" = "YES" -o "$WANT_CJK" = "yes" ]; then
+if [ "X$WANT_CJK" != "X" ]; then
     # There's no CJK module now.
 fi
 
-if [ "$WANT_GS6" = "YES" -o "$WANT_GS6" = "yes" ]; then
+if [ "X$WANT_GS6" != "X" ]; then
     for f in $FONTS; do
         $TTFM --add ghostscript6 $FONTDIR/$f
     done
@@ -39,7 +37,7 @@ if [ "$WANT_GS6" = "YES" -o "$WANT_GS6" = "yes" ]; then
     echo "ghostscript6" >> $FONTDIR/$PKGNAME
 fi
 
-if [ "$WANT_X" = "YES" -o "$WANT_X" = "yes" ]; then
+if [ "X$WITHOUT_X" = "X" ]; then
     for f in $FONTS; do
         $TTFM --add xttfm $FONTDIR/$f
     done