cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- remove broken MASTER_SITES

Browse Source 
- make sure only one FLAVOR is selected to avoid packaging error
- fix WANTLIB
- regen patches while here
This commit is contained in:
ajacoutot 2008-01-11 16:48:44 +00:00
parent aeeb01b66b
commit dfbca5b986
7 changed files with 44 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
games/quake/Makefile
View File

@ -1,17 +1,17 @@
# $OpenBSD: Makefile,v 1.18 2008/01/04 17:48:35 espie Exp $
# $OpenBSD: Makefile,v 1.19 2008/01/11 16:48:44 ajacoutot Exp $
COMMENT-main= Quake/Quake-world client
COMMENT-server= Quake world server
CATEGORIES= games
FULLPKGNAME-server= quakeworld-server-20000101p1
PKGNAME-main= quake-20000101p3
FULLPKGNAME-server= quakeworld-server-20000101p2
PKGNAME-main= quake-20000101p4
DISTNAME= quake-v6-bsd-kame
PATCHFILES= quake6-00-v6-20000202b.diff.gz:0
PATCH_DIST_STRIP= -p1
HOMEPAGE= http://www.viagenie.qc.ca/en/ipv6-quake.shtml
MASTER_SITES= http://www.viagenie.qc.ca/quake/
MASTER_SITES= ${MASTER_SITE_BACKUP}
MASTER_SITES0= ftp://ftp.kame.net/pub/kame/misc/
# GPL
@ -19,7 +19,8 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
WANTLIB= c m pthread
WANTLIB= c m
USE_GMAKE= Yes
@ -34,17 +35,30 @@ CONFIGURE_ARGS= --enable-release
CONFIGURE_ARGS+= --bindir=/bin
CONFIGURE_ARGS+= --with-opengl=no --with-opengl-includes=no
BRKFLAVORMSG= choose either sdl, ggi or x11
.if ${FLAVOR:L:Msdl}
.if ${FLAVOR:L:Mggi} || ${FLAVOR:L:Mx11}
BROKEN= ${BRKFLAVORMSG}
.endif
WANTLIB+= pthread
LIB_DEPENDS-main= SDL::devel/sdl
CONFIGURE_ARGS+= --with-sdl=${LOCALBASE} --without-ggi
MAKE_FLAGS= HAS_X11=no
CFLAGS+= -pthread
.elif ${FLAVOR:L:Mggi}
.if ${FLAVOR:L:Msdl} || ${FLAVOR:L:Mx11}
BROKEN= ${BRKFLAVORMSG}
.endif
WANTLIB+= pthread
LIB_DEPENDS-main= ggi::graphics/ggi
CONFIGURE_ARGS+= --with-ggi=${LOCALBASE} --without-sdl
MAKE_FLAGS= HAS_X11=no
CFLAGS+= -pthread
.elif ${FLAVOR:L:Mx11}
.if ${FLAVOR:L:Mggi} || ${FLAVOR:L:Msdl}
BROKEN= ${BRKFLAVORMSG}
.endif
CONFIGURE_ARGS+= --without-sdl --without-ggi
MAKE_FLAGS=
WANTLIB-main= c m X11 Xext

8
games/quake/patches/patch-common_asm_i386_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-common_asm_i386_h,v 1.1 2003/04/22 14:15:33 naddy Exp $
--- common/asm_i386.h.orig Tue Apr 22 16:19:34 2003
+++ common/asm_i386.h Tue Apr 22 16:19:47 2003
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suit
$OpenBSD: patch-common_asm_i386_h,v 1.2 2008/01/11 16:48:44 ajacoutot Exp $
--- common/asm_i386.h.orig Mon Jan 10 17:59:31 2000
+++ common/asm_i386.h Fri Jan 11 17:46:14 2008
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston,
#ifndef __ASM_I386__
#define __ASM_I386__

8
games/quake/patches/patch-common_snd_oss_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-common_snd_oss_c,v 1.1.1.1 2001/08/03 13:02:16 espie Exp $
--- common/snd_oss.c.orig Mon Jul 23 05:23:56 2001
+++ common/snd_oss.c Mon Jul 23 05:24:12 2001
@@ -30,6 +30,9 @@ Foundation, Inc., 59 Temple Place - Suit
$OpenBSD: patch-common_snd_oss_c,v 1.2 2008/01/11 16:48:44 ajacoutot Exp $
--- common/snd_oss.c.orig Mon Jan 10 17:59:31 2000
+++ common/snd_oss.c Fri Jan 11 17:46:14 2008
@@ -30,6 +30,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston,
#ifdef HAVE_SYS_MMAN_H
# include <sys/mman.h>
#endif

8
games/quake/patches/patch-qw_client_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-qw_client_Makefile_in,v 1.1.1.1 2001/08/03 13:02:16 espie Exp $
--- qw_client/Makefile.in.orig Mon Jul 23 05:30:00 2001
+++ qw_client/Makefile.in Mon Jul 23 05:31:19 2001
$OpenBSD: patch-qw_client_Makefile_in,v 1.2 2008/01/11 16:48:44 ajacoutot Exp $
--- qw_client/Makefile.in.orig Fri Jan 11 17:46:13 2008
+++ qw_client/Makefile.in Fri Jan 11 17:46:15 2008
@@ -17,9 +17,10 @@ mandir = @mandir@
BUILD_DIR = ../targets/qw_client
@ -84,7 +84,7 @@ $OpenBSD: patch-qw_client_Makefile_in,v 1.1.1.1 2001/08/03 13:02:16 espie Exp $
$(GGIQUAKE): $(BUILD_DIR)/../$(GGIQUAKE)
@@ -398,30 +400,30 @@ MAKE_SURE_gl_DIR = @DIR=gl; $(MAKE_SURE_
@@ -398,30 +400,30 @@ MAKE_SURE_gl_DIR = @DIR=gl; $(MAKE_SURE_DIR)
$(BUILD_DIR)/gl/%.o: $(SRC_DIR)/%.c
$(MAKE_SURE_gl_DIR)

6
games/quake/patches/patch-qw_server_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-qw_server_Makefile_in,v 1.1.1.1 2001/08/03 13:02:16 espie Exp $
$OpenBSD: patch-qw_server_Makefile_in,v 1.2 2008/01/11 16:48:44 ajacoutot Exp $
--- qw_server/Makefile.in.orig Tue Jan 11 15:37:02 2000
+++ qw_server/Makefile.in Mon Jul 23 04:56:36 2001
+++ qw_server/Makefile.in Fri Jan 11 17:46:15 2008
@@ -16,7 +16,7 @@ COMMON_DIR=$(PROJECT_DIR)/common
QW_COMMON_DIR= $(PROJECT_DIR)/qw_common
BUILD_DIR = ../targets/qw_server
@ -19,7 +19,7 @@ $OpenBSD: patch-qw_server_Makefile_in,v 1.1.1.1 2001/08/03 13:02:16 espie Exp $
$(BUILD_DIR)/srv/%.o: $(COMMON_DIR)/%.c
$(MAKE_SURE_srv_DIR)
@@ -121,7 +121,7 @@ $(BUILD_DIR)/srv/%.o: $(QW_COMMON_DIR)/%
@@ -121,7 +121,7 @@ $(BUILD_DIR)/srv/%.o: $(QW_COMMON_DIR)/%.c
$(BUILD_DIR)/srv/%.o: $(COMMON_DIR)/%.s
$(MAKE_SURE_srv_DIR)

8
games/quake/patches/patch-qw_server_sys_unix_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-qw_server_sys_unix_c,v 1.1.1.1 2001/08/03 13:02:16 espie Exp $
--- qw_server/sys_unix.c.orig Mon Jul 23 04:26:39 2001
+++ qw_server/sys_unix.c Mon Jul 23 04:26:39 2001
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suit
$OpenBSD: patch-qw_server_sys_unix_c,v 1.2 2008/01/11 16:48:44 ajacoutot Exp $
--- qw_server/sys_unix.c.orig Fri Jan 11 17:46:13 2008
+++ qw_server/sys_unix.c Fri Jan 11 17:46:14 2008
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston,
#endif
// FIXME: use autoconf

12
games/quake/patches/patch-uquake_Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-uquake_Makefile_in,v 1.1.1.1 2001/08/03 13:02:16 espie Exp $
--- uquake/Makefile.in.orig Thu Aug 2 04:23:05 2001
+++ uquake/Makefile.in Thu Aug 2 04:23:36 2001
$OpenBSD: patch-uquake_Makefile_in,v 1.2 2008/01/11 16:48:44 ajacoutot Exp $
--- uquake/Makefile.in.orig Fri Jan 11 17:46:13 2008
+++ uquake/Makefile.in Fri Jan 11 17:46:15 2008
@@ -16,9 +16,10 @@ mandir = @mandir@
COMMON_DIR=$(PROJECT_DIR)/common
BUILD_DIR =../targets/uquake
@ -32,7 +32,7 @@ $OpenBSD: patch-uquake_Makefile_in,v 1.1.1.1 2001/08/03 13:02:16 espie Exp $
ifeq ($(SND_STYLE),Solaris)
SND_SRC = snd_dma.c snd_sun.c
endif
@@ -195,7 +199,7 @@ CL_COMMON_SRC = $(MISC_SRC) $(CL_GUI_SRC
@@ -195,7 +199,7 @@ CL_COMMON_SRC = $(MISC_SRC) $(CL_GUI_SRC) $(CL_SRC) \
# Directory specific stuff
#
DEFS = @DEFS@
@ -77,7 +77,7 @@ $OpenBSD: patch-uquake_Makefile_in,v 1.1.1.1 2001/08/03 13:02:16 espie Exp $
$(SVGAQUAKE): $(BUILD_DIR)/../$(SVGAQUAKE)
@@ -313,7 +317,7 @@ ALL_GGI_SRC = $(GENERAL_SRC) $(SW_REND_S
@@ -313,7 +317,7 @@ ALL_GGI_SRC = $(GENERAL_SRC) $(SW_REND_SRC) $(GGI_VID_
OBJSquake-ggi = $(patsubst %,$(BUILD_DIR)/ggi/%,$(addsuffix .@OBJEXT@, $(basename $(ALL_GGI_SRC) .c .s)))
GGI_CFLAGS = -DGGI @GGI_CFLAGS@
@ -104,7 +104,7 @@ $OpenBSD: patch-uquake_Makefile_in,v 1.1.1.1 2001/08/03 13:02:16 espie Exp $
$(GGIQUAKE): $(BUILD_DIR)/../$(GGIQUAKE)
@@ -365,24 +369,24 @@ MAKE_SURE_gl_DIR = @DIR=gl; $(MAKE_SURE_
@@ -365,24 +369,24 @@ MAKE_SURE_gl_DIR = @DIR=gl; $(MAKE_SURE_DIR)
$(BUILD_DIR)/gl/%.o: $(SRC_DIR)/%.c
$(MAKE_SURE_gl_DIR)