rtyler
/
pkgsrc-wip
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sdl-hercules-*: some progress.

This commit is contained in:
Olaf Seibert 2020-02-08 19:33:41 +01:00
parent 19382a4939
commit 49734035e0
15 changed files with 248 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sdl-hercules-crypto/Makefile
View File

@ -23,5 +23,8 @@ CMAKE_ARGS+= -D INSTALL_PREFIX=${PREFIX}/lib/sdlhercules
pre-configure:
${MKDIR} ${BLDDIR}
post-install:
cd ${DESTDIR}${PREFIX}/lib/sdlhercules/lib && ${MV} libcrypto64.a libcrypto_pic.a
.include "../../wip/mk/git-package.mk"
.include "../../mk/bsd.pkg.mk"

2
sdl-hercules-crypto/PLIST
View File

@ -7,4 +7,4 @@ lib/sdlhercules/include/rijndael.h
lib/sdlhercules/include/sha1.h
lib/sdlhercules/include/sha2.h
lib/sdlhercules/include/sshdes.h
lib/sdlhercules/lib/libcrypto64.a
lib/sdlhercules/lib/libcrypto_pic.a

3
sdl-hercules-decnumber/Makefile
View File

@ -23,5 +23,8 @@ CMAKE_ARGS+= -D INSTALL_PREFIX=${PREFIX}/lib/sdlhercules
pre-configure:
${MKDIR} ${BLDDIR}
post-install:
cd ${DESTDIR}${PREFIX}/lib/sdlhercules/lib && ${MV} libdecNumber64.a libdecNumber_pic.a
.include "../../wip/mk/git-package.mk"
.include "../../mk/bsd.pkg.mk"

2
sdl-hercules-decnumber/PLIST
View File

@ -11,4 +11,4 @@ lib/sdlhercules/include/decimal128.h
lib/sdlhercules/include/decimal32.h
lib/sdlhercules/include/decimal64.h
lib/sdlhercules/include/decnumber_version.h
lib/sdlhercules/lib/libdecNumber64.a
lib/sdlhercules/lib/libdecNumber_pic.a

6
sdl-hercules-hyperion/Makefile
View File

@ -16,21 +16,27 @@ GITHUB_TAG= Release_${PKGVERSION_NOREV}
GNU_CONFIGURE= yes
USE_TOOLS+= autoconf automake flex gawk grep gm4 gmake perl gsed
USE_LIBTOOL= YES
USE_LANGUAGES+= c c++
PTHREAD_OPTS+= require
CONFIGURE_ARGS+= --disable-ipv6 # configure can't find header
CONFIGURE_ARGS+= --enable-extpkgs=${PREFIX}/lib/sdlhercules
MAKE_ARGS+= V=1
pre-configure:
${RM} ${WRKSRC}/ltdl.h ${WRKSRC}/ltdl.c
cd ${WRKSRC} && ./autogen.sh
.include "../../archivers/bzip2/builtin.mk"
.include "../../devel/zlib/builtin.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/libltdl/buildlink3.mk"
.include "../../wip/sdl-hercules-crypto/buildlink3.mk"
.include "../../wip/sdl-hercules-decnumber/buildlink3.mk"
.include "../../wip/sdl-hercules-softfloat/buildlink3.mk"
.include "../../wip/sdl-hercules-telnet/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

194
sdl-hercules-hyperion/PLIST
View File

