- Remove PKGNAMEPREFIX.

- Remove CONFLICTS with quake3. Install libraries in lib/q3base.
- Remove ONLY_FOR_ARCHS (builds on other archs).
- Integrate with quake3-data.
- Avoid creating a botlib.log file in the current directory.
- Add NO_PACKAGE and pkg-message to !i386, and ask for feedback.

PR:		ports/97931
Submitted by:	alepulver (myself)
Approved by:	garga (mentor, implicitly), maintainer

6 files changed, 68 insertions, 94 deletions

diff --git a/games/q3base/Makefile b/games/q3base/Makefile
index ea84aca62eaa..e16c2bb3a5b6 100644
--- a/games/q3base/Makefile
+++ b/games/q3base/Makefile
@@ -9,25 +9,15 @@ PORTNAME=		q3base
 PORTVERSION=		0.1
 CATEGORIES=		games
 MASTER_SITES=		http://quake3.quakesrc.org/files/quake3/q3base/
-PKGNAMEPREFIX=		quake3-
 
 MAINTAINER=		ed@fxq.nl
 COMMENT=		Quake III Arena fork using SDL
 
-BUILD_DEPENDS=		nasm:${PORTSDIR}/devel/nasm
-
 USE_BZIP2=		yes
 USE_SDL=		sdl net
 
-ONLY_FOR_ARCHS=		i386
-
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV+=		SDL_CONFIG=${SDL_CONFIG}
 CONFIGURE_TARGET=
-CONFLICTS=		q3server-1.32* quake3-[0-9]*
-
-SUB_FILES=		pkg-message
-PKGMESSAGE=		${WRKSRC}/pkg-message
 
 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS=		--disable-client
@@ -38,9 +28,27 @@ USE_SDL+=		image
 
 .include <bsd.port.pre.mk>
 
+.if ${ARCH} == "i386"
+BUILD_DEPENDS=		nasm:${PORTSDIR}/devel/nasm
+.endif
+
+.if ${ARCH} != "i386"
+NO_PACkAGE=	we don't know if this port works on ${ARCH}
+SUB_FILES+=	pkg-message
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|\($${exec_prefix}/lib\)/quake3|\1/q3base|' \
+		${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|botlib\.log|/dev/null|' \
+		${WRKSRC}/src/botlib/be_interface.c
+
+.if ${ARCH} != "i386"
 post-install:
-	@${MKDIR} ${PREFIX}/share/quake3/baseq3
-	@${MKDIR} ${PREFIX}/share/quake3/missionpack
+	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
+	@${ECHO_CMD}
+.endif
 
+.include "${.CURDIR}/../quake3-data/Makefile.include"
 .include <bsd.port.post.mk>
diff --git a/games/q3base/files/pkg-message.in b/games/q3base/files/pkg-message.in
index 199dc1eeafbc..9f4d8f47e777 100644
--- a/games/q3base/files/pkg-message.in
+++ b/games/q3base/files/pkg-message.in
@@ -1,25 +1,8 @@
-========================================================================
+==============================================================================
 
-In order to play Quake III Arena or Quake III Team Arena, you need to
-copy the non-free data-files from the CD to:
+This port has not been tested on this architecture.
 
-	%%PREFIX%%/share/quake3
+Please give feedback to the maintainer about whether it works or not, so it
+can be marked as it should.
 
