Re: pkg/44465: Please update emulators/spim to 8.0

To: gnats-bugs%NetBSD.org@localhost, obache%netbsd.org@localhost
Subject: Re: pkg/44465: Please update emulators/spim to 8.0
From: Ryo ONODERA <ryo_on%yk.rim.or.jp@localhost>
Date: Wed, 02 Feb 2011 22:05:33 +0900 (JST)
XMKMF setting is not needed, I think.

And switch to use PKGMANDIR etc.
Patches are included.

diff -urN -x CVS ../spim/Makefile ./Makefile
--- ../spim/Makefile    2009-05-19 17:59:13.000000000 +0900
+++ ./Makefile  2011-02-02 22:01:35.000000000 +0900
@@ -1,30 +1,22 @@
 # $NetBSD: Makefile,v 1.39 2009/05/19 08:59:13 wiz Exp $
 
-DISTNAME=      spim-7.3
+DISTNAME=      spim-8.0
 CATEGORIES=    emulators
-MASTER_SITES=  http://pages.cs.wisc.edu/~larus/SPIM/ 
+MASTER_SITES=  http://pages.cs.wisc.edu/~larus/SPIM/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://pages.cs.wisc.edu/~larus/spim.html
+HOMEPAGE=      http://spimsimulator.sourceforge.net/
 COMMENT=       MIPS R2000 Simulator
-LICENSE=       spim-license
-
-RESTRICTED=            No permission to copy, and prohibited commercially.
-NO_SRC_ON_CDROM=       ${RESTRICTED}
-NO_BIN_ON_CDROM=       ${RESTRICTED}
-NO_SRC_ON_FTP=         ${RESTRICTED}
-NO_BIN_ON_FTP=         ${RESTRICTED}
+LICENSE=       modified-bsd
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
-WRKSRC=                        ${WRKDIR}/${PKGNAME_NOREV}
 HAS_CONFIGURE=         yes
 CONFIGURE_DIRS=                xspim
 BUILD_DIRS=            spim xspim
 CONFIGURE_SCRIPT=      ./Configure
 USE_IMAKE=             yes
 USE_TOOLS+=            gzip flex yacc
-XMKMF=                 ${X11BASE}/bin/xmkmf # don't specify -a option
 INSTALL_TARGET=                install
 
 SUBST_CLASSES+=                cpudir
@@ -33,7 +25,7 @@
 SUBST_FILES.cpudir=    spim/Makefile xspim/Imakefile
 SUBST_SED.cpudir=      -e s:CPU_DIR:CPUDIR:
 
-INSTALLATION_DIRS=     bin share/spim share/doc/spim man/man1
+INSTALLATION_DIRS=     share/doc/${PKGBASE} ${PKGMANDIR}/man1
 
 post-configure:
        cd ${WRKSRC}/spim && ${SETENV} ${_CONFIGURE_SCRIPT_ENV}         \
@@ -43,15 +35,15 @@
 post-install:
        @${ECHO} "Installing spim/xspim documentation"
        ${INSTALL_DATA} ${WRKSRC}/Documentation/spim.man \
-               ${DESTDIR}${PREFIX}/man/man1/spim.1
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/spim.1
        ${INSTALL_DATA} ${WRKSRC}/Documentation/xspim.man \
-               ${DESTDIR}${PREFIX}/man/man1/xspim.1
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xspim.1
        ${INSTALL_DATA} ${WRKSRC}/Documentation/TeX/spim.tex \
