Attachment #51669 for bug #78430

View | Details | Raw Unified | Return to bug 78430
Collapse All | Expand All




#

PORTNAME=	prboom
PORTVERSION=	2.2.6
PORTREVISION=	2
CATEGORIES=	games
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}

MAINTAINER=	robin.schoonover@gmail.com
COMMENT=	A multiplayer-capable and modified version of ID's classic doom game

LIB_DEPENDS=	smpeg.1:${PORTSDIR}/multimedia/smpeg

GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CFLAGS+="-I${LOCALBASE}/include" \
		LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS+=--disable-cpu-opt

MAN5=		boom.cfg.5
MAN6=		prboom.6 prboom-game-server.6

.if defined(WITH_GL)
CONFIGURE_ARGS+=--enable-gl
USE_GL= 	yes
BROKEN=		"Does not compile on FreeBSD >= 5.x"
.endif

.include <bsd.port.pre.mk>

post-install:
.if !defined(NOPORTDOCS)

Lines 1-2 Link Here

(-)prboom/distinfo (-2 / +2 lines)
1	MD5 (prboom-2.2.2.tar.gz) = 90becb895114ab04fbb0644751a3d80b	1	MD5 (prboom-2.2.6.tar.gz) = ef0abe0aad017514857552434b5c6aaa
2	SIZE (prboom-2.2.2.tar.gz) = 1005898	2	SIZE (prboom-2.2.6.tar.gz) = 1047612




--- Makefile.in.orig	Thu Feb 17 13:43:28 2005
+++ Makefile.in	Thu Feb 17 13:45:50 2005
@@ -262,22 +262,8 @@
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 uninstall-info-am:
 install-docDATA: $(doc_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
-	@list='$(doc_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
-	  $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p; \
-	  fi; fi; \
-	done
 
 uninstall-docDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(doc_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(docdir)/$$f"; \
-	done
 
 # This directory's subdirectories are mostly independent; you can cd




 # Check whether --enable-debug or --disable-debug was given.
 if test "${enable_debug+set}" = set; then
   enableval="$enable_debug"
@@ -1250,30 +1250,8 @@
 
 
 
-# Check whether --enable-cpu-opt or --disable-cpu-opt was given.
-if test "${enable_cpu_opt+set}" = set; then
-  enableval="$enable_cpu_opt"
-  
-CPU_CFLAGS=""
-
-else
-  
-case "$target" in
-        # marginal gains from aligning code
-i386-*) CPU_CFLAGS="-m386" ;;
-i486-*) CPU_CFLAGS="-m486" ;;
-        # nothing special for pentium  
-        # CMOV op on ppro/II/686 can help us
-i686-*) CPU_CFLAGS="-mcpu=i686 -march=i686" ;;
-esac
-
-fi
-
-
-
-
 NEW_CFLAGS="$CFLAGS"
-for ac_flag in -Wall -Winline -Wwrite-strings -ffast-math $CFLAGS_OPT $CPU_CFLAGS
+for ac_flag in -Wall -Winline -Wwrite-strings -ffast-math $CFLAGS_OPT
 do
  echo $ac_n "checking whether compiler supports $ac_flag""... $ac_c" 1>&6
 echo "configure:1280: checking whether compiler supports $ac_flag" >&5

Lines 1-11 Link Here

(-)prboom/files/patch-data-Makefile.in (-7 / +7 lines)
1	--- data/Makefile.in.orig Sun Apr 1 02:14:06 2001	1	--- data/Makefile.in.orig Thu Feb 17 14:46:13 2005
2	+++ data/Makefile.in Sun Jun 10 16:49:16 2001	2	+++ data/Makefile.in Mon Sep 27 11:31:31 2004
3	@@ -91,7 +91,7 @@	3	@@ -163,7 +163,7 @@
4	VERSION = @VERSION@	4	target_cpu = @target_cpu@
5	ac_aux_dir = @ac_aux_dir@	5	target_os = @target_os@
6		6	target_vendor = @target_vendor@
7	-waddir = $(datadir)/games/doom	7	-waddir = $(datadir)/games/doom
8	+waddir = $(datadir)/doom	8	+waddir = $(datadir)/doom
9	wad_DATA = prboom.wad	9	wad_DATA = prboom.wad
10	EXTRA_DIST = prboom.wad	10	EXTRA_DIST = prboom.wad
11	mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs	11	all: all-am




--- doc/Makefile.in.orig	Mon Sep 27 11:31:31 2004
+++ doc/Makefile.in	Thu Feb 17 14:55:23 2005
@@ -32,7 +32,7 @@
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = 
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
@@ -297,22 +297,9 @@
 	  rm -f "$(DESTDIR)$(man6dir)/$$inst"; \
 	done
 install-docDATA: $(doc_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
-	@list='$(doc_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
-	  $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p; \
-	  fi; fi; \
-	done
 
 uninstall-docDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(doc_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(docdir)/$$f"; \
-	done
+
 tags: TAGS




--- src/Makefile.in.orig	Mon Sep 27 11:31:32 2004
+++ src/Makefile.in	Thu Feb 17 15:01:16 2005
@@ -37,7 +37,7 @@
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = 
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
@@ -276,7 +276,7 @@
 target_vendor = @target_vendor@
 EXTRA_SUBDIRS = Posix SDL
 SUBDIRS = SDL POSIX
 
-gamesdir = $(prefix)/games
+gamesdir = $(prefix)/bin
 prboom_game_server_SOURCES = d_server.c i_udp_sdl.c protocol.h
 prboom_game_server_LDADD = POSIX/libposixdoom.a @NET_LIBS@ @SDL_LIBS@
 COMMON_SRC = \

Return to bug 78430

Lines 6-18 Link Here

(-)prboom/Makefile (-7 / +8 lines)
6	#	6	#
7		7
8	PORTNAME= prboom	8	PORTNAME= prboom
9	PORTVERSION= 2.2.2	9	PORTVERSION= 2.2.6
10	PORTREVISION= 2
11	CATEGORIES= games	10	CATEGORIES= games
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
14		13
15	MAINTAINER= fracture@allusion.net	14	MAINTAINER= robin.schoonover@gmail.com
16	COMMENT= A multiplayer-capable and modified version of ID's classic doom game	15	COMMENT= A multiplayer-capable and modified version of ID's classic doom game
17		16
18	LIB_DEPENDS= smpeg.1:${PORTSDIR}/multimedia/smpeg	17	LIB_DEPENDS= smpeg.1:${PORTSDIR}/multimedia/smpeg
Lines 22-36 Link Here
22	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
23	CONFIGURE_ENV= CFLAGS+="-I${LOCALBASE}/include" \	22	CONFIGURE_ENV= CFLAGS+="-I${LOCALBASE}/include" \
24	LDFLAGS="-L${LOCALBASE}/lib"	23	LDFLAGS="-L${LOCALBASE}/lib"
		24	CONFIGURE_ARGS+=--disable-cpu-opt
25		25
26	MAN5= boom.cfg.5	26	MAN5= boom.cfg.5
27	MAN6= prboom.6 prboom-game-server.6	27	MAN6= prboom.6 prboom-game-server.6
28		28
29	.include <bsd.port.pre.mk>	29	.if defined(WITH_GL)
30		30	CONFIGURE_ARGS+=--enable-gl
31	.if ${OSVERSION} >= 502126	31	USE_GL= yes
32	BROKEN= "Does not compile on FreeBSD >= 5.x"
33	.endif	32	.endif
		33
		34	.include <bsd.port.pre.mk>
34		35
35	post-install:	36	post-install:
36	.if !defined(NOPORTDOCS)	37	.if !defined(NOPORTDOCS)

Lines 1-25 Link Here

(-)prboom/files/patch-Makefile.in (-15 / +14 lines)
1	--- Makefile.in.orig Fri Jun 29 03:30:25 2001	1	--- Makefile.in.orig Thu Feb 17 13:43:28 2005
2	+++ Makefile.in Fri Jun 29 03:31:24 2001	2	+++ Makefile.in Thu Feb 17 13:45:50 2005
3	@@ -167,23 +167,8 @@	3	@@ -262,22 +262,8 @@
4	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status	4	cd $(top_builddir) && $(SHELL) ./config.status $@
5		5	uninstall-info-am:
6	install-docDATA: $(doc_DATA)	6	install-docDATA: $(doc_DATA)
7	- @$(NORMAL_INSTALL)	7	- @$(NORMAL_INSTALL)
8	- $(mkinstalldirs) $(DESTDIR)$(docdir)	8	- test -z "$(docdir)" \|\| $(mkdir_p) "$(DESTDIR)$(docdir)"
9	- @list='$(doc_DATA)'; for p in $$list; do \	9	- @list='$(doc_DATA)'; for p in $$list; do \
10	- if test -f $(srcdir)/$$p; then \	10	- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
11	- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docdir)/$$p"; \	11	- f="`echo $$p \| sed -e 's\|^.*/\|\|'`"; \
12	- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docdir)/$$p; \	12	- echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
13	- else if test -f $$p; then \	13	- $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
14	- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p"; \
15	- $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p; \
16	- fi; fi; \
17	- done	14	- done
18		15
19	uninstall-docDATA:	16	uninstall-docDATA:
20	- @$(NORMAL_UNINSTALL)	17	- @$(NORMAL_UNINSTALL)
21	- list='$(doc_DATA)'; for p in $$list; do \	18	- @list='$(doc_DATA)'; for p in $$list; do \
22	- rm -f $(DESTDIR)$(docdir)/$$p; \	19	- f="`echo $$p \| sed -e 's\|^.*/\|\|'`"; \
		20	- echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \
		21	- rm -f "$(DESTDIR)$(docdir)/$$f"; \
23	- done	22	- done
24		23
25	# This directory's subdirectories are mostly independent; you can cd	24	# This directory's subdirectories are mostly independent; you can cd

Lines 21-55 Link Here

(-)prboom/files/patch-configure (-32 lines)
21	# Check whether --enable-debug or --disable-debug was given.	21	# Check whether --enable-debug or --disable-debug was given.
22	if test "${enable_debug+set}" = set; then	22	if test "${enable_debug+set}" = set; then
23	enableval="$enable_debug"	23	enableval="$enable_debug"
24	@@ -1250,30 +1250,8 @@
25
26
27
28	-# Check whether --enable-cpu-opt or --disable-cpu-opt was given.
29	-if test "${enable_cpu_opt+set}" = set; then
30	- enableval="$enable_cpu_opt"
31	-
32	-CPU_CFLAGS=""
33	-
34	-else
35	-
36	-case "$target" in
37	- # marginal gains from aligning code
38	-i386-*) CPU_CFLAGS="-m386" ;;
39	-i486-*) CPU_CFLAGS="-m486" ;;
40	- # nothing special for pentium
41	- # CMOV op on ppro/II/686 can help us
42	-i686-*) CPU_CFLAGS="-mcpu=i686 -march=i686" ;;
43	-esac
44	-
45	-fi
46	-
47	-
48	-
49	-
50	NEW_CFLAGS="$CFLAGS"
51	-for ac_flag in -Wall -Winline -Wwrite-strings -ffast-math $CFLAGS_OPT $CPU_CFLAGS
52	+for ac_flag in -Wall -Winline -Wwrite-strings -ffast-math $CFLAGS_OPT
53	do
54	echo $ac_n "checking whether compiler supports $ac_flag""... $ac_c" 1>&6
55	echo "configure:1280: checking whether compiler supports $ac_flag" >&5

