- Update to version "1.1" (actually updated textures).

- Remove BROKEN for !i386, as it's "nwreckdum" (a PAK archiver) which fails
  there, and disable SKYBOXES in that case (a PAK that has to be extracted).
- Clarify in OPTIONS and pkg-message engines supporting LITS option.

games/quake-extras/Makefile

@@ -6,10 +6,12 @@
 #
 
 PORTNAME=	extras
-PORTVERSION=	1.0
+PORTVERSION=	1.1
 CATEGORIES=	games
 MASTER_SITES=	http://gamefiles.virginmedia.com/blueyondergames/quake/quakeworld/clients/fuhquake/addons/:fq \
-		http://facelift.quakedev.com/download/:rev
+		http://facelift.quakedev.com/download/:remod,retex \
+		http://shub-hub.com/files/textures_retexture_project/:retex \
+		http://qrp.quakeonline.net/:retex
 PKGNAMEPREFIX=	${Q1PKGNAMEPREFIX}
 DISTFILES=	#
 DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
@@ -20,10 +22,10 @@ COMMENT=	Addons for Quake
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
-OPTIONS=	LITS "Coloured lighting (FuhQuake/JoeQuake)" on \
+OPTIONS=	LITS "Coloured lighting (FuhQuake/JoeQuake based)" on \
 		REMODEL "High quality models" on \
 		RETEXTURE_HQ "High quality textures (200MB)" off \
-		RETEXTURE_OP "Optimal quality textures (50MB)" on \
+		RETEXTURE_LW "Low (still good) quality textures (15MB)" on \
 		SKYBOXES "Skyboxes (sky replacement images)" on
 
 DATADIR=	${Q1DIR}
@@ -36,16 +38,15 @@ SKYFILE=	fuhquake-skyboxes.zip
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != "i386"
-BROKEN=		Does not build on !i386
-.endif
+# FIXME: SKYBOXES option only enabled for i386, as the unpacking program
+# "nwreckdum" fails when receiving SIGXFSZ on !i386 platforms.
 
-.if !defined(WITHOUT_REMODEL) || !defined(WITHOUT_SKYBOXES)
+.if !defined(WITHOUT_REMODEL) || \
+    (!defined(WITHOUT_SKYBOXES) && ${ARCH} == "i386")
 EXTRACT_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 .endif
 
-.if !defined(WITHOUT_LITS) || !defined(WITHOUT_RETEXTURE_OP) || \
-    defined(WITH_RETEXTURE_HQ)
+.if !defined(WITHOUT_LITS)
 EXTRACT_DEPENDS+=	unrar:${PORTSDIR}/archivers/unrar
 .endif
 
@@ -57,33 +58,35 @@ PLIST_SUB+=	LITS="@comment "
 .endif
 
 .if !defined(WITHOUT_REMODEL)
-DISTFILES+=	${SKINSFILE}:rev
+DISTFILES+=	${SKINSFILE}:remod
 PLIST_SUB+=	REMOD=""
 .else
 PLIST_SUB+=	REMOD="@comment "
 .endif
 
 .if defined(WITH_RETEXTURE_HQ)
-TEXFILE=	textures-486files-8-20-05.rar
-.elif !defined(WITHOUT_RETEXTURE_OP)
-TEXFILE=	textures-486files-8-20-05-low.rar
+TEXFILE=	qrp-maptextures-2007-10-06r2-7files.zip
+TEX_EXT=	tga
+.elif !defined(WITHOUT_RETEXTURE_LW)
+TEXFILE=	qrp-maptextures-2007-10-20r2-7files-low.zip
+TEX_EXT=	jpg
 .endif
 
-.if !defined(WITHOUT_RETEXTURE_OP) || defined(WITH_RETEXTURE_HQ)
-DISTFILES+=	${TEXFILE}:rev
-PLIST_SUB+=	RETEX=""
+.if !defined(WITHOUT_RETEXTURE_LW) || defined(WITH_RETEXTURE_HQ)
+DISTFILES+=	${TEXFILE}:retex
+PLIST_SUB+=	RETEX="" EXT="${TEX_EXT}"
 .else
 PLIST_SUB+=	RETEX="@comment "
 .endif
 
-.if !defined(WITHOUT_REMODEL) || !defined(WITHOUT_RETEXTURE_OP) || \
+.if !defined(WITHOUT_REMODEL) || !defined(WITHOUT_RETEXTURE_LW) || \
     defined(WITH_RETEXTURE_HQ)
 PLIST_SUB+=	TEX_DIR=""
 .else
 PLIST_SUB+=	TEX_DIR="@comment "
 .endif
 
-.if !defined(WITHOUT_SKYBOXES)
+.if !defined(WITHOUT_SKYBOXES) && ${ARCH} == "i386"
 DISTFILES+=	${SKYFILE}:fq
 EXTRACT_DEPENDS+=	nwreckdum:${PORTSDIR}/archivers/nwreckdum
 PLIST_SUB+=	SKYBOX=""
@@ -97,7 +100,7 @@ do-extract:
 	@cd ${WRKDIR}/lits && \
 		unrar x ${DISTDIR}/${DIST_SUBDIR}/${LITSFILE} >/dev/null
 .endif
-.if !defined(WITHOUT_REMODEL) || !defined(WITHOUT_RETEXTURE_OP) || \
+.if !defined(WITHOUT_REMODEL) || !defined(WITHOUT_RETEXTURE_LW) || \
     defined(WITH_RETEXTURE_HQ)
 	@${MKDIR} ${WRKDIR}/textures
 .endif
