- Change ppc to powerpc in the Makefile because that is the value of ARCH in

  FreeBSD (I didn't know ARCH can't be overriden from the original program's
  Makefile).
- Use a list of supported architectures for VM instead of hardcoding them.

1 files changed, 15 insertions, 4 deletions

diff --git a/games/quake3/Makefile b/games/quake3/Makefile
index f1e660b4410c..79438e899814 100644
--- a/games/quake3/Makefile
+++ b/games/quake3/Makefile
@@ -37,11 +37,12 @@ PLIST_SUB=	LIBDIR="${LIBDIR:S/${PREFIX}\///}"
 
 LIBDIR=		${PREFIX}/lib/${PORTNAME}
 REALVERSION=	1.32b
+VM_ARCHS=	i386 powerpc
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_CLIENT) && defined(WITHOUT_DEDICATED) \
-    && defined(WITHOUT_SMP)
+.if defined(WITHOUT_CLIENT) && defined(WITHOUT_DEDICATED) && \
+    defined(WITHOUT_SMP)
 IGNORE=		needs at least one of CLIENT, DEDICATED and SMP options
 .endif
 
@@ -49,6 +50,16 @@ IGNORE=		needs at least one of CLIENT, DEDICATED and SMP options
 BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
 .endif
 
+.for i in ${ARCH}
+.   if ${VM_ARCHS:M${i}} != ""
+HAVE_VM_COMPILED=	yes
+.   endif
+.endfor
+
+.if !defined(HAVE_VM_COMPILED)
+MAKE_ENV+=	DLL_ONLY=true
+.endif
+
 .if !defined(WITHOUT_CLIENT) || !defined(WITHOUT_SMP)
 USE_GL=		yes
 .endif
@@ -69,7 +80,7 @@ Q3BIN+=		q3ded
 PLIST_SUB+=	DEDICATED="@comment "
 .endif
 
-.if defined(WITH_GAMELIBS) || (${ARCH} != "i386" && ${ARCH} != "powerpc")
+.if defined(WITH_GAMELIBS) || !defined(HAVE_VM_COMPILED)
 MAKE_ENV+=	GAMELIBS=YES
 PLIST_SUB+=	GAMELIBS=""
 .else
@@ -101,7 +112,7 @@ do-install:
 .for bin in ${Q3BIN}
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${bin} ${PREFIX}/bin
 .endfor
-.if defined(WITH_GAMELIBS) || (${ARCH} != "i386" && ${ARCH} != "powerpc")
+.if defined(WITH_GAMELIBS) || !defined(HAVE_VM_COMPILED)
 .for dir in baseq3 missionpack
 	${MKDIR} ${LIBDIR}/${dir}
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${dir}/*.so ${LIBDIR}/${dir}