-For Quake III Arena, you need to have pak0.pk3 to pak8.pk3 stored in the
-'baseq3' directory. Quake III Team Arena also needs pak0.pk3 stored in
-the 'missionpack' directory.
-
-Below is a list of pk3 files, including their MD5 checksums:
-
-MD5 (%%PREFIX%%/share/quake3/baseq3/pak0.pk3) = 1197ca3df1e65f3c380f8abc10ca43bf
-MD5 (%%PREFIX%%/share/quake3/baseq3/pak1.pk3) = 48911719d91be25adb957f2d325db4a0
-MD5 (%%PREFIX%%/share/quake3/baseq3/pak2.pk3) = d550ce896130c47166ca44b53f8a670a
-MD5 (%%PREFIX%%/share/quake3/baseq3/pak3.pk3) = 968dfd0f30dad67056115c8e92344ddc
-MD5 (%%PREFIX%%/share/quake3/baseq3/pak4.pk3) = 24bb1f4fcabd95f6e320c0e2f62f19ca
-MD5 (%%PREFIX%%/share/quake3/baseq3/pak5.pk3) = 734dcd06d2cbc7a16432ff6697f1c5ba
-MD5 (%%PREFIX%%/share/quake3/baseq3/pak6.pk3) = 873888a73055c023f6c38b8ca3f2ce05
-MD5 (%%PREFIX%%/share/quake3/baseq3/pak7.pk3) = 8fd38c53ed814b64f6ab03b5290965e4
-MD5 (%%PREFIX%%/share/quake3/baseq3/pak8.pk3) = d8b96d429ca4a9c289071cb7e77e14d2
-MD5 (%%PREFIX%%/share/quake3/missionpack/pak0.pk3) = e8ba9e3bf06210930bc0e7fdbcdd01c2
-
-========================================================================
+==============================================================================
diff --git a/games/q3base/pkg-plist b/games/q3base/pkg-plist
index cae9f01cd4f0..587aecffed7b 100644
--- a/games/q3base/pkg-plist
+++ b/games/q3base/pkg-plist
@@ -1,14 +1,10 @@
 bin/q3base
-lib/quake3/baseq3/cgame.so
-lib/quake3/baseq3/qagame.so
-lib/quake3/baseq3/ui.so
-lib/quake3/missionpack/cgame.so
-lib/quake3/missionpack/qagame.so
-lib/quake3/missionpack/ui.so
-@dirrm lib/quake3/baseq3
-@dirrm lib/quake3/missionpack
-@dirrmtry lib/quake3
-@dirrmtry share/quake3/q3base
-@dirrmtry share/quake3/missionpack
-@dirrmtry share/quake3/baseq3
-@dirrmtry share/quake3
+lib/q3base/baseq3/cgame.so
+lib/q3base/baseq3/qagame.so
+lib/q3base/baseq3/ui.so
+lib/q3base/missionpack/cgame.so
+lib/q3base/missionpack/qagame.so
+lib/q3base/missionpack/ui.so
+@dirrm lib/q3base/baseq3
+@dirrm lib/q3base/missionpack
+@dirrm lib/q3base
diff --git a/games/quake3-q3base/Makefile b/games/quake3-q3base/Makefile
index ea84aca62eaa..e16c2bb3a5b6 100644
--- a/games/quake3-q3base/Makefile
+++ b/games/quake3-q3base/Makefile
@@ -9,25 +9,15 @@ PORTNAME=		q3base
 PORTVERSION=		0.1
 CATEGORIES=		games
 MASTER_SITES=		http://quake3.quakesrc.org/files/quake3/q3base/
-PKGNAMEPREFIX=		quake3-
 
 MAINTAINER=		ed@fxq.nl
 COMMENT=		Quake III Arena fork using SDL
 
-BUILD_DEPENDS=		nasm:${PORTSDIR}/devel/nasm
-
 USE_BZIP2=		yes
 USE_SDL=		sdl net
 
-ONLY_FOR_ARCHS=		i386
-
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV+=		SDL_CONFIG=${SDL_CONFIG}
 CONFIGURE_TARGET=
-CONFLICTS=		q3server-1.32* quake3-[0-9]*
-
-SUB_FILES=		pkg-message
-PKGMESSAGE=		${WRKSRC}/pkg-message
 
 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS=		--disable-client
@@ -38,9 +28,27 @@ USE_SDL+=		image
 
 .include <bsd.port.pre.mk>
 
+.if ${ARCH} == "i386"
+BUILD_DEPENDS=		nasm:${PORTSDIR}/devel/nasm
+.endif
+
+.if ${ARCH} != "i386"
+NO_PACkAGE=	we don't know if this port works on ${ARCH}
+SUB_FILES+=	pkg-message
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|\($${exec_prefix}/lib\)/quake3|\1/q3base|' \
+		${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|botlib\.log|/dev/null|' \
+		${WRKSRC}/src/botlib/be_interface.c
+
+.if ${ARCH} != "i386"
 post-install:
