summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2006-04-24 22:22:55 +0000
committermarkd <markd@pkgsrc.org>2006-04-24 22:22:55 +0000
commitbc4958c7578d48cc348afbaa47a34c580c19755a (patch)
tree3e0699609788834d16783a64b9fbbd9f43a74fe7
parentf72c86ef655e5d70371172c3c35e1931b6e0a8d5 (diff)
downloadpkgsrc-bc4958c7578d48cc348afbaa47a34c580c19755a.tar.gz
Rework Imakefile so manual pages are actually installed.
Bump PKGREVISION.
-rw-r--r--emulators/spim/Makefile6
-rw-r--r--emulators/spim/distinfo4
-rw-r--r--emulators/spim/patches/patch-aa36
3 files changed, 35 insertions, 11 deletions
diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile
index b900754bc21..f75a62e6f5e 100644
--- a/emulators/spim/Makefile
+++ b/emulators/spim/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2006/04/22 09:22:08 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2006/04/24 22:22:55 markd Exp $
DISTNAME= spim-7.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= emulators
MASTER_SITES= http://www.cs.wisc.edu/~larus/SPIM/ \
ftp://ftp.cs.wisc.edu/pub/spim/
@@ -23,7 +23,7 @@ USE_IMAKE= yes
USE_TOOLS+= gzip lex
XMKMF= ${X11BASE}/bin/xmkmf # don't specify -a option
-BUILD_TARGET= y.tab.c depend spim xspim
+BUILD_TARGET= y.tab.c depend all
pre-configure:
@${RM} -f ${WRKSRC}/y.tab.*
diff --git a/emulators/spim/distinfo b/emulators/spim/distinfo
index 6c8fe5a79e9..c7f0c629076 100644
--- a/emulators/spim/distinfo
+++ b/emulators/spim/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2006/01/12 21:02:10 joerg Exp $
+$NetBSD: distinfo,v 1.9 2006/04/24 22:22:55 markd Exp $
SHA1 (spim-7.1.tar.gz) = 3e0399e4c2e007aecbd2532b9d8f3f63b7035ff9
RMD160 (spim-7.1.tar.gz) = 175f63d95011a20087ab135de54b03fccc98286d
Size (spim-7.1.tar.gz) = 307599 bytes
-SHA1 (patch-aa) = 6c2ed827f757d3bb92d202d694e631c96750183a
+SHA1 (patch-aa) = ad07b8a31f95c27596dc56e7ba687df62794b404
SHA1 (patch-ab) = 5e1cf699e926f434d6f6aba8f55df7ad7da44fdb
SHA1 (patch-ac) = f3785adfdedf5744b0ce7b0bae5f39436bd4ac88
diff --git a/emulators/spim/patches/patch-aa b/emulators/spim/patches/patch-aa
index dc0d72db3e5..bfb4fdff4df 100644
--- a/emulators/spim/patches/patch-aa
+++ b/emulators/spim/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2005/07/17 21:38:45 kristerw Exp $
+$NetBSD: patch-aa,v 1.5 2006/04/24 22:22:55 markd Exp $
---- Imakefile.orig 2005-07-17 23:05:04.000000000 +0200
-+++ Imakefile 2005-07-17 23:06:37.000000000 +0200
+--- Imakefile.orig 2005-01-03 13:03:48.000000000 +1300
++++ Imakefile
@@ -44,13 +44,13 @@
#
@@ -11,15 +11,39 @@ $NetBSD: patch-aa,v 1.4 2005/07/17 21:38:45 kristerw Exp $
# Full path for the directory that will hold the executable files:
-BIN_DIR = /usr/unsup/bin
-+BIN_DIR = $(PREFIX)/bin
++# BIN_DIR = $(PREFIX)/bin
# Full path for the directory that will hold the man files:
-MAN_DIR = /var/unsup/man
-+MAN_DIR = $(PREFIX)/man/man1
++# MAN_DIR = $(PREFIX)/man/man1
# If you have flex, use it instead of lex. If you use flex, define this
-@@ -250,7 +250,7 @@
+@@ -111,7 +111,7 @@ CSH = csh
+ # Program dependencies:
+ #
+
+-AllTarget(spim)
++AllTarget(spim xspim)
+
+ spim: force
+ @touch .spim-made
+@@ -131,10 +131,10 @@ configuration:
+ NormalProgramTarget(spim_sub,$(OBJS),,,)
+ NormalProgramTarget(xspim_sub,$(XOBJS),$(DEPLIBS),$(LOCALLIBS),$(SYSLIBS))
+
+-InstallProgram(spim,$(BIN_DIR))
+-InstallProgram(xspim,$(BIN_DIR))
+-InstallManPage(spim,$(MAN_DIR))
+-InstallManPage(xspim,$(MAN_DIR))
++InstallProgram(spim,$(BINDIR))
++InstallProgram(xspim,$(BINDIR))
++InstallManPage(spim,$(MANDIR))
++InstallManPage(xspim,$(MANDIR))
+ InstallNonExec(exceptions.s,$(EXCEPTION_DIR))
+
+
+@@ -250,7 +250,7 @@ shar:
mv -f lex.yy.c.xx lex.yy.c
depend::