[103029] trunk/dports/emulators/dosbox

[ryandesign at macports.org]

Revision: 103029
          https://trac.macports.org/changeset/103029
Author:   ryandesign at macports.org
Date:     2013-02-11 23:48:03 -0800 (Mon, 11 Feb 2013)
Log Message:
-----------
dosbox: fix autoreconf problem with automake 1.13 when using +debug variant (#38019); rename configure.in to configure.ac to prepare for automake 1.14

Modified Paths:
--------------
    trunk/dports/emulators/dosbox/Portfile

Added Paths:
-----------
    trunk/dports/emulators/dosbox/files/patch-configure.ac.diff

Removed Paths:
-------------
    trunk/dports/emulators/dosbox/files/patch-configure.in.diff

Modified: trunk/dports/emulators/dosbox/Portfile
===================================================================
--- trunk/dports/emulators/dosbox/Portfile	2013-02-12 07:41:55 UTC (rev 103028)
+++ trunk/dports/emulators/dosbox/Portfile	2013-02-12 07:48:03 UTC (rev 103029)
@@ -29,6 +29,10 @@
                     port:libsdl_sound \
                     port:libpng
 
+post-extract {
+    move ${worksrcpath}/configure.in ${worksrcpath}/configure.ac
+}
+
 patchfiles          3689.diff 3694.diff 3776.diff 3777.diff
 
 # Assembly language issues
@@ -64,7 +68,7 @@
 variant debug description {Enable debug mode} {
     depends_lib-append port:ncurses
     use_autoreconf yes
-    patchfiles-append patch-configure.in.diff
+    patchfiles-append patch-configure.ac.diff
     configure.args-append --enable-debug
     configure.cppflags-append -I${prefix}/include/ncurses
 }

Copied: trunk/dports/emulators/dosbox/files/patch-configure.ac.diff (from rev 103018, trunk/dports/emulators/dosbox/files/patch-configure.in.diff)
===================================================================
--- trunk/dports/emulators/dosbox/files/patch-configure.ac.diff	                        (rev 0)
+++ trunk/dports/emulators/dosbox/files/patch-configure.ac.diff	2013-02-12 07:48:03 UTC (rev 103029)
@@ -0,0 +1,30 @@
+--- configure.ac.orig	2010-05-10 13:58:57.000000000 -0500
++++ configure.ac	2013-02-12 01:43:12.000000000 -0600
+@@ -9,7 +9,7 @@
+ 
+ dnl Setup for automake
+ AM_INIT_AUTOMAKE
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS([config.h])
+ 
+ dnl Checks for programs.
+ AC_PROG_MAKE_SET
+@@ -190,18 +190,11 @@
+ AH_TEMPLATE(C_HEAVY_DEBUG,[Define to 1 to enable heavy debugging, also have to enable C_DEBUG])
+ AC_ARG_ENABLE(debug,AC_HELP_STRING([--enable-debug],[Enable debug mode]),[
+    AC_CHECK_HEADER(curses.h,have_curses_h=yes,)
+-   AC_CHECK_LIB(curses, initscr, have_curses_lib=yes, , )
+    AC_CHECK_LIB(ncurses, initscr, have_ncurses_lib=yes, , )
+    AC_CHECK_LIB(pdcurses, initscr, have_pdcurses_lib=yes, , )
+ 
+    if test x$enable_debug = xno; then
+      AC_MSG_RESULT([Debugger not enabled])
+-   elif test x$have_curses_lib = xyes -a x$have_curses_h = xyes ; then
+-     LIBS="$LIBS -lcurses"
+-     AC_DEFINE(C_DEBUG,1)
+-     if test x$enable_debug = xheavy ; then 
+-       AC_DEFINE(C_HEAVY_DEBUG,1)
+-     fi
+    elif test x$have_ncurses_lib = xyes -a x$have_curses_h = xyes ; then
+      LIBS="$LIBS -lncurses"
+      AC_DEFINE(C_DEBUG,1)

Deleted: trunk/dports/emulators/dosbox/files/patch-configure.in.diff
===================================================================
--- trunk/dports/emulators/dosbox/files/patch-configure.in.diff	2013-02-12 07:41:55 UTC (rev 103028)
+++ trunk/dports/emulators/dosbox/files/patch-configure.in.diff	2013-02-12 07:48:03 UTC (rev 103029)
@@ -1,21 +0,0 @@
---- configure.in.orig	2010-05-10 13:58:57.000000000 -0500
-+++ configure.in	2011-01-06 00:38:43.000000000 -0600
-@@ -190,18 +190,11 @@
- AH_TEMPLATE(C_HEAVY_DEBUG,[Define to 1 to enable heavy debugging, also have to enable C_DEBUG])
- AC_ARG_ENABLE(debug,AC_HELP_STRING([--enable-debug],[Enable debug mode]),[
-    AC_CHECK_HEADER(curses.h,have_curses_h=yes,)
--   AC_CHECK_LIB(curses, initscr, have_curses_lib=yes, , )
-    AC_CHECK_LIB(ncurses, initscr, have_ncurses_lib=yes, , )
-    AC_CHECK_LIB(pdcurses, initscr, have_pdcurses_lib=yes, , )
- 
-    if test x$enable_debug = xno; then
-      AC_MSG_RESULT([Debugger not enabled])
--   elif test x$have_curses_lib = xyes -a x$have_curses_h = xyes ; then
--     LIBS="$LIBS -lcurses"
--     AC_DEFINE(C_DEBUG,1)
--     if test x$enable_debug = xheavy ; then 
--       AC_DEFINE(C_HEAVY_DEBUG,1)
--     fi
-    elif test x$have_ncurses_lib = xyes -a x$have_curses_h = xyes ; then
-      LIBS="$LIBS -lncurses"
-      AC_DEFINE(C_DEBUG,1)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130211/eba2cf4b/attachment.html>