From owner-svn-ports-all@freebsd.org Tue May 22 13:38:05 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9F09CEF6201; Tue, 22 May 2018 13:38:05 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 51D5B74C45; Tue, 22 May 2018 13:38:05 +0000 (UTC) (envelope-from adamw@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 3406B14B36; Tue, 22 May 2018 13:38:05 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4MDc56j010922; Tue, 22 May 2018 13:38:05 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4MDc55G010921; Tue, 22 May 2018 13:38:05 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201805221338.w4MDc55G010921@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Tue, 22 May 2018 13:38:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470612 - head/net/GeoIP/files X-SVN-Group: ports-head X-SVN-Commit-Author: adamw X-SVN-Commit-Paths: head/net/GeoIP/files X-SVN-Commit-Revision: 470612 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 May 2018 13:38:05 -0000 Author: adamw Date: Tue May 22 13:38:04 2018 New Revision: 470612 URL: https://svnweb.freebsd.org/changeset/ports/470612 Log: Fix building after r470315 When I switched from autoreconf, I forgot to point this patch file at Makefile.in instead of Makefile.am. On some systems, this caused automake to be run because it saw the Makefile.am as newer than the Makefile.in, but automake isn't pulled in as a dependency. Reported by: antoine Added: head/net/GeoIP/files/patch-man_Makefile.in - copied, changed from r470611, head/net/GeoIP/files/patch-man__Makefile.am Deleted: head/net/GeoIP/files/patch-man__Makefile.am Copied and modified: head/net/GeoIP/files/patch-man_Makefile.in (from r470611, head/net/GeoIP/files/patch-man__Makefile.am) ============================================================================== --- head/net/GeoIP/files/patch-man__Makefile.am Tue May 22 13:27:40 2018 (r470611, copy source) +++ head/net/GeoIP/files/patch-man_Makefile.in Tue May 22 13:38:04 2018 (r470612) @@ -1,14 +1,19 @@ ---- man/Makefile.am.orig 2015-04-30 04:26:22 UTC -+++ man/Makefile.am -@@ -1,4 +1,4 @@ +This patch fixes building as an unpriviliged user. + +--- man/Makefile.in.orig 2018-05-22 13:27:29 UTC ++++ man/Makefile.in +@@ -270,7 +270,7 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ -man_MANS = geoiplookup6.1 geoiplookup.1 +NOINST_man_MANS = geoiplookup6.1 geoiplookup.1 - EXTRA_DIST = geoiplookup6.1.in geoiplookup.1.in - -@@ -20,7 +20,7 @@ CLEANFILES = geoiplookup6.1 geoiplookup. - LOOKUP_MAN = $(mandir)/man1/geoiplookup.1 - LOOKUP6_MAN = $(mandir)/man1/geoiplookup6.1 + edit = sed \ + -e 's|DATADIR|$(pkgdatadir)|g' \ +@@ -530,7 +530,7 @@ geoiplookup.1 geoiplookup6.1: Makefile + geoiplookup.1: geoiplookup.1.in + geoiplookup6.1: geoiplookup6.1.in -install-data-hook: +install-data-hook: $(NOINST_man_MANS)