3 files changed, 38 insertions, 22 deletions

diff --git a/games/quake3-osp/Makefile b/games/quake3-osp/Makefile
index cfd667af50c3..2cb373f9024e 100644
--- a/games/quake3-osp/Makefile
+++ b/games/quake3-osp/Makefile
@@ -1,44 +1,45 @@
-# New ports collection makefile for:	Q3 Mod: OSP Tourney DM/CA/CTF
-# Date created:				Mon Jun  4 16:20:32 EDT 2001
-# Whom:					pat@databits.net
-#
+# Created by: Patrick Li <pat@databits.net>
 # $FreeBSD$
-#
 
 PORTNAME=	osp
 PORTVERSION=	1.03a
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR=	distfiles
+MASTER_SITES=	http://osp.jsmart.web.id/orangesmoothie/downloads/
 PKGNAMEPREFIX=	${Q3PKGNAMEPREFIX}
 DISTNAME=	osp-Quake3-${PORTVERSION}_full
 
 MAINTAINER=	danfe@FreeBSD.org
-COMMENT=	Quake III Arena Mod: OSP Tourney DM/CA/CTF
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
+COMMENT=	Quake III Arena mod: OSP Tourney DM/CA/CTF
 
 USE_ZIP=	yes
 USE_CRLF=	yes
 NO_BUILD=	yes
 
+WRKSRC=		${WRKDIR}/${PORTNAME}
 DATADIR=	${Q3DIR}/${PORTNAME}
 
+OPTIONS_DEFINE=	DOCS
+
+.include "${.CURDIR}/../quake3-data/Makefile.include"
+.include <bsd.port.options.mk>
+
+post-extract:
+# Replace outdated README file
+	@${MV} ${WRKSRC}/README.txt ${WRKSRC}/Docs
+
 do-install:
 	@${MKDIR} ${DATADIR}
 .for f in *.cfg *.pk3 description.txt filters.txt
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DATADIR}
 .endfor
-.for d in cfg-GfxExample locs vm
-	@${CP} -R ${WRKSRC}/${d} ${DATADIR}
+.for d in cfg-* locs vm
+	${CP} -a ${WRKSRC}/${d} ${DATADIR}
 .endfor
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/Docs/*.txt ${DOCSDIR}
-	@${INSTALL_DATA} "${WRKSRC}/OSP Match Quick Start.txt" \
+	${INSTALL_DATA} ${WRKSRC}/Docs/*.txt ${DOCSDIR}
+	${INSTALL_DATA} "${WRKSRC}/OSP Match Quick Start.txt" \
 		${DOCSDIR}/osp-match-quick-start.txt
 .endif
 
-.include "${.CURDIR}/../quake3-data/Makefile.include"
-
 .include <bsd.port.mk>
diff --git a/games/quake3-osp/pkg-descr b/games/quake3-osp/pkg-descr
index 2536817b3f7a..79e403db03dc 100644
--- a/games/quake3-osp/pkg-descr
+++ b/games/quake3-osp/pkg-descr
@@ -1,7 +1,7 @@
 OSP Tourney DM is designed to facilitate competitive, yet flexible, match
-play. This mod simply makes it easier and more convenient for players and
-admins alike to ehance the Quake3 experience. There have absolutely been *NO*
-changes to the core gameplay or its dynamics -- its all default Quake3 in this
-regard.
+play.  This mod simply makes it easier and more convenient for players and
+and admins alike to enhance the Quake 3 experience.  There have absolutely
+been *NO* changes to the core gameplay or its dynamics -- its all default
+Quake 3 in this regard.
 
 WWW: http://www.orangesmoothie.org/
diff --git a/games/quake3-osp/pkg-plist b/games/quake3-osp/pkg-plist
index a28f9f7f33d2..9815f867d106 100644
--- a/games/quake3-osp/pkg-plist
+++ b/games/quake3-osp/pkg-plist
@@ -15,8 +15,21 @@
 %%PORTDOCS%%%%DOCSDIR%%/osp-q3-Variables.txt
 %%PORTDOCS%%%%DOCSDIR%%/osp-q3-Viewcam.txt
 %%DATADIR%%/1v1.cfg
+%%DATADIR%%/cfg-DefaultModeReference/1v1.cfg
+%%DATADIR%%/cfg-DefaultModeReference/clanarena.cfg
+%%DATADIR%%/cfg-DefaultModeReference/ctf.cfg
+%%DATADIR%%/cfg-DefaultModeReference/ffa.cfg
+%%DATADIR%%/cfg-DefaultModeReference/qil.cfg
+%%DATADIR%%/cfg-DefaultModeReference/settings.txt
+%%DATADIR%%/cfg-DefaultModeReference/team.cfg
 %%DATADIR%%/cfg-GfxExample/gfxdef.cfg
 %%DATADIR%%/cfg-GfxExample/z-osp-misc.pk3
+%%DATADIR%%/cfg-maps/1v1maps.txt
+%%DATADIR%%/cfg-maps/cbmaps.txt
+%%DATADIR%%/cfg-maps/clanarenamaps.txt
+%%DATADIR%%/cfg-maps/ctfmaps.txt
+%%DATADIR%%/cfg-maps/ffamaps.txt
+%%DATADIR%%/cfg-maps/teammaps.txt
 %%DATADIR%%/clanarena.cfg
 %%DATADIR%%/ctf-public.cfg
 %%DATADIR%%/ctf.cfg
@@ -38,6 +51,8 @@
 %%DATADIR%%/zz-osp-server3a.pk3
 @dirrm %%DATADIR%%/vm
 @dirrm %%DATADIR%%/locs
+@dirrm %%DATADIR%%/cfg-maps
 @dirrm %%DATADIR%%/cfg-GfxExample
+@dirrm %%DATADIR%%/cfg-DefaultModeReference
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%