Re: pkgsrc NetBSD 3.0/x86_64 bulk build results 20060415.2323

[Mark Davies <mark%mcs.vuw.ac.nz@localhost>]

On Sunday 23 April 2006 02:58, joerg%britannica.bec.de@localhost wrote:
> > > emulators/spim                     pkgsrc-users%NetBSD.org@localhost
>
> This is a bug in imake on NetBSD, not sure how to best handle it.
> Basically, it checks whether the man page was built already and installs
> it only then. This fails here for obvious reasons.

Actually the package setting its own $MAN_DIR is also broken.  I believe the 
below patch fixes, if it works on DragonFly as well I'll commit.

cheers
mark

Index: Makefile
===================================================================
RCS file: /src/cvs/netbsd/pkgsrc/emulators/spim/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- Makefile    12 Apr 2006 19:27:22 -0000      1.29
+++ Makefile    22 Apr 2006 22:21:33 -0000
@@ -23,7 +23,7 @@
 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.*
Index: distinfo
===================================================================
RCS file: /src/cvs/netbsd/pkgsrc/emulators/spim/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo    12 Jan 2006 21:02:10 -0000      1.8
+++ distinfo    22 Apr 2006 22:33:52 -0000
@@ -3,6 +3,6 @@
 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
Index: patches/patch-aa
===================================================================
RCS file: /src/cvs/netbsd/pkgsrc/emulators/spim/patches/patch-aa,v
retrieving revision 1.4
diff -u -r1.4 patch-aa
--- patches/patch-aa    17 Jul 2005 21:38:45 -0000      1.4
+++ patches/patch-aa    22 Apr 2006 22:33:43 -0000
@@ -1,7 +1,7 @@
 $NetBSD: patch-aa,v 1.4 2005/07/17 21:38:45 kristerw 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 @@
  
  # 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::