From owner-svn-ports-head@FreeBSD.ORG Tue Jan 28 20:16:02 2014 Return-Path: Delivered-To: svn-ports-head@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 78D57397; Tue, 28 Jan 2014 20:16:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4AE401563; Tue, 28 Jan 2014 20:16:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0SKG2Mp054036; Tue, 28 Jan 2014 20:16:02 GMT (envelope-from lx@svn.freebsd.org) Received: (from lx@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0SKG13t054034; Tue, 28 Jan 2014 20:16:01 GMT (envelope-from lx@svn.freebsd.org) Message-Id: <201401282016.s0SKG13t054034@svn.freebsd.org> From: David Thiel Date: Tue, 28 Jan 2014 20:16:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341652 - in head/textproc/luaexpat: . 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-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Jan 2014 20:16:02 -0000 Author: lx Date: Tue Jan 28 20:16:01 2014 New Revision: 341652 URL: http://svnweb.freebsd.org/changeset/ports/341652 QAT: https://qat.redports.org/buildarchive/r341652/ Log: Fix build and STAGEify. PR: ports/185899 Submitted by: ashish@ Modified: head/textproc/luaexpat/Makefile head/textproc/luaexpat/files/patch-makefile Modified: head/textproc/luaexpat/Makefile ============================================================================== --- head/textproc/luaexpat/Makefile Tue Jan 28 20:05:49 2014 (r341651) +++ head/textproc/luaexpat/Makefile Tue Jan 28 20:16:01 2014 (r341652) @@ -13,6 +13,7 @@ COMMENT= LuaExpat is a SAX XML parser ba LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 +USES= gmake MAKEFILE= makefile ALL_TARGET= lib USE_LUA= 5.0-5.1 @@ -21,7 +22,6 @@ WANT_LUA_VER= 5.1 CFLAGS+= -fPIC -NO_STAGE= yes .include .if ${LUA_VER} == 5.0 Modified: head/textproc/luaexpat/files/patch-makefile ============================================================================== --- head/textproc/luaexpat/files/patch-makefile Tue Jan 28 20:05:49 2014 (r341651) +++ head/textproc/luaexpat/files/patch-makefile Tue Jan 28 20:16:01 2014 (r341652) @@ -1,6 +1,9 @@ ---- makefile.orig 2009-06-25 06:07:16.000000000 +0000 -+++ makefile 2009-06-25 06:23:06.000000000 +0000 -@@ -4,15 +4,11 @@ + +$FreeBSD$ + +--- makefile.orig ++++ makefile +@@ -4,10 +4,6 @@ include $(CONFIG) @@ -11,9 +14,20 @@ OBJS= src/lxplib.o $(COMPAT_O) lib: src/$(LIBNAME) - src/$(LIBNAME) : $(OBJS) -- export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) -o src/$(LIBNAME) $(LIB_OPTION) $(OBJS) -lexpat -+ export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) -o src/$(LIBNAME) $(LIB_OPTION) lxplib.o $(COMPAT_O) -lexpat - - $(COMPAT_DIR)/compat-5.1.o: $(COMPAT_DIR)/compat-5.1.c +@@ -18,11 +14,11 @@ $(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c + + install: +- mkdir -p $(LUA_LIBDIR) +- cp src/$(LIBNAME) $(LUA_LIBDIR) +- cd $(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so +- mkdir -p $(LUA_DIR)/$T +- cp src/$T/lom.lua $(LUA_DIR)/$T ++ mkdir -p $(DESTDIR)$(LUA_LIBDIR) ++ cp src/$(LIBNAME) $(DESTDIR)$(LUA_LIBDIR) ++ cd $(DESTDIR)$(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so ++ mkdir -p $(DESTDIR)$(LUA_DIR)/$T ++ cp src/$T/lom.lua $(DESTDIR)$(LUA_DIR)/$T + + clean: + rm -f src/$(LIBNAME) $(OBJS)