From owner-svn-ports-head@freebsd.org Wed Dec 4 17:10:43 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 681701A8A1A; Wed, 4 Dec 2019 17:10:43 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47Sljb1YLhz4545; Wed, 4 Dec 2019 17:10:43 +0000 (UTC) (envelope-from swills@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 174573412; Wed, 4 Dec 2019 17:10:43 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xB4HAgaO059009; Wed, 4 Dec 2019 17:10:42 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xB4HAgMS059007; Wed, 4 Dec 2019 17:10:42 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201912041710.xB4HAgMS059007@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Wed, 4 Dec 2019 17:10:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r519031 - in head/devel/log4cpp: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/devel/log4cpp: . files X-SVN-Commit-Revision: 519031 X-SVN-Commit-Repository: ports 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.29 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: Wed, 04 Dec 2019 17:10:43 -0000 Author: swills Date: Wed Dec 4 17:10:42 2019 New Revision: 519031 URL: https://svnweb.freebsd.org/changeset/ports/519031 Log: devel/log4cpp: use patch files instead of sed to replace static content Added: head/devel/log4cpp/files/ head/devel/log4cpp/files/patch-doc_Doxyfile.in (contents, props changed) head/devel/log4cpp/files/patch-doc_Makefile.in (contents, props changed) Modified: head/devel/log4cpp/Makefile (contents, props changed) Modified: head/devel/log4cpp/Makefile ============================================================================== --- head/devel/log4cpp/Makefile Wed Dec 4 17:04:41 2019 (r519030) +++ head/devel/log4cpp/Makefile Wed Dec 4 17:10:42 2019 (r519031) @@ -18,7 +18,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USES= compiler:c++11-lang gmake libtool pathfix GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-html-docs -REINPLACE_ARGS= -i "" INSTALL_TARGET= install-strip USE_LDCONFIG= yes @@ -29,13 +28,6 @@ DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen DOXYGEN_CONFIGURE_ENABLE= doxygen post-patch: - @${REINPLACE_CMD} -e \ - 's|^MAX_|#MAX_|' \ - ${WRKSRC}/doc/Doxyfile.in - @${REINPLACE_CMD} -e \ - 's|$$(prefix)/doc/.*|@docdir@| ; \ - s|\([[:blank:]]\)\($$(man3dir)\)|\1$$(DESTDIR)\2| ; \ - s|\([[:blank:]]\)\($$(docdir)\)|\1$$(DESTDIR)\2|' \ - ${WRKSRC}/doc/Makefile.in + @${RM} ${WRKSRC}/doc/Doxyfile.in.orig ${WRKSRC}/doc/Makefile.in.orig .include Added: head/devel/log4cpp/files/patch-doc_Doxyfile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/log4cpp/files/patch-doc_Doxyfile.in Wed Dec 4 17:10:42 2019 (r519031) @@ -0,0 +1,11 @@ +--- doc/Doxyfile.in.orig 2017-07-13 05:39:11 UTC ++++ doc/Doxyfile.in +@@ -62,6 +62,6 @@ COLLABORATION_GRAPH = YES + INCLUDE_GRAPH = YES + INCLUDED_BY_GRAPH = YES + GRAPHICAL_HIERARCHY = YES +-MAX_DOT_GRAPH_WIDTH = 1024 +-MAX_DOT_GRAPH_HEIGHT = 1024 ++#MAX_DOT_GRAPH_WIDTH = 1024 ++#MAX_DOT_GRAPH_HEIGHT = 1024 + GENERATE_LEGEND = YES Added: head/devel/log4cpp/files/patch-doc_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/log4cpp/files/patch-doc_Makefile.in Wed Dec 4 17:10:42 2019 (r519031) @@ -0,0 +1,46 @@ +--- doc/Makefile.in.orig 2019-12-04 16:28:30 UTC ++++ doc/Makefile.in +@@ -198,7 +198,7 @@ build_vendor = @build_vendor@ + builddir = @builddir@ + datadir = @datadir@ + datarootdir = @datarootdir@ +-docdir = $(prefix)/doc/@PACKAGE_TARNAME@-@PACKAGE_VERSION@ ++docdir = @docdir@ + dvidir = @dvidir@ + enable_dot = @enable_dot@ + enable_html_docs = @enable_html_docs@ +@@ -608,23 +608,23 @@ pdf: @PACKAGE_TARNAME@.pdf + ln -s ./latex/refman.pdf @PACKAGE_TARNAME@.pdf + + install-data-local: +- $(mkinstalldirs) $(man3dir) ++ $(mkinstalldirs) $(DESTDIR)$(man3dir) + @for i in ./man/man3/log4cpp.3 ./man/man3/log4cpp_*.3; do \ + inst=`basename $$i | sed 's/_/::/g'`; \ + echo "$(INSTALL_DATA) $$i$(man3dir)/$$inst"; \ +- $(INSTALL_DATA) $$i $(man3dir)/$$inst; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(man3dir)/$$inst; \ + done +- $(mkinstalldirs) $(docdir) +- cp -r html/. $(docdir) +- $(RM) -r -f $(docdir)/CVS \ +- $(docdir)/Makefile.am \ +- $(docdir)/Makefile.in \ +- $(docdir)/Makefile ++ $(mkinstalldirs) $(DESTDIR)$(docdir) ++ cp -r html/. $(DESTDIR)$(docdir) ++ $(RM) -r -f $(DESTDIR)$(docdir)/CVS \ ++ $(DESTDIR)$(docdir)/Makefile.am \ ++ $(DESTDIR)$(docdir)/Makefile.in \ ++ $(DESTDIR)$(docdir)/Makefile + + uninstall-local: +- $(RM) $(man3dir)/log4cpp.3 +- $(RM) $(man3dir)/log4cpp::*.3 +- $(RM) -r -f $(docdir) ++ $(RM) $(DESTDIR)$(man3dir)/log4cpp.3 ++ $(RM) $(DESTDIR)$(man3dir)/log4cpp::*.3 ++ $(RM) -r -f $(DESTDIR)$(docdir) + + clean-local: + $(RM) -r latex