Fix build on DragonFly 3.0.1

* Use autoconf on pre-configure stage, remove patch for configure
* Modify autoconf macro (treat DragonFly as recent FreeBSD)

7 files changed, 84 insertions, 25 deletions

diff --git a/emulators/hercules/Makefile b/emulators/hercules/Makefile
index d5a71506b6d..7b7f5964cee 100644
--- a/emulators/hercules/Makefile
+++ b/emulators/hercules/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2011/07/04 21:37:34 dholland Exp $
+# $NetBSD: Makefile,v 1.27 2012/03/25 05:27:42 ryoon Exp $
 
 DISTNAME=		hercules-3.07
 PKGREVISION=		1
@@ -14,7 +14,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=		hercules-images-[0-9]*:../../emulators/hercules-images
 
-USE_TOOLS+=		gmake bash:run
+AUTOCONF_REQD=		2.50
+USE_TOOLS+=		autoconf gmake bash:run
 GNU_CONFIGURE=		YES
 #MAKE_ENV+=		HOST_ARCH=${MACHINE_ARCH:Q}
 USE_LIBTOOL=		YES
@@ -30,6 +31,7 @@ INSTALLATION_DIRS+=	bin share/examples/hercules
 
 pre-configure:
 	${RM} ${WRKSRC}/ltdl.h ${WRKSRC}/ltdl.c
+	cd ${WRKSRC} && autoconf
 pre-install:
 	${INSTALL_DATA} ${WRKSRC}/hercules.cnf ${DESTDIR}${PREFIX}/share/examples/hercules/
 #	${INSTALL_DATA} ${WRKSRC}/zzsa.cnf ${DESTDIR}${PREFIX}/share/examples/hercules/
diff --git a/emulators/hercules/distinfo b/emulators/hercules/distinfo
index 6df2930efa0..b3d5eb46ceb 100644
--- a/emulators/hercules/distinfo
+++ b/emulators/hercules/distinfo
@@ -1,14 +1,15 @@
-$NetBSD: distinfo,v 1.12 2011/05/06 13:12:48 ryoon Exp $
+$NetBSD: distinfo,v 1.13 2012/03/25 05:27:43 ryoon Exp $
 
 SHA1 (hercules-3.07.tar.gz) = d0b2e543dd66ee43576e5a5faff8f4cc061cffb4
 RMD160 (hercules-3.07.tar.gz) = 241344a3242a1dacc5276dd61b7fa4c92a270f71
 Size (hercules-3.07.tar.gz) = 2701835 bytes
 SHA1 (patch-Makefile.in) = 80202ae45230949882fdc524df294230ef4b2846
-SHA1 (patch-configure) = 0d2e909120d892de335b90ef93eed8845c877227
+SHA1 (patch-autoconf_libtool.m4) = 713bc12bfd176e908fc01b401ee0163660f20da8
+SHA1 (patch-configure.ac) = 655e738191adcc79d509592c06089305ae743024
 SHA1 (patch-crypto_Makefile.in) = 0e9fa3ce7e2f629d9eaed21dcfe7625087f7103b
 SHA1 (patch-decNumber_Makefile.in) = 98228044642007e894fde580e010c6da874454af
-SHA1 (patch-hercifc.h) = e09e4dacc7d733972c2caeb82be7bbf2b84584fb
-SHA1 (patch-hostopts.h) = 57e90d3315d775751fc1c000749e1162b0f8c7a2
+SHA1 (patch-hercifc.h) = 29674ad8f23f69032248098647811e30438c2e98
+SHA1 (patch-hostopts.h) = f99dbfa7aed8b9e72ec82f32615ac4e3d1900ef9
 SHA1 (patch-hstructs.h) = 8680a7c4c0e6a1f3921a3fa8fce32010deb1768d
 SHA1 (patch-scsitape.c) = ecdbc3c83ea30bee55d747016671182c07c3aaad
 SHA1 (patch-tapecopy.c) = 8e73edd56f3b1627a41e39ef75aaa79efe13003e
