svn commit: r362719 - in head/net/GeoIP: . files

[Matthias Andree]

Author: mandree
Date: Wed Jul 23 19:27:16 2014
New Revision: 362719
URL: http://svnweb.freebsd.org/changeset/ports/362719
QAT: https://qat.redports.org/buildarchive/r362719/

Log:
  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)

Added:
  head/net/GeoIP/files/patch-man__Makefile.am
     - copied, changed from r362706, head/net/GeoIP/files/patch-man__Makefile.in
Deleted:
  head/net/GeoIP/files/patch-man__Makefile.in
Modified:
  head/net/GeoIP/Makefile

Modified: head/net/GeoIP/Makefile
==============================================================================
--- head/net/GeoIP/Makefile	Wed Jul 23 19:19:10 2014	(r362718)
+++ head/net/GeoIP/Makefile	Wed Jul 23 19:27:16 2014	(r362719)
@@ -13,7 +13,7 @@ COMMENT=	Find the country that any IP ad
 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

Copied and modified: head/net/GeoIP/files/patch-man__Makefile.am (from r362706, head/net/GeoIP/files/patch-man__Makefile.in)
==============================================================================
--- head/net/GeoIP/files/patch-man__Makefile.in	Wed Jul 23 16:44:38 2014	(r362706, copy source)
+++ head/net/GeoIP/files/patch-man__Makefile.am	Wed Jul 23 19:27:16 2014	(r362719)
@@ -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.