Hey,
Heres an update to prboom-plus 2.5.1.4. A bunch of cruft was
remove from the port Makefile such as a dos2unix file conversion
call, and there is a configure script distributed again so no
more fussing with autoconf/automake.
Patches got simpler, though for some reason they left SDL_mixer
as a dependency for the wad generator, hence just removing the
$(LIBS) portion for ${WRKSRC}/data/Makefile.in
A list of changes can been seen here:
http://prboom-plus.sourceforge.net/history.html
Cheers,
--Ryan
? prboom-plus.diff
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/prboom-plus/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 22 Oct 2014 13:55:07 -0000 1.2
+++ Makefile 1 Apr 2016 16:05:43 -0000
@@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.2 2014/10/22 13:55:07 jasper Exp $
COMMENT = enhanced version the PrBoom Doom engine
-DISTNAME = prboom-plus-2.5.1.3
-REVISION = 0
+DISTNAME = prboom-plus-2.5.1.4
CATEGORIES = games x11
HOMEPAGE = http://prboom-plus.sourceforge.net/
@@ -12,8 +11,7 @@ MAINTAINER = Ryan Freeman <ryan@slipgate
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
-BUILD_DEPENDS = archivers/unzip \
- ${MODGNU_AUTOCONF_DEPENDS}
+BUILD_DEPENDS = archivers/unzip
WANTLIB += SDL c m pthread GL GLU SDL_mixer SDL_net
@@ -22,22 +20,12 @@ LIB_DEPENDS = devel/sdl-mixer \
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=prboom-plus/}
-CONFIGURE_STYLE = autoconf automake
-AUTOCONF_VERSION = 2.65
-AUTOMAKE_VERSION = 1.9
+CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += --disable-cpu-opt \
--with-waddir=${TRUEPREFIX}/share/doom
CONFIGURE_ENV += CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include"
-MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/autotools
FAKE_FLAGS += gamesdir=${PREFIX}/bin \
docdir=${PREFIX}/share/doc/prboom-plus
-
-post-extract:
- @perl -MExtUtils::Command -e dos2unix ${WRKSRC}/*
- @cd ${WRKSRC} && \
- AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
- AUTOCONF_VERSION=${AUTOCONF_VERSION} \
- sh bootstrap && chmod 0755 ./configure
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/prboom-plus/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 18 Jan 2015 03:14:01 -0000 1.2
+++ distinfo 1 Apr 2016 16:05:43 -0000
@@ -1,2 +1,2 @@
-SHA256 (prboom-plus-2.5.1.3.tar.gz) =
CkBvqdJ1+96Ur89ybL/206Ai+DtBPb+20TGHLkZCZo8=
-SIZE (prboom-plus-2.5.1.3.tar.gz) = 1465003
+SHA256 (prboom-plus-2.5.1.4.tar.gz) =
4OIkHRdIObEH8aQrGRqpiV3GdJ5HfLyFCtUg+6I1O5Q=
+SIZE (prboom-plus-2.5.1.4.tar.gz) = 1627558
Index: patches/patch-data_Makefile_am
===================================================================
RCS file: patches/patch-data_Makefile_am
diff -N patches/patch-data_Makefile_am
--- patches/patch-data_Makefile_am 1 Apr 2013 22:02:15 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-data_Makefile_am,v 1.1.1.1 2013/04/01 22:02:15 rfreeman Exp $
---- data/Makefile.am.orig Tue Nov 8 17:52:52 2011
-+++ data/Makefile.am Tue Nov 8 17:53:07 2011
-@@ -8,5 +8,5 @@ EXTRA_DIST=prboom-plus.wad prboom.txt
- MAINTAINERCLEANFILES=prboom-plus.wad
-
- prboom-plus.wad: prboom.txt $(wildcard graphics/*.ppm sprites/*.ppm
lumps/*.lmp sounds/*.wav)
-- -rm -f $@
-- deutex -make prboom.txt $@
-+ #-rm -f $@
-+ #deutex -make prboom.txt $@
Index: patches/patch-data_Makefile_in
===================================================================
RCS file: /cvs/ports/games/prboom-plus/patches/patch-data_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-data_Makefile_in
--- patches/patch-data_Makefile_in 1 Apr 2013 22:02:15 -0000 1.1.1.1
+++ patches/patch-data_Makefile_in 1 Apr 2016 16:05:43 -0000
@@ -1,14 +1,12 @@
-$OpenBSD: patch-data_Makefile_in,v 1.1.1.1 2013/04/01 22:02:15 rfreeman Exp $
---- data/Makefile.in.orig Tue Nov 8 17:52:58 2011
-+++ data/Makefile.in Tue Nov 8 17:53:25 2011
-@@ -353,8 +353,8 @@ uninstall-am: uninstall-info-am uninstall-wadDATA
+$OpenBSD$
+--- data/Makefile.in.orig Sun Jan 10 10:20:43 2016
++++ data/Makefile.in Fri Apr 1 09:00:56 2016
+@@ -689,7 +689,7 @@ clean-noinstPROGRAMS:
+ rdatawad$(EXEEXT): $(rdatawad_OBJECTS) $(rdatawad_DEPENDENCIES)
$(EXTRA_rdatawad_DEPENDENCIES)
+ @rm -f rdatawad$(EXEEXT)
+- $(AM_V_CCLD)$(LINK) $(rdatawad_OBJECTS) $(rdatawad_LDADD) $(LIBS)
++ $(AM_V_CCLD)$(LINK) $(rdatawad_OBJECTS) $(rdatawad_LDADD)
- prboom-plus.wad: prboom.txt $(wildcard graphics/*.ppm sprites/*.ppm
lumps/*.lmp sounds/*.wav)
-- -rm -f $@
-- deutex -make prboom.txt $@
-+ #-rm -f $@
-+ #deutex -make prboom.txt $@
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
