Attachment 124544 Details for Bug 168031 – file.diff

[patch] file.diff

file.diff (text/plain), 5.54 KB, created by tkato432 on 2012-05-17 19:10:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2012-05-17 19:10:05 UTC

Size: 5.54 KB

patch

obsolete

>diff -urN /usr/ports/emulators/simh/Makefile emulators/simh/Makefile
>--- /usr/ports/emulators/simh/Makefile	2011-11-19 08:30:08.000000000 +0900
>+++ emulators/simh/Makefile	2012-05-06 01:41:47.000000000 +0900
>@@ -6,39 +6,43 @@
> #
> 
> PORTNAME=	simh
>-PORTVERSION=	3.8.1
>+PORTVERSION=	3.9.0
> CATEGORIES=	emulators
> MASTER_SITES=	http://simh.trailing-edge.com/sources/
>-DISTNAME=	${PORTNAME}v38-1
>+DISTNAME=	${PORTNAME}v${PORTVERSION:R:S/.//}-${PORTVERSION:E}
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Emulates classic DEC, HP, GRI, IBM, Altair, SDS, Honeywell, and others
> 
>+NO_WRKSUBDIR=	yes
>+
> USE_ZIP=	yes
>-EXTRACT_BEFORE_ARGS=	-qoa
>+USE_DOS2UNIX=	VAX/vax_sysdev.c
> USE_GMAKE=	yes
>+MAKE_ENV=	GCC="${CC}" CFLAGS_O="${CFLAGS}" USE_NETWORK=1
> MAKEFILE=	makefile
>-MAKE_ENV=	USE_NETWORK=1
>-NO_WRKSUBDIR=	yes
>+MAKE_JOBS_SAFE=	yes
>+
>+SUB_FILES=	pkg-message
> 
> BIN_FILES=	altair altairz80 gri h316 hp2100 i1401 i1620 i7094 ibm1130 \
> 		id16 id32 lgp nova pdp1 pdp10 pdp11 pdp15 pdp4 pdp7 pdp8 pdp9 \
>-		s3 sds vax vax780
>-
>-PORTDOCS=	0readme_38.txt 0readme_ethernet.txt
>+		s3 sds swtp6800mp-a swtp6800mp-a2 vax vax780
> 
>-PLIST_FILES=	${BIN_FILES:S/^/bin\//g} %%DATADIR%%/ka655x.bin bin/simh-eclipse
>+PORTDOCS=	0readme_${PORTVERSION:R:S/.//}.txt 0readme_ethernet.txt
>+PLIST_FILES=	${BIN_FILES:S/^/bin\//g} bin/simh-eclipse %%DATADIR%%/ka655x.bin
> PLIST_DIRS=	%%DATADIR%%
> 
>-SUB_FILES+=	pkg-message
>-
>-.include <bsd.port.pre.mk>
>-
> pre-patch:
> 	@${MKDIR} ${WRKSRC}/BIN
> 
> post-patch:
>-	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/VAX/vax_sysdev.c
>+	@${REINPLACE_CMD} -e \
>+		'/shell ldconfig/s|^|#| ; \
>+		 s|-lpthread|${PTHREAD_LIBS}| ; \
>+		 /-O2/s| = | ?= |' ${WRKSRC}/makefile
>+	@${REINPLACE_CMD} -e \
>+		's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/VAX/vax_sysdev.c
> 
> do-install:
> .for file in ${BIN_FILES}
>@@ -46,18 +50,14 @@
> .endfor
> # eclipse conflicts with java/eclipse, install it as simh-eclipse
> 	${INSTALL_PROGRAM} ${WRKDIR}/BIN/eclipse ${PREFIX}/bin/simh-eclipse
>-
> 	@${MKDIR} ${DATADIR}
> 	${INSTALL_DATA} ${WRKDIR}/VAX/ka655x.bin ${DATADIR}
>-
> .if !defined(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR}
>-	@for i in ${PORTDOCS}; do\
>-		${INSTALL_DATA} ${WRKDIR}/$$i ${DOCSDIR}; \
>-	done
>+.for file in ${PORTDOCS}
>+	${INSTALL_DATA} ${WRKDIR}/${file} ${DOCSDIR}
>+.endfor
> .endif
>-
>-post-install:
> 	@${CAT} ${PKGMESSAGE}
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -urN /usr/ports/emulators/simh/distinfo emulators/simh/distinfo
>--- /usr/ports/emulators/simh/distinfo	2011-07-03 02:14:15.000000000 +0900
>+++ emulators/simh/distinfo	2012-05-05 22:34:45.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (simhv38-1.zip) = 4fe294fa5285b1d6d0bd69f60889c00e518ce2be5f00abc2bd4adfa8daa85b06
>-SIZE (simhv38-1.zip) = 2954982
>+SHA256 (simhv39-0.zip) = e49b259b66ad6311ca9066dee3d3693cd915106a6938a52ed685cdbada8eda3b
>+SIZE (simhv39-0.zip) = 3103657
>diff -urN /usr/ports/emulators/simh/files/patch-VAX-vax_sysdev.c emulators/simh/files/patch-VAX-vax_sysdev.c
>--- /usr/ports/emulators/simh/files/patch-VAX-vax_sysdev.c	2009-02-15 19:01:07.000000000 +0900
>+++ emulators/simh/files/patch-VAX-vax_sysdev.c	2012-05-05 22:44:14.000000000 +0900
>@@ -1,20 +1,19 @@
>---- VAX/vax_sysdev.c.orig	2008-11-23 11:57:54.000000000 +0100
>-+++ VAX/vax_sysdev.c	2009-02-12 06:24:49.000000000 +0100
>-@@ -1553,9 +1553,15 @@
>+--- VAX/vax_sysdev.c.orig	2012-05-05 22:40:08.000000000 +0900
>++++ VAX/vax_sysdev.c	2012-05-05 22:43:28.000000000 +0900
>+@@ -1556,8 +1556,14 @@
>      if (sim_log)
>          fprintf (sim_log, "Loading boot code from ka655x.bin\n");
>      r = load_cmd (0, "-R ka655x.bin");
> -    if (r != SCPE_OK)
> -        return r;
> +    if (r != SCPE_OK) {
>-+        printf ("Loading boot code from /usr/local/share/simh/ka655x.bin\n");
>++        printf ("Loading boot code from %%DATADIR%%/ka655x.bin\n");
> +        if (sim_log)
>-+	    fprintf (sim_log, "Loading boot code from /usr/local/share/simh/ka655x.bin\n");
>-+        r = load_cmd (0, "-R /usr/local/share/simh/ka655x.bin");
>++            fprintf (sim_log, "Loading boot code from %%DATADIR%%/ka655x.bin\n");
>++        r = load_cmd (0, "-R %%DATADIR%%/ka655x.bin");
> +        if (r != SCPE_OK)
> +            return r;
>++        }
>      }
>-+}
>+ sysd_powerup ();
>  return SCPE_OK;
>- }
>- 
>diff -urN /usr/ports/emulators/simh/files/patch-makefile emulators/simh/files/patch-makefile
>--- /usr/ports/emulators/simh/files/patch-makefile	2009-01-13 06:30:36.000000000 +0900
>+++ emulators/simh/files/patch-makefile	1970-01-01 09:00:00.000000000 +0900
>@@ -1,19 +0,0 @@
>---- makefile.orig	2008-06-06 15:00:46.000000000 +0200
>-+++ makefile	2009-01-12 21:12:48.000000000 +0100
>-@@ -9,13 +9,13 @@
>-     ifneq (,$(findstring darwin,$(OSTYPE)))
>-       OS_CCDEFS = -D_GNU_SOURCE
>-     else
>--      OS_CCDEFS = -lrt -lm -D_GNU_SOURCE
>-+      OS_CCDEFS = -lm -D_GNU_SOURCE
>-     endif
>-   endif
>--  CC = gcc -std=c99 -U__STRICT_ANSI__ -g $(OS_CCDEFS) -I .
>-+  CC += ${CFLAGS} $(OS_CCDEFS) -I .
>-   ifeq ($(USE_NETWORK),)
>-   else
>--    NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a
>-+    NETWORK_OPT = -DUSE_NETWORK -lpcap
>-   endif
>- else
>-   #Win32 Environments
>diff -urN /usr/ports/emulators/simh/files/pkg-message.in emulators/simh/files/pkg-message.in
>--- /usr/ports/emulators/simh/files/pkg-message.in	2007-03-28 15:17:18.000000000 +0900
>+++ emulators/simh/files/pkg-message.in	2012-05-05 22:37:45.000000000 +0900
>@@ -1,5 +1,5 @@
> *********************************************************************
> 
>-The file needed by the VAX emulator is located in %%PREFIX%%/share/simh
>+The file needed by the VAX emulator is located in %%DATADIR%%
> 
> *********************************************************************

Actions: View | Diff

Attachments on bug 168031: 124544