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

Fix Makefile.am syntax error and render autotools handling more sane.

Browse Source 
Unbreak autoconf checks with clang by not using nested functions
This commit is contained in:
naddy 2017-09-28 22:40:01 +00:00
parent 987697e70b
commit 70148a9224
4 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
games/prboom-plus/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.2 2014/10/22 13:55:07 jasper Exp $
# $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 = 0
REVISION = 1
CATEGORIES = games x11
HOMEPAGE = http://prboom-plus.sourceforge.net/
@ -13,7 +13,8 @@ MAINTAINER = Ryan Freeman <ryan@slipgate.org>
PERMIT_PACKAGE_CDROM = Yes
BUILD_DEPENDS = archivers/unzip \
${MODGNU_AUTOCONF_DEPENDS}
${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
WANTLIB += SDL c m pthread GL GLU SDL_mixer SDL_net
@ -22,7 +23,7 @@ LIB_DEPENDS = devel/sdl-mixer \
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=prboom-plus/}
CONFIGURE_STYLE = autoconf automake
CONFIGURE_STYLE = gnu
AUTOCONF_VERSION = 2.65
AUTOMAKE_VERSION = 1.9
CONFIGURE_ARGS += --disable-cpu-opt \
@ -35,6 +36,8 @@ FAKE_FLAGS += gamesdir=${PREFIX}/bin \
post-extract:
@perl -MExtUtils::Command -e dos2unix ${WRKSRC}/*
pre-configure:
@cd ${WRKSRC} && \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
AUTOCONF_VERSION=${AUTOCONF_VERSION} \

13
games/prboom-plus/patches/patch-autotools_ac_c_compile_flags_m4 Normal file
View File

@ -0,0 +1,13 @@
$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)

17
games/prboom-plus/patches/patch-data_Makefile_am
View File

@ -1,11 +1,14 @@
$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
$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)
-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 $@
+prboom-plus.wad: prboom.txt
+# -rm -f $@
+# deutex -make prboom.txt $@

14
games/prboom-plus/patches/patch-data_Makefile_in
View File

@ -1,14 +0,0 @@
$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
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: