Index: head/emulators/hercules/Makefile =================================================================== --- head/emulators/hercules/Makefile (revision 451737) +++ head/emulators/hercules/Makefile (revision 451738) @@ -1,37 +1,37 @@ # Created by: Miguel Mendez # $FreeBSD$ PORTNAME= hercules -PORTVERSION= 3.12 +PORTVERSION= 3.13 CATEGORIES= emulators MASTER_SITES= http://downloads.hercules-390.eu/ MAINTAINER= ports@FreeBSD.org COMMENT= System/370, ESA/390, and z/Architecture Emulator LICENSE= QPL LICENSE_NAME= Q PUBLIC LICENSE version 1.0 LICENSE_TEXT= Please refer to: http://www.hercules-390.org/herclic.html for details LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept # :keepla because port uses lt_dlopen USES= iconv libtool:keepla perl5 shebangfix SHEBANG_FILES= util/bldlvlck USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-optimization INSTALL_TARGET= install-strip OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e \ 's|SOL_TCP|IPPROTO_TCP|g' ${WRKSRC}/hscutl.c @${REINPLACE_CMD} \ -e '/herclin_LDADD =/s/$$/ libhercu.la libhercd.la/' \ -e '/hercules_LDADD =/s/$$/ libhercu.la libhercd.la/' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e \ '/^pkgdatadir/s|=.*|= $$(docdir)|' ${WRKSRC}/html/Makefile.in .include Index: head/emulators/hercules/distinfo =================================================================== --- head/emulators/hercules/distinfo (revision 451737) +++ head/emulators/hercules/distinfo (revision 451738) @@ -1,2 +1,3 @@ -SHA256 (hercules-3.12.tar.gz) = aefbe9d2f09372a530c17c177b7d2a0f4bcf8cfd28474672935b067e5f9ee373 -SIZE (hercules-3.12.tar.gz) = 2569617 +TIMESTAMP = 1507710509 +SHA256 (hercules-3.13.tar.gz) = 890c57c558d58708e55828ae299245bd2763318acf53e456a48aac883ecfe67d +SIZE (hercules-3.13.tar.gz) = 2640742 Index: head/emulators/hercules/files/patch-tuntap =================================================================== --- head/emulators/hercules/files/patch-tuntap (revision 451737) +++ head/emulators/hercules/files/patch-tuntap (nonexistent) @@ -1,28 +0,0 @@ ---- tuntap.c.orig Sun Dec 11 16:44:16 2005 -+++ tuntap.c Wed Jan 25 20:05:14 2006 -@@ -159,6 +159,25 @@ int TUNTAP_CreateInterface( - strcpy( pszNetDevName, ifr.ifr_name ); - } - #if !defined( OPTION_W32_CTCI ) -+ else if ( strncasecmp( utsbuf.sysname, "FreeBSD", 7 ) == 0 ) -+ { -+ struct stat sb; -+ -+ if ( ( iFlags & IFF_TAP ) == IFF_TAP ) -+ { -+ logmsg( _("HHCTU011E TAP device not yet supported\n") ); -+ return -1; -+ } -+ -+ if ( fstat(fd, &sb) == 0 ) -+ devname_r(sb.st_rdev, S_IFCHR, pszNetDevName, IFNAMSIZ); -+ else -+ { -+ logmsg( _("HHCTU010E Error getting TUN/TAP device name: %s\n"), -+ strerror( errno ) ); -+ return -1; -+ } -+ } - else - { - // Other OS: Simply use basename of the device Property changes on: head/emulators/hercules/files/patch-tuntap ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/hercules/files/patch-hercifc.h =================================================================== --- head/emulators/hercules/files/patch-hercifc.h (revision 451737) +++ head/emulators/hercules/files/patch-hercifc.h (revision 451738) @@ -1,14 +1,14 @@ ---- hercifc.h.orig Fri Feb 24 18:36:35 2006 -+++ hercifc.h Fri Feb 24 18:39:41 2006 -@@ -77,7 +77,11 @@ +--- hercifc.h.orig 2017-03-26 19:44:49 UTC ++++ hercifc.h +@@ -73,7 +73,11 @@ // -------------------------------------------------------------------- #define HERCIFC_CMD "hercifc" // Interface config command +#if defined(__FreeBSD__) +#define HERCTUN_DEV "/dev/tun" // Default TUN control dev +#else #define HERCTUN_DEV "/dev/net/tun" // Default TUN/TAP char dev +#endif typedef struct _CTLREQ { Index: head/emulators/hercules/files/patch-tuntap.c =================================================================== --- head/emulators/hercules/files/patch-tuntap.c (nonexistent) +++ head/emulators/hercules/files/patch-tuntap.c (revision 451738) @@ -0,0 +1,28 @@ +--- tuntap.c.orig 2017-03-26 19:44:49 UTC ++++ tuntap.c +@@ -241,6 +241,25 @@ int TUNTAP_CreateInterface( + strcpy( pszNetDevName, ifr.ifr_name ); + } + #if !defined( OPTION_W32_CTCI ) ++ else if ( strncasecmp( utsbuf.sysname, "FreeBSD", 7 ) == 0 ) ++ { ++ struct stat sb; ++ ++ if ( ( iFlags & IFF_TAP ) == IFF_TAP ) ++ { ++ logmsg( _("HHCTU011E TAP device not yet supported\n") ); ++ return -1; ++ } ++ ++ if ( fstat(fd, &sb) == 0 ) ++ devname_r(sb.st_rdev, S_IFCHR, pszNetDevName, IFNAMSIZ); ++ else ++ { ++ logmsg( _("HHCTU010E Error getting TUN/TAP device name: %s\n"), ++ strerror( errno ) ); ++ return -1; ++ } ++ } + else + { + // Other OS: Simply use basename of the device Property changes on: head/emulators/hercules/files/patch-tuntap.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property