pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

sdl-hercules-hyperion: hopefully final tweaks (tun/tap still to be done).



Module Name:	pkgsrc-wip
Committed By:	Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By:	rhialto
Date:		Sun Feb 9 18:27:37 2020 +0100
Changeset:	e033d88b12daeddc68e8fddf6d77bd6e7c98cbe1

Modified Files:
	sdl-hercules-hyperion/Makefile
	sdl-hercules-hyperion/PLIST
	sdl-hercules-hyperion/distinfo
Added Files:
	sdl-hercules-hyperion/patches/patch-hercules.cnf

Log Message:
sdl-hercules-hyperion: hopefully final tweaks (tun/tap still to be done).

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e033d88b12daeddc68e8fddf6d77bd6e7c98cbe1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 sdl-hercules-hyperion/Makefile                   |  9 ++++++---
 sdl-hercules-hyperion/PLIST                      |  1 +
 sdl-hercules-hyperion/distinfo                   |  1 +
 sdl-hercules-hyperion/patches/patch-hercules.cnf | 14 ++++++++++++++
 4 files changed, 22 insertions(+), 3 deletions(-)

diffs:
diff --git a/sdl-hercules-hyperion/Makefile b/sdl-hercules-hyperion/Makefile
index 8076a6aa5d..e196a1e6d8 100644
--- a/sdl-hercules-hyperion/Makefile
+++ b/sdl-hercules-hyperion/Makefile
@@ -21,17 +21,20 @@ USE_LANGUAGES+=	c c++
 PTHREAD_OPTS+=	require
 
 CONFIGURE_ARGS+=	--enable-extpkgs=${PREFIX}/lib/sdlhercules
-MAKE_ARGS+=	V=1
+
+INSTALLATION_DIRS+=	share/examples/hercules
 
 pre-configure:
 	${RM} ${WRKSRC}/ltdl.h ${WRKSRC}/ltdl.c
 	cd ${WRKSRC} && ./autogen.sh
 
-.include "../../archivers/bzip2/builtin.mk"
-.include "../../devel/zlib/builtin.mk"
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/hercules.cnf ${DESTDIR}${PREFIX}/share/examples/hercules/
 
+.include "../../archivers/bzip2/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../wip/sdl-hercules-crypto/buildlink3.mk"
 .include "../../wip/sdl-hercules-decnumber/buildlink3.mk"
 .include "../../wip/sdl-hercules-softfloat/buildlink3.mk"
diff --git a/sdl-hercules-hyperion/PLIST b/sdl-hercules-hyperion/PLIST
index eff60d8fa2..4ff33e4028 100644
--- a/sdl-hercules-hyperion/PLIST
+++ b/sdl-hercules-hyperion/PLIST
@@ -72,6 +72,7 @@ man/man1/cckddiag.1
 man/man1/dasdseq.1
 man/man1/vmfplc2.1
 man/man4/cckd.4
+share/examples/hercules/hercules.cnf
 share/hercules/TMOUNT.txt
 share/hercules/awssl-v19g
 share/hercules/awswrite.jcl
diff --git a/sdl-hercules-hyperion/distinfo b/sdl-hercules-hyperion/distinfo
index dc5810e981..65994c53b4 100644
--- a/sdl-hercules-hyperion/distinfo
+++ b/sdl-hercules-hyperion/distinfo
@@ -8,6 +8,7 @@ SHA1 (patch-Makefile.am) = 354add1d50bbbc09226e848f6b2e7350ad34f915
 SHA1 (patch-autoconf_hercules.m4) = 2ea0beaa0a0470050f0c41befcaebd9f73dad4d5
 SHA1 (patch-configure.ac) = 5e2a92b3530fa4bd61a4f1e28ff98eab20f7d1b5
 SHA1 (patch-hercifc.c) = 5661ca325cb3575726a44ecadbaeb951fcf2d0fd
+SHA1 (patch-hercules.cnf) = cd0a09d39175e9673dab785703d2f8c1b92c8dc6
 SHA1 (patch-hifr.h) = d364bbd32143cf137aed84eb79f5af9f62f8210b
 SHA1 (patch-hostopts.h) = d464925f82570cbcf368f0b76d1b545a5eebacfd
 SHA1 (patch-hscutl.c) = 72ff77bff284e63bc42e124b56051fe735f74de6
diff --git a/sdl-hercules-hyperion/patches/patch-hercules.cnf b/sdl-hercules-hyperion/patches/patch-hercules.cnf
new file mode 100644
index 0000000000..497d063fbd
--- /dev/null
+++ b/sdl-hercules-hyperion/patches/patch-hercules.cnf
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Put a more likely to be correct path in the example config.
+
+--- hercules.cnf.orig	2020-02-09 16:27:07.621576951 +0000
++++ hercules.cnf
+@@ -4,6 +4,7 @@
+ 
+   MSGLEVEL  VERBOSE                   # normal/verbose/debug
+ # MODPATH   /usr/local/lib/hercules   # Where to search for modules
++  MODPATH   /usr/pkg/lib/hercules     # Where to search for modules
+ 
+ 
+ #-------------------------------------------------------------------------------


Home | Main Index | Thread Index | Old Index