ports/105916: [PATCH] games/oolite: honor X11BASE, update MASTER_SITES

[Andriy Gapon]

>Number:         105916
>Category:       ports
>Synopsis:       [PATCH] games/oolite: honor X11BASE, update MASTER_SITES
>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:   Mon Nov 27 17:50:13 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Andriy Gapon
>Release:        FreeBSD 6.1-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD 6.1-RELEASE-p2 i386
>Description:
This patch updates port to honor X11BASE value instead of depending on hardcoded /usr/X11RG path.
Also, MASTER_SITES is updated to make use of MASTER_SITE_BERLIOS.
Indentation is changed for a few lines for better formatting/readabiltiy.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- oolite-1.65_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/games/oolite.orig/Makefile /usr/ports/games/oolite/Makefile
--- /usr/ports/games/oolite.orig/Makefile	Mon Nov 27 18:54:51 2006
+++ /usr/ports/games/oolite/Makefile	Mon Nov 27 19:24:19 2006
@@ -5,18 +5,18 @@
 # $FreeBSD: ports/games/oolite/Makefile,v 1.6 2006/09/20 11:21:18 stas Exp $
 #
 
-PORTNAME=	oolite
-PORTVERSION=	1.65
-PORTREVISION=	1
-CATEGORIES=	games
-MASTER_SITES=	http://download.berlios.de/oolite-linux/ \
-		http://download2.berlios.de/oolite-linux/ \
-		ftp://ftp.alioth.net/oolite/
-DISTFILES=	${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX} \
-		${PORTNAME}-${PORTVERSION}-data${EXTRACT_SUFX}
+PORTNAME=		oolite
+PORTVERSION=		1.65
+PORTREVISION=		1
+CATEGORIES=		games
+MASTER_SITES=		${MASTER_SITE_BERLIOS} \
+			ftp://ftp.alioth.net/%SUBDIR%/:alioth
+MASTER_SITE_SUBDIR=	oolite-linux oolite/:alioth
+DISTFILES=		${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX}:DEFAULT,alioth \
+			${PORTNAME}-${PORTVERSION}-data${EXTRACT_SUFX}:DEFAULT,alioth
 
-MAINTAINER=	avg at icyb.net.ua
-COMMENT=	Trade and combat space simulator, clone of Elite
+MAINTAINER=		avg at icyb.net.ua
+COMMENT=		Trade and combat space simulator, clone of Elite
 
 WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
 USE_SDL=		mixer image gfx
diff -ruN --exclude=CVS /usr/ports/games/oolite.orig/files/patch-makefile /usr/ports/games/oolite/files/patch-makefile
--- /usr/ports/games/oolite.orig/files/patch-makefile	Mon Nov 27 18:54:51 2006
+++ /usr/ports/games/oolite/files/patch-makefile	Mon Nov 27 18:57:26 2006
@@ -16,9 +16,10 @@
 -	ADDITIONAL_OBJC_LIBS = -lGLU -lGL -lSDL -lpthread -lSDL_mixer -lSDL_image -lgnustep-base
 -	ADDITIONAL_CFLAGS = -DLINUX -DNEED_STRLCPY `sdl-config --cflags`
 -	ADDITIONAL_OBJCFLAGS = -DLOADSAVEGUI -DLINUX -DHAVE_SOUND -Wno-import `sdl-config --cflags`
+-	oolite_LIB_DIRS += -L/usr/X11R6/lib/
 +	ADDITIONAL_OBJC_LIBS = -lGLU -lGL -lSDL_mixer -lSDL_image -lSDL_gfx -lgnustep-base `sdl-config --libs`
-+	ADDITIONAL_CFLAGS = -I/usr/X11R6/include -DLINUX `sdl-config --cflags`
-+	ADDITIONAL_OBJCFLAGS = -I/usr/X11R6/include -DLOADSAVEGUI -DLINUX -DHAVE_SOUND -Wno-import `sdl-config --cflags`
- 	oolite_LIB_DIRS += -L/usr/X11R6/lib/
++	ADDITIONAL_CFLAGS = -I${X11BASE}/include -DLINUX `sdl-config --cflags`
++	ADDITIONAL_OBJCFLAGS = -I${X11BASE}/include -DLOADSAVEGUI -DLINUX -DHAVE_SOUND -Wno-import `sdl-config --cflags`
++	oolite_LIB_DIRS += -L${X11BASE}/lib/
  endif
  OBJC_PROGRAM_NAME = oolite
--- oolite-1.65_1.patch ends here ---

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