summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorjperkin <jperkin>2017-04-21 13:03:08 +0000
committerjperkin <jperkin>2017-04-21 13:03:08 +0000
commit2c7640f0329ba2d789c02db9a750c8998320a410 (patch)
tree83db88ce246fa19f45253e29afe624de009df540 /editors
parent3105f9acff5dd2f6874fec5bce206b37db387996 (diff)
downloadpkgsrc-2c7640f0329ba2d789c02db9a750c8998320a410.tar.gz
Honour LDFLAGS.
Diffstat (limited to 'editors')
-rw-r--r--editors/elvis/distinfo4
-rw-r--r--editors/elvis/patches/patch-ab12
2 files changed, 11 insertions, 5 deletions
diff --git a/editors/elvis/distinfo b/editors/elvis/distinfo
index 3cb334589c6..1912f7db061 100644
--- a/editors/elvis/distinfo
+++ b/editors/elvis/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.12 2015/12/29 04:22:33 dholland Exp $
+$NetBSD: distinfo,v 1.13 2017/04/21 13:03:08 jperkin 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
diff --git a/editors/elvis/patches/patch-ab b/editors/elvis/patches/patch-ab
index 23a6da569c1..cf1e25870e6 100644
--- a/editors/elvis/patches/patch-ab
+++ b/editors/elvis/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.5 2015/12/29 04:22:33 dholland Exp $
+$NetBSD: patch-ab,v 1.6 2017/04/21 13:03:08 jperkin 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 @@ $NetBSD: patch-ab,v 1.5 2015/12/29 04:22:33 dholland Exp $
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!