Index: head/textproc/scrollkeeper/Makefile =================================================================== --- head/textproc/scrollkeeper/Makefile (revision 464641) +++ head/textproc/scrollkeeper/Makefile (revision 464642) @@ -1,51 +1,50 @@ # Created by: Rene Hexel # $FreeBSD$ # $MCom: ports/textproc/scrollkeeper/Makefile,v 1.12 2007/10/17 21:36:13 mezz Exp $ PORTNAME= scrollkeeper PORTVERSION= 0.3.14 -PORTREVISION= 14 +PORTREVISION= 15 PORTEPOCH= 1 CATEGORIES= textproc gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Open Document Cataloging Project BUILD_DEPENDS= intltool-extract:textproc/intltool \ ${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl \ docbook-xml>0:textproc/docbook-xml RUN_DEPENDS= intltool-extract:textproc/intltool \ ${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl \ docbook-xml>0:textproc/docbook-xml DOCBOOK_VERSION=4.2 CONFLICTS_INSTALL= rarian-[0-9]* USES= bison pathfix gettext gmake tar:bzip2 libtool USE_GNOME= libxslt intlhack USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var --datadir=${PREFIX}/share \ --with-omfdirs=${PREFIX}/share/omf \ --with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -lintl PLIST_SUB= LOCALBASE=${LOCALBASE} INSTALL_TARGET= install-strip post-patch: @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ 's|[(]LN_S[)] -f -n|(LN_S) -f|g' @${REINPLACE_CMD} -e 's|/usr/share/locale|${PREFIX}/share/locale|g' \ ${WRKSRC}/libs/scrollkeeper.h.in @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/extract/dtds/Makefile.in post-install: - @${RM} ${STAGEDIR}/var/log/scrollkeeper.log @${MKDIR} ${STAGEDIR}/var/db/scrollkeeper .include Index: head/textproc/scrollkeeper/files/patch-Makefile.in =================================================================== --- head/textproc/scrollkeeper/files/patch-Makefile.in (revision 464641) +++ head/textproc/scrollkeeper/files/patch-Makefile.in (revision 464642) @@ -1,38 +1,46 @@ ---- Makefile.in.orig Sat Dec 6 17:36:32 2003 -+++ Makefile.in Sat Dec 6 17:37:57 2003 -@@ -193,18 +193,6 @@ +--- Makefile.in.orig 2018-03-15 21:38:13 UTC ++++ Makefile.in +@@ -193,18 +193,6 @@ EXTRA_DIST = \ scrollkeeper-spec.txt -scrollkeeperdocdir = $(datadir)/doc/scrollkeeper-$(VERSION) -scrollkeeperdoc_DATA = \ - AUTHORS \ - ChangeLog \ - COPYING.DOC \ - COPYING \ - NEWS \ - README \ - scrollkeeper-spec.txt \ - TODO - - scrollkeeper_localstate_dir = $(localstatedir)/@SCROLLKEEPER_PARTIAL_DB_DIR@ ACLOCAL_AMFLAGS = -I m4 -@@ -222,7 +210,7 @@ +@@ -222,7 +210,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = intl/Makefile scrollkeeper.spec DIST_SOURCES = -DATA = $(scrollkeeperdoc_DATA) +DATA = RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ -@@ -564,7 +552,6 @@ +@@ -564,7 +552,6 @@ check: check-recursive all-am: Makefile $(DATA) config.h installdirs: installdirs-recursive installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(scrollkeeperdocdir) install: install-recursive install-exec: install-exec-recursive +@@ -611,7 +598,6 @@ info-am: + + install-data-am: install-scrollkeeperdocDATA + @$(NORMAL_INSTALL) +- $(MAKE) $(AM_MAKEFLAGS) install-data-hook + + install-exec-am: + Index: head/textproc/scrollkeeper/files/patch-extract_dtds_Makefile.in =================================================================== --- head/textproc/scrollkeeper/files/patch-extract_dtds_Makefile.in (revision 464641) +++ head/textproc/scrollkeeper/files/patch-extract_dtds_Makefile.in (revision 464642) @@ -1,11 +1,10 @@ ---- extract/dtds/Makefile.in.orig Sat Dec 6 17:43:49 2003 -+++ extract/dtds/Makefile.in Sat Dec 6 17:43:49 2003 -@@ -408,7 +408,7 @@ +--- extract/dtds/Makefile.in.orig 2018-03-15 21:38:13 UTC ++++ extract/dtds/Makefile.in +@@ -361,7 +361,6 @@ info-am: - # ScrollKeeper OMF Variation DTD V1.0 - install-data-hook: -- -/usr/bin/xmlcatalog --noout --add "public" \ -+ -%%LOCALBASE%%/bin/xmlcatalog --noout --add "public" \ - "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \ - "$(dtdsdir)/scrollkeeper-omf.dtd" $(CATALOG) + install-data-am: install-dtdsHEADERS + @$(NORMAL_INSTALL) +- $(MAKE) $(AM_MAKEFLAGS) install-data-hook + + install-exec-am: