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
cvs diff -r1.12 -r1.12.10.1 pkgsrc/editors/elvis/distinfo (expand / switch to unified diff)

--- 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,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.12 2015/12/29 04:22:33 dholland Exp $ 1$NetBSD: distinfo,v 1.12.10.1 2017/05/01 08:48:09 bsiegert Exp $
2 2
3SHA1 (elvis-2.2_0.tar.gz) = 8c16574b6d36529735b8ced70972ddaf6275a477 3SHA1 (elvis-2.2_0.tar.gz) = 8c16574b6d36529735b8ced70972ddaf6275a477
4RMD160 (elvis-2.2_0.tar.gz) = 9867a3941a84a3db0bcfe4e36dd14132fbcf5805 4RMD160 (elvis-2.2_0.tar.gz) = 9867a3941a84a3db0bcfe4e36dd14132fbcf5805
5SHA512 (elvis-2.2_0.tar.gz) = 847cc9ac0af170798abd4725f7dc2ec74d4931fb761b58836d4016d36da5657176bd8cdcdae02bc08438b18e8ce2433eb3340ec2503630fd2992e83ba06adf42 5SHA512 (elvis-2.2_0.tar.gz) = 847cc9ac0af170798abd4725f7dc2ec74d4931fb761b58836d4016d36da5657176bd8cdcdae02bc08438b18e8ce2433eb3340ec2503630fd2992e83ba06adf42
6Size (elvis-2.2_0.tar.gz) = 1439293 bytes 6Size (elvis-2.2_0.tar.gz) = 1439293 bytes
7SHA1 (patch-ab) = 86cf5029a50c0bc353070bc0feacf8c2b13a6511 7SHA1 (patch-ab) = 9733e9000cb5313aacb68c62f27ed2dc542edf26
8SHA1 (patch-ac) = 11f8bea5683ee4d5dcfb618278aa7c381ebb4d9d 8SHA1 (patch-ac) = 11f8bea5683ee4d5dcfb618278aa7c381ebb4d9d
9SHA1 (patch-ad) = c0491fdc5da090f3aef956af4d2888014b3aee58 9SHA1 (patch-ad) = c0491fdc5da090f3aef956af4d2888014b3aee58
10SHA1 (patch-ae) = 6abf29e010d624fa074181c178878ff6c7fb580d 10SHA1 (patch-ae) = 6abf29e010d624fa074181c178878ff6c7fb580d
11SHA1 (patch-ref.c) = 324c6bd068bfaf44b278868f8e41895a0f91fe43 11SHA1 (patch-ref.c) = 324c6bd068bfaf44b278868f8e41895a0f91fe43
cvs diff -r1.5 -r1.5.10.1 pkgsrc/editors/elvis/patches/patch-ab (expand / switch to unified diff)

