Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 1 Feb 2016 10:13:45 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r407700 - in head/emulators/ia64sim: . files
Message-ID:  <201602011013.u11ADjou031966@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: amdmi3
Date: Mon Feb  1 10:13:45 2016
New Revision: 407700
URL: https://svnweb.freebsd.org/changeset/ports/407700

Log:
  - Add LICENSE
  - Switch to options helpers
  - Regenerate patches with `make makepatch`

Added:
  head/emulators/ia64sim/files/patch-include_ia64.h
     - copied, changed from r407699, head/emulators/ia64sim/files/patch-ia64.h
Deleted:
  head/emulators/ia64sim/files/patch-ia64.h
Modified:
  head/emulators/ia64sim/Makefile
  head/emulators/ia64sim/files/patch-ia64sim.c
  head/emulators/ia64sim/files/patch-makefile.unx

Modified: head/emulators/ia64sim/Makefile
==============================================================================
--- head/emulators/ia64sim/Makefile	Mon Feb  1 10:13:38 2016	(r407699)
+++ head/emulators/ia64sim/Makefile	Mon Feb  1 10:13:45 2016	(r407700)
@@ -11,6 +11,8 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	IA64 simulator (Intel(R) Architecture 64)
 
+LICENSE=	PD
+
 USES=		gmake zip
 MAKEFILE=	makefile.unx
 MAKE_ARGS=	CC="${CC}"
@@ -23,10 +25,12 @@ PORTDOCS=	ia64user.txt readme
 OPTIONS_DEFINE=	DOCS
 
 pre-build:
-	${RM} -f ${WRKSRC}/obj/*.o ${WRKSRC}/ia64sim
+	@${RM} -f ${WRKSRC}/obj/*.o ${WRKSRC}/ia64sim
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ia64sim ${STAGEDIR}${PREFIX}/bin
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/ia64user.txt ${WRKSRC}/readme \
 		${STAGEDIR}${DOCSDIR}

Modified: head/emulators/ia64sim/files/patch-ia64sim.c
==============================================================================
--- head/emulators/ia64sim/files/patch-ia64sim.c	Mon Feb  1 10:13:38 2016	(r407699)
+++ head/emulators/ia64sim/files/patch-ia64sim.c	Mon Feb  1 10:13:45 2016	(r407700)
@@ -1,6 +1,6 @@
---- ia64sim.c.orig	Sun Feb 27 17:20:26 2000
-+++ ia64sim.c	Sun May  6 11:51:41 2001
-@@ -779,7 +779,7 @@
+--- ia64sim.c.orig	2000-02-28 01:20:26 UTC
++++ ia64sim.c
+@@ -779,7 +779,7 @@ int main(int argc, char **argv) {
  
     uint32 i;
  
@@ -9,13 +9,13 @@
     printf("Memory limits: 0x%08x-0x%08x\n", 0, MEMSIZE-1);
     printf("Try 'h' for help\n\n");
  
-@@ -810,6 +810,9 @@
-    while(1) {
+@@ -811,6 +811,9 @@ int main(int argc, char **argv) {
        printf("IA64sim>> ");
        fgets(cmd,sizeof(cmd),stdin);
-+
+ 
 +      if (feof(stdin))
 +         return 0;
- 
++
        nextchar = cmd;
        while(*nextchar) *nextchar++ = tolower(*nextchar);
+ 

Copied and modified: head/emulators/ia64sim/files/patch-include_ia64.h (from r407699, head/emulators/ia64sim/files/patch-ia64.h)
==============================================================================
--- head/emulators/ia64sim/files/patch-ia64.h	Mon Feb  1 10:13:38 2016	(r407699, copy source)
+++ head/emulators/ia64sim/files/patch-include_ia64.h	Mon Feb  1 10:13:45 2016	(r407700)
@@ -1,6 +1,6 @@
---- include/ia64.h.orig	Sun May  6 11:39:29 2001
-+++ include/ia64.h	Sun May  6 11:35:10 2001
-@@ -29,6 +29,7 @@
+--- include/ia64.h.orig	2000-03-09 00:57:11 UTC
++++ include/ia64.h
+@@ -29,6 +29,7 @@ benefit from your work.	
  #include <ctype.h>
  #include <string.h>
  #include <elf.h>
@@ -8,7 +8,7 @@
  
  #define TRUE 1
  #define FALSE 0
-@@ -38,7 +39,7 @@
+@@ -38,7 +39,7 @@ benefit from your work.	
             0<=lo,hi<=63 and lo<=hi */
  
  #define BITS(x,lo,hi) (      \
@@ -17,7 +17,7 @@
  	   ( (1<<(hi-lo+1)) - 1 )    \
  	   )
  
-@@ -72,8 +73,8 @@
+@@ -72,8 +73,8 @@ typedef union {
     uint8 b[8];
  } qword;
  

Modified: head/emulators/ia64sim/files/patch-makefile.unx
==============================================================================
--- head/emulators/ia64sim/files/patch-makefile.unx	Mon Feb  1 10:13:38 2016	(r407699)
+++ head/emulators/ia64sim/files/patch-makefile.unx	Mon Feb  1 10:13:45 2016	(r407700)
@@ -1,8 +1,16 @@
---- makefile.unx.orig	Sat Feb 12 22:25:47 2000
-+++ makefile.unx	Sun May  6 11:48:13 2001
-@@ -21 +21 @@
+--- makefile.unx.orig	2000-02-13 06:25:47 UTC
++++ makefile.unx
+@@ -18,11 +18,11 @@ EXECDIR = execute
+ OBJDIR = obj
+ INCDIR = include
+ CC = gcc
 -CFLAGS = -O3 -m486 -fomit-frame-pointer -s -I$(INCDIR)
 +CFLAGS += -s -I$(INCDIR)
-@@ -25 +25 @@
+ 
+ ASMSRCS= assemble.c bundle.c asmfunc.c jumptbl.c decode.c symbols.c
+  
 -EXECSRCS = execute.c utils.c f_unit.c b_unit.c x_unit.c  \
 +EXECSRCS = elf.c execute.c utils.c f_unit.c b_unit.c x_unit.c  \
+            m_unit.c i_alu.c i_cmp.c i_shft.c globals.c
+ 
+ ASMOBJS = $(ASMSRCS:.c=.o)

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602011013.u11ADjou031966>