diff options
| author | adamw <adamw@FreeBSD.org> | 2018-05-22 21:38:04 +0800 |
|---|---|---|
| committer | adamw <adamw@FreeBSD.org> | 2018-05-22 21:38:04 +0800 |
| commit | a4dbf6c5cf548ac96503e7dbf1339d40c4b9e6bc (patch) | |
| tree | b549129ba8f00f14294d4b6a3cbaa971853fa307 /net | |
| parent | e2637d3fc5f4a2ce78b416484155094e1d92d383 (diff) | |
| download | freebsd-ports-graphics-a4dbf6c5cf548ac96503e7dbf1339d40c4b9e6bc.tar.gz freebsd-ports-graphics-a4dbf6c5cf548ac96503e7dbf1339d40c4b9e6bc.tar.zst freebsd-ports-graphics-a4dbf6c5cf548ac96503e7dbf1339d40c4b9e6bc.zip | |
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
Diffstat (limited to 'net')
| -rw-r--r-- | net/GeoIP/files/patch-man_Makefile.in | 22 | ||||
| -rw-r--r-- | net/GeoIP/files/patch-man__Makefile.am | 17 |
2 files changed, 22 insertions, 17 deletions
diff --git a/net/GeoIP/files/patch-man_Makefile.in b/net/GeoIP/files/patch-man_Makefile.in new file mode 100644 index 00000000000..e11b2ecfd85 --- /dev/null +++ b/net/GeoIP/files/patch-man_Makefile.in @@ -0,0 +1,22 @@ +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 + 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) + cat geoiplookup.1 | sed s,DATADIR,$(pkgdatadir), > $(DESTDIR)$(LOOKUP_MAN) + cat geoiplookup6.1 | sed s,DATADIR,$(pkgdatadir), > $(DESTDIR)$(LOOKUP6_MAN) + diff --git a/net/GeoIP/files/patch-man__Makefile.am b/net/GeoIP/files/patch-man__Makefile.am deleted file mode 100644 index 85c130436ce..00000000000 --- a/net/GeoIP/files/patch-man__Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ ---- man/Makefile.am.orig 2015-04-30 04:26:22 UTC -+++ man/Makefile.am -@@ -1,4 +1,4 @@ --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 - --install-data-hook: -+install-data-hook: $(NOINST_man_MANS) - cat geoiplookup.1 | sed s,DATADIR,$(pkgdatadir), > $(DESTDIR)$(LOOKUP_MAN) - cat geoiplookup6.1 | sed s,DATADIR,$(pkgdatadir), > $(DESTDIR)$(LOOKUP6_MAN) - |