From owner-svn-ports-all@FreeBSD.ORG  Sun May 26 16:14:46 2013
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])
 by hub.freebsd.org (Postfix) with ESMTP id 6A8F6D8C;
 Sun, 26 May 2013 16:14:46 +0000 (UTC)
 (envelope-from bsam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5D63C16F;
 Sun, 26 May 2013 16:14:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4QGEkGX081417;
 Sun, 26 May 2013 16:14:46 GMT (envelope-from bsam@svn.freebsd.org)
Received: (from bsam@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4QGEkj6081415;
 Sun, 26 May 2013 16:14:46 GMT (envelope-from bsam@svn.freebsd.org)
Message-Id: <201305261614.r4QGEkj6081415@svn.freebsd.org>
From: Boris Samorodov <bsam@FreeBSD.org>
Date: Sun, 26 May 2013 16:14:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r319117 - in head/sysutils/mapchan: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
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: Sun, 26 May 2013 16:14:46 -0000

Author: bsam
Date: Sun May 26 16:14:45 2013
New Revision: 319117
URL: http://svnweb.freebsd.org/changeset/ports/319117

Log:
  Use CFLAGS and LDFLAGS at the port's Makefile instead of
  patching the makefile at sources.

Modified:
  head/sysutils/mapchan/Makefile
  head/sysutils/mapchan/files/patch-Makefile

Modified: head/sysutils/mapchan/Makefile
==============================================================================
--- head/sysutils/mapchan/Makefile	Sun May 26 15:59:54 2013	(r319116)
+++ head/sysutils/mapchan/Makefile	Sun May 26 16:14:45 2013	(r319117)
@@ -13,6 +13,8 @@ COMMENT=	Transform the input and output 
 USES=		iconv
 WRKSRC=		${WRKDIR}/${PORTNAME}
 MAKE_ENV=	MAPDIR=${PREFIX}/etc/${PORTNAME}
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -liconv
 ETCDAT=		*.map default.sample
 MAN8=		mapchan.8
 PORTDOCS=	README

Modified: head/sysutils/mapchan/files/patch-Makefile
==============================================================================
--- head/sysutils/mapchan/files/patch-Makefile	Sun May 26 15:59:54 2013	(r319116)
+++ head/sysutils/mapchan/files/patch-Makefile	Sun May 26 16:14:45 2013	(r319117)
@@ -1,5 +1,5 @@
 --- Makefile.orig	2008-09-11 20:28:12.000000000 +0500
-+++ Makefile	2013-05-26 13:56:49.000000000 +0400
++++ Makefile	2013-05-26 20:10:47.000000000 +0400
 @@ -1,6 +1,6 @@
  #
  #
@@ -8,18 +8,16 @@
  #CFLAGS ?= -g
  # 
  # Defines:
-@@ -29,10 +29,10 @@ DEFS+=-DMAP_ONOFF
+@@ -29,9 +29,9 @@
  DEFS+=-DESC_C_TBL
  
  DESTDIR ?= /
 -BINDIR ?= $(DESTDIR)/bin
 -MAPDIR ?= $(DESTDIR)/etc/mapchan
 -LDFLAGS ?= -s
--LOADLIBES = -lutil
 +BINDIR?=$(PREFIX)/bin
 +MAPDIR?=$(PREFIX)/mapchan
-+LDFLAGS=-s -lutil -liconv -I /usr/local/include -L /usr/local/lib
-+LOADLIBES = -lutil -liconv
++LDFLAGS+=-s -lutil
+ LOADLIBES = -lutil
  #--------------------------------------------------------------
  CFLAGS += $(DEFS)
-