-	@${MKDIR} ${PREFIX}/share/quake3/baseq3
-	@${MKDIR} ${PREFIX}/share/quake3/missionpack
+	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
+	@${ECHO_CMD}
+.endif
 
+.include "${.CURDIR}/../quake3-data/Makefile.include"
 .include <bsd.port.post.mk>
diff --git a/games/quake3-q3base/files/pkg-message.in b/games/quake3-q3base/files/pkg-message.in
index 199dc1eeafbc..9f4d8f47e777 100644
--- a/games/quake3-q3base/files/pkg-message.in
+++ b/games/quake3-q3base/files/pkg-message.in
@@ -1,25 +1,8 @@
-========================================================================
+==============================================================================
 
-In order to play Quake III Arena or Quake III Team Arena, you need to
-copy the non-free data-files from the CD to:
+This port has not been tested on this architecture.
 
-	%%PREFIX%%/share/quake3
+Please give feedback to the maintainer about whether it works or not, so it
+can be marked as it should.
 
-For Quake III Arena, you need to have pak0.pk3 to pak8.pk3 stored in the
-'baseq3' directory. Quake III Team Arena also needs pak0.pk3 stored in
-the 'missionpack' directory.
-
-Below is a list of pk3 files, including their MD5 checksums:
-
-MD5 (%%PREFIX%%/share/quake3/baseq3/pak0.pk3) = 1197ca3df1e65f3c380f8abc10ca43bf
-MD5 (%%PREFIX%%/share/quake3/baseq3/pak1.pk3) = 48911719d91be25adb957f2d325db4a0
-MD5 (%%PREFIX%%/share/quake3/baseq3/pak2.pk3) = d550ce896130c47166ca44b53f8a670a
-MD5 (%%PREFIX%%/share/quake3/baseq3/pak3.pk3) = 968dfd0f30dad67056115c8e92344ddc
-MD5 (%%PREFIX%%/share/quake3/baseq3/pak4.pk3) = 24bb1f4fcabd95f6e320c0e2f62f19ca
-MD5 (%%PREFIX%%/share/quake3/baseq3/pak5.pk3) = 734dcd06d2cbc7a16432ff6697f1c5ba
-MD5 (%%PREFIX%%/share/quake3/baseq3/pak6.pk3) = 873888a73055c023f6c38b8ca3f2ce05
-MD5 (%%PREFIX%%/share/quake3/baseq3/pak7.pk3) = 8fd38c53ed814b64f6ab03b5290965e4
-MD5 (%%PREFIX%%/share/quake3/baseq3/pak8.pk3) = d8b96d429ca4a9c289071cb7e77e14d2
-MD5 (%%PREFIX%%/share/quake3/missionpack/pak0.pk3) = e8ba9e3bf06210930bc0e7fdbcdd01c2
-
-========================================================================
+==============================================================================
diff --git a/games/quake3-q3base/pkg-plist b/games/quake3-q3base/pkg-plist
index cae9f01cd4f0..587aecffed7b 100644
--- a/games/quake3-q3base/pkg-plist
+++ b/games/quake3-q3base/pkg-plist
@@ -1,14 +1,10 @@
 bin/q3base
-lib/quake3/baseq3/cgame.so
-lib/quake3/baseq3/qagame.so
-lib/quake3/baseq3/ui.so
-lib/quake3/missionpack/cgame.so
-lib/quake3/missionpack/qagame.so
-lib/quake3/missionpack/ui.so
-@dirrm lib/quake3/baseq3
-@dirrm lib/quake3/missionpack
-@dirrmtry lib/quake3
-@dirrmtry share/quake3/q3base
-@dirrmtry share/quake3/missionpack
-@dirrmtry share/quake3/baseq3
-@dirrmtry share/quake3
+lib/q3base/baseq3/cgame.so
+lib/q3base/baseq3/qagame.so
+lib/q3base/baseq3/ui.so
+lib/q3base/missionpack/cgame.so
+lib/q3base/missionpack/qagame.so
+lib/q3base/missionpack/ui.so
+@dirrm lib/q3base/baseq3
+@dirrm lib/q3base/missionpack
+@dirrm lib/q3base