Mon Dec 18 14:12:40 2017 UTC ()
xrmap-base: Don't overwrite user CFLAGS.


(jperkin)
diff -r1.6 -r1.7 pkgsrc/geography/xrmap-base/distinfo
diff -r1.1 -r1.2 pkgsrc/geography/xrmap-base/patches/patch-ab
cvs diff -r1.6 -r1.7 pkgsrc/geography/xrmap-base/distinfo (expand / switch to unified diff)

--- pkgsrc/geography/xrmap-base/distinfo 2015/11/03 00:08:45 1.6
+++ pkgsrc/geography/xrmap-base/distinfo 2017/12/18 14:12:40 1.7
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.6 2015/11/03 00:08:45 agc Exp $ 1$NetBSD: distinfo,v 1.7 2017/12/18 14:12:40 jperkin Exp $
2 2
3SHA1 (xrmap-2.29.tar.bz2) = af2efc47b7ef76840a72a96e67174b0fd5dd8973 3SHA1 (xrmap-2.29.tar.bz2) = af2efc47b7ef76840a72a96e67174b0fd5dd8973
4RMD160 (xrmap-2.29.tar.bz2) = f8cacc343643a66c8236743c76c80d3c33c44c5c 4RMD160 (xrmap-2.29.tar.bz2) = f8cacc343643a66c8236743c76c80d3c33c44c5c
5SHA512 (xrmap-2.29.tar.bz2) = a07791f54d9a020fe1aa61aa5d6330d1d434ce1cb5967c1c79b2c500da1feb99f6cbd19281f722d2dd201ecc20905214b0e8ecca217d9fc5de957bd6b0fa89aa 5SHA512 (xrmap-2.29.tar.bz2) = a07791f54d9a020fe1aa61aa5d6330d1d434ce1cb5967c1c79b2c500da1feb99f6cbd19281f722d2dd201ecc20905214b0e8ecca217d9fc5de957bd6b0fa89aa
6Size (xrmap-2.29.tar.bz2) = 1072241 bytes 6Size (xrmap-2.29.tar.bz2) = 1072241 bytes
7SHA1 (patch-aa) = 31ae754c428cd96e5c4313b53c26cadefff3e47f 7SHA1 (patch-aa) = 31ae754c428cd96e5c4313b53c26cadefff3e47f
8SHA1 (patch-ab) = fa0619337c40cef0d3bd63fcadc9f7bcefb473a6 8SHA1 (patch-ab) = 96b06b88d79fc5d578127ad029a8606d33264789
9SHA1 (patch-xrmap.c) = 015e4437f0cd6089a57a5acc16bfdfde7830a8f8 9SHA1 (patch-xrmap.c) = 015e4437f0cd6089a57a5acc16bfdfde7830a8f8
cvs diff -r1.1 -r1.2 pkgsrc/geography/xrmap-base/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/geography/xrmap-base/patches/patch-ab 2004/09/09 10:26:27 1.1
+++ pkgsrc/geography/xrmap-base/patches/patch-ab 2017/12/18 14:12:40 1.2
@@ -1,20 +1,29 @@ @@ -1,20 +1,29 @@
1$NetBSD: patch-ab,v 1.1 2004/09/09 10:26:27 drochner Exp $ 1$NetBSD: patch-ab,v 1.2 2017/12/18 14:12:40 jperkin Exp $
2 2
3--- editkit/Imakefile.orig 2003-05-18 21:41:24.000000000 +0200 3--- editkit/Imakefile.orig 2003-05-18 19:41:24.000000000 +0000
4+++ editkit/Imakefile 4+++ editkit/Imakefile
5@@ -1,14 +1,6 @@ 5@@ -1,14 +1,6 @@
6-XCOMM Should install to /usr or /usr/local ?? 6-XCOMM Should install to /usr or /usr/local ??
7-DESTDIR=/usr 7-DESTDIR=/usr
8- 8-
9-XCOMM Name of man subdirectory of DESTDIR: 9-XCOMM Name of man subdirectory of DESTDIR:
10-MANDIR=/X11R6/man/man1 10-MANDIR=/X11R6/man/man1
11- 11-
12-XCOMM Name of bin subdirectory of DESTDIR: /X11R6/bin or maybe just /bin 12-XCOMM Name of bin subdirectory of DESTDIR: /X11R6/bin or maybe just /bin
13-BINDIR=/X11R6/bin 13-BINDIR=/X11R6/bin
14  14
15 XCOMM Name of share subdirectory of DESTDIR: 15 XCOMM Name of share subdirectory of DESTDIR:
16-SHARE_DIR=/share/editkit 16-SHARE_DIR=/share/editkit
17+SHARE_DIR=${PREFIX}/share/editkit 17+SHARE_DIR=${PREFIX}/share/editkit
18  18
19 XCOMM 19 XCOMM
20 XCOMM Normally -- except for new architectures -- you should be done there. 20 XCOMM Normally -- except for new architectures -- you should be done there.
 21@@ -17,7 +9,7 @@ XCOMM
 22 XCOMM Compile options:
 23 XCOMM
 24
 25-CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHARE_DIR="\"$(DESTDIR)$(SHARE_DIR)\""
 26+CFLAGS += -Wall -DTHREED -DGREEK -DJUSTIFY -DSHARE_DIR="\"$(DESTDIR)$(SHARE_DIR)\""
 27
 28 LOCAL_LIBRARIES=$(XLIB)
 29 DEPLIBS= # I don't know what I'm doing, and I hate imake!