Mon May 1 08:48:09 2017 UTC ()

Pullup ticket #5341 - requested by sevan
editors/elvis: build fix

Revisions pulled up:
- editors/elvis/distinfo                                        1.13
- editors/elvis/patches/patch-ab                                1.6

---
   Module Name:    pkgsrc
   Committed By:   jperkin
   Date:           Fri Apr 21 13:03:08 UTC 2017

   Modified Files:
           pkgsrc/editors/elvis: distinfo
           pkgsrc/editors/elvis/patches: patch-ab

   Log Message:
   Honour LDFLAGS.


(bsiegert)

diff -r1.12 -r1.12.10.1 pkgsrc/editors/elvis/distinfo
diff -r1.5 -r1.5.10.1 pkgsrc/editors/elvis/patches/patch-ab

--- pkgsrc/editors/elvis/distinfo 2015/12/29 04:22:33 1.12
+++ pkgsrc/editors/elvis/distinfo 2017/05/01 08:48:09 1.12.10.1

@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.12 2015/12/29 04:22:33 dholland Exp $
+$NetBSD: distinfo,v 1.12.10.1 2017/05/01 08:48:09 bsiegert Exp $
 
 SHA1 (elvis-2.2_0.tar.gz) = 8c16574b6d36529735b8ced70972ddaf6275a477
 RMD160 (elvis-2.2_0.tar.gz) = 9867a3941a84a3db0bcfe4e36dd14132fbcf5805
 SHA512 (elvis-2.2_0.tar.gz) = 847cc9ac0af170798abd4725f7dc2ec74d4931fb761b58836d4016d36da5657176bd8cdcdae02bc08438b18e8ce2433eb3340ec2503630fd2992e83ba06adf42
 Size (elvis-2.2_0.tar.gz) = 1439293 bytes
-SHA1 (patch-ab) = 86cf5029a50c0bc353070bc0feacf8c2b13a6511
+SHA1 (patch-ab) = 9733e9000cb5313aacb68c62f27ed2dc542edf26
 SHA1 (patch-ac) = 11f8bea5683ee4d5dcfb618278aa7c381ebb4d9d
 SHA1 (patch-ad) = c0491fdc5da090f3aef956af4d2888014b3aee58
 SHA1 (patch-ae) = 6abf29e010d624fa074181c178878ff6c7fb580d

--- pkgsrc/editors/elvis/patches/patch-ab 2015/12/29 04:22:33 1.5
+++ pkgsrc/editors/elvis/patches/patch-ab 2017/05/01 08:48:09 1.5.10.1

@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.5 2015/12/29 04:22:33 dholland Exp $
+$NetBSD: patch-ab,v 1.5.10.1 2017/05/01 08:48:09 bsiegert Exp $
 
  - Support passing sysconfdir as a configure option.
  - Honor COMPILER_RPATH_FLAG.
  - Use pkgconfig to find freetype.
 
---- configure.orig	2003-10-20 22:32:25.000000000 -0400
+--- configure.orig	2003-10-21 02:32:25.000000000 +0000
 +++ configure
 @@ -27,6 +27,7 @@ GUI_GNOME=bug
  #	 --bindir=DIR		where to install the executables
@@ -120,7 +120,13 @@
  cat >config.h <<eof-config
  /* config.h */
  
-@@ -1200,6 +1205,7 @@ s!^PREFIX=.*!PREFIX=$PREFIX!
+@@ -1195,11 +1200,12 @@ eof-generic
+ 
+ esac
+ cat >>$tmp <<eof-all
+-s!^LIBS=.*!LIBS=$GNOMELIBS $XLIBS $LIBS!
++s!^LIBS=.*!LIBS=$LDFLAGS $GNOMELIBS $XLIBS $LIBS!
+ s!^PREFIX=.*!PREFIX=$PREFIX!
  s!^BINDIR=.*!BINDIR=$BINDIR!
  s!^DATADIR=.*!DATADIR=$DATADIR!
  s!^DOCDIR=.*!DOCDIR=$DOCDIR!