From owner-svn-ports-all@FreeBSD.ORG Wed Jul 23 20:15:37 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2D78FE08; Wed, 23 Jul 2014 20:15:37 +0000 (UTC) Received: from apnoea.adamw.org (apnoea.adamw.org [204.109.59.150]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0219E25AE; Wed, 23 Jul 2014 20:15:36 +0000 (UTC) Received: from [192.168.192.25] (dhcp-108-170-169-12.cable.user.start.ca [108.170.169.12]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by apnoea.adamw.org (Postfix) with ESMTPSA id 5D06412B3A1; Wed, 23 Jul 2014 16:15:34 -0400 (EDT) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: svn commit: r362719 - in head/net/GeoIP: . files From: Adam Weinberger In-Reply-To: <201407231927.s6NJRGtY029839@svn.freebsd.org> Date: Wed, 23 Jul 2014 16:15:32 -0400 Content-Transfer-Encoding: quoted-printable Message-Id: <7323D4B2-D7BB-49CD-AE17-076EF9A4772F@adamw.org> References: <201407231927.s6NJRGtY029839@svn.freebsd.org> To: Matthias Andree X-Mailer: Apple Mail (2.1878.6) Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 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: Wed, 23 Jul 2014 20:15:37 -0000 On 23 Jul, 2014, at 15:27, Matthias Andree wrote: > 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/ >=20 > Log: > Fix unprivileged build. Remove libtool from USE_AUTOTOOLS. >=20 > Make sure that Makefile.am is patched, a Makefile.in patch is useless > with USE_AUTOTOOLS=3Dautomake. >=20 > Remove libtool from USE_AUTOTOOLS, USES already contains libtool, to > fix a DEVELOPER=3Dyes warning. >=20 > Approved by: portmgr (blanket "just fix it" approval) Does everything still pass stage-qa on amd64 with these changes? Without = libtool in USES and USE_AUTOTOOLS, it was failing to link and install = all the files on amd64. # Adam --=20 Adam Weinberger adamw@adamw.org http://www.adamw.org >=20 > 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 >=20 > Modified: head/net/GeoIP/Makefile > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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=3D Find the country that any IP ad > GNU_CONFIGURE=3D yes > USES=3D libtool:oldver > USE_LDCONFIG=3D yes > -USE_AUTOTOOLS=3D aclocal automake libtool libtoolize autoconf > +USE_AUTOTOOLS=3D aclocal automake libtoolize autoconf > AUTOMAKE_ARGS=3D --add-missing >=20 > SUB_FILES=3D geoipupdate.sh pkg-message >=20 > Copied and modified: head/net/GeoIP/files/patch-man__Makefile.am (from = r362706, head/net/GeoIP/files/patch-man__Makefile.in) > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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 =3D $(mandir)/man1/geoiplookup6.1 >=20 > 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 >=20 > - # 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. >=20