@ -1,2 +1,194 @@
@comment $NetBSD$
@comment Package does not build yet
bin/cckd2ckd
bin/cckd642ckd
bin/cckdcdsk
bin/cckdcdsk64
bin/cckdcomp
bin/cckdcomp64
bin/cckddiag
bin/cckddiag64
bin/cckdmap
bin/cckdswap
bin/cckdswap64
bin/cfba2fba
bin/cfba642fba
bin/ckd2cckd
bin/ckd2cckd64
bin/convto64
bin/dasdcat
bin/dasdconv
bin/dasdconv64
bin/dasdcopy
bin/dasdcopy64
bin/dasdinit
bin/dasdinit64
bin/dasdisup
bin/dasdlist
bin/dasdload
bin/dasdload64
bin/dasdls
bin/dasdpdsu
bin/dasdseq
bin/dasdser
bin/dmap2hrc
bin/fba2cfba
bin/fba2cfba64
bin/hercifc
bin/herclin
bin/hercules
bin/hetget
bin/hetinit
bin/hetmap
bin/hetupd
bin/maketape
bin/tapecopy
bin/tapemap
bin/tapesplt
bin/vmfplc2
bin/voldsext.cmd
lib/hercules/dyncrypt.la
lib/hercules/dyngui.la
lib/hercules/hdt1052c.la
lib/hercules/hdt1403.la
lib/hercules/hdt2703.la
lib/hercules/hdt2880.la
lib/hercules/hdt3088.la
lib/hercules/hdt3270.la
lib/hercules/hdt3420.la
lib/hercules/hdt3505.la
lib/hercules/hdt3525.la
lib/hercules/hdt3705.la
lib/hercules/hdteq.la
lib/hercules/hdtptp.la
lib/hercules/hdtqeth.la
lib/hercules/hdtzfcp.la
lib/libhdt3420_not_mod.la
lib/libherc.la
lib/libhercd.la
lib/libhercs.la
lib/libherct.la
lib/libhercu.la
man/man1/cckddiag.1
man/man1/dasdseq.1
man/man1/vmfplc2.1
man/man4/cckd.4
share/hercules/TMOUNT.txt
share/hercules/awssl-v19g
share/hercules/awswrite.jcl
share/hercules/cckddasd.html
share/hercules/cckddump.hla
share/hercules/cckdload.hla
share/hercules/fishgui.html
share/hercules/hercconf.html
share/hercules/hercfaq.html
share/hercules/hercinst.html
share/hercules/herclic.html
share/hercules/hercload.html
share/hercules/hercmsca.html
share/hercules/hercmscf.html
share/hercules/hercmscp.html
share/hercules/hercmsct.html
share/hercules/hercmscu.html
share/hercules/hercmsda.html
share/hercules/hercmsdc.html
share/hercules/hercmsdg.html
share/hercules/hercmsdi.html
share/hercules/hercmsdl.html
share/hercules/hercmsdn.html
share/hercules/hercmsds.html
share/hercules/hercmsdt.html
share/hercules/hercmsdu.html
share/hercules/hercmsg.html
share/hercules/hercmshd.html
share/hercules/hercmshe.html
share/hercules/hercmshg.html
share/hercules/hercmshm.html
share/hercules/hercmsht.html
share/hercules/hercmshu.html
share/hercules/hercmsif.html
share/hercules/hercmsin.html
share/hercules/hercmslc.html
share/hercules/hercmslg.html
share/hercules/hercmspn.html
share/hercules/hercmspr.html
share/hercules/hercmspu.html
share/hercules/hercmsrd.html
share/hercules/hercmssd.html
share/hercules/hercmsta.html
share/hercules/hercmstc.html
share/hercules/hercmste.html
share/hercules/hercmstm.html
share/hercules/hercmsts.html
share/hercules/hercmstt.html
share/hercules/hercmstu.html
share/hercules/hercmsvm.html
share/hercules/hercnew.html
share/hercules/hercrdr.html
share/hercules/hercrnot.html
share/hercules/hercsupp.html
share/hercules/herctcp.html
share/hercules/hercules.css
share/hercules/hercules.html
share/hercules/images/back.gif
share/hercules/images/bkued.gif
share/hercules/images/blueu.gif
share/hercules/images/dial1.gif
share/hercules/images/dial2.gif
share/hercules/images/dial3.gif
share/hercules/images/dial4.gif
share/hercules/images/favicon.ico
share/hercules/images/greend.gif
share/hercules/images/greenu.gif
share/hercules/images/hercpic-rblk-256.gif
share/hercules/images/hercpic-rblk-80.gif
share/hercules/images/interruptd.gif
share/hercules/images/interruptu.gif
share/hercules/images/loadd.gif
share/hercules/images/loadoffu.gif
share/hercules/images/loadonu.gif
share/hercules/images/loadu.gif
share/hercules/images/manoffu.gif
share/hercules/images/manonu.gif
share/hercules/images/note.gif
share/hercules/images/osi-certified-60x50.jpg
share/hercules/images/poweroffd.gif
share/hercules/images/poweroffu.gif
share/hercules/images/poweronoffd.gif
share/hercules/images/poweronoffu.gif
share/hercules/images/poweronond.gif
share/hercules/images/powerononu.gif
share/hercules/images/redd.gif
share/hercules/images/redu.gif
share/hercules/images/restartd.gif
share/hercules/images/restartu.gif
share/hercules/images/startd.gif
share/hercules/images/startu.gif
share/hercules/images/stopd.gif
share/hercules/images/stopu.gif
share/hercules/images/stored.gif
share/hercules/images/storeu.gif
share/hercules/images/sysoffu.gif
share/hercules/images/sysonu.gif
share/hercules/images/telnetputtyconndata.png
share/hercules/images/telnetputtysession.png
share/hercules/images/telnetputtyterminal.png
share/hercules/images/telnetwin.png
share/hercules/images/telnetwinntconnect.png
share/hercules/images/telnetwinnttermpref.png
share/hercules/images/translucentoffd.gif
share/hercules/images/translucentoffu.gif
share/hercules/images/translucentond.gif
share/hercules/images/translucentonu.gif
share/hercules/images/waitoffu.gif
share/hercules/images/waitonu.gif
share/hercules/include/footer.htmlpart
share/hercules/include/header.htmlpart
share/hercules/index.html
share/hercules/rawstape.jcl
share/hercules/rexx.html
share/hercules/scsiboot
share/hercules/shared.html
share/hercules/tapeconv.jcl
share/hercules/tasks.html
share/hercules/telnet.html
share/hercules/zzsacard.bin

4
sdl-hercules-hyperion/TODO
View File

@ -1,4 +1,4 @@
This doesn't build properly yet:
libtool somehow doesn't like the static libraries of dynamic objects,
and the symbols that are supposed to be resolved by them remain unresolved.
The programs link, but since lots of *.a files are not installed (even though
the *.la file references them), packaging fails.

5
sdl-hercules-hyperion/distinfo
View File

@ -4,12 +4,13 @@ SHA1 (Release_4.2.1.tar.gz) = ca2f9c802c05c4ddd528718c2a3b4df01ae09564
RMD160 (Release_4.2.1.tar.gz) = cc8fd7e5deb2b2a857215172c13b237f1525858b
SHA512 (Release_4.2.1.tar.gz) = 8d8e94136b3ffa57fc03f687c3b8662ccffb150a29904e911d2383eadd09ae732e73c1712e00bf9a8350fbdd31936f10c498e64574c4bd4316e82c1fb535ca68
Size (Release_4.2.1.tar.gz) = 11124925 bytes
SHA1 (patch-Makefile.am) = 5a3b9d3a8f5f9340119dd8640fc9bd5267f69a00
SHA1 (patch-Makefile.am) = 01c1b8865febfd3451b2adbcc84ab7f91fc64964
SHA1 (patch-autoconf_hercules.m4) = 2ea0beaa0a0470050f0c41befcaebd9f73dad4d5
SHA1 (patch-configure.ac) = de2590aadae6da2432940d8e73b3f8015cf716f6
SHA1 (patch-configure.ac) = b1bd6a6c17eb38ba9fb4d5d3a5b62285bfc4b332
SHA1 (patch-hercifc.c) = 5661ca325cb3575726a44ecadbaeb951fcf2d0fd
SHA1 (patch-hifr.h) = d364bbd32143cf137aed84eb79f5af9f62f8210b
SHA1 (patch-hscutl.c) = 72ff77bff284e63bc42e124b56051fe735f74de6
SHA1 (patch-hthreads.c) = 59ae36320b8ee7072a0fb8710e274ab17c2ffb47
SHA1 (patch-htypes.h) = 7e057ae370b266758176fbe13964581cac5004f0
SHA1 (patch-tuntap.c) = ea3ca480613781e9dc09479d32e6d1138cc396aa
SHA1 (patch-tuntap.h) = 24946aab519beb6185800801f2bb38dccfdfef94

18
sdl-hercules-hyperion/patches/patch-Makefile.am
View File

@ -22,15 +22,6 @@ $NetBSD$
DYNMOD_LD_FLAGS = \
-module \
@@ -162,7 +162,7 @@ LIB_LD_FLAGS = \
-export-dynamic \
$(XSTATIC) \
-no-undefined \
- -avoid-version
+ -avoid-version -pthread
#------------------------------------------------------------------------------
@@ -500,7 +500,6 @@ libherc_la_SOURCES = \
$(DYNSRC)
@ -39,15 +30,6 @@ $NetBSD$
memrchr.c \
$(dynamic_SRC) \
$(dyndev_SRC) \
@@ -521,7 +520,7 @@ libherc_la_LIBADD = \
# THIS is the hercules executable.
#--------------------------------------------------------
-HLDFLAGS = -dlopen self
+HLDFLAGS = -dlopen self -pthread
HDEPS = $(extpkg_ldadd)
hercules_SOURCES = \
@@ -939,7 +938,6 @@ noinst_HEADERS = \
inline.h \
linklist.h \

26
sdl-hercules-hyperion/patches/patch-configure.ac
View File

@ -13,19 +13,15 @@ test == is not portable.
AC_CHECK_SIZEOF(pthread_t)
fi
@@ -3141,10 +3141,11 @@ extpkg_ldadd="${crypto_libdir}/${crypto_
##----------------------------------------------------------------
## DEBUGGING
##----------------------------------------------------------------
-## AC_MSG_NOTICE( [Using crypto_libdir = ${crypto_libdir}] )
-## AC_MSG_NOTICE( [Using decnumber_libdir = ${decnumber_libdir}] )
-## AC_MSG_NOTICE( [Using softfloat_libdir = ${softfloat_libdir}] )
-## AC_MSG_NOTICE( [Using telnet_libdir = ${telnet_libdir}] )
+AC_MSG_NOTICE( [Using crypto_libdir = ${crypto_libdir}] )
+AC_MSG_NOTICE( [Using decnumber_libdir = ${decnumber_libdir}] )
+AC_MSG_NOTICE( [Using softfloat_libdir = ${softfloat_libdir}] )
+AC_MSG_NOTICE( [Using telnet_libdir = ${telnet_libdir}] )
+AC_MSG_NOTICE( [Using extpkg_ldadd = ${extpkg_ldadd}] )
@@ -2943,9 +2943,9 @@ test "$hc_cv_is_mingw" = "yes" &&
#------------------------------------------------------#
EXTPKG_INCDIRS="${extpkg_incdirs}"
AC_SUBST(EXTPKG_INCDIRS)
if test "$hc_cv_opt_debug" = "yes"; then
- hc_cv_pkg_lib_suffix=${hc_cv_cpu_bits}d
+ hc_cv_pkg_lib_suffix=d_pic
else
- hc_cv_pkg_lib_suffix=${hc_cv_cpu_bits}
+ hc_cv_pkg_lib_suffix=_pic
fi
AC_CACHE_SAVE()

16
sdl-hercules-hyperion/patches/patch-hthreads.c Normal file
View File

@ -0,0 +1,16 @@
$NetBSD$
--- hthreads.c.orig 2020-02-08 18:02:21.803241719 +0000
+++ hthreads.c
@@ -279,9 +279,11 @@ DLL_EXPORT int hthread_initialize_rwloc
if (rc)
goto fatal;
+#if !defined(__NetBSD__)
rc = hthread_rwlockattr_setpshared( &attr1, HTHREAD_RWLOCK_DEFAULT );
if (rc)
goto fatal;
+#endif
rc = hthread_mutexattr_settype( &attr2, HTHREAD_MUTEX_DEFAULT );
if (rc)

3
sdl-hercules-softfloat/Makefile
View File

@ -23,5 +23,8 @@ CMAKE_ARGS+= -D INSTALL_PREFIX=${PREFIX}/lib/sdlhercules
pre-configure:
${MKDIR} ${BLDDIR}
post-install:
cd ${DESTDIR}${PREFIX}/lib/sdlhercules/lib && ${MV} libSoftFloat64.a libSoftFloat_pic.a
.include "../../wip/mk/git-package.mk"
.include "../../mk/bsd.pkg.mk"

2
sdl-hercules-softfloat/PLIST
View File

@ -5,7 +5,7 @@ lib/sdlhercules/doc/SoftFloat.html
lib/sdlhercules/include/softfloat.h
lib/sdlhercules/include/softfloat_types.h
lib/sdlhercules/include/softfloat_version.h
lib/sdlhercules/lib/libSoftFloat64.a
lib/sdlhercules/lib/libSoftFloat_pic.a
lib/sdlhercules/softfloat.LICENSE.txt
lib/sdlhercules/softfloat.README.html
lib/sdlhercules/softfloat.README.txt

5
sdl-hercules-telnet/Makefile
View File

@ -8,7 +8,7 @@ CHECKOUT_DATE= 2019-11-29
MAINTAINER= rhialto@NetBSD.org
HOMEPAGE= https://github.com/SDL-Hercules-390/telnet
COMMENT= The SoftDevLabs version of SoftFloat for Hercules 4.x
COMMENT= The SoftDevLabs version of telnet library for Hercules 4.x
LICENSE= modified-bsd
USE_TOOLS+= cmake
@ -23,5 +23,8 @@ CMAKE_ARGS+= -D INSTALL_PREFIX=${PREFIX}/lib/sdlhercules
pre-configure:
${MKDIR} ${BLDDIR}
post-install:
cd ${DESTDIR}${PREFIX}/lib/sdlhercules/lib && ${MV} libtelnet64.a libtelnet_pic.a
.include "../../wip/mk/git-package.mk"
.include "../../mk/bsd.pkg.mk"

2
sdl-hercules-telnet/PLIST
View File

@ -1,6 +1,6 @@
@comment $NetBSD$
lib/sdlhercules/include/telnet.h
lib/sdlhercules/include/telnet_version.h
lib/sdlhercules/lib/libtelnet64.a
lib/sdlhercules/lib/libtelnet_pic.a
lib/sdlhercules/telnet.LICENSE.txt
lib/sdlhercules/telnet.README.txt