diff --git a/emulators/hercules/patches/patch-autoconf_libtool.m4 b/emulators/hercules/patches/patch-autoconf_libtool.m4
new file mode 100644
index 00000000000..2553a970166
--- /dev/null
+++ b/emulators/hercules/patches/patch-autoconf_libtool.m4
@@ -0,0 +1,40 @@
+$NetBSD: patch-autoconf_libtool.m4,v 1.1 2012/03/25 05:27:43 ryoon Exp $
+
+--- autoconf/libtool.m4.orig	2009-02-09 07:55:03.000000000 +0000
++++ autoconf/libtool.m4
+@@ -1323,7 +1323,7 @@ kfreebsd*-gnu)
+   dynamic_linker='GNU ld.so'
+   ;;
+ 
+-freebsd*)
++freebsd* | dragonfly*)
+   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+   version_type=freebsd-$objformat
+   case $version_type in
+@@ -2989,7 +2989,7 @@ case $host_os in
+   freebsd-elf*)
+     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+     ;;
+-  freebsd* | kfreebsd*-gnu)
++  freebsd* | kfreebsd*-gnu | dragonfly*)
+     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+     # conventions
+     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+@@ -4635,7 +4635,7 @@ AC_MSG_CHECKING([for $compiler option to
+ 	    ;;
+ 	esac
+ 	;;
+-      freebsd* | kfreebsd*-gnu)
++      freebsd* | kfreebsd*-gnu | dragonfly*)
+ 	# FreeBSD uses GNU C++
+ 	;;
+       hpux9* | hpux10* | hpux11*)
+@@ -5456,7 +5456,7 @@ EOF
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu)
++    freebsd* | kfreebsd*-gnu | dragonfly*)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
diff --git a/emulators/hercules/patches/patch-configure b/emulators/hercules/patches/patch-configure
deleted file mode 100644
index 31bdd4f9f8b..00000000000
--- a/emulators/hercules/patches/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2011/05/01 23:28:59 ryoon Exp $
-
-* Fix incorrect use of ==
-
---- configure.orig	2010-03-07 12:04:50.000000000 +0000
-+++ configure
-@@ -33253,7 +33253,7 @@ fi
- 
- 
- 
--if test "$hc_cv_have_sys_mtio_h" == "yes"; then
-+if test "$hc_cv_have_sys_mtio_h" = "yes"; then
-     { echo "$as_me:$LINENO: checking whether MTEWARN is declared" >&5
- echo $ECHO_N "checking whether MTEWARN is declared... $ECHO_C" >&6; }
- if test "${ac_cv_have_decl_MTEWARN+set}" = set; then
diff --git a/emulators/hercules/patches/patch-configure.ac b/emulators/hercules/patches/patch-configure.ac
new file mode 100644
index 00000000000..8ac1f5a7eb1
--- /dev/null
+++ b/emulators/hercules/patches/patch-configure.ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-configure.ac,v 1.1 2012/03/25 05:27:43 ryoon Exp $
+
+--- configure.ac.orig	2010-03-07 12:22:36.000000000 +0000
++++ configure.ac
+@@ -320,7 +320,7 @@ case "$host_os" in
+         fi
+         ;;
+ 
+-    *bsd*)
++    *bsd* | dragonfly*)
+         hc_cv_is_nix=yes
+         hc_cv_is_windows=no
+         hc_cv_is_mingw32=no
+@@ -558,7 +558,7 @@ AC_CHECK_DECLS( SIOCADDRT,            [h
+ AC_CHECK_DECLS( SIOCDELRT,            [hc_cv_have_siocdelrt=yes],           [hc_cv_have_siocdelrt=no],           [#include <linux/sockios.h>] )
+ AC_CHECK_DECLS( SIOCDIFADDR,          [hc_cv_have_siocdifaddr=yes],         [hc_cv_have_siocdifaddr=no],         [#include <linux/sockios.h>] )
+ 
+-if test "$hc_cv_have_sys_mtio_h" == "yes"; then
++if test "$hc_cv_have_sys_mtio_h" = "yes"; then
+     AC_CHECK_DECLS( MTEWARN,          [hc_cv_have_mtewarn=yes],             [hc_cv_have_mtewarn=no],             [#include <sys/mtio.h>] )
+ else
+     hc_cv_have_mtewarn=no
diff --git a/emulators/hercules/patches/patch-hercifc.h b/emulators/hercules/patches/patch-hercifc.h
index 06e88dcc82e..b52c248e76f 100644
--- a/emulators/hercules/patches/patch-hercifc.h
+++ b/emulators/hercules/patches/patch-hercifc.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-hercifc.h,v 1.1 2011/05/01 23:28:59 ryoon Exp $
+$NetBSD: patch-hercifc.h,v 1.2 2012/03/25 05:27:43 ryoon Exp $
 
 --- hercifc.h.orig	2009-02-09 07:55:14.000000000 +0000
 +++ hercifc.h
@@ -6,7 +6,7 @@ $NetBSD: patch-hercifc.h,v 1.1 2011/05/01 23:28:59 ryoon Exp $
  // --------------------------------------------------------------------
  
  #define  HERCIFC_CMD  "hercifc"           // Interface config command
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
 +#define  HERCTUN_DEV  "/dev/tun"          // Default TUN/TAP char dev
 +#else
  #define  HERCTUN_DEV  "/dev/net/tun"      // Default TUN/TAP char dev
@@ -14,3 +14,12 @@ $NetBSD: patch-hercifc.h,v 1.1 2011/05/01 23:28:59 ryoon Exp $
  
  typedef struct _CTLREQ
  {
+@@ -101,7 +105,7 @@ typedef struct _CTLREQ
+   union
+   {
+     struct ifreq     ifreq;
+-#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__SOLARIS__)
++#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__SOLARIS__) && !defined(__DragonFly__)
+     struct rtentry   rtentry;
+ #endif
+   }
diff --git a/emulators/hercules/patches/patch-hostopts.h b/emulators/hercules/patches/patch-hostopts.h
index 9d4c04918e0..ae401580900 100644
--- a/emulators/hercules/patches/patch-hostopts.h
+++ b/emulators/hercules/patches/patch-hostopts.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-hostopts.h,v 1.1 2011/05/01 23:28:59 ryoon Exp $
+$NetBSD: patch-hostopts.h,v 1.2 2012/03/25 05:27:43 ryoon Exp $
 
 --- hostopts.h.orig	2010-01-08 22:56:27.000000000 +0000
 +++ hostopts.h
@@ -7,7 +7,7 @@ $NetBSD: patch-hostopts.h,v 1.1 2011/05/01 23:28:59 ryoon Exp $
  /* Hard-coded FreeBSD-specific features and options...               */
  /*-------------------------------------------------------------------*/
 -#elif defined(__FreeBSD__)              /* "FreeBSD" options         */
-+#elif defined(__FreeBSD__) || defined(__NetBSD__)/* "BSD" options    */
++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)/* "BSD" options    */
  
  #define DLL_IMPORT   extern
  #define DLL_EXPORT