From owner-svn-ports-all@FreeBSD.ORG  Sat Aug  9 18:37:20 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 04DEFC87
 for <svn-ports-all@freebsd.org>; Sat,  9 Aug 2014 18:37:20 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id CA04A29A4
 for <svn-ports-all@freebsd.org>; Sat,  9 Aug 2014 18:37:19 +0000 (UTC)
Received: from adamw (uid 959) (envelope-from adamw@FreeBSD.org) id 2eda
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Sat, 09 Aug 2014 18:37:19 +0000
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Sat, 9 Aug 2014 18:37:19 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r364461 - head/devel/cdecl/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e66a5f.2eda.78a6d4c6@svn.freebsd.org>
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Aug 2014 18:37:20 -0000

Author: adamw
Date: Sat Aug  9 18:37:19 2014
New Revision: 364461
URL: http://svnweb.freebsd.org/changeset/ports/364461
QAT: https://qat.redports.org/buildarchive/r364461/

Log:
  Honour CPPFLAGS and LDFLAGS to fix readline support on current.

Modified:
  head/devel/cdecl/files/patch-Makefile

Modified: head/devel/cdecl/files/patch-Makefile
==============================================================================
--- head/devel/cdecl/files/patch-Makefile	Sat Aug  9 18:36:56 2014	(r364460)
+++ head/devel/cdecl/files/patch-Makefile	Sat Aug  9 18:37:19 2014	(r364461)
@@ -1,14 +1,15 @@
---- ./Makefile.orig	1996-01-16 06:36:38.000000000 +0100
-+++ ./Makefile	2013-06-10 00:05:02.101069622 +0200
+--- Makefile.orig	1996-01-16 00:36:38.000000000 -0500
++++ Makefile	2014-08-09 14:36:10.000000000 -0400
 @@ -15,13 +15,13 @@
  #
  # add -DUSE_READLINE	To compile in support for the GNU readline library.
  
 -CFLAGS= -s -O2 -DUSE_READLINE
 -CC= gcc
-+CFLAGS+= -s -DUSE_READLINE
+-LIBS= -lreadline -ltermcap
++CFLAGS+= -s -DUSE_READLINE ${CPPFLAGS}
 +CC?= gcc
- LIBS= -lreadline -ltermcap
++LIBS= -lreadline -ltermcap ${LDFLAGS}
  ALLFILES= makefile cdgram.y cdlex.l cdecl.c cdecl.1 testset testset++
 -BINDIR= /usr/bin
 -MANDIR= /usr/man/man1
@@ -24,11 +25,11 @@
  
  install: cdecl
 -	$(INSTALL) cdecl $(BINDIR)
-+	${BSD_INSTALL_PROGRAM} cdecl $(STAGEDIR)$(BINDIR)
 -	ln $(BINDIR)/cdecl $(BINDIR)/c++decl
-+	ln -s $(BINDIR)/cdecl $(STAGEDIR)$(BINDIR)/c++decl
 -	$(INSTALL_DATA) cdecl.1 $(MANDIR)
 -	$(INSTALL_DATA) c++decl.1 $(MANDIR)
++	${BSD_INSTALL_PROGRAM} cdecl $(STAGEDIR)$(BINDIR)
++	ln -s $(BINDIR)/cdecl $(STAGEDIR)$(BINDIR)/c++decl
 +	${BSD_INSTALL_MAN} cdecl.1 $(STAGEDIR)$(MANDIR)
 +	ln -s $(MANDIR)/cdecl.1 $(STAGEDIR)$(MANDIR)/c++decl.1