From owner-svn-ports-head@FreeBSD.ORG Tue Oct 1 16:49:55 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 323E9212; Tue, 1 Oct 2013 16:49:55 +0000 (UTC) (envelope-from wg@FreeBSD.org) 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 053A62930; Tue, 1 Oct 2013 16:49:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r91GnsPv068871; Tue, 1 Oct 2013 16:49:54 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r91GnsjH068869; Tue, 1 Oct 2013 16:49:54 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201310011649.r91GnsjH068869@svn.freebsd.org> From: William Grzybowski Date: Tue, 1 Oct 2013 16:49:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328967 - in head/textproc/libroxml: . 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.14 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, 01 Oct 2013 16:49:55 -0000 Author: wg Date: Tue Oct 1 16:49:54 2013 New Revision: 328967 URL: http://svnweb.freebsd.org/changeset/ports/328967 Log: textproc/libroxml: fix build on head - Fix build on head [1] - Allow staging - Remove leading article from COMMENT - USES gmake PR: ports/182234 [1] Submitted by: Hung-Yi Chen (maintainer) [1] Modified: head/textproc/libroxml/Makefile head/textproc/libroxml/files/patch-Makefile Modified: head/textproc/libroxml/Makefile ============================================================================== --- head/textproc/libroxml/Makefile Tue Oct 1 16:36:24 2013 (r328966) +++ head/textproc/libroxml/Makefile Tue Oct 1 16:49:54 2013 (r328967) @@ -3,30 +3,31 @@ PORTNAME= libroxml PORTVERSION= 2.2.2 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= GOOGLE_CODE MAINTAINER= gaod@hychen.org -COMMENT= A minimum, easy-to-use, C implementation for xml file parsing +COMMENT= Minimum, easy-to-use, C implementation for xml file parsing LICENSE= LGPL21 PROJECTHOST= libroxml -USE_GMAKE= yes -MAKE_ENV+= DESTDIR=${PREFIX} +USES= gmake +# Workaround overwriting DESTDIR var +DESTDIRNAME= NONE +MAKE_ARGS= DESTDIR=${STAGEDIR}${PREFIX} USE_LDCONFIG= yes -MAN1= roxml.1 - PLIST_FILES= bin/roxml \ lib/libroxml.so \ lib/libroxml.so.0 \ lib/libroxml.a \ include/roxml.h \ - libdata/pkgconfig/libroxml.pc + libdata/pkgconfig/libroxml.pc \ + man/man1/roxml.1.gz -NO_STAGE= yes pre-build: @cd ${WRKSRC} && ${GMAKE} clean Modified: head/textproc/libroxml/files/patch-Makefile ============================================================================== --- head/textproc/libroxml/files/patch-Makefile Tue Oct 1 16:36:24 2013 (r328966) +++ head/textproc/libroxml/files/patch-Makefile Tue Oct 1 16:49:54 2013 (r328967) @@ -1,9 +1,17 @@ ---- Makefile.orig 2012-08-07 05:07:01.000000000 +0800 -+++ Makefile 2012-08-07 05:12:48.000000000 +0800 +--- Makefile.orig 2013-06-07 22:26:58.000000000 +0000 ++++ Makefile 2013-09-19 18:58:18.000000000 +0000 +@@ -44,7 +44,7 @@ + + # options + override CPPFLAGS += -Iinc/ +-override CFLAGS += $(OPTIM) -fPIC -Wall -Wextra -Wno-unused -Werror -Iinc/ $(DEFINES) ++override CFLAGS += $(OPTIM) -fPIC -Wall -Wextra -Wno-unused -Iinc/ $(DEFINES) + override LDFLAGS += + + ifeq ("$(OS)", "Darwin") @@ -149,24 +149,16 @@ $E - $(MAKE) -C $(abspath fuse.xml) - - .PHONY: install + .PHONY: install -install: $(TARGETS) doxy - $P ' INSTALL DIRS' - $E mkdir -p $(DESTDIR)/usr/bin