Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 14 Feb 2014 03:05:29 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/186740: emulators/hercules: Update to version 3.10
Message-ID:  <20140214030529.4f7d5bcb75dd2bad77d0d005@yahoo.com>
Resent-Message-ID: <201402131840.s1DIe3gY017390@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         186740
>Category:       ports
>Synopsis:       emulators/hercules: Update to version 3.10
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 13 18:40:03 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p7 i386
>Organization:
>Environment:
>Description:
- Update to version 3.10

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/emulators/hercules/Makefile emulators/hercules/Makefile
--- /usr/ports/emulators/hercules/Makefile	2013-11-06 22:06:15.000000000 +0900
+++ emulators/hercules/Makefile	2014-02-14 00:00:00.000000000 +0900
@@ -2,40 +2,37 @@
 # $FreeBSD: head/emulators/hercules/Makefile 331623 2013-10-25 18:38:03Z danilo $
 
 PORTNAME=	hercules
-PORTVERSION=	3.09
+PORTVERSION=	3.10
 CATEGORIES=	emulators
 MASTER_SITES=	http://downloads.hercules-390.eu/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	System/370, ESA/390, and z/Architecture Emulator
 
-OPTIONS_DEFINE=	DEBUG PTHREADS OPTIMIZATIONS DOCS
-OPTIONS_DEFAULT=	PTHREADS
-PTHREADS_DESC=	Build with pthreads instead of fthreads
-OPTIMIZATIONS_DESC=	Enable optimizations
-
+USES=		iconv perl5 shebangfix
+SHEBANG_FILES=	util/bldlvlck
 USE_AUTOTOOLS=	libtool libltdl
-GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-optimization="no"
 USE_LDCONFIG=	yes
 
-CFLAGS+=	-I/usr/local/include
-LDFLAGS+=	-L/usr/local/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
-PORTDOCS=	*
+OPTIONS_DEFINE=		DOCS
 
-DEBUG_CFLAGS=	-g
-PTHREADS_CONFIGURE_ON=	--disable-fthreads
-OPTIMIZATIONS_CONFIGURE_ON=	--enable-optimization="yes"
-OPTIMIZATIONS_CONFIGURE_OFF=	--enable-optimization="no"
+.include <bsd.port.options.mk>
 
 post-extract:
-	@${RM} ${WRKSRC}/ltdl.*
+	@${RM} -f ${WRKSRC}/ltdl.h
 
 post-patch:
-	@${REINPLACE_CMD} -e 's@-lpthread@${PTHREAD_LIBS}@g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's@SOL_TCP@IPPROTO_TCP@g' ${WRKSRC}/hscutl.c
-	@${REINPLACE_CMD} -e 's,^datadir = @datadir@,datadir = ${PREFIX}/share/doc/,' ${WRKSRC}/html/Makefile.in
-	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
+	@${REINPLACE_CMD} -e \
+		'/LIBS/s|-lpthread|-pthread|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|SOL_TCP|IPPROTO_TCP|g' ${WRKSRC}/hscutl.c
+	@${REINPLACE_CMD} -e \
+		'/^pkgdatadir/s|=.*|= $$(docdir)|' ${WRKSRC}/html/Makefile.in
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		'/^libherc_la_LIBADD/s|=|= -lltdl |g'
 
 .include <bsd.port.mk>
diff -urN /usr/ports/emulators/hercules/distinfo emulators/hercules/distinfo
--- /usr/ports/emulators/hercules/distinfo	2013-11-06 22:06:15.000000000 +0900
+++ emulators/hercules/distinfo	2014-02-14 00:00:00.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (hercules-3.09.tar.gz) = 98a6029d908943451635ba53acf97ed61fdf6ebafc4402be7137c620851fe4e7
-SIZE (hercules-3.09.tar.gz) = 2567052
+SHA256 (hercules-3.10.tar.gz) = 26264569b7d78bbc3b6221926051ac3761c4a792dfc84d591d3230de40aa46fa
+SIZE (hercules-3.10.tar.gz) = 2608321
diff -urN /usr/ports/emulators/hercules/pkg-plist emulators/hercules/pkg-plist
--- /usr/ports/emulators/hercules/pkg-plist	2013-11-06 22:06:15.000000000 +0900
+++ emulators/hercules/pkg-plist	2014-02-14 00:00:00.000000000 +0900
@@ -28,19 +28,6 @@
 bin/tapecopy
 bin/tapemap
 bin/tapesplt
