From owner-svn-ports-all@FreeBSD.ORG Sat Mar 16 14:19:06 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id CB819C25; Sat, 16 Mar 2013 14:19:06 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A6EB4FD4; Sat, 16 Mar 2013 14:19:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2GEJ6OJ082637; Sat, 16 Mar 2013 14:19:06 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2GEJ6Z6082635; Sat, 16 Mar 2013 14:19:06 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201303161419.r2GEJ6Z6082635@svn.freebsd.org> From: Alexey Dokuchaev Date: Sat, 16 Mar 2013 14:19:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314356 - head/games/egl X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Mar 2013 14:19:07 -0000 Author: danfe Date: Sat Mar 16 14:19:05 2013 New Revision: 314356 URL: http://svnweb.freebsd.org/changeset/ports/314356 Log: - 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 Modified: head/games/egl/Makefile head/games/egl/pkg-descr Modified: head/games/egl/Makefile ============================================================================== --- head/games/egl/Makefile Sat Mar 16 13:46:09 2013 (r314355) +++ head/games/egl/Makefile Sat Mar 16 14:19:05 2013 (r314356) @@ -1,46 +1,40 @@ -# New ports collection makefile for: EGL -# Date created: 20 May 2006 -# Whom: Alejandro Pulver -# +# Created by: Alejandro Pulver # $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 +.include "${.CURDIR}/../quake2-data/Makefile.include" +.include -.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 +.include Modified: head/games/egl/pkg-descr ============================================================================== --- head/games/egl/pkg-descr Sat Mar 16 13:46:09 2013 (r314355) +++ head/games/egl/pkg-descr Sat Mar 16 14:19:05 2013 (r314356) @@ -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/