pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

sdl-hercules-*: wean packages off wip/mk/git-package.mk

Module Name:	pkgsrc-wip
Committed By:	Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By:	rhialto
Date:		Tue Dec 1 20:14:23 2020 +0100
Changeset:	d35ed62857f2a214918134e941cf940392e1fe50

Modified Files:
	sdl-hercules-crypto/Makefile
	sdl-hercules-decnumber/Makefile
	sdl-hercules-hyperion/Makefile
	sdl-hercules-hyperion/distinfo
	sdl-hercules-hyperion/patches/patch-configure.ac
	sdl-hercules-hyperion/patches/patch-hifr.h
	sdl-hercules-hyperion/patches/patch-msgenu.h
	sdl-hercules-softfloat/Makefile
	sdl-hercules-telnet/Makefile
Added Files:
	sdl-hercules-crypto/distinfo
	sdl-hercules-decnumber/distinfo
	sdl-hercules-softfloat/distinfo
	sdl-hercules-telnet/distinfo

Log Message:
sdl-hercules-*: wean packages off wip/mk/git-package.mk

and use mk/fetch/github.mk (implicitly) instead.
Also clean up some patches of sdl-hercules-hyperion.

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

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

diffstat:
 sdl-hercules-crypto/Makefile                     | 10 +++++-----
 sdl-hercules-crypto/distinfo                     |  6 ++++++
 sdl-hercules-decnumber/Makefile                  | 10 +++++-----
 sdl-hercules-decnumber/distinfo                  |  6 ++++++
 sdl-hercules-hyperion/Makefile                   |  2 +-
 sdl-hercules-hyperion/distinfo                   |  8 ++++----
 sdl-hercules-hyperion/patches/patch-configure.ac |  8 ++++----
 sdl-hercules-hyperion/patches/patch-hifr.h       |  2 ++
 sdl-hercules-hyperion/patches/patch-msgenu.h     |  2 ++
 sdl-hercules-softfloat/Makefile                  | 10 +++++-----
 sdl-hercules-softfloat/distinfo                  |  6 ++++++
 sdl-hercules-telnet/Makefile                     | 10 +++++-----
 sdl-hercules-telnet/distinfo                     |  6 ++++++
 13 files changed, 57 insertions(+), 29 deletions(-)

diffs:
diff --git a/sdl-hercules-crypto/Makefile b/sdl-hercules-crypto/Makefile
index 3b2a6c2f54..6e61d5181d 100644
--- a/sdl-hercules-crypto/Makefile
+++ b/sdl-hercules-crypto/Makefile
@@ -1,10 +1,11 @@
 # $NetBSD$
 
-PKGNAME=	sdl-hercules-crypto-1.0.0
+GITHUB_PROJECT=	crypto
+GITHUB_TAG=	53dda212770e5981974e11437535a586a22d4aae # Nov 13, 2020
+DISTNAME=	sdl-hercules-crypto-1.0.0
+PKGREVISION=	20201113
 CATEGORIES=	emulators
-GIT_REPO=	https://github.com/SDL-Hercules-390/crypto.git
-GIT_REVISION=	53dda212770e5981974e11437535a586a22d4aae # Nov 13, 2020
-CHECKOUT_DATE=	2020-11-13
+MASTER_SITES=	${MASTER_SITE_GITHUB:=SDL-Hercules-390/}
 
 MAINTAINER=	rhialto%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/SDL-Hercules-390/hyperion
@@ -26,5 +27,4 @@ pre-configure:
 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"
diff --git a/sdl-hercules-crypto/distinfo b/sdl-hercules-crypto/distinfo
new file mode 100644
index 0000000000..e1dedfb50e
--- /dev/null
+++ b/sdl-hercules-crypto/distinfo
@@ -0,0 +1,6 @@
+$NetBSD$
+
+SHA1 (sdl-hercules-crypto-1.0.0-53dda212770e5981974e11437535a586a22d4aae.tar.gz) = d9297baf339116138348df999bd31a40bf2b4b40
+RMD160 (sdl-hercules-crypto-1.0.0-53dda212770e5981974e11437535a586a22d4aae.tar.gz) = 802f8e56d36fa99e6b6b897ee60cb9674ae8d979
+SHA512 (sdl-hercules-crypto-1.0.0-53dda212770e5981974e11437535a586a22d4aae.tar.gz) = 708f54adf7a0d6c5552c50d4d53506b06c688d74f2e4c38fb987bcc6475055e138fadffe9c285cfbe01887bd9b3cc77b5def02abfd5621a2c74d6d87c30d2c36
+Size (sdl-hercules-crypto-1.0.0-53dda212770e5981974e11437535a586a22d4aae.tar.gz) = 80752 bytes
diff --git a/sdl-hercules-decnumber/Makefile b/sdl-hercules-decnumber/Makefile
index 2136711c77..6f45dd55aa 100644
--- a/sdl-hercules-decnumber/Makefile
+++ b/sdl-hercules-decnumber/Makefile
@@ -1,10 +1,11 @@
 # $NetBSD$
 
-PKGNAME=	sdl-hercules-decnumber-3.68.0
+GITHUB_PROJECT=	decNumber
+GITHUB_TAG=	e41bb5245dbfdde1dd3d55b2c755230325b2e4be # Nov 13, 2020
+DISTNAME=	sdl-hercules-decnumber-3.68.0
+PKGREVISION=	20201113
 CATEGORIES=	emulators
-GIT_REPO=	https://github.com/SDL-Hercules-390/decNumber.git
-GIT_REVISION=	e41bb5245dbfdde1dd3d55b2c755230325b2e4be # Nov 13, 2020
-CHECKOUT_DATE=	2020-11-13
+MASTER_SITES=	${MASTER_SITE_GITHUB:=SDL-Hercules-390/}
 
 MAINTAINER=	rhialto%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/SDL-Hercules-390/hyperion
@@ -26,5 +27,4 @@ pre-configure:
 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"
diff --git a/sdl-hercules-decnumber/distinfo b/sdl-hercules-decnumber/distinfo
new file mode 100644
index 0000000000..e21e7fbe1f
--- /dev/null
+++ b/sdl-hercules-decnumber/distinfo
@@ -0,0 +1,6 @@
+$NetBSD$
+
+SHA1 (sdl-hercules-decnumber-3.68.0-e41bb5245dbfdde1dd3d55b2c755230325b2e4be.tar.gz) = eeddf87c24dc0cb500299258c0ed0788365a490e
+RMD160 (sdl-hercules-decnumber-3.68.0-e41bb5245dbfdde1dd3d55b2c755230325b2e4be.tar.gz) = d4c17f1443ce581dc9e54a668a192df04639e889
+SHA512 (sdl-hercules-decnumber-3.68.0-e41bb5245dbfdde1dd3d55b2c755230325b2e4be.tar.gz) = 93c22f278a48f4b121e64947a38da1af82a4c0a580faad13539a253ace1f7f571c143679e9d7b5bd9379a38439a121d61c1616283df160ca449eb4e7baf387f6
+Size (sdl-hercules-decnumber-3.68.0-e41bb5245dbfdde1dd3d55b2c755230325b2e4be.tar.gz) = 785533 bytes
diff --git a/sdl-hercules-hyperion/Makefile b/sdl-hercules-hyperion/Makefile
index 1ec96636de..f453a704e6 100644
--- a/sdl-hercules-hyperion/Makefile
+++ b/sdl-hercules-hyperion/Makefile
@@ -18,7 +18,7 @@ GNU_CONFIGURE=	yes
 USE_TOOLS+=	autoconf automake flex gawk grep gm4 gmake perl gsed
 USE_TOOLS+=	bash
 USE_LIBTOOL=	YES
-USE_LANGUAGES+=	c c++
+USE_LANGUAGES+=	c
 PTHREAD_OPTS+=	require
 REPLACE_BASH=	_dynamic_version
 
diff --git a/sdl-hercules-hyperion/distinfo b/sdl-hercules-hyperion/distinfo
index d08b936508..452cf2c4c3 100644
--- a/sdl-hercules-hyperion/distinfo
+++ b/sdl-hercules-hyperion/distinfo
@@ -5,8 +5,8 @@ RMD160 (Release_4.3.tar.gz) = 2552fbe36d0db1dc630e734ea46dcca0d32bb73a
 SHA512 (Release_4.3.tar.gz) = e2591b16ecc08f952f16c013764a1d6bfd88aafe9620130dca9619a8af47f2cc04af7d7552c08f75ff6000854fe8e698350b344dbb573551701a610df68fd00a
 Size (Release_4.3.tar.gz) = 11609664 bytes
 SHA1 (patch-Makefile.am) = 85b65386cfde0d7c180abaeaab67e05ad7d07385
-SHA1 (patch-configure.ac) = ccec25f9f20ae0263905ccaea9e30a2aff6660fd
+SHA1 (patch-configure.ac) = b7f79b0a12cfe20eab389b59ace08bea427d2b63
 SHA1 (patch-hercules.cnf) = cd0a09d39175e9673dab785703d2f8c1b92c8dc6
-SHA1 (patch-hifr.h) = 8c1164bdc04afb19aa3254f33ef5c6349e1bcf58
-SHA1 (patch-msgenu.h) = 89a1ac7373da138e79e3538aaaf96f85d07ab873
-SHA1 (patch-tuntap.c) = 9fc0be227907ae0eca4bb41c95be8c3540d6def5
+SHA1 (patch-hifr.h) = 6b878b957d1847296882316067281b05872a760c
+SHA1 (patch-msgenu.h) = 947d7ddf4395c6c91d2f6640c9d06e8880c8fdf9
+SHA1 (patch-tuntap.c) = 6067b1be32d2cd3aa4ad57e63a7483aa823fbcf1
diff --git a/sdl-hercules-hyperion/patches/patch-configure.ac b/sdl-hercules-hyperion/patches/patch-configure.ac
index 6cf26535c8..de9cd51971 100644
--- a/sdl-hercules-hyperion/patches/patch-configure.ac
+++ b/sdl-hercules-hyperion/patches/patch-configure.ac
@@ -1,11 +1,11 @@
 $NetBSD$
 
 - Avoid -march=xxx because it makes binaries nonportable.
+- Fix suffix of helper libraries.
 
-
---- configure.ac.orig	2019-09-10 18:06:20.000000000 +0000
+--- configure.ac.orig	2020-11-27 18:45:12.000000000 +0000
 +++ configure.ac
-@@ -2828,7 +2828,8 @@ if test "$hc_cv_auto_optimize" = "yes"; 
+@@ -2826,7 +2826,8 @@ if test "$hc_cv_auto_optimize" = "yes"; 
      if test "$hc_cv_is_intel_x86_arch" = "yes"; then
  
          # Set CPU type
@@ -27,7 +27,7 @@ $NetBSD$
  fi
  
  AC_CACHE_SAVE()
-@@ -3229,10 +3231,11 @@ extpkg_ldadd="${crypto_libdir}/${crypto_
+@@ -3229,10 +3230,11 @@ extpkg_ldadd="${crypto_libdir}/${crypto_
  ##----------------------------------------------------------------
  ##                         DEBUGGING
  ##----------------------------------------------------------------
diff --git a/sdl-hercules-hyperion/patches/patch-hifr.h b/sdl-hercules-hyperion/patches/patch-hifr.h
index 2932ce2971..74bab3f469 100644
--- a/sdl-hercules-hyperion/patches/patch-hifr.h
+++ b/sdl-hercules-hyperion/patches/patch-hifr.h
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Correct back over-done "or NetBSD" condition.
+
 --- hifr.h.orig	2020-11-30 19:36:38.734299287 +0000
 +++ hifr.h
 @@ -119,7 +119,7 @@ typedef struct hifr hifr;
diff --git a/sdl-hercules-hyperion/patches/patch-msgenu.h b/sdl-hercules-hyperion/patches/patch-msgenu.h
index 9db70b4532..952d99317a 100644
--- a/sdl-hercules-hyperion/patches/patch-msgenu.h
+++ b/sdl-hercules-hyperion/patches/patch-msgenu.h
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Introduce 2 message texts as added to tuntap.c.
+
 --- msgenu.h.orig	2019-09-10 18:06:20.000000000 +0000
 +++ msgenu.h
 @@ -322,8 +322,8 @@ LOGM_DLL_IMPORT int  panel_command_captu
diff --git a/sdl-hercules-softfloat/Makefile b/sdl-hercules-softfloat/Makefile
index 1eedd77e09..5f72d42c29 100644
--- a/sdl-hercules-softfloat/Makefile
+++ b/sdl-hercules-softfloat/Makefile
@@ -1,10 +1,11 @@
 # $NetBSD$
 
-PKGNAME=	sdl-hercules-softfloat-3.5.0
+GITHUB_PROJECT=	SoftFloat
+GITHUB_TAG=	1991ebd466f46590d02aa68729f3283fe430bec0 # Nov 13, 2020
+DISTNAME=	sdl-hercules-softfloat-3.5.0
+PKGREVISION=	20201113
 CATEGORIES=	emulators
