Date: Thu, 25 Oct 2012 06:51:40 GMT From: Jukka Ukkonen <jau@iki.fi> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/173051: hercules port update from 3.05 to 3.07 Message-ID: <201210250651.q9P6pejO025175@red.freebsd.org> Resent-Message-ID: <201210250700.q9P700rO028031@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 173051 >Category: ports >Synopsis: hercules port update from 3.05 to 3.07 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Oct 25 07:00:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Jukka Ukkonen >Release: 9.1-PRERELEASE >Organization: ----- >Environment: FreeBSD sleipnir 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #0: Thu Oct 25 08:09:28 EEST 2012 root@sleipnir:/usr/obj/usr/src/sys/Sleipnir amd64 >Description: There were problems getting Fedora-14 to run with hercules 3.05. Using 3.07 proved to be the solution. >How-To-Repeat: See full description above. >Fix: The attached shar file contains the whole new ports directory content for hercules. Replace everything under emulators/hercules with the contents of the shar bundle. Notice that I had to add the .txt extension to the file name to force the upload automation to accept the file. Patch attached with submission follows: # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # Makefile # distinfo # files # pkg-descr # pkg-message # pkg-plist # files/patch-hercifc.h # files/patch-hscutl.c # files/patch-libtool22 # files/patch-tuntap # echo x - Makefile sed 's/^X//' >Makefile << 'b67911656ef5d18c4ae36cb6741b7965' X# New ports collection makefile for: dice X# Date created: Thu Jan 31 12:07:01 CET 2002 X# Whom: Miguel Mendez <flynn@energyhq.homeip.net> X# X# $FreeBSD: ports/emulators/hercules/Makefile,v 1.29 2010/12/04 07:31:36 ade Exp $ X# X XPORTNAME= hercules XPORTVERSION= 3.07 XPORTREVISION= XCATEGORIES= emulators XMASTER_SITES= http://www.hercules-390.org/ X XMAINTAINER= bzeeb+freebsdports@zabbadoz.net XCOMMENT= The Hercules System/370, ESA/390, and z/Architecture Emulator X XOPTIONS= PTHREADS "Build with pthreads instead of fthreads." on \ X NLS "Build with native language support." on \ X DEBUG "Enable for debugging hercules itself." off X XUSE_AUTOTOOLS= libtool libltdl XGNU_CONFIGURE= yes XUSE_LDCONFIG= yes X Xpost-extract: X ${RM} ${WRKSRC}/ltdl.* X Xpost-patch: X @${REINPLACE_CMD} -e 's@-lpthread@${PTHREAD_LIBS}@g' ${WRKSRC}/configure X.if defined(NOPORTDOCS) X @${REINPLACE_CMD} -e 's,^SUBDIRS = decNumber m4 po util html man . crypto,SUBDIRS = decNumber m4 po util man . crypto,g' ${WRKSRC}/Makefile.in X.else X @${REINPLACE_CMD} -e 's,^datadir = @datadir@,datadir = ${PREFIX}/share/doc/,' ${WRKSRC}/html/Makefile.in X.endif X @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ X '/^libherc_la_LIBADD/s|=|= -lltdl |g' X XMAN1= cckddiag.1 dasdseq.1 XMAN4= cckd.4 X X.if !defined(NOPORTDOCS) XPORTDOCS= * X.endif X Xpost-install: X @${CAT} ${PKGMESSAGE} X X.include <bsd.port.pre.mk> X X.if defined(WITH_DEBUG) XCFLAGS+= -g X.endif X.if defined(WITH_PTHREADS) XCONFIGURE_ARGS+= --disable-fthreads X.endif X.if defined(WITHOUT_NLS) XCONFIGURE_ARGS+= --disable-nls XPLIST_SUB+= GETTEXT="@comment " X.else XCONFIGURE_ARGS+= --with-libintl-prefix=${LOCALBASE} XUSE_GETTEXT= yes XPLIST_SUB+= GETTEXT="" X.endif X X.if defined(CFLAGS) XCONFIGURE_ARGS+= --enable-optimization="no" X.endif X X.include <bsd.port.post.mk> b67911656ef5d18c4ae36cb6741b7965 echo x - distinfo sed 's/^X//' >distinfo << '57677d168a5ec21bdf22c9501f075a8f' XSHA256 (hercules-3.07.tar.gz) = 02d5f6c66d699d413a4db9ef5a799249a6645ac10f2af1edb37992e7fa1f7724 XSIZE (hercules-3.07.tar.gz) = 2701835 57677d168a5ec21bdf22c9501f075a8f echo c - files mkdir -p files > /dev/null 2>&1 echo x - pkg-descr sed 's/^X//' >pkg-descr << '7f9555c3c1089940396b503dd37f3979' XHercules is an open source software implementation of the mainframe System/370 Xand ESA/390 architectures, in addition to the new 64-bit z/Architecture. XHercules runs under Linux, Windows 98, Windows NT, and Windows 2000. X XHercules was created by Roger Bowler and is maintained by Jay Maynard. Jan XJaeger designed and implemented many of the advanced features of Hercules, Xincluding dynamic reconfiguration, integrated console, interpretive execution Xand z/Architecture support. X XWWW: http://www.hercules-390.org/ X X-phk@FreeBSD.org 7f9555c3c1089940396b503dd37f3979 echo x - pkg-message sed 's/^X//' >pkg-message << '90c81c06929c43140502a9f17b449376' X###################################################################### X X IMPORTANT X X Be sure to have a look at the docs and edit the hercules.cnf file to Xyour needs (The sample is in ${PREFIX}/share/doc/hercules) X X###################################################################### 90c81c06929c43140502a9f17b449376 echo x - pkg-plist sed 's/^X//' >pkg-plist << '842cde48cf18b70a11b15515ca566742' Xbin/cckd2ckd Xbin/cckdcdsk Xbin/cckdcomp Xbin/cckddiag Xbin/cckdswap Xbin/cfba2fba Xbin/ckd2cckd Xbin/cvslvlck Xbin/dasdcat Xbin/dasdconv Xbin/dasdcopy Xbin/dasdinit Xbin/dasdisup Xbin/dasdlist Xbin/dasdload Xbin/dasdls Xbin/dasdpdsu Xbin/dasdseq Xbin/dmap2hrc Xbin/fba2cfba Xbin/hercifc Xbin/herclin Xbin/hercules Xbin/hetget Xbin/hetinit Xbin/hetmap Xbin/hetupd Xbin/tapecopy Xbin/tapemap Xbin/tapesplt Xlib/libherc.la Xlib/libherc.so Xlib/libhercd.la Xlib/libhercd.so Xlib/libhercs.la Xlib/libhercs.so Xlib/libherct.la Xlib/libherct.so Xlib/libhercu.la Xlib/libhercu.so Xlib/libdecNumber.so Xlib/libdecNumber.la Xlib/libdecNumber.a Xlib/hercules/dyncrypt.a Xlib/hercules/dyncrypt.la Xlib/hercules/dyncrypt.so Xlib/hercules/dyngui.la Xlib/hercules/dyngui.so Xlib/hercules/dyninst.la Xlib/hercules/dyninst.so Xlib/hercules/hdt1052c.la Xlib/hercules/hdt1052c.so Xlib/hercules/hdt1403.la Xlib/hercules/hdt1403.so Xlib/hercules/hdt2703.la Xlib/hercules/hdt2703.so Xlib/hercules/hdt2880.la Xlib/hercules/hdt2880.so Xlib/hercules/hdt3088.la Xlib/hercules/hdt3088.so Xlib/hercules/hdt3270.la Xlib/hercules/hdt3270.so Xlib/hercules/hdt3420.la Xlib/hercules/hdt3420.so Xlib/hercules/hdt3505.la Xlib/hercules/hdt3505.so Xlib/hercules/hdt3525.la Xlib/hercules/hdt3525.so Xlib/hercules/hdteq.la Xlib/hercules/hdteq.so Xlib/hercules/hdtqeth.la Xlib/hercules/hdtqeth.so X@dirrm lib/hercules X%%DATADIR%%/awssl-v19g X%%DATADIR%%/awswrite.jcl X%%DATADIR%%/cckddump.hla X%%DATADIR%%/cckdload.hla X%%DATADIR%%/rawstape.jcl X%%DATADIR%%/tapeconv.jcl X%%DATADIR%%/zzsacard.bin X@dirrm share/hercules X%%GETTEXT%%share/locale/de/LC_MESSAGES/hercules.mo X%%GETTEXT%%share/locale/nl/LC_MESSAGES/hercules.mo 842cde48cf18b70a11b15515ca566742 echo x - files/patch-hercifc.h sed 's/^X//' >files/patch-hercifc.h << 'bf66db4559230eb0d272947520ff9631' X--- hercifc.h.orig Fri Feb 24 18:36:35 2006 X+++ hercifc.h Fri Feb 24 18:39:41 2006 X@@ -77,7 +77,11 @@ X // -------------------------------------------------------------------- X X #define HERCIFC_CMD "hercifc" // Interface config command X+#if defined(__FreeBSD__) X+#define HERCTUN_DEV "/dev/tun" // Default TUN control dev X+#else X #define HERCTUN_DEV "/dev/net/tun" // Default TUN/TAP char dev X+#endif X X typedef struct _CTLREQ X { bf66db4559230eb0d272947520ff9631 echo x - files/patch-hscutl.c sed 's/^X//' >files/patch-hscutl.c << '87ce10df61fd61f5955ae0e0cfb22a94' X--- hscutl.c.orig 2012-10-14 08:47:02.252508688 +0300 X+++ hscutl.c 2012-10-14 08:48:03.485519701 +0300 X@@ -704,7 +704,7 @@ X if (rc) logmsg("HHCUT002I TCP_KEEPALIVE rc=%d %s\n", rc, strerror(errno)); X #elif defined(TCP_KEEPIDLE) X optval = idle_time; X- rc = setsockopt(sfd, SOL_TCP, TCP_KEEPIDLE, &optval, sizeof(optval)); X+ rc = setsockopt(sfd, IPPROTO_TCP, TCP_KEEPIDLE, &optval, sizeof(optval)); X if (rc) logmsg("HHCUT003I TCP_KEEPIDLE rc=%d %s\n", rc, strerror(errno)); X #else X UNREFERENCED(idle_time); X@@ -712,7 +712,7 @@ X X #if defined(TCP_KEEPINTVL) X optval = probe_interval; X- rc = setsockopt(sfd, SOL_TCP, TCP_KEEPINTVL, &optval, sizeof(optval)); X+ rc = setsockopt(sfd, IPPROTO_TCP, TCP_KEEPINTVL, &optval, sizeof(optval)); X if (rc) logmsg("HHCUT004I TCP_KEEPINTVL rc=%d %s\n", rc, strerror(errno)); X #else X UNREFERENCED(probe_interval); X@@ -720,7 +720,7 @@ X X #if defined(TCP_KEEPCNT) X optval = probe_count; X- rc = setsockopt(sfd, SOL_TCP, TCP_KEEPCNT, &optval, sizeof(optval)); X+ rc = setsockopt(sfd, IPPROTO_TCP, TCP_KEEPCNT, &optval, sizeof(optval)); X if (rc) logmsg("HHCUT005I TCP_KEEPCNT rc=%d %s\n", rc, strerror(errno)); X #else X UNREFERENCED(probe_count); 87ce10df61fd61f5955ae0e0cfb22a94 echo x - files/patch-libtool22 sed 's/^X//' >files/patch-libtool22 << '0950f1c31eee10bf26520227e3859c7c' X--- crypto/Makefile.in.orig 2009-07-13 15:39:40.000000000 -0500 X+++ crypto/Makefile.in 2009-07-13 15:39:44.000000000 -0500 X@@ -244,7 +244,7 @@ X @OPTION_DYNAMIC_LOAD_FALSE@DYNSRC = $(dyndev_SRC) X @OPTION_DYNAMIC_LOAD_TRUE@DYNSRC = X @OPTION_DYNAMIC_LOAD_FALSE@LTDL = X-@OPTION_DYNAMIC_LOAD_TRUE@LTDL = ../ltdl.c X+@OPTION_DYNAMIC_LOAD_TRUE@LTDL = X @OPTION_DYNAMIC_LOAD_FALSE@DYNMOD_LD_FLAGS = X @OPTION_DYNAMIC_LOAD_TRUE@DYNMOD_LD_FLAGS = -module \ X @OPTION_DYNAMIC_LOAD_TRUE@ -no-undefined \ X--- decNumber/Makefile.in.orig 2009-07-13 15:40:23.000000000 -0500 X+++ decNumber/Makefile.in 2009-07-13 15:40:25.000000000 -0500 X@@ -258,7 +258,7 @@ X @BUILD_SHARED_FALSE@XSTATIC = -static X @BUILD_SHARED_TRUE@XSTATIC = X @OPTION_DYNAMIC_LOAD_FALSE@LTDL = X-@OPTION_DYNAMIC_LOAD_TRUE@LTDL = ../ltdl.c X+@OPTION_DYNAMIC_LOAD_TRUE@LTDL = X @OPTION_DYNAMIC_LOAD_FALSE@LIB_LD_FLAGS = $(XSTATIC) \ X @OPTION_DYNAMIC_LOAD_FALSE@ -no-undefined \ X @OPTION_DYNAMIC_LOAD_FALSE@ -avoid-version X--- Makefile.in.orig 2010-03-07 14:04:49.000000000 +0200 X+++ Makefile.in 2012-10-14 17:27:30.565513737 +0300 X@@ -304,13 +304,13 @@ X libhercu_la_DEPENDENCIES = $(am__DEPENDENCIES_1) libhercs.la X am__libhercu_la_SOURCES_DIST = version.c hscutl.c hscutl2.c codepage.c \ X logger.c logmsg.c hdl.c hostinfo.c hsocket.c memrchr.c \ X- parser.c pttrace.c fthreads.c fishhang.c ltdl.c X+ parser.c pttrace.c fthreads.c fishhang.c X am__objects_5 = fthreads.lo X @BUILD_FTHREADS_TRUE@am__objects_8 = $(am__objects_5) X am__objects_6 = fishhang.lo X @BUILD_FISHHANG_TRUE@@BUILD_FTHREADS_TRUE@am__objects_9 = \ X @BUILD_FISHHANG_TRUE@@BUILD_FTHREADS_TRUE@ $(am__objects_6) X-@OPTION_DYNAMIC_LOAD_TRUE@am__objects_10 = ltdl.lo X+@OPTION_DYNAMIC_LOAD_TRUE@am__objects_10 = X am_libhercu_la_OBJECTS = version.lo hscutl.lo hscutl2.lo codepage.lo \ X logger.lo logmsg.lo hdl.lo hostinfo.lo hsocket.lo memrchr.lo \ X parser.lo pttrace.lo $(am__objects_8) $(am__objects_9) \ X@@ -687,7 +687,7 @@ X @OPTION_DYNAMIC_LOAD_FALSE@DYNSRC = $(dyndev_SRC) X @OPTION_DYNAMIC_LOAD_TRUE@DYNSRC = X @OPTION_DYNAMIC_LOAD_FALSE@LTDL = X-@OPTION_DYNAMIC_LOAD_TRUE@LTDL = ltdl.c X+@OPTION_DYNAMIC_LOAD_TRUE@LTDL = X @OPTION_DYNAMIC_LOAD_FALSE@DYNMOD_LD_FLAGS = X @OPTION_DYNAMIC_LOAD_TRUE@DYNMOD_LD_FLAGS = -module \ X @OPTION_DYNAMIC_LOAD_TRUE@ -no-undefined \ X@@ -913,8 +913,7 @@ X memrchr.c \ X $(dynamic_SRC) \ X $(extra_SRC) \ X- $(dyndev_SRC) \ X- ltdl.c X+ $(dyndev_SRC) X X libherc_la_LDFLAGS = $(LIB_LD_FLAGS) X libherc_la_LIBADD = libhercs.la \ X@@ -1166,7 +1165,6 @@ X hdl.h \ X crypto.h \ X sockdev.h \ X- ltdl.h \ X herc_getopt.h \ X service.h \ X chsc.h \ X@@ -1552,7 +1550,6 @@ X @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logger.Plo@am__quote@ X @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logmsg.Plo@am__quote@ X @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losc.Plo@am__quote@ X-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ltdl.Plo@am__quote@ X @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/machchk.Plo@am__quote@ X @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memrchr.Plo@am__quote@ X @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/omatape.Plo@am__quote@ 0950f1c31eee10bf26520227e3859c7c echo x - files/patch-tuntap sed 's/^X//' >files/patch-tuntap << '2b0ca21331d97d7c8bf06dae733d5be4' X--- tuntap.c.orig Sun Dec 11 16:44:16 2005 X+++ tuntap.c Wed Jan 25 20:05:14 2006 X@@ -159,6 +159,25 @@ int TUNTAP_CreateInterface( X strcpy( pszNetDevName, ifr.ifr_name ); X } X #if !defined( OPTION_W32_CTCI ) X+ else if ( strncasecmp( utsbuf.sysname, "FreeBSD", 7 ) == 0 ) X+ { X+ struct stat sb; X+ X+ if ( ( iFlags & IFF_TAP ) == IFF_TAP ) X+ { X+ logmsg( _("HHCTU011E TAP device not yet supported\n") ); X+ return -1; X+ } X+ X+ if ( fstat(fd, &sb) == 0 ) X+ devname_r(sb.st_rdev, S_IFCHR, pszNetDevName, IFNAMSIZ); X+ else X+ { X+ logmsg( _("HHCTU010E Error getting TUN/TAP device name: %s\n"), X+ strerror( errno ) ); X+ return -1; X+ } X+ } X else X { X // Other OS: Simply use basename of the device 2b0ca21331d97d7c8bf06dae733d5be4 exit >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210250651.q9P6pejO025175>