CVS commit: pkgsrc/geography/xrmap-base

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Dec 18 14:12:40 UTC 2017

Modified Files:
        pkgsrc/geography/xrmap-base: distinfo
        pkgsrc/geography/xrmap-base/patches: patch-ab

Log Message:
xrmap-base: Don't overwrite user CFLAGS.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/geography/xrmap-base/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/geography/xrmap-base/patches/patch-ab

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/xrmap-base/distinfo
diff -u pkgsrc/geography/xrmap-base/distinfo:1.6 pkgsrc/geography/xrmap-base/distinfo:1.7
--- pkgsrc/geography/xrmap-base/distinfo:1.6    Tue Nov  3 00:08:45 2015
+++ pkgsrc/geography/xrmap-base/distinfo        Mon Dec 18 14:12:40 2017
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 00:08:45 agc Exp $
+$NetBSD: distinfo,v 1.7 2017/12/18 14:12:40 jperkin Exp $
 
 SHA1 (xrmap-2.29.tar.bz2) = af2efc47b7ef76840a72a96e67174b0fd5dd8973
 RMD160 (xrmap-2.29.tar.bz2) = f8cacc343643a66c8236743c76c80d3c33c44c5c
 SHA512 (xrmap-2.29.tar.bz2) = a07791f54d9a020fe1aa61aa5d6330d1d434ce1cb5967c1c79b2c500da1feb99f6cbd19281f722d2dd201ecc20905214b0e8ecca217d9fc5de957bd6b0fa89aa
 Size (xrmap-2.29.tar.bz2) = 1072241 bytes
 SHA1 (patch-aa) = 31ae754c428cd96e5c4313b53c26cadefff3e47f
-SHA1 (patch-ab) = fa0619337c40cef0d3bd63fcadc9f7bcefb473a6
+SHA1 (patch-ab) = 96b06b88d79fc5d578127ad029a8606d33264789
 SHA1 (patch-xrmap.c) = 015e4437f0cd6089a57a5acc16bfdfde7830a8f8

Index: pkgsrc/geography/xrmap-base/patches/patch-ab
diff -u pkgsrc/geography/xrmap-base/patches/patch-ab:1.1 pkgsrc/geography/xrmap-base/patches/patch-ab:1.2
--- pkgsrc/geography/xrmap-base/patches/patch-ab:1.1    Thu Sep  9 10:26:27 2004
+++ pkgsrc/geography/xrmap-base/patches/patch-ab        Mon Dec 18 14:12:40 2017
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1 2004/09/09 10:26:27 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2017/12/18 14:12:40 jperkin Exp $
 
---- editkit/Imakefile.orig     2003-05-18 21:41:24.000000000 +0200
+--- editkit/Imakefile.orig     2003-05-18 19:41:24.000000000 +0000
 +++ editkit/Imakefile
 @@ -1,14 +1,6 @@
 -XCOMM Should install to /usr or /usr/local ??
@@ -18,3 +18,12 @@ $NetBSD: patch-ab,v 1.1 2004/09/09 10:26
  
  XCOMM
  XCOMM Normally -- except for new architectures -- you should be done there.
+@@ -17,7 +9,7 @@ XCOMM
+ XCOMM Compile options:
+ XCOMM
+ 
+-CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHARE_DIR="\"$(DESTDIR)$(SHARE_DIR)\""
++CFLAGS += -Wall -DTHREED -DGREEK -DJUSTIFY -DSHARE_DIR="\"$(DESTDIR)$(SHARE_DIR)\""
+ 
+ LOCAL_LIBRARIES=$(XLIB)
+ DEPLIBS=              # I don't know what I'm doing, and I hate imake!