- Trim Makefile headers

- Convert to new options framework

2 files changed, 27 insertions, 37 deletions

diff --git a/devel/ecb/Makefile b/devel/ecb/Makefile
index 443b9570b9f1..a56408d8beaf 100644
--- a/devel/ecb/Makefile
+++ b/devel/ecb/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   ecb
-# Date created:                25 January 2002
-# Whom:                        Kimura Fuyuki <fuyuki@mj.0038.net>
-#
+# Created by: Kimura Fuyuki <fuyuki@mj.0038.net>
 # $FreeBSD$
-#
 
 PORTNAME=	ecb
 PORTVERSION=	2.40
@@ -29,29 +25,28 @@ ALL_TARGET=	ecb
 
 INFO=		ecb
 
-OPTIONS=	CEDET	"Use the Cedet library" On \
-		ICONS	"Install ecb's icons" On
+OPTIONS_DEFINE=		CEDET ICONS DOCS
+OPTIONS_DEFAULT=	CEDET ICONS
+CEDET_DESC=	Use the Cedet library
 
-.include <bsd.port.pre.mk>
+PORTDOCS=	NEWS README RELEASE_NOTES
 
-.if defined(WITHOUT_CEDET)
-BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/semantic/semantic.el:${PORTSDIR}/devel/semantic
-RUN_DEPENDS+=	${BUILD_DEPENDS}
-MAKE_ARGS=	CEDET=""
-.else
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MCEDET}
 BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/cedet/common/cedet.el:${PORTSDIR}/devel/cedet
 RUN_DEPENDS+=	${BUILD_DEPENDS}
 MAKE_ARGS=	CEDET=${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/cedet
-.endif
-
-.if defined(WITHOUT_ICONS)
-PLIST_SUB+=	ICONS="@comment "
 .else
-PLIST_SUB+=	ICONS=""
+BUILD_DEPENDS+=	${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/semantic/semantic.el:${PORTSDIR}/devel/semantic
+RUN_DEPENDS+=	${BUILD_DEPENDS}
+MAKE_ARGS=	CEDET=""
 .endif
 
-.if !defined(NOPORTDOCS)
-PORTDOCS=	NEWS README RELEASE_NOTES
+.if ${PORT_OPTIONS:MICONS}
+PLIST_SUB+=	ICONS=""
+.else
+PLIST_SUB+=	ICONS="@comment "
 .endif
 
 post-patch:
@@ -69,7 +64,7 @@ do-install:
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/ecb.info ${PREFIX}/info
 
-.if !defined(WITHOUT_ICONS)
+.if ${PORT_OPTIONS:MICONS}
 .for i in ${ICONSUBDIRS}
 	${MKDIR} ${ICONDIR}/default/${i}
 	${INSTALL_DATA} ${ICONSRC}/default/${i}/*.xpm ${ICONDIR}/default/${i}
@@ -82,11 +77,11 @@ do-install:
 		${ICONDIR}/methods/height-14_to_21
 .endif
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/guichan/Makefile b/devel/guichan/Makefile
index 000be455f52d..194cb7e48cdd 100644
--- a/devel/guichan/Makefile
+++ b/devel/guichan/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	guichan
-# Date created:				2005-10-03
-# Whom:					Tobias Gion <freebsd@gionet.de>
-#
+# Created by: Tobias Gion <freebsd@gionet.de>
 # $FreeBSD$
-#
 
 PORTNAME=	guichan
 PORTVERSION=	0.8.2
@@ -12,7 +8,7 @@ CATEGORIES=	devel games
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
 MAINTAINER=	mva@FreeBSD.org
-COMMENT=	A small, efficient C++ GUI library designed for games
+COMMENT=	Small, efficient C++ GUI library designed for games
 
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
@@ -23,13 +19,12 @@ USES=	pathfix
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS=	SDL	"Enable SDL support" On \
-		ALLEGRO	"Enable Allegro support" Off \
-		GL	"Enable OpenGL support" On
+OPTIONS_DEFINE=	SDL ALLEGRO OPENGL
+ALLEGRO_DESC=	Allegro support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_SDL)
+.if ${PORT_OPTIONS:MSDL}
 USE_SDL+=	sdl image
 CONFIGURE_ARGS+=--enable-sdl --enable-sdlimage
 PLIST_SUB+=	SDL=""
@@ -38,7 +33,7 @@ CONFIGURE_ARGS+=--disable-sdl --disable-sdlimage
 PLIST_SUB+=	SDL="@comment "
 .endif
 
-.if defined(WITH_ALLEGRO)
+.if ${PORT_OPTIONS:MALLEGRO}
 LIB_DEPENDS+=	alleg.42:${PORTSDIR}/devel/allegro
 CONFIGURE_ARGS+=--enable-allegro
 PLIST_SUB+=	ALLEGRO=""
@@ -47,7 +42,7 @@ CONFIGURE_ARGS+=--disable-allegro
 PLIST_SUB+=	ALLEGRO="@comment "
 .endif
 
-.if !defined(WITHOUT_GL)
+.if ${PORT_OPTIONS:MGL}
 USE_GL=		yes
 CONFIGURE_ARGS+=--enable-opengl
 PLIST_SUB+=	GL=""
@@ -56,4 +51,4 @@ CONFIGURE_ARGS+=--disable-opengl
 PLIST_SUB+=	GL="@comment "
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>