diff --git a/emulators/simh-hp3000/Makefile b/emulators/simh-hp3000/Makefile index 11d9bd00b52e..c81c24f6859e 100644 --- a/emulators/simh-hp3000/Makefile +++ b/emulators/simh-hp3000/Makefile @@ -1,44 +1,44 @@ PORTNAME= hp3000 -DISTVERSION= 3.11-0.8 +DISTVERSION= 3.11-0.10 CATEGORIES= emulators MASTER_SITES= http://simh.trailing-edge.com/hp/releases/:src \ http://simh.trailing-edge.com/hp/docs/:app \ http://www.ml1.org.uk/distfiles/:src \ http://www.ml1.org.uk/distfiles/:app PKGNAMEPREFIX= simh- DISTFILES= HP3000-source-release-${DISTVERSION:E}.zip:src DIST_SUBDIR= simh-hp EXTRACT_ONLY= HP3000-source-release-${DISTVERSION:E}.zip MAINTAINER= bob@eager.cx COMMENT= Emulates classic HP 3000 computers LICENSE= SIMHv1 LICENSE_NAME= SIMH License LICENSE_FILE= ${FILESDIR}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept RUN_DEPENDS= ${LOCALBASE}/share/doc/hpdoc/simh_doc.pdf:emulators/simh-hpdoc USES= gmake dos2unix zip NO_WRKSUBDIR= yes CONFLICTS_INSTALL= simh-3.[789]* DOS2UNIX_GLOB= *.c *.h *.txt *.mak makefile SUB_FILES= hp3000.1 .include do-build: (cd ${WRKSRC}; GCC=${CC} ${GMAKE} -C SCP hp3000) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/hp3000 ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKDIR}/hp3000.1 ${STAGEDIR}${MANPREFIX}/man/man1 @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${WRKSRC}/SCP/doc/*.txt ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${WRKSRC}/SCP/doc/hp3000_guide.pdf ${STAGEDIR}${DOCSDIR} .include diff --git a/emulators/simh-hp3000/distinfo b/emulators/simh-hp3000/distinfo index 2ed4cabd9a23..cd613856c0b8 100644 --- a/emulators/simh-hp3000/distinfo +++ b/emulators/simh-hp3000/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1582502963 -SHA256 (simh-hp/HP3000-source-release-8.zip) = 2c003841b8c189299d45253520fd687694687c0a023aae9c79650234948b5a66 -SIZE (simh-hp/HP3000-source-release-8.zip) = 1412655 +TIMESTAMP = 1621888505 +SHA256 (simh-hp/HP3000-source-release-10.zip) = 3c4529e68d27490c3f4df154993ae7faa462f5962605ec8497914aed19a5de2f +SIZE (simh-hp/HP3000-source-release-10.zip) = 1481404 diff --git a/emulators/simh-hp3000/files/patch-SCP_makefile b/emulators/simh-hp3000/files/patch-SCP_makefile deleted file mode 100644 index 1a83c734a73e..000000000000 --- a/emulators/simh-hp3000/files/patch-SCP_makefile +++ /dev/null @@ -1,17 +0,0 @@ ---- SCP/makefile.orig 2020-08-23 21:58:56 UTC -+++ SCP/makefile -@@ -532,10 +532,12 @@ ifneq ($(DONT_USE_READER_THREAD),) - endif - - --# Shut up annoying clang default warnings. -+# Shut up annoying clang default warnings, and also fix -+# multiply defined symbols on clang 11 and above - --ifeq ($(GCC),clang) -+ifeq ($(findstring clang,$(COMPILER_NAME)),clang) - OS_CCDEFS += -Wno-parentheses -Wno-bitwise-op-parentheses -Wno-dangling-else -+ CFLAGS_O += -fcommon - endif - -