On Fri, Jan 23, 2009 at 11:30:03AM -0800, Ryan Freeman wrote:
> hello,
>
> attached is a patch updating prboom to the latest release, 2.5.0.
> changelog here: http://prboom.sourceforge.net/
>
> i have modified the patches so data files do go under
>
> /usr/local/share/games/doom rather than
> /usr/local/share/prboom
>
> as all the other doom ports are generally setup to use that standard
> location for iwads and port's helper wads.
Actually, I believe we should change it to be /var/doomwads. Users
need a writable directory to copy wads into and /usr/local/share doesn't
work for that.
> ? prboom-2.5.0.diff
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/games/prboom/Makefile,v
> retrieving revision 1.14
> diff -u -r1.14 Makefile
> --- Makefile 5 Dec 2007 13:15:09 -0000 1.14
> +++ Makefile 23 Jan 2009 18:55:46 -0000
> @@ -1,31 +1,34 @@
> # $OpenBSD: Makefile,v 1.14 2007/12/05 13:15:09 ajacoutot Exp $
>
> -COMMENT= enhanced clone of Id Software's Doom game; multiplayer
> -DISTNAME= prboom-2.4.7
> -PKGNAME= ${DISTNAME}p1
> -CATEGORIES= games x11
> -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=prboom/}
> +COMMENT = enhanced clone of Id Software's Doom game; multiplayer
> +DISTNAME = prboom-2.5.0
> +CATEGORIES = games x11
> +MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=prboom/}
>
> -HOMEPAGE= http://prboom.sourceforge.net/
> +HOMEPAGE = http://prboom.sourceforge.net/
> +
> +MAINTAINER = Ryan Freeman <r...@slipgate.org>
>
> # GPL
> -PERMIT_PACKAGE_CDROM= Yes
> -PERMIT_PACKAGE_FTP= Yes
> -PERMIT_DISTFILES_CDROM= Yes
> -PERMIT_DISTFILES_FTP= Yes
> +PERMIT_PACKAGE_CDROM = Yes
> +PERMIT_PACKAGE_FTP = Yes
> +PERMIT_DISTFILES_CDROM =Yes
> +PERMIT_DISTFILES_FTP = Yes
> +
> +WANTLIB = SDL c m pthread GL GLU
>
> -WANTLIB= SDL c m pthread z GL GLU
> +USE_X11 = Yes
>
> -USE_X11=Yes
> +LIB_DEPENDS = SDL_mixer.>=3::devel/sdl-mixer \
> + SDL_net.>=1::devel/sdl-net
> +# png.>=4::graphics/png
>
> -LIB_DEPENDS= SDL_mixer.>=3::devel/sdl-mixer \
> - SDL_net.>=1::devel/sdl-net \
> - png.>=4::graphics/png
> +MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=prboom/}
>
> -CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include
> -I${LOCALBASE}/include/libpng" \
> +CONFIGURE_ENV +=CPPFLAGS="-I${X11BASE}/include" \
> LDFLAGS="-L${LOCALBASE}/lib"
> -CONFIGURE_STYLE=gnu
> -CONFIGURE_ARGS+=--disable-cpu-opt
> +CONFIGURE_STYLE = gnu
> +CONFIGURE_ARGS += --disable-cpu-opt
> MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/autotools
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/games/prboom/distinfo,v
> retrieving revision 1.9
> diff -u -r1.9 distinfo
> --- distinfo 5 Apr 2007 15:38:11 -0000 1.9
> +++ distinfo 23 Jan 2009 18:55:46 -0000
> @@ -1,5 +1,5 @@
> -MD5 (prboom-2.4.7.tar.gz) = mUL1IXZNf4nfIhikVtpPAg==
> -RMD160 (prboom-2.4.7.tar.gz) = eMhUiVTdlUafgJm8j6aX9ippwX4=
> -SHA1 (prboom-2.4.7.tar.gz) = Uq65M9t3C0gzExfcNX9sutMIVgA=
> -SHA256 (prboom-2.4.7.tar.gz) = 3iLbqs0loPCxbFB6ojJqkLf13Pz4YsPccHaZbGGHzS8=
> -SIZE (prboom-2.4.7.tar.gz) = 999524
> +MD5 (prboom-2.5.0.tar.gz) = qKFfYfomJquYBRqycDN4xA==
> +RMD160 (prboom-2.5.0.tar.gz) = zGlcoM65+bnKKs5yZ6BkeZxh/7o=
> +SHA1 (prboom-2.5.0.tar.gz) = 8X3G7U5y0HuFQpF3sAuHCeo29aA=
> +SHA256 (prboom-2.5.0.tar.gz) = ImwcRw+MyYMydTZAT0BaHQJs8KUYjGlKEkPMhjABS64=
> +SIZE (prboom-2.5.0.tar.gz) = 1049505
> Index: patches/patch-Makefile_in
> ===================================================================
> RCS file: /cvs/ports/games/prboom/patches/patch-Makefile_in,v
> retrieving revision 1.1
> diff -u -r1.1 patch-Makefile_in
> --- patches/patch-Makefile_in 22 Sep 2006 05:54:38 -0000 1.1
> +++ patches/patch-Makefile_in 23 Jan 2009 18:55:46 -0000
> @@ -1,12 +1,12 @@
> -$OpenBSD: patch-Makefile_in,v 1.1 2006/09/22 05:54:38 jsg Exp $
> ---- Makefile.in.orig Fri Sep 22 13:30:36 2006
> -+++ Makefile.in Fri Sep 22 13:30:54 2006
> -@@ -207,7 +207,7 @@ AUX_DIST_GEN = \
> - $(ac_aux_dir)/missing
> -
> - MAINTAINERCLEANFILES = $(AUX_DIST_GEN)
> +$OpenBSD$
> +--- Makefile.in.orig Sat Dec 13 12:04:48 2008
> ++++ Makefile.in Sat Dec 13 12:05:11 2008
> +@@ -163,7 +163,7 @@ build_vendor = @build_vendor@
> + builddir = @builddir@
> + datadir = @datadir@
> + datarootdir = @datarootdir@
> -docdir = $(prefix)/share/doc/@pack...@-@VERSION@
> +docdir = $(prefix)/share/doc/prboom
> - SUBDIRS = doc data src ICONS VisualC8 VisualC6
> - EXTRA_DIST = prboom.spec.in prboom.spec config.h bootstrap $(AUX_DIST_GEN)
> - doc_DATA = README COPYING AUTHORS NEWS
> + dvidir = @dvidir@
> + exec_prefix = @exec_prefix@
> + host = @host@
> Index: patches/patch-configure
> ===================================================================
> RCS file: /cvs/ports/games/prboom/patches/patch-configure,v
> retrieving revision 1.6
> diff -u -r1.6 patch-configure
> --- patches/patch-configure 20 Nov 2006 03:15:36 -0000 1.6
> +++ patches/patch-configure 23 Jan 2009 18:55:46 -0000
> @@ -1,19 +1,7 @@
> -$OpenBSD: patch-configure,v 1.6 2006/11/20 03:15:36 jolan Exp $
> ---- configure.orig Sun Nov 19 11:45:22 2006
> -+++ configure Sun Nov 19 21:12:41 2006
> -@@ -1913,9 +1913,9 @@ if test "${with_waddir+set}" = set; then
> - DOOMWADDIR="$withval"
> - else
> - if test "x$prefix" != xNONE; then
> -- DOOMWADDIR="$prefix/share/games/doom"
> -+ DOOMWADDIR="$prefix/share/prboom"
> - else
> -- DOOMWADDIR="$ac_default_prefix/share/games/doom"
> -+ DOOMWADDIR="$ac_default_prefix/share/prboom"
> - fi
> -
> - fi;
> -@@ -5999,7 +5999,7 @@ if test "${ac_cv_lib_png_png_create_info
> +$OpenBSD$
> +--- configure.orig Sun Nov 9 11:22:17 2008
> ++++ configure Sat Dec 13 12:07:28 2008
> +@@ -6814,7 +6814,7 @@ if test "${ac_cv_lib_png_png_create_info_struct+set}"
> echo $ECHO_N "(cached) $ECHO_C" >&6
> else
> ac_check_lib_save_LIBS=$LIBS
> @@ -22,7 +10,7 @@
> cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h. */
> _ACEOF
> -@@ -6061,7 +6061,7 @@ if test $ac_cv_lib_png_png_create_info_s
> +@@ -6874,7 +6874,7 @@ if test $ac_cv_lib_png_png_create_info_struct = yes; t
> #define HAVE_LIBPNG 1
> _ACEOF
>
> Index: patches/patch-doc_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/games/prboom/patches/patch-doc_Makefile_in,v
> retrieving revision 1.1
> diff -u -r1.1 patch-doc_Makefile_in
> --- patches/patch-doc_Makefile_in 22 Sep 2006 05:54:38 -0000 1.1
> +++ patches/patch-doc_Makefile_in 23 Jan 2009 18:55:46 -0000
> @@ -1,12 +1,12 @@
> -$OpenBSD: patch-doc_Makefile_in,v 1.1 2006/09/22 05:54:38 jsg Exp $
> ---- doc/Makefile.in.orig Sat Aug 12 21:33:32 2006
> -+++ doc/Makefile.in Fri Sep 22 13:30:07 2006
> -@@ -175,7 +175,7 @@ target_alias = @target_alias@
> - target_cpu = @target_cpu@
> - target_os = @target_os@
> - target_vendor = @target_vendor@
> +$OpenBSD$
> +--- doc/Makefile.in.orig Sat Dec 13 12:09:06 2008
> ++++ doc/Makefile.in Sat Dec 13 12:09:21 2008
> +@@ -140,7 +140,7 @@ build_vendor = @build_vendor@
> + builddir = @builddir@
> + datadir = @datadir@
> + datarootdir = @datarootdir@
> -docdir = $(prefix)/share/doc/@pack...@-@VERSION@
> +docdir = $(prefix)/share/doc/prboom
> - man_MANS = prboom.6 boom.cfg.5 prboom-game-server.6
> - doc_DATA = boom.txt MBF.txt MBFFAQ.txt README.demos README.compat
> - EXTRA_DIST = boom.txt prboom.6 boom.cfg.5 prboom-game-server.6 \
> + dvidir = @dvidir@
> + exec_prefix = @exec_prefix@
> + host = @host@
> Index: patches/patch-src_Makefile_in
> ===================================================================
> RCS file: /cvs/ports/games/prboom/patches/patch-src_Makefile_in,v
> retrieving revision 1.7
> diff -u -r1.7 patch-src_Makefile_in
> --- patches/patch-src_Makefile_in 20 Nov 2006 03:15:36 -0000 1.7
> +++ patches/patch-src_Makefile_in 23 Jan 2009 18:55:46 -0000
> @@ -1,9 +1,9 @@
> -$OpenBSD: patch-src_Makefile_in,v 1.7 2006/11/20 03:15:36 jolan Exp $
> ---- src/Makefile.in.orig Sun Nov 19 11:45:21 2006
> -+++ src/Makefile.in Sun Nov 19 21:12:41 2006
> -@@ -248,7 +248,7 @@ target_cpu = @target_cpu@
> - target_os = @target_os@
> - target_vendor = @target_vendor@
> +$OpenBSD$
> +--- src/Makefile.in.orig Sat Dec 13 12:10:14 2008
> ++++ src/Makefile.in Sat Dec 13 12:10:32 2008
> +@@ -246,7 +246,7 @@ target_vendor = @target_vendor@
> + top_builddir = @top_builddir@
> + top_srcdir = @top_srcdir@
> SUBDIRS = SDL POSIX MAC
> -gamesdir = $(prefix)/games
> +gamesdir = $(prefix)/bin
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/games/prboom/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -r1.3 PLIST
> --- pkg/PLIST 15 Sep 2004 00:46:10 -0000 1.3
> +++ pkg/PLIST 23 Jan 2009 18:55:46 -0000
> @@ -1,6 +1,6 @@
> @comment $OpenBSD: PLIST,v 1.3 2004/09/15 00:46:10 espie Exp $
> -bin/prboom
> -bin/prboom-game-server
> +...@bin bin/prboom
> +...@bin bin/prboom-game-server
> @man man/man5/boom.cfg.5
> @man man/man6/prboom-game-server.6
> @man man/man6/prboom.6
> @@ -14,5 +14,6 @@
> share/doc/prboom/README.compat
> share/doc/prboom/README.demos
> share/doc/prboom/boom.txt
> -share/prboom/
> -share/prboom/prboom.wad
> +share/games/
> +share/games/doom/
> +share/games/doom/prboom.wad
