- Trim old-school Makefile header

- Convert to contemporary OPTIONS framework and cleanup Makefile
- Drop shlib ABI version from LIB_DEPENDS
- Provide a new home for distfiles (make them fetchable) and update WWW
  line in port description

2 files changed, 22 insertions, 28 deletions

diff --git a/games/egl/Makefile b/games/egl/Makefile
index 6a4b0d0f1520..bc69740b04ed 100644
--- a/games/egl/Makefile
+++ b/games/egl/Makefile
@@ -1,46 +1,40 @@
-# New ports collection makefile for:	EGL
-# Date created:				20 May 2006
-# Whom:					Alejandro Pulver <alepulver@FreeBSD.org>
-#
+# Created by: Alejandro Pulver <alepulver@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	egl
 PORTVERSION=	0.3.1
 PORTREVISION=	5
 CATEGORIES=	games
-MASTER_SITES=	http://egl.quakedev.com/files/:src \
-		ftp://ftp.alepulver.com.ar/distfiles/:data
+MASTER_SITES=	http://freebsd.nsu.ru/distfiles/
 DISTNAME=	${PORTNAME}-v${PORTVERSION}-stable-src
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:src \
-		egl.pkz:data
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} egl.pkz
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	danfe@FreeBSD.org
-COMMENT=	Enhanced OpenGL only Quake II engine
+COMMENT=	Enhanced OpenGL-only Quake II engine
 
 USE_ZIP=	yes
 USE_DOS2UNIX=	yes
 USE_GMAKE=	yes
-NO_WRKSUBDIR=	yes
-
-OPTIONS=	CLIENT "Build client" on \
-		DEDICATED "Build dedicated server" on \
-		GAME "Build main game modification" on \
-		OPTIMIZED_CFLAGS "Enable compilation optimizations" on
-
 MAKEFILE=	makefile
+NO_WRKSUBDIR=	yes
 
 MAKE_ENV=	LIBDIR="${LIBDIR}" PTHREAD_LIBS="${PTHREAD_LIBS}"
 PLIST_SUB=	LIBDIR="${LIBDIR:S/${PREFIX}\///}"
 LIBDIR=		${PREFIX}/lib/${PORTNAME}
 
-.include "${.CURDIR}/../quake2-data/Makefile.include"
+OPTIONS_DEFINE=	CLIENT DEDICATED GAME OPTIMIZED_CFLAGS
+OPTIONS_DEFAULT=	CLIENT DEDICATED GAME OPTIMIZED_CFLAGS
+
+CLIENT_DESC=	Build client
+DEDICATED_DESC=	Build dedicated server
+GAME_DESC=	Build main game modification
 
-.include <bsd.port.pre.mk>
+.include "${.CURDIR}/../quake2-data/Makefile.include"
+.include <bsd.port.options.mk>
 
-.if defined(WITH_CLIENT)
-LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg \
+.if ${PORT_OPTIONS:MCLIENT}
+LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 		png15:${PORTSDIR}/graphics/png
 USE_GL=		yes
 CFLAGS+=	-I${LOCALBASE}/include/libpng15
@@ -53,7 +47,7 @@ MAKE_ENV+=	BUILD_CLIENT=NO \
 PLIST_SUB+=	CLIENT="@comment "
 .endif
 
-.if defined(WITH_DEDICATED)
+.if ${PORT_OPTIONS:MDEDICATED}
 PLIST_SUB+=	DEDICATED=""
 EGL_BIN+=	eglded
 .else
@@ -61,14 +55,14 @@ MAKE_ENV+=	BUILD_DEDICATED=NO
 PLIST_SUB+=	DEDICATED="@comment "
 .endif
 
-.if defined(WITH_GAME)
+.if ${PORT_OPTIONS:MGAME}
 PLIST_SUB+=	GAME=""
 .else
 MAKE_ENV+=	BUILD_GAME=NO
 PLIST_SUB+=	GAME="@comment "
 .endif
 
-.if defined(WITHOUT_OPTIMIZED_CFLAGS)
+.if ! ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 MAKE_ENV+=	WITH_OPT_CFLAGS=NO
 .endif
 
@@ -76,8 +70,8 @@ do-install:
 .for f in ${EGL_BIN}
 	${INSTALL_PROGRAM} ${WRKSRC}/release/${f} ${PREFIX}/bin
 .endfor
-	${MKDIR} ${LIBDIR}/baseq2
+	@${MKDIR} ${LIBDIR}/baseq2
 	${INSTALL_PROGRAM} ${WRKSRC}/release/baseq2/*.so ${LIBDIR}/baseq2
 	${INSTALL_DATA} ${DISTDIR}/egl.pkz ${LIBDIR}/baseq2
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/egl/pkg-descr b/games/egl/pkg-descr
index db5b34c8f19b..c15a49f69b4e 100644
--- a/games/egl/pkg-descr
+++ b/games/egl/pkg-descr
@@ -1,3 +1,3 @@
-Enhanced OpenGL only Quake II engine.
+Enhanced, OpenGL-only Quake II engine.
 
-WWW: http://egl.quakedev.com/
+WWW: http://bfeared.com/library/quake/archive/quakedev/egl/