ports/147828: [maintainer-update] games/stonesoup: split up games/stonesoup-sdl

[Tobias Rehbein]

>Number:         147828
>Category:       ports
>Synopsis:       [maintainer-update] games/stonesoup: split up games/stonesoup-sdl
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jun 13 08:30:05 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Tobias Rehbein
>Release:        FreeBSD 8.0-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD sushi.pseudo.local 8.0-RELEASE-p3 FreeBSD 8.0-RELEASE-p3 #6: Sat May 29 14:03:04 CEST 2010 tobi at sushi.pseudo.local:/usr/obj/usr/src/sys/SUSHI i386


	
>Description:
	
        Create a new slave port games/stonesoup-sdl for the sdl based tiles version of games/stonesoup.
>How-To-Repeat:
	
>Fix:
        - games-stonesoup-sdl.shar contains the new slave port
        - games-stonesoup.diff contains trivial changes to support the slave port

	

--- games-stonesoup-sdl.shar begins here ---
# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	games/stonesoup-sdl
#	games/stonesoup-sdl/Makefile
#
echo c - games/stonesoup-sdl
mkdir -p games/stonesoup-sdl > /dev/null 2>&1
echo x - games/stonesoup-sdl/Makefile
sed 's/^X//' >games/stonesoup-sdl/Makefile << 'c8603e2deb0e0eef26f372ed5ec6e998'
X# New ports collection makefile for:   stonesoup-sdl
X# Date created:		13 June 2010
X# Whom:			tobias.rehbein at web.de
X#
X# $FreeBSD$
X#
X
XWITH_SDL=	yes
X
XMASTERDIR=	${.CURDIR}/../stonesoup
X
X.include        "${MASTERDIR}/Makefile"
c8603e2deb0e0eef26f372ed5ec6e998
exit
--- games-stonesoup-sdl.shar ends here ---

--- games-stonesoup.diff begins here ---
diff -ruN games/stonesoup.orig/Makefile games/stonesoup/Makefile
--- games/stonesoup.orig/Makefile	2010-06-13 10:03:11.000000000 +0200
+++ games/stonesoup/Makefile	2010-06-13 10:04:33.000000000 +0200
@@ -31,8 +31,7 @@
 SUB_FILES=	README.FreeBSD
 PLIST_SUB=	SAVEDIR="${SAVEDIR}"
 
-OPTIONS=	SDL		"SDL support (tiles interface)"	off \
-		SOUND		"Sound support"			off \
+OPTIONS=	SOUND		"Sound support"			off \
 		LUA_BINDINGS	"LUA bindings for user scripts"	on \
 		UNICODE		"Unicode glyphs (UTF-8)"	off \
 		WIZARD		"Wizard mode"			off
@@ -51,10 +50,7 @@
 MAKE_ARGS+=	wizard
 .endif
 
-.if defined(WITHOUT_SDL)
-CONFLICTS+=	${PORTNAME}-sdl-[0-9]*
-PLIST_SUB+=	SDL="@comment "
-.else
+.if defined(WITH_SDL)
 CONFLICTS+=	${PORTNAME}-[0-9]*
 MAKE_ARGS+=	TILES=y
 PLIST_SUB+=	SDL=""
@@ -63,6 +59,9 @@
 LIB_DEPENDS+=	png.6:${PORTSDIR}/graphics/png \
 		freetype:${PORTSDIR}/print/freetype2
 USE_SDL=	sdl image
+.else
+CONFLICTS+=	${PORTNAME}-sdl-[0-9]*
+PLIST_SUB+=	SDL="@comment "
 .endif
 
 .if defined(WITH_SOUND)
--- games-stonesoup.diff ends here ---


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