merge in games/uqmcontent, bump PKGNAME

games/uqm/Makefile

@@ -1,32 +1,56 @@
-# $OpenBSD: Makefile,v 1.2 2003/05/12 08:23:47 jolan Exp $
+# $OpenBSD: Makefile,v 1.3 2003/07/25 11:04:30 jolan Exp $
 ONLY_FOR_ARCHS=	i386 macppc
 
-COMMENT=	"ur-quan masters: sdl port of star control 2"
+COMMENT=		"ur-quan masters: sdl port of star control 2"
+COMMENT-content=	"ur-quan masters: minimal content"
+COMMENT-3domusic=	"ur-quan masters: 3DO music content"
+COMMENT-voice=		"ur-quan masters: speech content"
 
-DISTNAME=	uqm-0.2-source
-EXTRACT_SUFX=	.tgz
-PKGNAME=	uqm-0.2
-CATEGORIES=	games x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sc2/}
+VER=			0.2
+DISTNAME=		uqm-${VER}-source
+PDIST=			${DISTNAME}.tgz
+CDIST=			uqm-${VER}-content.zip
+MDIST=			uqm-${VER}-3domusic.zip
+VDIST=			uqm-${VER}-voice.zip
+DISTFILES=		${PDIST} ${CDIST}
+CATEGORIES=		games x11
+PKGNAME=		uqm-${VER}p0
+PKGNAME-3domusic=	uqm-3domusic-${VER}
+PKGNAME-content=	uqm-content-${VER}
+PKGNAME-voice=		uqm-voice-${VER}
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=sc2/}
 
 HOMEPAGE=	http://sc2.sourceforge.net/
 
 MAINTAINER=	Jolan Luff <jolan@openbsd.org>
 
 # GPL
-PERMIT_PACKAGE_CDROM=	Yes
-PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	Yes
-PERMIT_DISTFILES_FTP=	Yes
+PERMIT_PACKAGE_CDROM=	"Unresolved licensing issues"
+PERMIT_PACKAGE_FTP=	"Unresolved licensing issues"
+PERMIT_DISTFILES_CDROM=	"Unresolved licensing issues"
+PERMIT_DISTFILES_FTP=	"Unresolved licensing issues"
 
 LIB_DEPENDS=	SDL_image::devel/sdl-image \
 		vorbis.0,vorbisfile.1::audio/libvorbis
-RUN_DEPENDS=	:uqmcontent-*:games/uqmcontent
 
 NO_REGRESS=	Yes
 USE_GMAKE=	Yes
 USE_X11=	Yes
 
