ports/70684: Enable OPTIONS feature of ports/chinese/moettf

[Ying-Chieh Chen]

>Number:         70684
>Category:       ports
>Synopsis:       Enable OPTIONS feature of ports/chinese/moettf
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 20 05:00:32 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Ying-Chieh Chen
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
NCTU CSIE
>Environment:
System: FreeBSD alumni 4.10-STABLE FreeBSD 4.10-STABLE #25: Fri Jul 2 07:46:15 CST 2004 wcpan at ccduty:/bsdhome/bsd4/obj/bsdhome/bsd4/src/sys/CSIEBSD i386


>Description:

	Enable OPTIONS feature of ports/chinese/moettf

	Please commit it, thanks!

>How-To-Repeat:

	cd /usr/ports/chinese/moettf
	Apply the following patch
	make install

>Fix:

--- moettf.patch begins here ---
diff -ruN /usr/ports/chinese/moettf/Makefile moettf/Makefile
--- /usr/ports/chinese/moettf/Makefile	Sat Aug 14 22:05:00 2004
+++ moettf/Makefile	Fri Aug 20 12:42:46 2004
@@ -32,39 +32,35 @@
 FONTDIR=	${PREFIX}/share/fonts/TrueType
 XFONTDIR=	${X11BASE}/lib/X11/fonts/TrueType
 INSTALL_ENV=	PKG_PREFIX=${PREFIX} \
-		DEFAULT=${DEFAULT} WANT_CJK=${WANT_CJK} WANT_GS=${WANT_GS} \
-		WITHOUT_X=${WITHOUT_X}
+		DEFAULT=${WITH_DEFAULT} WANT_CJK=${WITH_CJK} \
+		WANT_GS=${WITH_GS} WITHOUT_X=${WITHOUT_X}
+
+OPTIONS=	CJK "CJK support" off \
+		GS "Ghostscript support" off \
+		X "X Window support" on \
+		DEFAULT "set MOETTF the default font" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WANT_CJK)
+.if defined(WITH_CJK)
 RUN_DEPENDS+=	bg5latex:${PORTSDIR}/chinese/CJK
 .endif
-.if defined(WANT_GS)
+.if defined(WITH_GS)
 RUN_DEPENDS+=	${LOCALBASE}/share/ghostscript/Resource/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps
 .endif
 
 pre-fetch:
-.if defined(WANT_CJK)
+.if defined(WITH_CJK)
 	@${ECHO} "CJK support will be added."
 .endif
-.if defined(WANT_GS)
+.if defined(WITH_GS)
 	@${ECHO} "Ghostscript support will be added."
 .endif
 .if defined(WITHOUT_X)
 	@${ECHO} "X Window support will NOT be added."
 .endif
-.if defined(DEFAULT)
+.if defined(WITH_DEFAULT)
 	@${ECHO} "MOETTF will be set as default font."
-.endif
-.if !defined(WANT_CJK) && !defined(WANT_GS) && !defined(WITHOUT_X) && !defined(DEFAULT)
-	@${ECHO} --
-	@${ECHO} "Type \"make WANT_CJK=yes\" if you want CJK support."
-	@${ECHO} "Type \"make WANT_GS=yes\" if you want Ghostscript support."
-	@${ECHO} "Type \"make WITHOUT_X=yes\" if you DONT want X Window support."
-	@${ECHO} "Type \"make DEFAULT=yes\" to set MOETTF the default font."
-	@${ECHO} "You can use them in combinations."
-	@${ECHO} --
 .endif
 
 do-extract:
--- moettf.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: