Index: head/textproc/xmlroff/Makefile =================================================================== --- head/textproc/xmlroff/Makefile (revision 416808) +++ head/textproc/xmlroff/Makefile (revision 416809) @@ -1,35 +1,34 @@ # Created by: James Earl # $FreeBSD$ PORTNAME= xmlroff PORTVERSION= 0.6.2 PORTREVISION= 6 DISTVERSIONPREFIX= v CATEGORIES= textproc MAINTAINER= hrs@FreeBSD.org COMMENT= XSL formatter that produces PDF and PostScript LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= libfo>=0.6.2:textproc/libfo RUN_DEPENDS:= ${BUILD_DEPENDS} USES= autoreconf gmake gettext libtool pkgconfig pathfix USE_GITHUB= yes USE_GNOME= libgnomeprint libartlgpl2 pango glib20 \ 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 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 Index: head/textproc/xmlroff/files/patch-Makefile.am =================================================================== --- head/textproc/xmlroff/files/patch-Makefile.am (revision 416808) +++ head/textproc/xmlroff/files/patch-Makefile.am (revision 416809) @@ -1,31 +1,31 @@ ---- 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 -SUBDIRS = libfo xmlroff . examples docs $(CUNIT_DIRS) +SUBDIRS = xmlroff examples docs $(CUNIT_DIRS) if PLATFORM_WIN32 no_undefined = -no-undefined endif INCLUDES = \ - -DG_LOG_DOMAIN=\"libfo\" \ - $(LIBXSLT_CFLAGS) \ - $(GLIB_CFLAGS) \ - -Ilibfo - - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libfo-0.6.pc - -xmldir = $(datadir)/xml/libfo-@VERSION@ -xml_DATA = \ - catalog.xml \ - libfo-compat.xsl + -DG_LOG_DOMAIN=\"libfo\" EXTRA_DIST = \ catalog.xml.in \ Index: head/textproc/xmlroff/files/patch-configure.ac =================================================================== --- head/textproc/xmlroff/files/patch-configure.ac (revision 416808) +++ head/textproc/xmlroff/files/patch-configure.ac (revision 416809) @@ -1,59 +1,59 @@ ---- 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) # -# Checks for libxslt -# -# Variables for libxslt will also include values appropriate for -# libxml2. +# Checks for libfo # -LIBXSLT_PACKAGES=libxslt -LIBXSLT_REQUIRED_VERSION=1.0.3 +LIBFO_PACKAGES=libfo-0.6 +LIBFO_REQUIRED_VERSION=0.6 -have_libxslt=false +have_libfo=false -PKG_CHECK_MODULES(LIBXSLT, - $LIBXSLT_PACKAGES >= $LIBXSLT_REQUIRED_VERSION, - have_libxslt=true, +PKG_CHECK_MODULES(LIBFO, + $LIBFO_PACKAGES >= $LIBFO_REQUIRED_VERSION, + have_libfo=true, :) -if $have_libxslt ; then : ; else +if $have_libfo ; then : ; else AC_MSG_ERROR([ -*** Libxslt $LIBXSLT_REQUIRED_VERSION or newer is required. -*** Libxslt is available at http://xsltsoft.org/. +*** Libfo $LIBFO_REQUIRED_VERSION or newer is required. ]) fi -AC_SUBST(LIBXSLT_LIBS) -AC_SUBST(LIBXSLT_CFLAGS) +AC_SUBST(LIBFO_LIBS) +AC_SUBST(LIBFO_CFLAGS) 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 -libfo/Makefile -libfo/area/Makefile -libfo/datatype/Makefile -libfo/expr/Makefile -libfo/fo/Makefile -libfo/property/Makefile -libfo/util/Makefile -libfo-0.6.pc xmlroff.spec xmlroff/Makefile catalog.xml Index: head/textproc/xmlroff/files/patch-docs-Makefile.am =================================================================== --- head/textproc/xmlroff/files/patch-docs-Makefile.am (revision 416808) +++ head/textproc/xmlroff/files/patch-docs-Makefile.am (revision 416809) @@ -1,11 +1,20 @@ ---- 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 - xsltproc $(DOCBOOK_XSL) xmlroff.xml > xmlroff.tmp + env XML_CATALOG_FILES=file://${LOCALBASE}/share/xml/catalog xsltproc --nonet $(DOCBOOK_XSL) xmlroff.xml > xmlroff.tmp xsltproc ../libfo-compat.xsl xmlroff.tmp > xmlroff.fo rm -f xmlroff.tmp Index: head/textproc/xmlroff/files/patch-xmlroff-Makefile.am =================================================================== --- head/textproc/xmlroff/files/patch-xmlroff-Makefile.am (revision 416808) +++ head/textproc/xmlroff/files/patch-xmlroff-Makefile.am (revision 416809) @@ -1,27 +1,27 @@ ---- 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\" \ - $(LIBXSLT_CFLAGS) \ - $(GLIB_CFLAGS) + $(LIBFO_CFLAGS) bin_PROGRAMS = \ xmlroff -@@ -18,11 +17,8 @@ +@@ -18,11 +17,8 @@ bin_PROGRAMS = \ xmlroff_SOURCES = \ xmlroff.c -xmlroff_LDFLAGS = -static +xmlroff_LDFLAGS = \ + $(LIBFO_LDFLAGS) xmlroff_LDADD = \ - ../libfo/libfo-0.6.la \ - $(PANGO_LIBS) \ - $(GNOMEPRINT_LIBS) \ - $(LIBXSLT_LIBS) \ - $(FREETYPE_LIBS) + $(LIBFO_LIBS)