From owner-svn-ports-all@FreeBSD.ORG Sun Jul 6 10:31:56 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C4522F1B; Sun, 6 Jul 2014 10:31:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A50362573; Sun, 6 Jul 2014 10:31:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s66AVuGi016846; Sun, 6 Jul 2014 10:31:56 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s66AVt5x016836; Sun, 6 Jul 2014 10:31:55 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201407061031.s66AVt5x016836@svn.freebsd.org> From: Pawel Pekala Date: Sun, 6 Jul 2014 10:31:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360875 - in head/games: xpilot-ng-client xpilot-ng-server 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.18 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: Sun, 06 Jul 2014 10:31:56 -0000 Author: pawel Date: Sun Jul 6 10:31:55 2014 New Revision: 360875 URL: http://svnweb.freebsd.org/changeset/ports/360875 QAT: https://qat.redports.org/buildarchive/r360875/ Log: - Add staging support - Convert to new LIB_DEPENDS format, options subs and helpers - Fix spelling mistake in descriptions Modified: head/games/xpilot-ng-client/Makefile head/games/xpilot-ng-server/Makefile head/games/xpilot-ng-server/pkg-descr.client head/games/xpilot-ng-server/pkg-descr.server head/games/xpilot-ng-server/pkg-plist.client head/games/xpilot-ng-server/pkg-plist.server Modified: head/games/xpilot-ng-client/Makefile ============================================================================== --- head/games/xpilot-ng-client/Makefile Sun Jul 6 10:30:11 2014 (r360874) +++ head/games/xpilot-ng-client/Makefile Sun Jul 6 10:31:55 2014 (r360875) @@ -7,5 +7,4 @@ COMMENT= Enhanced version of XPilot (cli MASTERDIR= ${.CURDIR}/../xpilot-ng-server -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/games/xpilot-ng-server/Makefile ============================================================================== --- head/games/xpilot-ng-server/Makefile Sun Jul 6 10:30:11 2014 (r360874) +++ head/games/xpilot-ng-server/Makefile Sun Jul 6 10:31:55 2014 (r360875) @@ -13,7 +13,7 @@ COMMENT?= Enhanced version of XPilot (se LICENSE= GPLv2 -LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 +LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 GNU_CONFIGURE= yes @@ -29,31 +29,31 @@ DESCR= ${PKGDIR}/pkg-descr${PKGFILESUFF PLIST= ${PKGDIR}/pkg-plist${PKGFILESUFFIX} .if ${PKGNAMESUFFIX} == "-server" -MAN6= xpilot-ng-server.6 - CONFIGURE_ARGS+=--disable-replay \ --disable-xp-mapedit \ --disable-x11-client \ --disable-sdl-client .else # client -MAN6= xpilot-ng-replay.6 \ - xpilot-ng-x11.6 \ - xpilot-ng-xp-mapedit.6 - CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -I${LOCALBASE}/include -OPTIONS_DEFINE= SDL SOUND -OPTIONS_DEFAULT= SDL -SOUND_DESC= Enable sound support - DESKTOP_ENTRIES= "Xpilot-ng X11" "Xpilot game client program" \ "" "xpilot-ng-x11" "Game;ArcadeGame;" false \ "Xpilot-ng Map Editor" "Xpilot Map Editor" \ "" "xpilot-ng-xp-mapedit" "Game;ArcadeGame;" false + +OPTIONS_DEFINE= SDL SOUND +OPTIONS_DEFAULT= SDL +OPTIONS_SUB= yes + +SOUND_DESC= Enable sound support +SOUND_CONFIGURE_ENABLE= sound +SOUND_USES= openal:al,alut + +SDL_CONFIGURE_ENABLE= sdl-client +SDL_USE= SDL=image,sdl,ttf GL=yes .endif -NO_STAGE= yes .include .if ${PKGNAMESUFFIX} == "-server" @@ -68,25 +68,8 @@ post-patch: ${WRKSRC}/lib/Makefile.in .else # client .if ${PORT_OPTIONS:MSDL} -USE_SDL= image sdl ttf -USE_GL= yes -PLIST_SUB+= SDL="" -MAN6+= xpilot-ng-sdl.6 DESKTOP_ENTRIES+= "Xpilot-ng SDL" "Xpilot game client program" \ "" "xpilot-ng-sdl" "Game;ArcadeGame;" false -.else -CONFIGURE_ARGS+=--disable-sdl-client -PLIST_SUB+= SDL="@comment " -.endif - -.if ${PORT_OPTIONS:MSOUND} -USES+= openal:al,alut -CONFIGURE_ARGS+=--enable-sound -CPPFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} -PLIST_SUB+= SOUND="" -.else -PLIST_SUB+= SOUND="@comment " .endif post-patch: Modified: head/games/xpilot-ng-server/pkg-descr.client ============================================================================== --- head/games/xpilot-ng-server/pkg-descr.client Sun Jul 6 10:30:11 2014 (r360874) +++ head/games/xpilot-ng-server/pkg-descr.client Sun Jul 6 10:31:55 2014 (r360875) @@ -1,4 +1,4 @@ -XPilot is a multi-player tactical manouvring game for X and Unix workstations. +XPilot is a multi-player tactical maneuvering game for X and Unix workstations. Players have a fighter which they move along in an artificial world and shoot each other using various kinds of weapons like bullets, mines, smart missiles, heat seekers and so on. It is a fast paced game with Modified: head/games/xpilot-ng-server/pkg-descr.server ============================================================================== --- head/games/xpilot-ng-server/pkg-descr.server Sun Jul 6 10:30:11 2014 (r360874) +++ head/games/xpilot-ng-server/pkg-descr.server Sun Jul 6 10:31:55 2014 (r360875) @@ -1,4 +1,4 @@ -XPilot is a multi-player tactical manouvring game for X and Unix workstations. +XPilot is a multi-player tactical maneuvering game for X and Unix workstations. Players have a fighter which they move along in an artificial world and shoot each other using various kinds of weapons like bullets, mines, smart missiles, heat seekers and so on. It is a fast paced game with Modified: head/games/xpilot-ng-server/pkg-plist.client ============================================================================== --- head/games/xpilot-ng-server/pkg-plist.client Sun Jul 6 10:30:11 2014 (r360874) +++ head/games/xpilot-ng-server/pkg-plist.client Sun Jul 6 10:31:55 2014 (r360875) @@ -2,6 +2,10 @@ bin/xpilot-ng-replay %%SDL%%bin/xpilot-ng-sdl bin/xpilot-ng-x11 bin/xpilot-ng-xp-mapedit +man/man6/xpilot-ng-replay.6.gz +%%SDL%%man/man6/xpilot-ng-sdl.6.gz +man/man6/xpilot-ng-x11.6.gz +man/man6/xpilot-ng-xp-mapedit.6.gz share/xpilot-ng/fonts/ConsoleFont.bmp share/xpilot-ng/fonts/FreeSansBoldOblique.ttf share/xpilot-ng/fonts/VeraMoBd.ttf Modified: head/games/xpilot-ng-server/pkg-plist.server ============================================================================== --- head/games/xpilot-ng-server/pkg-plist.server Sun Jul 6 10:30:11 2014 (r360874) +++ head/games/xpilot-ng-server/pkg-plist.server Sun Jul 6 10:31:55 2014 (r360875) @@ -1,4 +1,5 @@ bin/xpilot-ng-server +man/man6/xpilot-ng-server.6.gz share/xpilot-ng/defaults.txt share/xpilot-ng/mapconvert.py share/xpilot-ng/maps/blood-music.xp2