ports/70728: [UPDATE] Enable OPTIONS feature of ports/x11/ggiterm

[Ying-Chieh Chen]

>Number:         70728
>Category:       ports
>Synopsis:       [UPDATE] Enable OPTIONS feature of ports/x11/ggiterm
>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 15:50:31 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/x11/ggiterm

>How-To-Repeat:

	Apply the patch.

>Fix:

	

--- ggiterm.patch begins here ---
diff -ruN /usr/ports/x11/ggiterm/Makefile ggiterm/Makefile
--- /usr/ports/x11/ggiterm/Makefile	Wed Mar 31 03:56:43 2004
+++ ggiterm/Makefile	Fri Aug 20 21:05:45 2004
@@ -17,10 +17,6 @@
 COMMENT=	A terminal emulator for GGI
 
 LIB_DEPENDS=	ggi.2:${PORTSDIR}/graphics/libggi
-.if !defined(WITHOUT_FREETYPE)
-LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
-USE_ICONV=	yes
-.endif
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
@@ -28,27 +24,19 @@
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ggi=${LOCALBASE}
+
+OPTIONS=	FREETYPE "build with Freetype support" on
+
+.include <bsd.port.pre.mk>
+
 .if !defined(WITHOUT_FREETYPE)
+LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
+USE_ICONV=	yes
 CONFIGURE_ARGS+=--with-ft-prefix=${LOCALBASE}
 .endif
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-pre-everything::
-.if !defined(WITHOUT_FREETYPE)
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "ggiterm can be built without Freetype support. However, as the author says,"
-	@${ECHO_MSG} "'if you don't have freetype you lose much of the ggiterm reason for being,'"
-	@${ECHO_MSG} "so you probably don't want this. If you do, cancel now and build with:"
-	@${ECHO_MSG} "  WITHOUT_FREETYPE=yes"
-	@${ECHO_MSG} ""
-.else
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You have chosen to build ggiterm without Freetype. If this wasn't your"
-	@${ECHO_MSG} "intention, cancel now and unset the 'WITHOUT_FREETYPE' variable."
-	@${ECHO_MSG} ""
-.endif
-
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
@@ -56,4 +44,4 @@
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- ggiterm.patch ends here ---


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