--- 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,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: patch-ab,v 1.5 2015/12/29 04:22:33 dholland Exp $ 1$NetBSD: patch-ab,v 1.5.10.1 2017/05/01 08:48:09 bsiegert Exp $
2 2
3 - Support passing sysconfdir as a configure option. 3 - Support passing sysconfdir as a configure option.
4 - Honor COMPILER_RPATH_FLAG. 4 - Honor COMPILER_RPATH_FLAG.
5 - Use pkgconfig to find freetype. 5 - Use pkgconfig to find freetype.
6 6
7--- configure.orig 2003-10-20 22:32:25.000000000 -0400 7--- configure.orig 2003-10-21 02:32:25.000000000 +0000
8+++ configure 8+++ configure
9@@ -27,6 +27,7 @@ GUI_GNOME=bug 9@@ -27,6 +27,7 @@ GUI_GNOME=bug
10 # --bindir=DIR where to install the executables 10 # --bindir=DIR where to install the executables
11 # --datadir=DIR where to install the supporting data files 11 # --datadir=DIR where to install the supporting data files
12 # --docdir=DIR where to install the :help files & other docs 12 # --docdir=DIR where to install the :help files & other docs
13+# --sysconfdir=DIR where to install the configuration files 13+# --sysconfdir=DIR where to install the configuration files
14 # --prefix=DIR like --bindir=DIR/bin --datadir=DIR/lib/elvis 14 # --prefix=DIR like --bindir=DIR/bin --datadir=DIR/lib/elvis
15 # --ioctl=VARIETY type of tty ioctl to use: termios, termio, sgtty 15 # --ioctl=VARIETY type of tty ioctl to use: termios, termio, sgtty
16 # --verbose explain each decision 16 # --verbose explain each decision
17@@ -66,6 +67,7 @@ PREFIX=/usr 17@@ -66,6 +67,7 @@ PREFIX=/usr
18 BINDIR='$(PREFIX)/bin' 18 BINDIR='$(PREFIX)/bin'
19 DATADIR='$(PREFIX)/share/elvis/' 19 DATADIR='$(PREFIX)/share/elvis/'
20 DOCDIR='$(PREFIX)/share/elvis/doc/' 20 DOCDIR='$(PREFIX)/share/elvis/doc/'
@@ -110,21 +110,27 @@ $NetBSD: patch-ab,v 1.5 2015/12/29 04:22 @@ -110,21 +110,27 @@ $NetBSD: patch-ab,v 1.5 2015/12/29 04:22
110+ CC="$CC `pkg-config --cflags freetype2 xft`" 110+ CC="$CC `pkg-config --cflags freetype2 xft`"
111 ;; 111 ;;
112 *)  112 *)
113 xft="" 113 xft=""
114@@ -950,7 +955,7 @@ esac 114@@ -950,7 +955,7 @@ esac
115  115
116  116
117 # Generate the "config.h" file 117 # Generate the "config.h" file
118-ELVISPATH=`echo "~/.elvis:/etc/elvis:$DATADIR:$DOCDIR" | sed s,'$(DATADIR)',"$DATADIR",g\;s,'$(PREFIX)',"$PREFIX",g` 118-ELVISPATH=`echo "~/.elvis:/etc/elvis:$DATADIR:$DOCDIR" | sed s,'$(DATADIR)',"$DATADIR",g\;s,'$(PREFIX)',"$PREFIX",g`
119+ELVISPATH=`echo "~/.elvis:$SYSCONFDIR:$DATADIR:$DOCDIR" | sed s,'$(DATADIR)',"$DATADIR",g\;s,'$(PREFIX)',"$PREFIX",g` 119+ELVISPATH=`echo "~/.elvis:$SYSCONFDIR:$DATADIR:$DOCDIR" | sed s,'$(DATADIR)',"$DATADIR",g\;s,'$(PREFIX)',"$PREFIX",g`
120 cat >config.h <<eof-config 120 cat >config.h <<eof-config
121 /* config.h */ 121 /* config.h */
122  122
123@@ -1200,6 +1205,7 @@ s!^PREFIX=.*!PREFIX=$PREFIX! 123@@ -1195,11 +1200,12 @@ eof-generic
 124
 125 esac
 126 cat >>$tmp <<eof-all
 127-s!^LIBS=.*!LIBS=$GNOMELIBS $XLIBS $LIBS!
 128+s!^LIBS=.*!LIBS=$LDFLAGS $GNOMELIBS $XLIBS $LIBS!
 129 s!^PREFIX=.*!PREFIX=$PREFIX!
124 s!^BINDIR=.*!BINDIR=$BINDIR! 130 s!^BINDIR=.*!BINDIR=$BINDIR!
125 s!^DATADIR=.*!DATADIR=$DATADIR! 131 s!^DATADIR=.*!DATADIR=$DATADIR!
126 s!^DOCDIR=.*!DOCDIR=$DOCDIR! 132 s!^DOCDIR=.*!DOCDIR=$DOCDIR!
127+s!^SYSCONFDIR=.*!SYSCONFDIR=$SYSCONFDIR! 133+s!^SYSCONFDIR=.*!SYSCONFDIR=$SYSCONFDIR!
128 eof-all 134 eof-all
129 if [ -d /usr/local/X11/include ] 135 if [ -d /usr/local/X11/include ]
130 then 136 then