Lines 1-25 Link Here

(-)prboom/files/patch-doc-Makefile.in (-15 / +23 lines)
1	--- doc/Makefile.in.orig Sun Apr 1 02:14:05 2001	1	--- doc/Makefile.in.orig Mon Sep 27 11:31:31 2004
2	+++ doc/Makefile.in Fri Jun 29 03:39:06 2001	2	+++ doc/Makefile.in Thu Feb 17 14:55:23 2005
3	@@ -196,23 +196,9 @@	3	@@ -32,7 +32,7 @@
4	$(MAKE) $(AM_MAKEFLAGS) uninstall-man5 uninstall-man6	4	install_sh_PROGRAM = $(install_sh) -c
5		5	install_sh_SCRIPT = $(install_sh) -c
		6	INSTALL_HEADER = $(INSTALL_DATA)
		7	-transform = $(program_transform_name)
		8	+transform =
		9	NORMAL_INSTALL = :
		10	PRE_INSTALL = :
		11	POST_INSTALL = :
		12	@@ -297,22 +297,9 @@
		13	rm -f "$(DESTDIR)$(man6dir)/$$inst"; \
		14	done
6	install-docDATA: $(doc_DATA)	15	install-docDATA: $(doc_DATA)
7	- @$(NORMAL_INSTALL)	16	- @$(NORMAL_INSTALL)
8	- $(mkinstalldirs) $(DESTDIR)$(docdir)	17	- test -z "$(docdir)" \|\| $(mkdir_p) "$(DESTDIR)$(docdir)"
9	- @list='$(doc_DATA)'; for p in $$list; do \	18	- @list='$(doc_DATA)'; for p in $$list; do \
10	- if test -f $(srcdir)/$$p; then \	19	- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
11	- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docdir)/$$p"; \	20	- f="`echo $$p \| sed -e 's\|^.*/\|\|'`"; \
12	- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docdir)/$$p; \	21	- echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
13	- else if test -f $$p; then \	22	- $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
14	- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p"; \
15	- $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p; \
16	- fi; fi; \
17	- done	23	- done
18		24
19	uninstall-docDATA:	25	uninstall-docDATA:
20	- @$(NORMAL_UNINSTALL)	26	- @$(NORMAL_UNINSTALL)
21	- list='$(doc_DATA)'; for p in $$list; do \	27	- @list='$(doc_DATA)'; for p in $$list; do \
22	- rm -f $(DESTDIR)$(docdir)/$$p; \	28	- f="`echo $$p \| sed -e 's\|^.*/\|\|'`"; \
		29	- echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \
		30	- rm -f "$(DESTDIR)$(docdir)/$$f"; \
