Hey, I sent this in back in 2016, totally forgot about it: https://marc.info/?l=openbsd-ports&m=145953130908490&w=2
Apologies to naddy@ who recently modified this and likely wouldn't have had to if i had stayed on top of getting this update in... Anyway, this updates prboom-plus to 2.5.1.4. - strip away need for dos2unix conversions - strip away need for autotools dance - removes autotools fix, as this actually prevents the bundled configure from working, or rather the generated Makefile detects the modified file in ${WRKSRC}/autotools and tries to run aclocal-1.15 and...everything breaks - still needs manual patch to remove $(LIBS) from being added to the data directory Makefile, I couldn't figure out how to stop it any other way :/ - stopped using --without-cpu-opt, it is OK with ports like this(games) using -O2 now if i recall correctly? - passes portcheck - builds and runs great on amd64 Thanks to lea.chescotta _at_ tutanota [dot] com for the reminder that this port was a version behind. Comments? OK? Cheers, -ryan ? prboom-plus.diff Index: Makefile =================================================================== RCS file: /cvs/ports/games/prboom-plus/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- Makefile 28 Sep 2017 22:40:01 -0000 1.3 +++ Makefile 10 May 2018 07:14:56 -0000 @@ -1,8 +1,7 @@ # $OpenBSD: Makefile,v 1.3 2017/09/28 22:40:01 naddy Exp $ COMMENT = enhanced version the PrBoom Doom engine -DISTNAME = prboom-plus-2.5.1.3 -REVISION = 1 +DISTNAME = prboom-plus-2.5.1.4 CATEGORIES = games x11 HOMEPAGE = http://prboom-plus.sourceforge.net/ @@ -12,9 +11,7 @@ MAINTAINER = Ryan Freeman <ryan@slipgate # GPLv2+ PERMIT_PACKAGE_CDROM = Yes -BUILD_DEPENDS = archivers/unzip \ - ${MODGNU_AUTOCONF_DEPENDS} \ - ${MODGNU_AUTOMAKE_DEPENDS} +BUILD_DEPENDS = archivers/unzip WANTLIB += SDL c m pthread GL GLU SDL_mixer SDL_net @@ -24,23 +21,10 @@ LIB_DEPENDS = devel/sdl-mixer \ MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=prboom-plus/} CONFIGURE_STYLE = gnu -AUTOCONF_VERSION = 2.65 -AUTOMAKE_VERSION = 1.9 -CONFIGURE_ARGS += --disable-cpu-opt \ - --with-waddir=${TRUEPREFIX}/share/doom +CONFIGURE_ARGS += --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}/* - -pre-configure: - @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 10 May 2018 07:14:56 -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-autotools_ac_c_compile_flags_m4 =================================================================== RCS file: patches/patch-autotools_ac_c_compile_flags_m4 diff -N patches/patch-autotools_ac_c_compile_flags_m4 --- patches/patch-autotools_ac_c_compile_flags_m4 28 Sep 2017 22:40:01 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -$OpenBSD: patch-autotools_ac_c_compile_flags_m4,v 1.1 2017/09/28 22:40:01 naddy Exp $ - -Index: autotools/ac_c_compile_flags.m4 ---- autotools/ac_c_compile_flags.m4.orig -+++ autotools/ac_c_compile_flags.m4 -@@ -5,7 +5,6 @@ do - AC_MSG_CHECKING(whether compiler supports $ac_flag) - CFLAGS="$NEW_CFLAGS $ac_flag" - AC_TRY_COMPILE(,[ -- void f() {}; - ],[ - NEW_CFLAGS="$CFLAGS" - AC_MSG_RESULT(yes) 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 28 Sep 2017 22:40:01 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-data_Makefile_am,v 1.2 2017/09/28 22:40:01 naddy Exp $ -Index: data/Makefile.am ---- data/Makefile.am.orig -+++ data/Makefile.am -@@ -7,6 +7,6 @@ wad_DATA=prboom-plus.wad - 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 $@ -+prboom-plus.wad: prboom.txt -+# -rm -f $@ -+# deutex -make prboom.txt $@ Index: patches/patch-data_Makefile_in =================================================================== RCS file: patches/patch-data_Makefile_in diff -N patches/patch-data_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-data_Makefile_in 10 May 2018 07:14:56 -0000 @@ -0,0 +1,16 @@ +$OpenBSD$ + +fix accidental inclusion of SDL_Mixer for wad creation + +Index: data/Makefile.in +--- data/Makefile.in.orig ++++ data/Makefile.in +@@ -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) + + mostlyclean-compile: + -rm -f *.$(OBJEXT)