+PSEUDO_FLAVORS=	no_3domusic no_voice
+FLAVOR?=
+MULTI_PACKAGES=	-content
+.if !${FLAVOR:L:Mno_3domusic}
+DISTFILES+=	${MDIST}
+MULTI_PACKAGES+=-3domusic
+.endif
+.if !${FLAVOR:L:Mno_voice}
+DISTFILES+=	${VDIST}
+MULTI_PACKAGES+=-voice
+.endif
+
+SUBPACKAGE?=
+
 do-configure:
 .if (${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "i386" || \
      ${MACHINE_ARCH} == "vax")
@@ -42,11 +66,30 @@ do-configure:
 		> ${WRKSRC}/build.vars
 
 do-build:
-	cd ${WRKSRC}; ./build.sh uqm
+	cd ${WRKBUILD}; ./build.sh uqm
+
+pre-install:
+	@mkdir -p ${WRKDIST}/content
+.for R in androsyn arilou blackurq chenjesu chmmr druuge human ilwrath \
+	melnorme mmrnmhrm mycon orz pkunk shofixti slylandr spathi supox \
+	syreen thradd umgah urquan utwig vux yehat zoqfot
+	@mv ${WRKDIR}/${R} ${WRKDIST}/content
+	@mv ${WRKDIR}/${R}.shp ${WRKDIST}/content
+.endfor
+.for E in comm ipanims lastbat{,.sc2} lbm melee probe{,.sc2} sis{_ship,.dat} \
+	slides starcon{.key,.ndx,.txt} version
+	@mv ${WRKDIR}/${E} ${WRKDIST}/content
+.endfor
+	@mv ${WRKDIR}/*.con ${WRKDIST}/content
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/uqm
+	${INSTALL_DATA_DIR} ${PREFIX}/share/uqm
 	${INSTALL_DATA} ${WRKSRC}/doc/users/manual.txt ${PREFIX}/share/doc/uqm
 	${INSTALL_PROGRAM} ${WRKSRC}/uqm ${PREFIX}/bin
+	@cp -R ${WRKDIST}/content/* ${PREFIX}/share/uqm
+
+post-install:
+	@find ${PREFIX}/share/uqm -type f -print0 | xargs -0 chmod 444
 
 .include <bsd.port.mk>

games/uqm/distinfo

@@ -1,3 +1,12 @@
+MD5 (uqm-0.2-3domusic.zip) = f7760aa305b743304504e04df742f57e
+MD5 (uqm-0.2-content.zip) = ad4de1c9318d9196ebf332d935bb6032
 MD5 (uqm-0.2-source.tgz) = 8b95dda6ed73802cee18a44f56322076
+MD5 (uqm-0.2-voice.zip) = f7213e8db6ca4bca4ddfdeed8a7ca0d6
+RMD160 (uqm-0.2-3domusic.zip) = 0cd7a2b75a799344c79db406f1b8d995dc8939a7
+RMD160 (uqm-0.2-content.zip) = fc3b50a01a18c368edea16c8990bbc7600cc91d1
 RMD160 (uqm-0.2-source.tgz) = 453065429cb7d90194b6922ff36f27fdd5413988
+RMD160 (uqm-0.2-voice.zip) = c8f971bf0d0bb6419686fe280da102936427cfbd
+SHA1 (uqm-0.2-3domusic.zip) = 9aaaf1961f82226c78ca8dd3871404e761413e11
+SHA1 (uqm-0.2-content.zip) = 3773bb13742f750793d9518c7254c5509117ee14
 SHA1 (uqm-0.2-source.tgz) = 031d9d6041768ddf4ee63fe3e0760d9b72c78864
+SHA1 (uqm-0.2-voice.zip) = fd867d15f740674bee46254fa555a67faec53645

games/uqm/pkg/DESCR

@@ -1,14 +1,8 @@
 The Ur-Quan Masters is an SDL-based port of the 3DO version of the
-popular game Star Control 2.  This port is for only the program.
-The uqmcontent port which contains all the graphics and sounds is
-needed as well.  For a richer game experience, you may wish to
-install the uqmcontent port with a non-default FLAVOR, which will
-add enjoyable extras.
+popular game Star Control 2.
 
 At this time, the introduction is not played.  It is highly
 recommended to at least skim through the text version of the
 introduction, a copy of which may be found here:
 
 http://www.classicgaming.com/starcontrol/sc2/sc2_hist.shtml
-
-WWW: ${HOMEPAGE}

games/uqm/pkg/DESCR-3domusic

@@ -0,0 +1 @@
+Optional 3DO music package for The Ur-Quan Masters.

games/uqm/pkg/DESCR-content

@@ -0,0 +1 @@
+Required content package for The Ur-Quan Masters.

games/uqm/pkg/DESCR-voice

@@ -0,0 +1 @@
+Optional speech package for The Ur-Quan Masters.

games/uqm/pkg/PLIST-3domusic

@@ -0,0 +1,14 @@
+@comment $OpenBSD: PLIST-3domusic,v 1.1 2003/07/25 11:04:30 jolan Exp $
+share/uqm/ipanims/orbit1.ogg
+share/uqm/ipanims/orbit2.ogg
+share/uqm/ipanims/orbit3.ogg
+share/uqm/ipanims/orbit4.ogg
+share/uqm/ipanims/orbit5.ogg
+share/uqm/ipanims/space.ogg
+share/uqm/lbm/arispace.ogg
+share/uqm/lbm/battle.ogg
+share/uqm/lbm/credits.ogg
+share/uqm/lbm/hyper.ogg
+share/uqm/lbm/outfit.ogg
+share/uqm/lbm/shipyard.ogg
+share/uqm/lbm/starbase.ogg