From owner-svn-ports-head@freebsd.org Sun Jun 12 17:14:42 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 86D15AF1D08; Sun, 12 Jun 2016 17:14:42 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5F2C12A30; Sun, 12 Jun 2016 17:14:42 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5CHEf12069988; Sun, 12 Jun 2016 17:14:41 GMT (envelope-from hrs@FreeBSD.org) Received: (from hrs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5CHEfdF069983; Sun, 12 Jun 2016 17:14:41 GMT (envelope-from hrs@FreeBSD.org) Message-Id: <201606121714.u5CHEfdF069983@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hrs set sender to hrs@FreeBSD.org using -f From: Hiroki Sato Date: Sun, 12 Jun 2016 17:14:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416809 - in head/textproc/xmlroff: . 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.22 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: Sun, 12 Jun 2016 17:14:42 -0000 Author: hrs Date: Sun Jun 12 17:14:40 2016 New Revision: 416809 URL: https://svnweb.freebsd.org/changeset/ports/416809 Log: Fix build when DOCS=on. Modified: head/textproc/xmlroff/Makefile head/textproc/xmlroff/files/patch-Makefile.am head/textproc/xmlroff/files/patch-configure.ac head/textproc/xmlroff/files/patch-docs-Makefile.am head/textproc/xmlroff/files/patch-xmlroff-Makefile.am Modified: head/textproc/xmlroff/Makefile ============================================================================== --- head/textproc/xmlroff/Makefile Sun Jun 12 16:59:04 2016 (r416808) +++ head/textproc/xmlroff/Makefile Sun Jun 12 17:14:40 2016 (r416809) @@ -22,7 +22,6 @@ USE_GNOME= libgnomeprint libartlgpl2 pan libxslt libxml2 gdkpixbuf2 GH_ACCOUNT= xmlroff GH_PROJECT= xmlroff -EXTRACT_AFTER_ARGS= --exclude=xmlroff/libfo WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc @@ -30,6 +29,6 @@ INSTALL_TARGET= install-strip OPTIONS_DEFINE= DOCS DOCS_CONFIGURE_ENABLE= gtk-doc -DOCS_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gtk-doc.pc:${PORTSDIR}/textproc/gtk-doc +DOCS_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gtk-doc.pc:textproc/gtk-doc .include Modified: head/textproc/xmlroff/files/patch-Makefile.am ============================================================================== --- head/textproc/xmlroff/files/patch-Makefile.am Sun Jun 12 16:59:04 2016 (r416808) +++ head/textproc/xmlroff/files/patch-Makefile.am Sun Jun 12 17:14:40 2016 (r416809) @@ -1,6 +1,6 @@ ---- Makefile.am.orig 2009-03-12 06:08:57.000000000 +0900 -+++ Makefile.am 2016-03-26 11:11:44.004539000 +0900 -@@ -6,26 +6,14 @@ +--- Makefile.am.orig 2009-03-11 21:08:57 UTC ++++ Makefile.am +@@ -6,26 +6,14 @@ if ENABLE_CUNIT CUNIT_DIRS = cunit endif Modified: head/textproc/xmlroff/files/patch-configure.ac ============================================================================== --- head/textproc/xmlroff/files/patch-configure.ac Sun Jun 12 16:59:04 2016 (r416808) +++ head/textproc/xmlroff/files/patch-configure.ac Sun Jun 12 17:14:40 2016 (r416809) @@ -1,6 +1,6 @@ ---- configure.ac.orig 2009-03-12 06:08:57.000000000 +0900 -+++ configure.ac 2016-03-26 11:07:28.607576000 +0900 -@@ -230,30 +230,26 @@ +--- configure.ac.orig 2009-03-11 21:08:57 UTC ++++ configure.ac +@@ -230,30 +230,26 @@ fi AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno) # @@ -42,7 +42,7 @@ AC_ARG_ENABLE(rebuilds, AC_HELP_STRING([--disable-rebuilds], -@@ -623,14 +619,6 @@ +@@ -623,14 +619,6 @@ cunit/Makefile docs/Makefile examples/Makefile examples/xml2003/Makefile Modified: head/textproc/xmlroff/files/patch-docs-Makefile.am ============================================================================== --- head/textproc/xmlroff/files/patch-docs-Makefile.am Sun Jun 12 16:59:04 2016 (r416808) +++ head/textproc/xmlroff/files/patch-docs-Makefile.am Sun Jun 12 17:14:40 2016 (r416809) @@ -1,6 +1,15 @@ ---- docs/Makefile.am.orig 2009-03-12 06:08:57.000000000 +0900 -+++ docs/Makefile.am 2016-03-25 14:22:51.475354000 +0900 -@@ -228,7 +228,7 @@ +--- docs/Makefile.am.orig 2009-03-11 21:08:57 UTC ++++ docs/Makefile.am +@@ -186,7 +186,7 @@ GTKDOC_CFLAGS = \ + -I$(top_builddir) + + GTKDOC_LIBS = \ +- ../libfo/libfo-0.6.la \ ++ $(LIBFO_LIBS) \ + $(PANGO_LIBS) \ + $(GNOMEPRINT_LIBS) \ + $(GDKPIXBUF_LIBS) \ +@@ -228,7 +228,7 @@ dist-hook-local: DOCBOOK_XSL=http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl xmlroff.fo: xmlroff.xml ../libfo-compat.xsl Modified: head/textproc/xmlroff/files/patch-xmlroff-Makefile.am ============================================================================== --- head/textproc/xmlroff/files/patch-xmlroff-Makefile.am Sun Jun 12 16:59:04 2016 (r416808) +++ head/textproc/xmlroff/files/patch-xmlroff-Makefile.am Sun Jun 12 17:14:40 2016 (r416809) @@ -1,6 +1,6 @@ ---- xmlroff/Makefile.am.orig 2016-03-26 11:00:22.298011000 +0900 -+++ xmlroff/Makefile.am 2016-03-26 11:01:28.445341000 +0900 -@@ -6,8 +6,7 @@ +--- xmlroff/Makefile.am.orig 2009-03-11 21:08:57 UTC ++++ xmlroff/Makefile.am +@@ -6,8 +6,7 @@ endif INCLUDES = \ -DG_LOG_DOMAIN=\"libfo\" \ @@ -10,7 +10,7 @@ bin_PROGRAMS = \ xmlroff -@@ -18,11 +17,8 @@ +@@ -18,11 +17,8 @@ bin_PROGRAMS = \ xmlroff_SOURCES = \ xmlroff.c