From nobody@FreeBSD.org  Thu Oct 25 06:51:42 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 54985909
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 25 Oct 2012 06:51:42 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 2D44F8FC0A
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 25 Oct 2012 06:51:42 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id q9P6peeo025176
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 25 Oct 2012 06:51:41 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id q9P6pejO025175;
	Thu, 25 Oct 2012 06:51:40 GMT
	(envelope-from nobody)
Message-Id: <201210250651.q9P6pejO025175@red.freebsd.org>
Date: Thu, 25 Oct 2012 06:51:40 GMT
From: Jukka Ukkonen <jau@iki.fi>
To: freebsd-gnats-submit@FreeBSD.org
Subject: hercules port update from 3.05 to 3.07
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: bzeeb+freebsdports@zabbadoz.net

>Number:         173051
>Category:       ports
>Synopsis:       emulators/hercules update from 3.05 to 3.07
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ak
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 25 07:00:00 UTC 2012
>Closed-Date:    Sat Jan 12 00:43:18 UTC 2013
>Last-Modified:  Sat Jan 12 00:50:00 UTC 2013
>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:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Thu Oct 25 09:15:17 UTC 2012 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173051 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: bzeeb+freebsdports@zabbadoz.net
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/173051: emulators/hercules update from 3.05 to 3.07
Date: Thu, 25 Oct 2012 09:15:16 UT

 Maintainer of emulators/hercules,
 
 Please note that PR ports/173051 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/173051
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: bzeeb+freebsdports@zabbadoz.net
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/173051: emulators/hercules update from 3.05 to 3.07
Date: Thu, 25 Oct 2012 09:34:20 +0000 (UTC)

 I have not tested it but as stated previously I am happy with an
 update going in.
State-Changed-From-To: feedback->open 
State-Changed-By: ak 
State-Changed-When: Tue Nov 27 18:28:55 UTC 2012 
State-Changed-Why:  
Maintainer has approved. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173051 
State-Changed-From-To: open->feedback 
State-Changed-By: ak 
State-Changed-When: Tue Nov 27 18:29:52 UTC 2012 
State-Changed-Why:  
Ask for submitter fix. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173051 

From: Alex Kozlov <ak@FreeBSD.org>
To: Jukka Ukkonen <jau@iki.fi>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/173051: emulators/hercules update from 3.05 to 3.07
Date: Tue, 27 Nov 2012 20:27:43 +0200

 Hi
 
 Can you please resubmit this update as a diff?
 
 
 -- 
 Alex

From: "Jukka A. Ukkonen" <jau@oxit.fi>
To: bug-followup@FreeBSD.org, jau@iki.fi
Cc:  
Subject: Re: ports/173051: emulators/hercules update from 3.05 to 3.07
Date: Thu, 06 Dec 2012 10:58:49 +0200

 This is a multi-part message in MIME format.
 --------------030808070602070404000907
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 
 Find an attempt for a diff style version patch attached.
 
 --jau
 
 
 --------------030808070602070404000907
 Content-Type: text/plain; charset=UTF-8;
  name="Hercules-3.05-3.07.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="Hercules-3.05-3.07.patch"
 
 diff -u -r emulators/hercules-3.05/Makefile emulators/hercules/Makefile
 --- emulators/hercules-3.05/Makefile	2012-11-23 07:45:33.000000000 +0200
 +++ emulators/hercules/Makefile	2012-12-06 10:49:04.370215795 +0200
 @@ -2,12 +2,12 @@
  # Date created:		Thu Jan 31 12:07:01 CET 2002
  # Whom:			Miguel Mendez <flynn@energyhq.homeip.net>
  #
 -# $FreeBSD: ports/emulators/hercules/Makefile,v 1.30 2012/11/17 05:57:20 svnexp Exp $
 +# $FreeBSD: ports/emulators/hercules/Makefile,v 1.29 2010/12/04 07:31:36 ade Exp $
  #
  
  PORTNAME=	hercules
 -PORTVERSION=	3.05
 -PORTREVISION=	3
 +PORTVERSION=	3.07
 +PORTREVISION=	
  CATEGORIES=	emulators
  MASTER_SITES=	http://www.hercules-390.org/
  
 diff -u -r emulators/hercules-3.05/distinfo emulators/hercules/distinfo
 --- emulators/hercules-3.05/distinfo	2011-07-02 20:14:08.000000000 +0300
 +++ emulators/hercules/distinfo	2012-12-06 10:49:04.377215177 +0200
 @@ -1,2 +1,2 @@
 -SHA256 (hercules-3.05.tar.gz) = f190221fa25692c0316be331f618c0675f9f9875c44b8af3efa7a431d138b1e2
 -SIZE (hercules-3.05.tar.gz) = 2470621
 +SHA256 (hercules-3.07.tar.gz) = 02d5f6c66d699d413a4db9ef5a799249a6645ac10f2af1edb37992e7fa1f7724
 +SIZE (hercules-3.07.tar.gz) = 2701835
 diff -u -r emulators/hercules-3.05/files/patch-20080506-cvs-endian.diff emulators/hercules/files/patch-20080506-cvs-endian.diff
 --- emulators/hercules-3.05/files/patch-20080506-cvs-endian.diff	2008-05-14 20:25:19.000000000 +0300
 +++ emulators/hercules/files/patch-20080506-cvs-endian.diff	2012-12-06 10:48:28.040214004 +0200
 @@ -1,168 +0,0 @@
 -Index: control.c
 -===================================================================
 -RCS file: /usr/cvs/hercules/hercules/control.c,v
 -retrieving revision 1.266
 -retrieving revision 1.267
 -diff -u -p -r1.266 -r1.267
 ---- control.c	11 Apr 2008 14:28:00 -0000	1.266
 -+++ control.c	6 May 2008 22:15:42 -0000	1.267
 -@@ -1968,16 +1971,16 @@ U16     updated = 0;                    
 -         m = n;
 - 
 -     /* Copy from operand beginning */
 --    for (i = 0; i < m; i++)
 -+    for (i = 0; i < m; i++, p1++)
 -     {
 --        regs->CR_L((r1 + i) & 0xF) = fetch_fw (p1++);
 -+        regs->CR_L((r1 + i) & 0xF) = fetch_fw (p1);
 -         updated |= BIT((r1 + i) & 0xF);
 -     }
 - 
 -     /* Copy from next page */
 --    for ( ; i < n; i++)
 -+    for ( ; i < n; i++, p2++)
 -     {
 --        regs->CR_L((r1 + i) & 0xF) = fetch_fw (p2++);
 -+        regs->CR_L((r1 + i) & 0xF) = fetch_fw (p2);
 -         updated |= BIT((r1 + i) & 0xF);
 -     }
 - 
 -Index: esame.c
 -===================================================================
 -RCS file: /usr/cvs/hercules/hercules/esame.c,v
 -retrieving revision 1.201
 -retrieving revision 1.202
 -diff -u -p -r1.201 -r1.202
 ---- esame.c	11 Apr 2008 14:28:29 -0000	1.201
 -+++ esame.c	6 May 2008 22:15:42 -0000	1.202
 -@@ -4038,8 +4041,8 @@ U32    *p1, *p2;                        
 -     {
 -         /* Boundary not crossed */
 -         n >>= 2;
 --        for (i = 0; i < n; i++)
 --            regs->GR_H((r1 + i) & 0xF) = fetch_fw (p1++);
 -+        for (i = 0; i < n; i++, p1++)
 -+            regs->GR_H((r1 + i) & 0xF) = fetch_fw (p1);
 -     }
 -     else
 -     {
 -@@ -4052,11 +4055,11 @@ U32    *p1, *p2;                        
 -         {
 -             /* Addresses are word aligned */
 -             m >>= 2;
 --            for (i = 0; i < m; i++)
 --                regs->GR_H((r1 + i) & 0xF) = fetch_fw (p1++);
 -+            for (i = 0; i < m; i++, p1++)
 -+                regs->GR_H((r1 + i) & 0xF) = fetch_fw (p1);
 -             n >>= 2;
 --            for ( ; i < n; i++)
 --                regs->GR_H((r1 + i) & 0xF) = fetch_fw (p2++);
 -+            for ( ; i < n; i++, p2++)
 -+                regs->GR_H((r1 + i) & 0xF) = fetch_fw (p2);
 -         }
 -         else
 -         {
 -@@ -6728,16 +6731,16 @@ U32    *p1, *p2 = NULL;                 
 -         m = n;
 - 
 -     /* Load from first page */
 --    for (i = 0; i < m; i++)
 -+    for (i = 0; i < m; i++, p1++)
 -     {
 --        regs->AR((r1 + i) & 0xF) = fetch_fw (p1++);
 -+        regs->AR((r1 + i) & 0xF) = fetch_fw (p1);
 -         SET_AEA_AR(regs, (r1 + i) & 0xF);
 -     }
 - 
 -     /* Load from next page */
 --    for ( ; i < n; i++)
 -+    for ( ; i < n; i++, p2++)
 -     {
 --        regs->AR((r1 + i) & 0xF) = fetch_fw (p2++);
 -+        regs->AR((r1 + i) & 0xF) = fetch_fw (p2);
 -         SET_AEA_AR(regs, (r1 + i) & 0xF);
 -     }
 - 
 -@@ -6811,8 +6814,8 @@ U32    *p1, *p2;                        
 -     {
 -         /* Boundary not crossed */
 -         n >>= 2;
 --        for (i = 0; i < n; i++)
 --            regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1++);
 -+        for (i = 0; i < n; i++, p1++)
 -+            regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1);
 -     }
 -     else
 -     {
 -@@ -6825,11 +6828,11 @@ U32    *p1, *p2;                        
 -         {
 -             /* Addresses are word aligned */
 -             m >>= 2;
 --            for (i = 0; i < m; i++)
 --                regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1++);
 -+            for (i = 0; i < m; i++, p1++)
 -+                regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1);
 -             n >>= 2;
 --            for ( ; i < n; i++)
 --                regs->GR_L((r1 + i) & 0xF) = fetch_fw (p2++);
 -+            for ( ; i < n; i++, p2++)
 -+                regs->GR_L((r1 + i) & 0xF) = fetch_fw (p2);
 -         }
 -         else
 -         {
 -Index: general1.c
 -===================================================================
 -RCS file: /usr/cvs/hercules/hercules/general1.c,v
 -retrieving revision 1.165
 -retrieving revision 1.166
 -diff -u -p -r1.165 -r1.166
 ---- general1.c	11 Apr 2008 14:28:44 -0000	1.165
 -+++ general1.c	6 May 2008 22:15:42 -0000	1.166
 -@@ -3413,16 +3416,16 @@ U32    *p1, *p2 = NULL;                 
 -         m = n;
 - 
 -     /* Copy from operand beginning */
 --    for (i = 0; i < m; i++)
 -+    for (i = 0; i < m; i++, p1++)
 -     {
 --        regs->AR((r1 + i) & 0xF) = fetch_fw (p1++);
 -+        regs->AR((r1 + i) & 0xF) = fetch_fw (p1);
 -         SET_AEA_AR (regs, (r1 + i) & 0xF);
 -     }
 - 
 -     /* Copy from next page */
 --    for ( ; i < n; i++)
 -+    for ( ; i < n; i++, p2++)
 -     {
 --        regs->AR((r1 + i) & 0xF) = fetch_fw (p2++);
 -+        regs->AR((r1 + i) & 0xF) = fetch_fw (p2);
 -         SET_AEA_AR (regs, (r1 + i) & 0xF);
 -     }
 - 
 -@@ -3580,8 +3583,8 @@ U32    *p1, *p2;                        
 -     {
 -         /* Boundary not crossed */
 -         n >>= 2;
 --        for (i = 0; i < n; i++)
 --            regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1++);
 -+        for (i = 0; i < n; i++, p1++)
 -+            regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1);
 -     }
 -     else
 -     {
 -@@ -3594,11 +3597,11 @@ U32    *p1, *p2;                        
 -         {
 -             /* Addresses are word aligned */
 -             m >>= 2;
 --            for (i = 0; i < m; i++)
 --                regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1++);
 -+            for (i = 0; i < m; i++, p1++)
 -+                regs->GR_L((r1 + i) & 0xF) = fetch_fw (p1);
 -             n >>= 2;
 --            for ( ; i < n; i++)
 --                regs->GR_L((r1 + i) & 0xF) = fetch_fw (p2++);
 -+            for ( ; i < n; i++, p2++)
 -+                regs->GR_L((r1 + i) & 0xF) = fetch_fw (p2);
 -         }
 -         else
 -         {
 diff -u -r emulators/hercules-3.05/files/patch-libtool22 emulators/hercules/files/patch-libtool22
 --- emulators/hercules-3.05/files/patch-libtool22	2009-08-02 22:33:43.000000000 +0300
 +++ emulators/hercules/files/patch-libtool22	2012-12-06 10:49:04.445214973 +0200
 @@ -1,6 +1,28 @@
 ---- Makefile.in.orig	2009-07-13 15:39:03.000000000 -0500
 -+++ Makefile.in	2009-07-13 15:39:06.000000000 -0500
 -@@ -257,13 +257,13 @@
 +--- crypto/Makefile.in.orig	2009-07-13 15:39:40.000000000 -0500
 ++++ crypto/Makefile.in	2009-07-13 15:39:44.000000000 -0500
 +@@ -244,7 +244,7 @@
 + @OPTION_DYNAMIC_LOAD_FALSE@DYNSRC = $(dyndev_SRC)
 + @OPTION_DYNAMIC_LOAD_TRUE@DYNSRC = 
 + @OPTION_DYNAMIC_LOAD_FALSE@LTDL = 
 +-@OPTION_DYNAMIC_LOAD_TRUE@LTDL = ../ltdl.c
 ++@OPTION_DYNAMIC_LOAD_TRUE@LTDL = 
 + @OPTION_DYNAMIC_LOAD_FALSE@DYNMOD_LD_FLAGS = 
 + @OPTION_DYNAMIC_LOAD_TRUE@DYNMOD_LD_FLAGS = -module         \
 + @OPTION_DYNAMIC_LOAD_TRUE@                   -no-undefined   \
 +--- decNumber/Makefile.in.orig	2009-07-13 15:40:23.000000000 -0500
 ++++ decNumber/Makefile.in	2009-07-13 15:40:25.000000000 -0500
 +@@ -258,7 +258,7 @@
 + @BUILD_SHARED_FALSE@XSTATIC = -static
 + @BUILD_SHARED_TRUE@XSTATIC = 
 + @OPTION_DYNAMIC_LOAD_FALSE@LTDL = 
 +-@OPTION_DYNAMIC_LOAD_TRUE@LTDL = ../ltdl.c
 ++@OPTION_DYNAMIC_LOAD_TRUE@LTDL = 
 + @OPTION_DYNAMIC_LOAD_FALSE@LIB_LD_FLAGS = $(XSTATIC)    \
 + @OPTION_DYNAMIC_LOAD_FALSE@		   -no-undefined \
 + @OPTION_DYNAMIC_LOAD_FALSE@		   -avoid-version
 +--- Makefile.in.orig	2010-03-07 14:04:49.000000000 +0200
 ++++ Makefile.in	2012-10-14 17:27:30.565513737 +0300
 +@@ -304,13 +304,13 @@
   libhercu_la_DEPENDENCIES = $(am__DEPENDENCIES_1) libhercs.la
   am__libhercu_la_SOURCES_DIST = version.c hscutl.c hscutl2.c codepage.c \
   	logger.c logmsg.c hdl.c hostinfo.c hsocket.c memrchr.c \
 @@ -16,7 +38,7 @@
   am_libhercu_la_OBJECTS = version.lo hscutl.lo hscutl2.lo codepage.lo \
   	logger.lo logmsg.lo hdl.lo hostinfo.lo hsocket.lo memrchr.lo \
   	parser.lo pttrace.lo $(am__objects_8) $(am__objects_9) \
 -@@ -626,7 +626,7 @@
 +@@ -687,7 +687,7 @@
   @OPTION_DYNAMIC_LOAD_FALSE@DYNSRC = $(dyndev_SRC)
   @OPTION_DYNAMIC_LOAD_TRUE@DYNSRC = 
   @OPTION_DYNAMIC_LOAD_FALSE@LTDL = 
 @@ -25,7 +47,7 @@
   @OPTION_DYNAMIC_LOAD_FALSE@DYNMOD_LD_FLAGS = 
   @OPTION_DYNAMIC_LOAD_TRUE@DYNMOD_LD_FLAGS = -module         \
   @OPTION_DYNAMIC_LOAD_TRUE@                   -no-undefined    \
 -@@ -843,8 +843,7 @@
 +@@ -913,8 +913,7 @@
                                memrchr.c        \
                                $(dynamic_SRC)   \
                                $(extra_SRC)     \
 @@ -35,7 +57,7 @@
   
   libherc_la_LDFLAGS = $(LIB_LD_FLAGS)
   libherc_la_LIBADD = libhercs.la     \
 -@@ -1089,7 +1088,6 @@
 +@@ -1166,7 +1165,6 @@
                    hdl.h          \
                    crypto.h       \
                    sockdev.h      \
 @@ -43,33 +65,11 @@
                    herc_getopt.h  \
                    service.h      \
                    chsc.h         \
 -@@ -1465,7 +1463,6 @@
 - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadparm.Plo@am__quote@
 +@@ -1552,7 +1550,6 @@
   @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logger.Plo@am__quote@
   @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logmsg.Plo@am__quote@
 + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losc.Plo@am__quote@
  -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ltdl.Plo@am__quote@
   @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/machchk.Plo@am__quote@
   @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memrchr.Plo@am__quote@
 - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opcode.Plo@am__quote@
 ---- crypto/Makefile.in.orig	2009-07-13 15:39:40.000000000 -0500
 -+++ crypto/Makefile.in	2009-07-13 15:39:44.000000000 -0500
 -@@ -244,7 +244,7 @@
 - @OPTION_DYNAMIC_LOAD_FALSE@DYNSRC = $(dyndev_SRC)
 - @OPTION_DYNAMIC_LOAD_TRUE@DYNSRC = 
 - @OPTION_DYNAMIC_LOAD_FALSE@LTDL = 
 --@OPTION_DYNAMIC_LOAD_TRUE@LTDL = ../ltdl.c
 -+@OPTION_DYNAMIC_LOAD_TRUE@LTDL = 
 - @OPTION_DYNAMIC_LOAD_FALSE@DYNMOD_LD_FLAGS = 
 - @OPTION_DYNAMIC_LOAD_TRUE@DYNMOD_LD_FLAGS = -module         \
 - @OPTION_DYNAMIC_LOAD_TRUE@                   -no-undefined   \
 ---- decNumber/Makefile.in.orig	2009-07-13 15:40:23.000000000 -0500
 -+++ decNumber/Makefile.in	2009-07-13 15:40:25.000000000 -0500
 -@@ -258,7 +258,7 @@
 - @BUILD_SHARED_FALSE@XSTATIC = -static
 - @BUILD_SHARED_TRUE@XSTATIC = 
 - @OPTION_DYNAMIC_LOAD_FALSE@LTDL = 
 --@OPTION_DYNAMIC_LOAD_TRUE@LTDL = ../ltdl.c
 -+@OPTION_DYNAMIC_LOAD_TRUE@LTDL = 
 - @OPTION_DYNAMIC_LOAD_FALSE@LIB_LD_FLAGS = $(XSTATIC)    \
 - @OPTION_DYNAMIC_LOAD_FALSE@		   -no-undefined \
 - @OPTION_DYNAMIC_LOAD_FALSE@		   -avoid-version
 + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/omatape.Plo@am__quote@
 
 --------------030808070602070404000907--
Responsible-Changed-From-To: freebsd-ports-bugs->ak 
Responsible-Changed-By: ak 
Responsible-Changed-When: Sat Jan 12 00:43:03 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173051 
State-Changed-From-To: feedback->closed 
State-Changed-By: ak 
State-Changed-When: Sat Jan 12 00:43:16 UTC 2013 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173051 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/173051: commit references a PR
Date: Sat, 12 Jan 2013 00:41:39 +0000 (UTC)

 Author: ak
 Date: Sat Jan 12 00:41:29 2013
 New Revision: 310255
 URL: http://svnweb.freebsd.org/changeset/ports/310255
 
 Log:
   - Update to 3.07 [1]
   - Convert to new options framework
   - Improve COMMENT
   
   PR:	ports/173051 [1]
   Submitted by:	Jukka Ukkonen <jau@iki.fi>
   Approved by:	bzeeb+freebsdports@zabbadoz.net (maintainer)
 
 Deleted:
   head/emulators/hercules/files/patch-20080506-cvs-endian.diff
 Modified:
   head/emulators/hercules/Makefile   (contents, props changed)
   head/emulators/hercules/distinfo   (contents, props changed)
   head/emulators/hercules/files/patch-libtool22   (contents, props changed)
   head/emulators/hercules/pkg-plist   (contents, props changed)
 
 Modified: head/emulators/hercules/Makefile
 ==============================================================================
 --- head/emulators/hercules/Makefile	Fri Jan 11 23:45:57 2013	(r310254)
 +++ head/emulators/hercules/Makefile	Sat Jan 12 00:41:29 2013	(r310255)
 @@ -2,29 +2,32 @@
  # $FreeBSD$
  
  PORTNAME=	hercules
 -PORTVERSION=	3.05
 -PORTREVISION=	3
 +PORTVERSION=	3.07
  CATEGORIES=	emulators
  MASTER_SITES=	http://www.hercules-390.org/
  
  MAINTAINER=	bzeeb+freebsdports@zabbadoz.net
 -COMMENT=	The Hercules System/370, ESA/390, and z/Architecture Emulator
 +COMMENT=	System/370, ESA/390, and z/Architecture Emulator
  
 -OPTIONS=	PTHREADS "Build with pthreads instead of fthreads." on \
 -		NLS "Build with native language support." on \
 -		DEBUG "Enable for debugging hercules itself." off
 +OPTIONS_DEFINE=	DEBUG NLS PTHREADS
 +OPTIONS_DEFAULT=	NLS PTHREADS
 +PTHREADS_DESC=	Build with pthreads instead of fthreads
  
  USE_AUTOTOOLS=	libtool libltdl
 -GNU_CONFIGURE=		yes
 +GNU_CONFIGURE=	yes
  USE_LDCONFIG=	yes
  
 +PORTDOCS=	*
 +
 +.include <bsd.port.options.mk>
 +
  post-extract:
 -	${RM} ${WRKSRC}/ltdl.*
 +	@${RM} ${WRKSRC}/ltdl.*
  
  post-patch:
  	@${REINPLACE_CMD} -e 's@-lpthread@${PTHREAD_LIBS}@g' ${WRKSRC}/configure
  	@${REINPLACE_CMD} -e 's@SOL_TCP@IPPROTO_TCP@g' ${WRKSRC}/hscutl.c
 -.if defined(NOPORTDOCS)
 +.if empty(PORT_OPTIONS:MDOCS)
  	@${REINPLACE_CMD} -e 's,^SUBDIRS = decNumber m4 po util html man . crypto,SUBDIRS = decNumber m4 po util man . crypto,g' ${WRKSRC}/Makefile.in
  .else
  	@${REINPLACE_CMD} -e 's,^datadir = @datadir@,datadir = ${PREFIX}/share/doc/,' ${WRKSRC}/html/Makefile.in
 @@ -35,22 +38,18 @@ post-patch:
  MAN1=			cckddiag.1 dasdseq.1
  MAN4=			cckd.4
  
 -.if !defined(NOPORTDOCS)
 -PORTDOCS=		*
 -.endif
 -
  post-install:
  	@${CAT} ${PKGMESSAGE}
  
 -.include <bsd.port.pre.mk>
 -
 -.if defined(WITH_DEBUG)
 -CFLAGS+=		-g
 +.if ${PORT_OPTIONS:MDEBUG}
 +CFLAGS+=	-g
  .endif
 -.if defined(WITH_PTHREADS)
 +
 +.if ${PORT_OPTIONS:MPTHREADS}
  CONFIGURE_ARGS+=	--disable-fthreads
  .endif
 -.if defined(WITHOUT_NLS)
 +
 +.if empty(PORT_OPTIONS:MNLS)
  CONFIGURE_ARGS+=	--disable-nls
  PLIST_SUB+=		GETTEXT="@comment "
  .else
 @@ -63,4 +62,4 @@ PLIST_SUB+=		GETTEXT=""
  CONFIGURE_ARGS+=	--enable-optimization="no"
  .endif
  
 -.include <bsd.port.post.mk>
 +.include <bsd.port.mk>
 
 Modified: head/emulators/hercules/distinfo
 ==============================================================================
 --- head/emulators/hercules/distinfo	Fri Jan 11 23:45:57 2013	(r310254)
 +++ head/emulators/hercules/distinfo	Sat Jan 12 00:41:29 2013	(r310255)
 @@ -1,2 +1,2 @@
 -SHA256 (hercules-3.05.tar.gz) = f190221fa25692c0316be331f618c0675f9f9875c44b8af3efa7a431d138b1e2
 -SIZE (hercules-3.05.tar.gz) = 2470621
 +SHA256 (hercules-3.07.tar.gz) = 02d5f6c66d699d413a4db9ef5a799249a6645ac10f2af1edb37992e7fa1f7724
 +SIZE (hercules-3.07.tar.gz) = 2701835
 
 Modified: head/emulators/hercules/files/patch-libtool22
 ==============================================================================
 --- head/emulators/hercules/files/patch-libtool22	Fri Jan 11 23:45:57 2013	(r310254)
 +++ head/emulators/hercules/files/patch-libtool22	Sat Jan 12 00:41:29 2013	(r310255)
 @@ -1,6 +1,28 @@
 ---- Makefile.in.orig	2009-07-13 15:39:03.000000000 -0500
 -+++ Makefile.in	2009-07-13 15:39:06.000000000 -0500
 -@@ -257,13 +257,13 @@
 +--- crypto/Makefile.in.orig	2009-07-13 15:39:40.000000000 -0500
 ++++ crypto/Makefile.in	2009-07-13 15:39:44.000000000 -0500
 +@@ -244,7 +244,7 @@
 + @OPTION_DYNAMIC_LOAD_FALSE@DYNSRC = $(dyndev_SRC)
 + @OPTION_DYNAMIC_LOAD_TRUE@DYNSRC = 
 + @OPTION_DYNAMIC_LOAD_FALSE@LTDL = 
 +-@OPTION_DYNAMIC_LOAD_TRUE@LTDL = ../ltdl.c
 ++@OPTION_DYNAMIC_LOAD_TRUE@LTDL = 
 + @OPTION_DYNAMIC_LOAD_FALSE@DYNMOD_LD_FLAGS = 
 + @OPTION_DYNAMIC_LOAD_TRUE@DYNMOD_LD_FLAGS = -module         \
 + @OPTION_DYNAMIC_LOAD_TRUE@                   -no-undefined   \
 +--- decNumber/Makefile.in.orig	2009-07-13 15:40:23.000000000 -0500
 ++++ decNumber/Makefile.in	2009-07-13 15:40:25.000000000 -0500
 +@@ -258,7 +258,7 @@
 + @BUILD_SHARED_FALSE@XSTATIC = -static
 + @BUILD_SHARED_TRUE@XSTATIC = 
 + @OPTION_DYNAMIC_LOAD_FALSE@LTDL = 
 +-@OPTION_DYNAMIC_LOAD_TRUE@LTDL = ../ltdl.c
 ++@OPTION_DYNAMIC_LOAD_TRUE@LTDL = 
 + @OPTION_DYNAMIC_LOAD_FALSE@LIB_LD_FLAGS = $(XSTATIC)    \
 + @OPTION_DYNAMIC_LOAD_FALSE@		   -no-undefined \
 + @OPTION_DYNAMIC_LOAD_FALSE@		   -avoid-version
 +--- Makefile.in.orig	2010-03-07 14:04:49.000000000 +0200
 ++++ Makefile.in	2012-10-14 17:27:30.565513737 +0300
 +@@ -304,13 +304,13 @@
   libhercu_la_DEPENDENCIES = $(am__DEPENDENCIES_1) libhercs.la
   am__libhercu_la_SOURCES_DIST = version.c hscutl.c hscutl2.c codepage.c \
   	logger.c logmsg.c hdl.c hostinfo.c hsocket.c memrchr.c \
 @@ -16,7 +38,7 @@
   am_libhercu_la_OBJECTS = version.lo hscutl.lo hscutl2.lo codepage.lo \
   	logger.lo logmsg.lo hdl.lo hostinfo.lo hsocket.lo memrchr.lo \
   	parser.lo pttrace.lo $(am__objects_8) $(am__objects_9) \
 -@@ -626,7 +626,7 @@
 +@@ -687,7 +687,7 @@
   @OPTION_DYNAMIC_LOAD_FALSE@DYNSRC = $(dyndev_SRC)
   @OPTION_DYNAMIC_LOAD_TRUE@DYNSRC = 
   @OPTION_DYNAMIC_LOAD_FALSE@LTDL = 
 @@ -25,7 +47,7 @@
   @OPTION_DYNAMIC_LOAD_FALSE@DYNMOD_LD_FLAGS = 
   @OPTION_DYNAMIC_LOAD_TRUE@DYNMOD_LD_FLAGS = -module         \
   @OPTION_DYNAMIC_LOAD_TRUE@                   -no-undefined    \
 -@@ -843,8 +843,7 @@
 +@@ -913,8 +913,7 @@
                                memrchr.c        \
                                $(dynamic_SRC)   \
                                $(extra_SRC)     \
 @@ -35,7 +57,7 @@
   
   libherc_la_LDFLAGS = $(LIB_LD_FLAGS)
   libherc_la_LIBADD = libhercs.la     \
 -@@ -1089,7 +1088,6 @@
 +@@ -1166,7 +1165,6 @@
                    hdl.h          \
                    crypto.h       \
                    sockdev.h      \
 @@ -43,33 +65,11 @@
                    herc_getopt.h  \
                    service.h      \
                    chsc.h         \
 -@@ -1465,7 +1463,6 @@
 - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadparm.Plo@am__quote@
 +@@ -1552,7 +1550,6 @@
   @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logger.Plo@am__quote@
   @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logmsg.Plo@am__quote@
 + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/losc.Plo@am__quote@
  -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ltdl.Plo@am__quote@
   @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/machchk.Plo@am__quote@
   @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memrchr.Plo@am__quote@
 - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opcode.Plo@am__quote@
 ---- crypto/Makefile.in.orig	2009-07-13 15:39:40.000000000 -0500
 -+++ crypto/Makefile.in	2009-07-13 15:39:44.000000000 -0500
 -@@ -244,7 +244,7 @@
 - @OPTION_DYNAMIC_LOAD_FALSE@DYNSRC = $(dyndev_SRC)
 - @OPTION_DYNAMIC_LOAD_TRUE@DYNSRC = 
 - @OPTION_DYNAMIC_LOAD_FALSE@LTDL = 
 --@OPTION_DYNAMIC_LOAD_TRUE@LTDL = ../ltdl.c
 -+@OPTION_DYNAMIC_LOAD_TRUE@LTDL = 
 - @OPTION_DYNAMIC_LOAD_FALSE@DYNMOD_LD_FLAGS = 
 - @OPTION_DYNAMIC_LOAD_TRUE@DYNMOD_LD_FLAGS = -module         \
 - @OPTION_DYNAMIC_LOAD_TRUE@                   -no-undefined   \
 ---- decNumber/Makefile.in.orig	2009-07-13 15:40:23.000000000 -0500
 -+++ decNumber/Makefile.in	2009-07-13 15:40:25.000000000 -0500
 -@@ -258,7 +258,7 @@
 - @BUILD_SHARED_FALSE@XSTATIC = -static
 - @BUILD_SHARED_TRUE@XSTATIC = 
 - @OPTION_DYNAMIC_LOAD_FALSE@LTDL = 
 --@OPTION_DYNAMIC_LOAD_TRUE@LTDL = ../ltdl.c
 -+@OPTION_DYNAMIC_LOAD_TRUE@LTDL = 
 - @OPTION_DYNAMIC_LOAD_FALSE@LIB_LD_FLAGS = $(XSTATIC)    \
 - @OPTION_DYNAMIC_LOAD_FALSE@		   -no-undefined \
 - @OPTION_DYNAMIC_LOAD_FALSE@		   -avoid-version
 + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/omatape.Plo@am__quote@
 
 Modified: head/emulators/hercules/pkg-plist
 ==============================================================================
 --- head/emulators/hercules/pkg-plist	Fri Jan 11 23:45:57 2013	(r310254)
 +++ head/emulators/hercules/pkg-plist	Sat Jan 12 00:41:29 2013	(r310255)
 @@ -66,11 +66,14 @@ lib/hercules/hdt3505.la
  lib/hercules/hdt3505.so
  lib/hercules/hdt3525.la
  lib/hercules/hdt3525.so
 +lib/hercules/hdt3705.la
 +lib/hercules/hdt3705.so
  lib/hercules/hdteq.la
  lib/hercules/hdteq.so
  lib/hercules/hdtqeth.la
  lib/hercules/hdtqeth.so
  @dirrm lib/hercules
 +%%DATADIR%%/TMOUNT.txt
  %%DATADIR%%/awssl-v19g
  %%DATADIR%%/awswrite.jcl
  %%DATADIR%%/cckddump.hla
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