@@ -111,11 +114,14 @@ do-extract:
 		${LN} -s $$f `${ECHO_CMD} $$f | ${SED} -E -e 's/([[:alnum:]]+)_.+/\1/'`.mdl_`${ECHO_CMD} $$f | ${SED} -E -e 's/[[:alnum:]]+_(.+)/\1/'`; \
 	done
 .endif
-.if !defined(WITHOUT_RETEXTURE_OP) || defined(WITH_RETEXTURE_HQ)
-	@cd ${WRKDIR}/textures && \
-		unrar x ${DISTDIR}/${DIST_SUBDIR}/${TEXFILE} >/dev/null
+.if !defined(WITHOUT_RETEXTURE_LW) || defined(WITH_RETEXTURE_HQ)
+	@cd ${WRKDIR} && \
+	    ${UNZIP_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/${TEXFILE} "*.pk3" && \
+	    ${UNZIP_CMD} -qo *.pk3 && ${RM} *.pk3
+	@cd ${WRKDIR}/textures && for tex in *.link; do ln -s `${CAT} $$tex` \
+	    `${ECHO_CMD} $$tex | ${SED} -e 's|\.link|.${TEX_EXT}|'`; done
 .endif
-.if !defined(WITHOUT_SKYBOXES)
+.if !defined(WITHOUT_SKYBOXES) && ${ARCH} == "i386"
 	@cd ${WRKDIR} && ${UNZIP_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/${SKYFILE}
 	@nwreckdum -d ${WRKDIR}/skyboxes -p ${WRKDIR}/pakX.pak >/dev/null
 .endif
@@ -125,7 +131,7 @@ do-install:
 	${MKDIR} ${DATADIR}/id1/lits
 	${INSTALL_DATA} ${WRKSRC}/lits/* ${DATADIR}/id1/lits
 .endif
-.if !defined(WITHOUT_REMODEL) || !defined(WITHOUT_RETEXTURE_OP) || \
+.if !defined(WITHOUT_REMODEL) || !defined(WITHOUT_RETEXTURE_LW) || \
     defined(WITH_RETEXTURE_HQ)
 	${CP} -R ${WRKSRC}/textures ${DATADIR}/id1
 .endif
@@ -133,7 +139,7 @@ do-install:
 	cd ${DATADIR}/id1/textures && \
 		${LN} -s . bmodels && ${LN} -s . progs
 .endif
-.if !defined(WITHOUT_SKYBOXES)
+.if !defined(WITHOUT_SKYBOXES) && ${ARCH} == "i386"
 	${CP} -R ${WRKSRC}/skyboxes/* ${DATADIR}/id1
 .endif
 

games/quake-extras/distinfo

@@ -4,12 +4,12 @@ SIZE (quake-extras/fuhquake-lits.rar) = 8388829
 MD5 (quake-extras/SKINSbmodels-48files-4-23-05.zip) = b223ea1551b9ae3a1e54e52c10e3d592
 SHA256 (quake-extras/SKINSbmodels-48files-4-23-05.zip) = 85a450b23eeb44539a3cf1a4c9feb1aeb56a14ec4b89d01dba5d237b8987c284
 SIZE (quake-extras/SKINSbmodels-48files-4-23-05.zip) = 12627945
-MD5 (quake-extras/textures-486files-8-20-05.rar) = d6187baffaed77e6057b19b2c77ab990
-SHA256 (quake-extras/textures-486files-8-20-05.rar) = e368e0e12cf09d128eaac78e455cc4e280a38a641e8400d3c939f9889df8a1b1
-SIZE (quake-extras/textures-486files-8-20-05.rar) = 207799283
-MD5 (quake-extras/textures-486files-8-20-05-low.rar) = 020471e5fdf7ed1d2150f8b575868082
-SHA256 (quake-extras/textures-486files-8-20-05-low.rar) = 8bd7a9303db84397539c07e1a9999ebc2c52131d7616f9ee44685fc99e56edf7
-SIZE (quake-extras/textures-486files-8-20-05-low.rar) = 51679418
+MD5 (quake-extras/qrp-maptextures-2007-10-06r2-7files.zip) = 244805d95a14381fd8732054dcf106a0
+SHA256 (quake-extras/qrp-maptextures-2007-10-06r2-7files.zip) = a147ccb515f33d1bfd9411891dedc369b9b904a00c75513ee8480bc57c6cadd5
+SIZE (quake-extras/qrp-maptextures-2007-10-06r2-7files.zip) = 207202676
+MD5 (quake-extras/qrp-maptextures-2007-10-20r2-7files-low.zip) = 20c64e3fdf9ebf72f6870f413b09a1a0
+SHA256 (quake-extras/qrp-maptextures-2007-10-20r2-7files-low.zip) = e384c5c7a59414c797256f00e4b20c20fec1303349f54df57e7afdca71b00f7c
+SIZE (quake-extras/qrp-maptextures-2007-10-20r2-7files-low.zip) = 16307260
 MD5 (quake-extras/fuhquake-skyboxes.zip) = 9360d7902e24e8b89d74600ce5d61b81
 SHA256 (quake-extras/fuhquake-skyboxes.zip) = 31061d87afa4e0980bf1ca9b608f914b8294e8d8435a74d40b1016bbe232062b
 SIZE (quake-extras/fuhquake-skyboxes.zip) = 3258479

games/quake-extras/pkg-message

@@ -5,6 +5,8 @@ quake-extras has been installed.
 To load a skybox type "loadsky <skybox>", where "<skybox>" can be one of
 "dmcw", "frozendust" and "snow2".
 
-Note that the lits are only for FuhQuake and JoeQuake.
+Note that the lits are only for FuhQuake and JoeQuake based clients.
+
+Also, the low quality textures require a client with JPEG support.
 
 ==============================================================================