-GIT_REPO=	https://github.com/SDL-Hercules-390/SoftFloat.git
-GIT_REVISION=	1991ebd466f46590d02aa68729f3283fe430bec0 # Nov 13, 2020
-CHECKOUT_DATE=	2020-11-13
+MASTER_SITES=	${MASTER_SITE_GITHUB:=SDL-Hercules-390/}
 
 MAINTAINER=	rhialto%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/SDL-Hercules-390/SoftFloat
@@ -26,5 +27,4 @@ pre-configure:
 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"
diff --git a/sdl-hercules-softfloat/distinfo b/sdl-hercules-softfloat/distinfo
new file mode 100644
index 0000000000..9cb05b990f
--- /dev/null
+++ b/sdl-hercules-softfloat/distinfo
@@ -0,0 +1,6 @@
+$NetBSD$
+
+SHA1 (sdl-hercules-softfloat-3.5.0-1991ebd466f46590d02aa68729f3283fe430bec0.tar.gz) = 629596285b183847b665f1966f9b79af07ec01b5
+RMD160 (sdl-hercules-softfloat-3.5.0-1991ebd466f46590d02aa68729f3283fe430bec0.tar.gz) = 372ab17bf4872f8be75239ccc698959f8f505914
+SHA512 (sdl-hercules-softfloat-3.5.0-1991ebd466f46590d02aa68729f3283fe430bec0.tar.gz) = 79db6b140f9d44ee11047bb7580143e8099264e043e7a3e1fede7f634a10046036649d5876d9a2ce0c4e1c76f7f6e5c88b955447cb6f9842243a665783e164cd
+Size (sdl-hercules-softfloat-3.5.0-1991ebd466f46590d02aa68729f3283fe430bec0.tar.gz) = 237069 bytes
diff --git a/sdl-hercules-telnet/Makefile b/sdl-hercules-telnet/Makefile
index c9e0a2196a..128fd8bc90 100644
--- a/sdl-hercules-telnet/Makefile
+++ b/sdl-hercules-telnet/Makefile
@@ -1,10 +1,11 @@
 # $NetBSD$
 
-PKGNAME=	sdl-hercules-telnet-1.0.0
+GITHUB_PROJECT=	telnet
+GITHUB_TAG=	4b8acebec532057a29bc5662f8ca80d50aeda05c # Nov 13, 2020
+DISTNAME=	sdl-hercules-telnet-1.0.0
+PKGREVISION=	20201113
 CATEGORIES=	emulators
-GIT_REPO=	https://github.com/SDL-Hercules-390/telnet.git
-GIT_REVISION=	4b8acebec532057a29bc5662f8ca80d50aeda05c # Nov 13, 2020
-CHECKOUT_DATE=	2020-11-13
+MASTER_SITES=	${MASTER_SITE_GITHUB:=SDL-Hercules-390/}
 
 MAINTAINER=	rhialto%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/SDL-Hercules-390/telnet
@@ -26,5 +27,4 @@ pre-configure:
 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"
diff --git a/sdl-hercules-telnet/distinfo b/sdl-hercules-telnet/distinfo
new file mode 100644
index 0000000000..6e0f64c9d2
--- /dev/null
+++ b/sdl-hercules-telnet/distinfo
@@ -0,0 +1,6 @@
+$NetBSD$
+
+SHA1 (sdl-hercules-telnet-1.0.0-4b8acebec532057a29bc5662f8ca80d50aeda05c.tar.gz) = e0a632d3de6df3d0447d9456c584add2533db2bb
+RMD160 (sdl-hercules-telnet-1.0.0-4b8acebec532057a29bc5662f8ca80d50aeda05c.tar.gz) = 8684fc95fc22dc1c61efc52d39ffb183ecdd2fb2
+SHA512 (sdl-hercules-telnet-1.0.0-4b8acebec532057a29bc5662f8ca80d50aeda05c.tar.gz) = ef28f8f833eabe7491183ae60bc6a1be5b117e9f6e9f86b99543262f04a1c78faee0e0313e3647674cc7e314696775334b86d93950ff2b54bdab7ef3c4a32148
+Size (sdl-hercules-telnet-1.0.0-4b8acebec532057a29bc5662f8ca80d50aeda05c.tar.gz) = 67098 bytes
Home | Main Index | Thread Index | Old Index