-lib/libherc.la
-lib/libherc.so
-lib/libhercd.la
-lib/libhercd.so
-lib/libhercs.la
-lib/libhercs.so
-lib/libherct.la
-lib/libherct.so
-lib/libhercu.la
-lib/libhercu.so
-lib/libdecNumber.so
-lib/libdecNumber.la
-lib/libdecNumber.a
 lib/hercules/dyncrypt.a
 lib/hercules/dyncrypt.la
 lib/hercules/dyncrypt.so
@@ -72,10 +59,128 @@
 lib/hercules/hdteq.so
 lib/hercules/hdtqeth.la
 lib/hercules/hdtqeth.so
+lib/libdecNumber.a
+lib/libdecNumber.la
+lib/libdecNumber.so
+lib/libherc.la
+lib/libherc.so
+lib/libhercd.la
+lib/libhercd.so
+lib/libhercs.la
+lib/libhercs.so
+lib/libherct.la
+lib/libherct.so
+lib/libhercu.la
+lib/libhercu.so
+lib/libsoftfloat.a
+lib/libsoftfloat.la
+lib/libsoftfloat.so
 man/man1/cckddiag.1.gz
 man/man1/dasdseq.1.gz
 man/man1/hercules.1.gz
 man/man4/cckd.4.gz
+%%PORTDOCS%%%%DOCSDIR%%/cckddasd.html
+%%PORTDOCS%%%%DOCSDIR%%/fishgui.html
+%%PORTDOCS%%%%DOCSDIR%%/hercconf.html
+%%PORTDOCS%%%%DOCSDIR%%/hercfaq.html
+%%PORTDOCS%%%%DOCSDIR%%/hercinst.html
+%%PORTDOCS%%%%DOCSDIR%%/herclic.html
+%%PORTDOCS%%%%DOCSDIR%%/hercload.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmsca.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmscf.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmscp.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmsct.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmscu.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmsda.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmsdc.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmsdg.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmsdi.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmsdl.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmsds.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmsdt.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmsdu.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmsg.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmshd.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmshe.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmshg.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmshm.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmsht.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmshu.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmsif.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmsin.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmslc.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmslg.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmspn.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmspr.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmspu.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmsrd.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmssd.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmsta.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmstc.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmste.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmstm.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmsts.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmstt.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmstu.html
+%%PORTDOCS%%%%DOCSDIR%%/hercmsvm.html
+%%PORTDOCS%%%%DOCSDIR%%/hercnew.html
+%%PORTDOCS%%%%DOCSDIR%%/hercrdr.html
+%%PORTDOCS%%%%DOCSDIR%%/hercrnot.html
+%%PORTDOCS%%%%DOCSDIR%%/hercsupp.html
+%%PORTDOCS%%%%DOCSDIR%%/herctcp.html
+%%PORTDOCS%%%%DOCSDIR%%/hercules.css
+%%PORTDOCS%%%%DOCSDIR%%/hercules.html
+%%PORTDOCS%%%%DOCSDIR%%/images/back.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/bkued.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/blueu.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/dial1.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/dial2.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/dial3.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/dial4.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/favicon.ico
+%%PORTDOCS%%%%DOCSDIR%%/images/greend.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/greenu.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/hercpic-rblk-256.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/hercpic-rblk-80.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/interruptd.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/interruptu.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/loadd.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/loadoffu.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/loadonu.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/loadu.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/manoffu.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/manonu.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/note.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/osi-certified-60x50.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/poweroffd.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/poweroffu.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/poweronoffd.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/poweronoffu.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/poweronond.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/powerononu.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/redd.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/redu.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/restartd.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/restartu.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/startd.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/startu.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/stopd.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/stopu.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/stored.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/storeu.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/sysoffu.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/sysonu.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/translucentoffd.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/translucentoffu.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/translucentond.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/translucentonu.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/waitoffu.gif
+%%PORTDOCS%%%%DOCSDIR%%/images/waitonu.gif
+%%PORTDOCS%%%%DOCSDIR%%/include/footer.htmlpart
+%%PORTDOCS%%%%DOCSDIR%%/include/header.htmlpart
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/shared.html
+%%PORTDOCS%%%%DOCSDIR%%/tasks.html
 %%DATADIR%%/TMOUNT.txt
 %%DATADIR%%/awssl-v19g
 %%DATADIR%%/awswrite.jcl
@@ -85,4 +190,7 @@
 %%DATADIR%%/tapeconv.jcl
 %%DATADIR%%/zzsacard.bin
 @dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/include
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/hercules
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140214030529.4f7d5bcb75dd2bad77d0d005>