From 8c9b5cff7c5eaad5ce70e18761d7d15fe6693ac2 Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Wed, 23 Jul 2014 19:27:16 +0000 Subject: [PATCH] Fix unprivileged build. Remove libtool from USE_AUTOTOOLS. Make sure that Makefile.am is patched, a Makefile.in patch is useless with USE_AUTOTOOLS=automake. Remove libtool from USE_AUTOTOOLS, USES already contains libtool, to fix a DEVELOPER=yes warning. Approved by: portmgr (blanket "just fix it" approval) --- net/GeoIP/Makefile | 2 +- .../{patch-man__Makefile.in => patch-man__Makefile.am} | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) rename net/GeoIP/files/{patch-man__Makefile.in => patch-man__Makefile.am} (54%) diff --git a/net/GeoIP/Makefile b/net/GeoIP/Makefile index e2ab94a238f0..52c7bf5c3fda 100644 --- a/net/GeoIP/Makefile +++ b/net/GeoIP/Makefile @@ -13,7 +13,7 @@ COMMENT= Find the country that any IP address or hostname originates from GNU_CONFIGURE= yes USES= libtool:oldver USE_LDCONFIG= yes -USE_AUTOTOOLS= aclocal automake libtool libtoolize autoconf +USE_AUTOTOOLS= aclocal automake libtoolize autoconf AUTOMAKE_ARGS= --add-missing SUB_FILES= geoipupdate.sh pkg-message diff --git a/net/GeoIP/files/patch-man__Makefile.in b/net/GeoIP/files/patch-man__Makefile.am similarity index 54% rename from net/GeoIP/files/patch-man__Makefile.in rename to net/GeoIP/files/patch-man__Makefile.am index 7604f41c24ff..15ff6f25842f 100644 --- a/net/GeoIP/files/patch-man__Makefile.in +++ b/net/GeoIP/files/patch-man__Makefile.am @@ -1,7 +1,7 @@ ---- man/Makefile.in.orig 2014-06-05 17:06:15.791427000 +0400 -+++ man/Makefile.in 2014-06-05 17:09:15.000000000 +0400 -@@ -446,9 +446,11 @@ - geoiplookup6.1: geoiplookup6.1.in +--- ./man/Makefile.am.orig 2011-03-27 23:00:36.000000000 +0200 ++++ ./man/Makefile.am 2014-07-23 19:37:28.000000000 +0200 +@@ -23,7 +23,9 @@ + LOOKUP6_MAN = $(mandir)/man1/geoiplookup6.1 install-data-hook: + chmod u+w $(DESTDIR)$(mandir)/man1/*.1 @@ -10,5 +10,3 @@ cat geoiplookup6.1 | sed s,DATADIR,$(pkgdatadir), > $(DESTDIR)$(LOOKUP6_MAN) + chmod u-w $(DESTDIR)$(mandir)/man1/*.1 - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded.