[pkgsrc/trunk]: pkgsrc/geography/xrmap-base make sure the subdir xmkmf doesn'...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c451b4dc9719
branches:  trunk
changeset: 480434:c451b4dc9719
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Thu Sep 09 10:26:27 2004 +0000

description:
make sure the subdir xmkmf doesn't circumvent xpkgwedge,
should fix install error detected in bulk build

diffstat:

 geography/xrmap-base/PLIST            |   7 ++++++-
 geography/xrmap-base/distinfo         |   5 +++--
 geography/xrmap-base/patches/patch-aa |  22 ++++++++++++++++++++--
 geography/xrmap-base/patches/patch-ab |  20 ++++++++++++++++++++
 4 files changed, 49 insertions(+), 5 deletions(-)

diffs (90 lines):

diff -r 8fe875a20408 -r c451b4dc9719 geography/xrmap-base/PLIST
--- a/geography/xrmap-base/PLIST        Thu Sep 09 07:50:53 2004 +0000
+++ b/geography/xrmap-base/PLIST        Thu Sep 09 10:26:27 2004 +0000
@@ -1,6 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/08/27 12:21:28 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/09/09 10:26:27 drochner Exp $
+bin/emx
 bin/xrmap
 man/cat1/xrmap.0
+share/editkit/README
+share/editkit/emxrc
+share/editkit/rc.common
 share/rmap/Locations
 share/rmap/Xrmaprc
 share/rmap/doc/CHANGES
@@ -112,3 +116,4 @@
 @dirrm share/rmap/factbook
 @dirrm share/rmap/doc
 @dirrm share/rmap
+@dirrm share/editkit
diff -r 8fe875a20408 -r c451b4dc9719 geography/xrmap-base/distinfo
--- a/geography/xrmap-base/distinfo     Thu Sep 09 07:50:53 2004 +0000
+++ b/geography/xrmap-base/distinfo     Thu Sep 09 10:26:27 2004 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/08/27 12:21:28 drochner Exp $
+$NetBSD: distinfo,v 1.2 2004/09/09 10:26:27 drochner Exp $
 
 SHA1 (xrmap-2.29.tar.bz2) = af2efc47b7ef76840a72a96e67174b0fd5dd8973
 Size (xrmap-2.29.tar.bz2) = 1072241 bytes
-SHA1 (patch-aa) = da3987b0624d609804c49a1270a55c740ff32dac
+SHA1 (patch-aa) = 8ffc67bb8b73819b143e65a29eea4e8e2674b1a1
+SHA1 (patch-ab) = fa0619337c40cef0d3bd63fcadc9f7bcefb473a6
diff -r 8fe875a20408 -r c451b4dc9719 geography/xrmap-base/patches/patch-aa
--- a/geography/xrmap-base/patches/patch-aa     Thu Sep 09 07:50:53 2004 +0000
+++ b/geography/xrmap-base/patches/patch-aa     Thu Sep 09 10:26:27 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/08/27 12:21:28 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2004/09/09 10:26:27 drochner Exp $
 
---- Imakefile.orig     2004-08-27 11:17:33.000000000 +0200
+--- Imakefile.orig     2003-05-18 20:53:02.000000000 +0200
 +++ Imakefile
 @@ -1,14 +1,6 @@
 -XCOMM Should install to /usr or /usr/local ??
@@ -18,3 +18,21 @@
  
  XCOMM Default external utilities :
  XCOMM PostScript viewer, image viewer, HTML viewer, Print command
+@@ -68,7 +60,7 @@ install.man::
+ 
+ all::
+       strip xrmap ; ls -al xrmap
+-      cd editkit ; xmkmf ; make
++      cd editkit ; pkgxmkmf ; make
+ 
+ install:: install.man
+       $(MKDIRHIER) $(DESTDIR)$(SHAREDIR)
+@@ -88,7 +80,7 @@ install:: install.man
+             EXAMPLE.rc midi_cfg/README.midi $(DESTDIR)$(SHAREDIR)/doc
+       cd rc ; rm -f *~
+       cp -fR rc $(DESTDIR)$(SHAREDIR)
+-      cd editkit ; xmkmf ; make install
++      cd editkit ; pkgxmkmf ; make install
+       cat WARNING
+ 
+ clean::
diff -r 8fe875a20408 -r c451b4dc9719 geography/xrmap-base/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/geography/xrmap-base/patches/patch-ab     Thu Sep 09 10:26:27 2004 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-ab,v 1.1 2004/09/09 10:26:27 drochner Exp $
+
+--- editkit/Imakefile.orig     2003-05-18 21:41:24.000000000 +0200
++++ editkit/Imakefile
+@@ -1,14 +1,6 @@
+-XCOMM Should install to /usr or /usr/local ??
+-DESTDIR=/usr
+-
+-XCOMM Name of man subdirectory of DESTDIR:
+-MANDIR=/X11R6/man/man1
+-
+-XCOMM Name of bin subdirectory of DESTDIR: /X11R6/bin or maybe just  /bin
+-BINDIR=/X11R6/bin
+ 
+ XCOMM Name of share subdirectory of DESTDIR:
+-SHARE_DIR=/share/editkit
++SHARE_DIR=${PREFIX}/share/editkit
+ 
+ XCOMM
+ XCOMM Normally -- except for new architectures -- you should be done there.