summaryrefslogtreecommitdiff
path: root/geography
diff options
context:
space:
mode:
authordrochner <drochner>2004-09-09 10:26:27 +0000
committerdrochner <drochner>2004-09-09 10:26:27 +0000
commitfd840ec9f2a10dc928beb2ef437252062d1c051c (patch)
treeea1ea95c7492c633a5f14b21864abc6bbe7beb56 /geography
parent99abfe0f926954986b18c35d9818180e69740c17 (diff)
downloadpkgsrc-fd840ec9f2a10dc928beb2ef437252062d1c051c.tar.gz
make sure the subdir xmkmf doesn't circumvent xpkgwedge,
should fix install error detected in bulk build
Diffstat (limited to 'geography')
-rw-r--r--geography/xrmap-base/PLIST7
-rw-r--r--geography/xrmap-base/distinfo5
-rw-r--r--geography/xrmap-base/patches/patch-aa22
-rw-r--r--geography/xrmap-base/patches/patch-ab20
4 files changed, 49 insertions, 5 deletions
diff --git a/geography/xrmap-base/PLIST b/geography/xrmap-base/PLIST
index fba1252340b..73a276efee7 100644
--- a/geography/xrmap-base/PLIST
+++ b/geography/xrmap-base/PLIST
@@ -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 @@ share/rmap/themes/sea
@dirrm share/rmap/factbook
@dirrm share/rmap/doc
@dirrm share/rmap
+@dirrm share/editkit
diff --git a/geography/xrmap-base/distinfo b/geography/xrmap-base/distinfo
index 0dd93dc4862..fdd795770d7 100644
--- a/geography/xrmap-base/distinfo
+++ b/geography/xrmap-base/distinfo
@@ -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 --git a/geography/xrmap-base/patches/patch-aa b/geography/xrmap-base/patches/patch-aa
index ff0c09dc536..3ef7f4ab28c 100644
--- a/geography/xrmap-base/patches/patch-aa
+++ b/geography/xrmap-base/patches/patch-aa
@@ -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 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/08/27 12:21:28 drochner Exp $
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 --git a/geography/xrmap-base/patches/patch-ab b/geography/xrmap-base/patches/patch-ab
new file mode 100644
index 00000000000..2230667de1b
--- /dev/null
+++ b/geography/xrmap-base/patches/patch-ab
@@ -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.