svn commit: r470612 - head/net/GeoIP/files
Adam Weinberger
adamw at FreeBSD.org
Tue May 22 13:38:05 UTC 2018
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)
More information about the svn-ports-all
mailing list