-               ${DESTDIR}${PREFIX}/share/doc/spim
+               ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
        ${INSTALL_DATA} ${WRKSRC}/Documentation/TeX/*.id \
-               ${DESTDIR}${PREFIX}/share/doc/spim
+               ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
        ${INSTALL_DATA} ${WRKSRC}/Documentation/TeX/cycle.ps \
-               ${DESTDIR}${PREFIX}/share/doc/spim
+               ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXp/buildlink3.mk"
diff -urN -x CVS ../spim/distinfo ./distinfo
--- ../spim/distinfo    2009-03-23 04:55:42.000000000 +0900
+++ ./distinfo  2011-02-02 21:52:46.000000000 +0900
@@ -1,10 +1,9 @@
 $NetBSD: distinfo,v 1.11 2009/03/22 19:55:42 markd Exp $
 
-SHA1 (spim-7.3.tar.gz) = 630b75ebc9365093e1b3d0c98ca0524f772d8647
-RMD160 (spim-7.3.tar.gz) = f87116820755ff76087889bbd0f39eaacbce201a
-Size (spim-7.3.tar.gz) = 347226 bytes
-SHA1 (patch-aa) = 8dfa13e5d986d02bd0a995401b0a8582c849a0b9
-SHA1 (patch-ab) = 175b8ac38b140c8b284a21663f2be86cc6196979
-SHA1 (patch-ac) = 198d1d95302463348043281ed4e2e14d83fb5855
-SHA1 (patch-ad) = 66a7b90a20764eb022e45552775be21fcfef6b5a
-SHA1 (patch-ae) = 1f5610a0458acb132a108bfc29504b1d05fca5f0
+SHA1 (spim-8.0.tar.gz) = 979b91e0acb792310593d31aa65e49cccec73036
+RMD160 (spim-8.0.tar.gz) = 129e61a6ee2f338abe2eafb175ac16fc0ebd20c7
+Size (spim-8.0.tar.gz) = 355204 bytes
+SHA1 (patch-aa) = 8232ff358f1bf2ede3216187faf77aad85b1da87
+SHA1 (patch-ab) = 6f52160d99f363dc0b8d327e05bee2470b59dd41
+SHA1 (patch-ac) = 0150642458e8e7feabf7ab02ed219107c4e5b778
+SHA1 (patch-ad) = 056ef015de5daff3003a834ff4867f97db70c79f
diff -urN -x CVS ../spim/patches/patch-aa ./patches/patch-aa
--- ../spim/patches/patch-aa    2009-03-23 04:55:42.000000000 +0900
+++ ./patches/patch-aa  2011-02-02 21:52:46.000000000 +0900
@@ -1,34 +1,34 @@
-$NetBSD: patch-aa,v 1.6 2009/03/22 19:55:42 markd Exp $
+$NetBSD$
 
---- xspim/Imakefile.orig       2006-08-29 14:23:19.000000000 +1200
+--- xspim/Imakefile.orig       2010-01-09 05:22:58.000000000 +0000
 +++ xspim/Imakefile
-@@ -33,13 +33,13 @@
+@@ -43,13 +43,13 @@
  #
  
  # Full path for the directory that will hold the executable files:
 -BIN_DIR = /usr/local/bin
-+# BIN_DIR = /usr/local/bin
++#BIN_DIR = /usr/local/bin
  
  # Full path for the directory that will hold the exception handler:
--EXCEPTION_DIR = /usr/local/lib
+-EXCEPTION_DIR = /usr/local/lib/spim
 +EXCEPTION_DIR = $(PREFIX)/share/spim
  
  # Full path for the directory that will hold the man files:
--MAN_DIR = /usr/man/mann
-+# MAN_DIR = /usr/man/mann
+-MAN_DIR = /usr/local/man/en
++#MAN_DIR = /usr/local/man/en
  
  
  # If you have flex, use it instead of lex.  If you use flex, define this
-@@ -112,7 +112,7 @@ force:  configuration
+@@ -122,7 +122,7 @@ force:  configuration
  configuration:
        ./Configure
  
 -InstallProgram(xspim,$(BIN_DIR))
 +InstallProgram(xspim,$(BINDIR))
- InstallNonExec($(CPU_DIR)/exceptions.s,$(EXCEPTION_DIR))
+ InstallNonExec($(CPU_DIR)/exceptions.s,$(EXCEPTION_DIR)/exceptions.s)
  #InstallManPage($(DOC_DIR)/xspim,$(MAN_DIR))
  
-@@ -147,7 +147,7 @@ very-clean: clean
+@@ -157,7 +157,7 @@ very-clean: clean
        rm -f configuration
  
  makedepend: y.tab.c
diff -urN -x CVS ../spim/patches/patch-ab ./patches/patch-ab
--- ../spim/patches/patch-ab    2009-03-23 04:55:42.000000000 +0900
+++ ./patches/patch-ab  2011-02-02 21:52:46.000000000 +0900
@@ -1,11 +1,12 @@
-$NetBSD: patch-ab,v 1.2 2009/03/22 19:55:42 markd Exp $
+$NetBSD$
 
---- xspim/Configure.orig       2006-08-29 14:23:19.000000000 +1200
+--- xspim/Configure.orig       2010-01-09 05:22:58.000000000 +0000
 +++ xspim/Configure
-@@ -153,13 +153,14 @@ fi;
+@@ -170,14 +170,14 @@ fi;
+ 
  
  echo
- echo Checking for /usr/include/termios.h
+-echo Checking for /usr/include/termios.h
 -if [ -f /usr/include/termios.h ]; then
 -  echo "-DUSE_TERMIOS" >> ./configuration
 -  echo "Yes, it is there"
@@ -13,7 +14,7 @@
 -  # No termios
 -  echo "No, it is not there"
 -fi;
-+# The pkg uses unportable termios.h stuff, so disable it.
++#echo Checking for /usr/include/termios.h
 +#if [ -f /usr/include/termios.h ]; then
 +#  echo "-DUSE_TERMIOS" >> ./configuration
 +#  echo "Yes, it is there"
diff -urN -x CVS ../spim/patches/patch-ac ./patches/patch-ac
--- ../spim/patches/patch-ac    2009-03-23 04:55:42.000000000 +0900
+++ ./patches/patch-ac  2011-02-02 21:52:46.000000000 +0900
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2009/03/22 19:55:42 markd Exp $
+$NetBSD$
 
---- spim/Configure.orig        2006-08-29 14:23:19.000000000 +1200
+--- spim/Configure.orig        2010-01-09 05:22:57.000000000 +0000
 +++ spim/Configure
-@@ -152,14 +152,15 @@ fi;
+@@ -172,14 +172,14 @@ fi;
  
  
  echo
@@ -14,7 +14,6 @@
 -  # No termios
 -  echo "No, it is not there"
 -fi;
-+# The pkg uses unportable termios.h stuff, so disable it.
 +#echo Checking for /usr/include/termios.h
 +#if [ -f /usr/include/termios.h ]; then
 +#  echo "-DUSE_TERMIOS" >> ./configuration
diff -urN -x CVS ../spim/patches/patch-ad ./patches/patch-ad
--- ../spim/patches/patch-ad    2009-03-23 04:55:42.000000000 +0900
+++ ./patches/patch-ad  2011-02-02 21:52:46.000000000 +0900
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2009/03/22 19:55:42 markd Exp $
+$NetBSD$
 
---- spim/Makefile.orig 2006-08-29 14:23:19.000000000 +1200
+--- spim/Makefile.orig 2010-01-09 05:22:57.000000000 +0000
 +++ spim/Makefile
-@@ -54,13 +54,13 @@ DOC_DIR = ../Documentation
+@@ -66,13 +66,13 @@ DOC_DIR = ../Documentation
  
  
  # Full path for the directory that will hold the executable files:
@@ -10,16 +10,16 @@
 +BIN_DIR = $(DESTDIR)$(PREFIX)/bin
  
  # Full path for the directory that will hold the exception handler:
--EXCEPTION_DIR = /usr/local/lib
-+EXCEPTION_DIR = $(PREFIX)/share/spim
+-EXCEPTION_DIR = /usr/local/lib/spim
++EXCEPTION_DIR = $(DESTDIR)$(PREFIX)/share/spim
  
  # Full path for the directory that will hold the man files:
--MAN_DIR = /usr/man/mann
-+MAN_DIR = $(DESTDIR)$(PREFIX)/man/man1
+-MAN_DIR = /usr/local/man/en
++MAN_DIR = $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1
  
  
  # If you have flex, use it instead of lex.  If you use flex, define this
-@@ -92,7 +92,7 @@ ENDIAN=`cat configuration`
+@@ -104,9 +104,9 @@ ENDIAN=`cat configuration`
  
  DEFINES = $(ENDIAN) $(MEM_SIZES) 
-DDEFAULT_EXCEPTION_HANDLER="\"$(EXCEPTION_DIR)/exceptions.s\"" 
-DSPIM_VERSION="\"`cat ../VERSION`\""
  
@@ -29,7 +29,9 @@
 -YFLAGS = -d --file-prefix=y
 +YFLAGS = -d # --file-prefix=y
  YCFLAGS =
-@@ -108,6 +108,7 @@ LEXCFLAGS = -O $(CFLAGS)
+ LDFLAGS = -lm
+ CSH = bash
+@@ -120,6 +120,7 @@ LEXCFLAGS = -O $(CFLAGS)
  OBJS = spim-utils.o run.o mem.o inst.o data.o sym-tbl.o y.tab.o lex.yy.o \
         syscall.o display-utils.o string-stream.o
  
@@ -37,29 +39,12 @@
  
  spim:   force
        make -f Makefile spim2
-@@ -174,11 +175,11 @@ clean:
-       rm -f spim spim.exe *.o TAGS test.out lex.yy.c y.tab.c y.tab.h y.output
- 
- install: spim
-       install -c -s  spim $(BIN_DIR)
--      install -c -m 0444 $(CPU_DIR)/exceptions.s $(EXCEPTION_DIR)
-+      install -c -m 0444 $(CPU_DIR)/exceptions.s $(DESTDIR)$(EXCEPTION_DIR)
- 
--install-man:
--      install -c -m 0444 $(DOC_DIR)/spim.man $(MAN_DIR)
-+install.man:
-+      install -c -m 0444 $(DOC_DIR)/spim.man $(MAN_DIR)/spim.1
- 
- very-clean: clean
-       rm -f configuration
-@@ -195,8 +196,8 @@ splint: spim
-
+@@ -211,7 +212,7 @@ splint: spim
  y.tab.h: y.tab.c
-
+ 
  y.tab.c: $(CPU_DIR)/parser.y
 -      bison $(YFLAGS) $(CPU_DIR)/parser.y
 +      $(YACC) $(YFLAGS) $(CPUDIR)/parser.y
-
+ 
  y.tab.o: y.tab.c
-       $(CC) $(CFLAGS) $(YCFLAGS) -c y.tab.c
-
+       $(CC) $(CFLAGS) $(YCFLAGS) -c y.tab.c
diff -urN -x CVS ../spim/patches/patch-ae ./patches/patch-ae
--- ../spim/patches/patch-ae    2009-03-23 04:55:42.000000000 +0900
+++ ./patches/patch-ae  1970-01-01 09:00:00.000000000 +0900
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2009/03/22 19:55:42 markd Exp $
-
---- CPU/scanner.l.orig 2006-08-29 14:23:17.000000000 +1200
-+++ CPU/scanner.l
-@@ -309,7 +309,7 @@ initialize_scanner (FILE *in_file)
-   yyin = in_file;
- #ifdef FLEX_SCANNER
-   yyrestart(in_file);
--#if (YY_FLEX_MAJOR_VERSION==2 && YY_FLEX_MINOR_VERSION==5 && 
YY_FLEX_SUBMINOR_VERSION==33)
-+#if (YY_FLEX_MAJOR_VERSION==2 && YY_FLEX_MINOR_VERSION==5 && 
YY_FLEX_SUBMINOR_VERSION>=33)
-   /* flex 2.5.33 flips the polarity of this flag (sigh) */
-   yy_init = 0;
- #else
References:
- Re: pkg/44465: Please update emulators/spim to 8.0
  - From: OBATA Akio
Prev by Date: Re: pkg/44501: MACHINE_ARCH problem on IRIX64: mips != mipseb
Next by Date: Re: pkg/44465: Please update emulators/spim to 8.0
Previous by Thread: Re: pkg/44465: Please update emulators/spim to 8.0
Next by Thread: Re: pkg/44465: Please update emulators/spim to 8.0
Indexes:
Home | Main Index | Thread Index | Old Index