Date: Sun, 26 May 2013 16:14:46 +0000 (UTC) From: Boris Samorodov <bsam@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r319117 - in head/sysutils/mapchan: . files Message-ID: <201305261614.r4QGEkj6081415@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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) -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305261614.r4QGEkj6081415>