23	- done	31	- done
24	+	32	+
25	tags: TAGS	33	tags: TAGS

Lines 1-11 Link Here

(-)prboom/files/patch-src-Makefile.in (-8 / +17 lines)
1	--- src/Makefile.in.orig Sun Apr 1 02:14:08 2001	1	--- src/Makefile.in.orig Mon Sep 27 11:31:32 2004
2	+++ src/Makefile.in Sun Jun 10 16:44:19 2001	2	+++ src/Makefile.in Thu Feb 17 15:01:16 2005
3	@@ -97,7 +97,7 @@	3	@@ -37,7 +37,7 @@
4		4	install_sh_PROGRAM = $(install_sh) -c
		5	install_sh_SCRIPT = $(install_sh) -c
		6	INSTALL_HEADER = $(INSTALL_DATA)
		7	-transform = $(program_transform_name)
		8	+transform =
		9	NORMAL_INSTALL = :
		10	PRE_INSTALL = :
		11	POST_INSTALL = :
		12	@@ -276,7 +276,7 @@
		13	target_vendor = @target_vendor@
		14	EXTRA_SUBDIRS = Posix SDL
5	SUBDIRS = SDL POSIX	15	SUBDIRS = SDL POSIX
6
7	-gamesdir = $(prefix)/games	16	-gamesdir = $(prefix)/games
8	+gamesdir = $(prefix)/bin	17	+gamesdir = $(prefix)/bin
9	EXTRA_PROGRAMS = prboom-game-server	18	prboom_game_server_SOURCES = d_server.c i_udp_sdl.c protocol.h
10	games_PROGRAMS = prboom @BUILD_SERVER@	19	prboom_game_server_LDADD = POSIX/libposixdoom.a @NET_LIBS@ @SDL_LIBS@
11		20	COMMON_SRC = \